Accepting request 923182 from hardware:boot

OBS-URL: https://build.opensuse.org/request/show/923182
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/u-boot?expand=0&rev=154

0001-XXX-openSUSE-XXX-Prepend-partition-.patch

@@ -1,4 +1,4 @@
-From e65aad38b22eceaf1e841e6ea1fe0defb51040e8 Mon Sep 17 00:00:00 2001
+From d2526d797aed3a59eadb64ffc81e371e9edb0c54 Mon Sep 17 00:00:00 2001
 From: Guillaume GARDET <guillaume.gardet@free.fr>
 Date: Wed, 13 Apr 2016 13:44:29 +0200
 Subject: [PATCH] XXX openSUSE XXX: Prepend partition 3 (and 4 for chromebook
@@ -12,7 +12,7 @@ Subject: [PATCH] XXX openSUSE XXX: Prepend partition 3 (and 4 for chromebook
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h
-index 2627c2a6a5..7dccc083cf 100644
+index 750e9e04e8..71bbf4bc21 100644
 --- a/include/config_distro_bootcmd.h
 +++ b/include/config_distro_bootcmd.h
 @@ -151,7 +151,7 @@

0002-Revert-Revert-omap3-Use-raw-SPL-by-.patch

@@ -1,4 +1,4 @@
-From b127a4fcc738e26627b468245cbd04c6352b28e6 Mon Sep 17 00:00:00 2001
+From a25b6fca9b8a33ee63073f3911581bd786726a72 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Mon, 2 May 2016 23:25:07 +0200
 Subject: [PATCH] Revert "Revert "omap3: Use raw SPL by default for mmc1""
@@ -9,7 +9,7 @@ This reverts commit 7fa75d0ac5502db813d109c1df7bd0da34688685.
  1 file changed, 2 deletions(-)
 
 diff --git a/arch/arm/mach-omap2/boot-common.c b/arch/arm/mach-omap2/boot-common.c
-index 1268a32503..e564fad0e9 100644
+index 7cdf7f1589..c06f0f8e67 100644
 --- a/arch/arm/mach-omap2/boot-common.c
 +++ b/arch/arm/mach-omap2/boot-common.c
 @@ -134,8 +134,6 @@ void save_omap_boot_params(void)

0003-rpi-Use-firmware-provided-device-tr.patch

@@ -1,4 +1,4 @@
-From 399ff5b15c070f6d36cfafbc687f3dc35f8edafc Mon Sep 17 00:00:00 2001
+From 0156cd76f4468bb145508b9f90fa6afe0e279edb Mon Sep 17 00:00:00 2001
 From: Guillaume Gardet <guillaume.gardet@arm.com>
 Date: Fri, 18 Sep 2020 15:27:37 +0200
 Subject: [PATCH] rpi: Use firmware provided device tree
@@ -28,7 +28,7 @@ Signed-off-by: Guillaume Gardet <guillaume.gardet@free.fr>
  5 files changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/configs/rpi_0_w_defconfig b/configs/rpi_0_w_defconfig
-index b9ac5fbbce..118981d7d8 100644
+index d17e102052..e5cd7d4913 100644
 --- a/configs/rpi_0_w_defconfig
 +++ b/configs/rpi_0_w_defconfig
 @@ -17,7 +17,7 @@ CONFIG_CMD_GPIO=y
@@ -41,7 +41,7 @@ index b9ac5fbbce..118981d7d8 100644
  CONFIG_SYS_RELOC_GD_ENV_ADDR=y
  CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 diff --git a/configs/rpi_2_defconfig b/configs/rpi_2_defconfig
-index 2b73619383..354ede8476 100644
+index 8b8affb777..8bda6e6aa9 100644
 --- a/configs/rpi_2_defconfig
 +++ b/configs/rpi_2_defconfig
 @@ -17,7 +17,7 @@ CONFIG_CMD_GPIO=y
@@ -54,7 +54,7 @@ index 2b73619383..354ede8476 100644
  CONFIG_SYS_RELOC_GD_ENV_ADDR=y
  CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 diff --git a/configs/rpi_3_32b_defconfig b/configs/rpi_3_32b_defconfig
-index f4fdb455f4..58f16a0365 100644
+index b867b7fa7b..370495c9e4 100644
 --- a/configs/rpi_3_32b_defconfig
 +++ b/configs/rpi_3_32b_defconfig
 @@ -18,7 +18,7 @@ CONFIG_CMD_GPIO=y
@@ -67,7 +67,7 @@ index f4fdb455f4..58f16a0365 100644
  CONFIG_SYS_RELOC_GD_ENV_ADDR=y
  CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 diff --git a/configs/rpi_3_defconfig b/configs/rpi_3_defconfig
-index 3a8ca5f2e5..b489edd876 100644
+index 3cebd657da..bb0a7ebcd5 100644
 --- a/configs/rpi_3_defconfig
 +++ b/configs/rpi_3_defconfig
 @@ -18,7 +18,7 @@ CONFIG_CMD_GPIO=y
@@ -80,7 +80,7 @@ index 3a8ca5f2e5..b489edd876 100644
  CONFIG_SYS_RELOC_GD_ENV_ADDR=y
  CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 diff --git a/configs/rpi_defconfig b/configs/rpi_defconfig
-index 5bfb81e02e..e1966bf4ac 100644
+index af2189b8fe..f6517eb52a 100644
 --- a/configs/rpi_defconfig
 +++ b/configs/rpi_defconfig
 @@ -17,7 +17,7 @@ CONFIG_CMD_GPIO=y

0004-Temp-workaround-for-Chromebook-snow.patch

@@ -1,4 +1,4 @@
-From 55d58bdeb37fa6b3b1922ea07c8b610d72d86825 Mon Sep 17 00:00:00 2001
+From d37b7bd4ee7d5b77987e97198c8ebe28244c86e1 Mon Sep 17 00:00:00 2001
 From: Guillaume GARDET <guillaume.gardet@free.fr>
 Date: Mon, 9 Apr 2018 10:28:26 +0200
 Subject: [PATCH] Temp workaround for Chromebook snow to avoid the 'unable to

0005-tools-zynqmpbif-Add-support-for-loa.patch

@@ -1,4 +1,4 @@
-From ea78f8ede3e9512fcc6569b2693225cdfa54601b Mon Sep 17 00:00:00 2001
+From fb581695b39e1877cc182717c124d519fb815bc9 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Thu, 26 Apr 2018 13:30:32 +0200
 Subject: [PATCH] tools: zynqmpbif: Add support for load=after

0006-Kconfig-add-btrfs-to-distro-boot.patch

@@ -1,4 +1,4 @@
-From 62be4dbf9b2de5d7d9dea38b3cf7d3dc824fe8ea Mon Sep 17 00:00:00 2001
+From b9839e3f75e51f8a01766e7613d01c4a70e86e51 Mon Sep 17 00:00:00 2001
 From: Matthias Brugger <mbrugger@suse.com>
 Date: Fri, 17 Jan 2020 20:59:02 +0100
 Subject: [PATCH] Kconfig: add btrfs to distro boot
@@ -13,10 +13,10 @@ Signed-off-by: Matthias Brugger <mbrugger@suse.com>
  1 file changed, 1 insertion(+)
 
 diff --git a/Kconfig b/Kconfig
-index f8c1a77bed..e4882370f8 100644
+index a6c42b902f..01186e2098 100644
 --- a/Kconfig
 +++ b/Kconfig
-@@ -167,6 +167,7 @@ config DISTRO_DEFAULTS
+@@ -182,6 +182,7 @@ config DISTRO_DEFAULTS
  	select HUSH_PARSER
  	select SUPPORT_RAW_INITRD
  	select SYS_LONGHELP

0007-configs-Re-sync-with-CONFIG_DISTRO_.patch

@@ -1,4 +1,4 @@
-From 657a96f61883211216c3b4bf89df106397c5408e Mon Sep 17 00:00:00 2001
+From 66bcb6bf6a3b3bffde8281927712154ee7be7aa8 Mon Sep 17 00:00:00 2001
 From: Matthias Brugger <mbrugger@suse.com>
 Date: Wed, 29 Jan 2020 09:56:06 +0100
 Subject: [PATCH] configs: Re-sync with CONFIG_DISTRO_DEFAULTS
@@ -18,7 +18,7 @@ Signed-off-by: Matthias Brugger <mbrugger@suse.com>
  5 files changed, 2 insertions(+), 4 deletions(-)
 
 diff --git a/configs/sandbox64_defconfig b/configs/sandbox64_defconfig
-index fafa85a5c0..9176352f48 100644
+index f7098b4969..09bf1f8eb3 100644
 --- a/configs/sandbox64_defconfig
 +++ b/configs/sandbox64_defconfig
 @@ -77,7 +77,6 @@ CONFIG_CMD_REGULATOR=y
@@ -30,10 +30,10 @@ index fafa85a5c0..9176352f48 100644
  CONFIG_CMD_CRAMFS=y
  CONFIG_CMD_EXT4_WRITE=y
 diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig
-index f279bd1a0f..3cbea5d99b 100644
+index ea08a9e5bd..ec19587e82 100644
 --- a/configs/sandbox_defconfig
 +++ b/configs/sandbox_defconfig
-@@ -90,7 +90,6 @@ CONFIG_CMD_REGULATOR=y
+@@ -99,7 +99,6 @@ CONFIG_CMD_REGULATOR=y
  CONFIG_CMD_AES=y
  CONFIG_CMD_TPM=y
  CONFIG_CMD_TPM_TEST=y
@@ -42,20 +42,20 @@ index f279bd1a0f..3cbea5d99b 100644
  CONFIG_CMD_CRAMFS=y
  CONFIG_CMD_EXT4_WRITE=y
 diff --git a/configs/socfpga_arria10_defconfig b/configs/socfpga_arria10_defconfig
-index 17f13ff4d5..f914cb7f9f 100644
+index ef9bbb9c3a..c4ddbcc612 100644
 --- a/configs/socfpga_arria10_defconfig
 +++ b/configs/socfpga_arria10_defconfig
-@@ -54,3 +54,5 @@ CONFIG_USB=y
+@@ -53,3 +53,5 @@ CONFIG_DESIGNWARE_APB_TIMER=y
- CONFIG_DM_USB=y
+ CONFIG_USB=y
  CONFIG_USB_DWC2=y
  # CONFIG_SPL_WDT is not set
 +# CONFIG_CMD_BTRFS is not set
 +# CONFIG_FS_BTRFS is not set
 diff --git a/configs/turris_mox_defconfig b/configs/turris_mox_defconfig
-index 2c6f4938db..9d8ba3a7a8 100644
+index 9a9102430e..dca076bf4b 100644
 --- a/configs/turris_mox_defconfig
 +++ b/configs/turris_mox_defconfig
-@@ -41,7 +41,6 @@ CONFIG_CMD_TIME=y
+@@ -44,7 +44,6 @@ CONFIG_CMD_TIME=y
  CONFIG_CMD_MVEBU_BUBT=y
  CONFIG_CMD_AES=y
  CONFIG_CMD_HASH=y
@@ -64,10 +64,10 @@ index 2c6f4938db..9d8ba3a7a8 100644
  CONFIG_MAC_PARTITION=y
  CONFIG_ENV_OVERWRITE=y
 diff --git a/configs/turris_omnia_defconfig b/configs/turris_omnia_defconfig
-index 57ab384f63..bad37a17a5 100644
+index a724a1baa1..1695a99f30 100644
 --- a/configs/turris_omnia_defconfig
 +++ b/configs/turris_omnia_defconfig
-@@ -51,7 +51,6 @@ CONFIG_CMD_CACHE=y
+@@ -54,7 +54,6 @@ CONFIG_CMD_CACHE=y
  CONFIG_CMD_TIME=y
  CONFIG_CMD_AES=y
  CONFIG_CMD_HASH=y

0008-sunxi-dts-OrangePi-Zero-Add-SPI-ali.patch

@@ -1,4 +1,4 @@
-From 559ee1b8af9b10b311581965bae912c05cea29e7 Mon Sep 17 00:00:00 2001
+From cf306dba0ea094571f16ebad7bcd254b3692f95a Mon Sep 17 00:00:00 2001
 From: Michal Suchanek <msuchanek@suse.de>
 Date: Tue, 29 Sep 2020 10:13:33 +0200
 Subject: [PATCH] sunxi: dts: OrangePi Zero: Add SPI aliases to make bus usable

0009-sunxi-dts-OrangePi-Zero-Enable-SPI-.patch

@@ -1,4 +1,4 @@
-From f1a2fe50d6eb11584d962a19b1b95747c12638f8 Mon Sep 17 00:00:00 2001
+From 33c1292e19391d45b0abe3d4709eed90821867a3 Mon Sep 17 00:00:00 2001
 From: Michal Suchanek <msuchanek@suse.de>
 Date: Mon, 28 Sep 2020 23:02:01 +0200
 Subject: [PATCH] sunxi: dts: OrangePi Zero: Enable SPI flash.

0010-sunxi-Enable-SPI-support-on-Orange-.patch

@@ -1,4 +1,4 @@
-From 47ef0cfeb241574a8473b6458ca3f9d615669a46 Mon Sep 17 00:00:00 2001
+From eb8774e67be4498078722f9ba333d120f88994f9 Mon Sep 17 00:00:00 2001
 From: Michal Suchanek <msuchanek@suse.de>
 Date: Mon, 28 Sep 2020 23:02:02 +0200
 Subject: [PATCH] sunxi: Enable SPI support on Orange Pi Zero

0011-Disable-CONFIG_CMD_BTRFS-in-xilinx_.patch

@@ -1,4 +1,4 @@
-From eb590062a71cd22c74ee84f37ef0438f8281f79c Mon Sep 17 00:00:00 2001
+From 2bae907961222cddaa84f428d174a89f77e8aa09 Mon Sep 17 00:00:00 2001
 From: Guillaume Gardet <guillaume.gardet@arm.com>
 Date: Wed, 18 Nov 2020 13:42:04 +0000
 Subject: [PATCH] Disable CONFIG_CMD_BTRFS in xilinx_zynqmp_virt_defconfig to
@@ -9,11 +9,11 @@ Subject: [PATCH] Disable CONFIG_CMD_BTRFS in xilinx_zynqmp_virt_defconfig to
  1 file changed, 1 insertion(+)
 
 diff --git a/configs/xilinx_zynqmp_virt_defconfig b/configs/xilinx_zynqmp_virt_defconfig
-index a3d944d94b..b805999396 100644
+index 2c8dc3427c..7b26c1445b 100644
 --- a/configs/xilinx_zynqmp_virt_defconfig
 +++ b/configs/xilinx_zynqmp_virt_defconfig
-@@ -63,6 +63,7 @@ CONFIG_CMD_GETTIME=y
+@@ -73,6 +73,7 @@ CONFIG_CMD_TIMER=y
- CONFIG_CMD_TIMER=y
+ CONFIG_CMD_REGULATOR=y
  CONFIG_CMD_TPM=y
  CONFIG_CMD_EXT4_WRITE=y
 +# CONFIG_CMD_BTRFS is not set

0012-smbios-Fix-table-when-no-string-is-.patch

@@ -1,4 +1,4 @@
-From 58c14d948350826f50b6cdb405fe42c89e7ecae3 Mon Sep 17 00:00:00 2001
+From 4e4375819ad4e941fa154b2f7a7b4792fbbe0402 Mon Sep 17 00:00:00 2001
 From: Matthias Brugger <mbrugger@suse.com>
 Date: Wed, 17 Mar 2021 12:20:32 +0100
 Subject: [PATCH] smbios: Fix table when no string is present
@@ -19,10 +19,10 @@ Series-cc: u-boot@lists.denx.de
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/lib/smbios.c b/lib/smbios.c
-index b52e125eeb..0979a08416 100644
+index d7f4999e8b..2cdfef7a2c 100644
 --- a/lib/smbios.c
 +++ b/lib/smbios.c
-@@ -149,7 +149,7 @@ static int smbios_add_prop(struct smbios_ctx *ctx, const char *prop)
+@@ -172,7 +172,7 @@ static int smbios_add_prop(struct smbios_ctx *ctx, const char *prop)
  static void smbios_set_eos(struct smbios_ctx *ctx, char *eos)
  {
  	ctx->eos = eos;

0013-configs-rpi-Enable-SMBIOS-sysinfo-d.patch

@@ -1,138 +0,0 @@
-From d0f1ad9f231651f440a262b2dd187bba78fa35f9 Mon Sep 17 00:00:00 2001
-From: Matthias Brugger <mbrugger@suse.com>
-Date: Fri, 9 Apr 2021 14:35:11 +0200
-Subject: [PATCH] configs: rpi: Enable SMBIOS sysinfo driver
-
-Enalbe this driver to allow U-Boot to get SMBIOS table information from
-a device tree node.
-
-Signed-off-by: Matthias Brugger <mbrugger@suse.com>
----
- configs/rpi_0_w_defconfig      | 2 ++
- configs/rpi_2_defconfig        | 2 ++
- configs/rpi_3_32b_defconfig    | 2 ++
- configs/rpi_3_b_plus_defconfig | 2 ++
- configs/rpi_3_defconfig        | 2 ++
- configs/rpi_4_32b_defconfig    | 2 ++
- configs/rpi_4_defconfig        | 2 ++
- configs/rpi_arm64_defconfig    | 2 ++
- configs/rpi_defconfig          | 2 ++
- 9 files changed, 18 insertions(+)
-
-diff --git a/configs/rpi_0_w_defconfig b/configs/rpi_0_w_defconfig
-index 118981d7d8..bb4c45447b 100644
---- a/configs/rpi_0_w_defconfig
-+++ b/configs/rpi_0_w_defconfig
-@@ -27,6 +27,8 @@ CONFIG_DM_ETH=y
- CONFIG_PINCTRL=y
- # CONFIG_PINCTRL_GENERIC is not set
- # CONFIG_REQUIRE_SERIAL_CONSOLE is not set
-+CONFIG_SYSINFO=y
-+CONFIG_SYSINFO_SMBIOS=y
- CONFIG_USB=y
- CONFIG_DM_USB=y
- CONFIG_USB_DWC2=y
-diff --git a/configs/rpi_2_defconfig b/configs/rpi_2_defconfig
-index 354ede8476..73c24ca979 100644
---- a/configs/rpi_2_defconfig
-+++ b/configs/rpi_2_defconfig
-@@ -27,6 +27,8 @@ CONFIG_DM_ETH=y
- CONFIG_PINCTRL=y
- # CONFIG_PINCTRL_GENERIC is not set
- # CONFIG_REQUIRE_SERIAL_CONSOLE is not set
-+CONFIG_SYSINFO=y
-+CONFIG_SYSINFO_SMBIOS=y
- CONFIG_USB=y
- CONFIG_DM_USB=y
- CONFIG_USB_DWC2=y
-diff --git a/configs/rpi_3_32b_defconfig b/configs/rpi_3_32b_defconfig
-index 58f16a0365..a5ca3522be 100644
---- a/configs/rpi_3_32b_defconfig
-+++ b/configs/rpi_3_32b_defconfig
-@@ -29,6 +29,8 @@ CONFIG_DM_ETH=y
- CONFIG_PINCTRL=y
- # CONFIG_PINCTRL_GENERIC is not set
- # CONFIG_REQUIRE_SERIAL_CONSOLE is not set
-+CONFIG_SYSINFO=y
-+CONFIG_SYSINFO_SMBIOS=y
- CONFIG_USB=y
- CONFIG_DM_USB=y
- CONFIG_USB_DWC2=y
-diff --git a/configs/rpi_3_b_plus_defconfig b/configs/rpi_3_b_plus_defconfig
-index ccdabcb9ee..d856f4a476 100644
---- a/configs/rpi_3_b_plus_defconfig
-+++ b/configs/rpi_3_b_plus_defconfig
-@@ -29,6 +29,8 @@ CONFIG_DM_ETH=y
- CONFIG_PINCTRL=y
- # CONFIG_PINCTRL_GENERIC is not set
- # CONFIG_REQUIRE_SERIAL_CONSOLE is not set
-+CONFIG_SYSINFO=y
-+CONFIG_SYSINFO_SMBIOS=y
- CONFIG_USB=y
- CONFIG_DM_USB=y
- CONFIG_USB_DWC2=y
-diff --git a/configs/rpi_3_defconfig b/configs/rpi_3_defconfig
-index b489edd876..e316cb498d 100644
---- a/configs/rpi_3_defconfig
-+++ b/configs/rpi_3_defconfig
-@@ -29,6 +29,8 @@ CONFIG_DM_ETH=y
- CONFIG_PINCTRL=y
- # CONFIG_PINCTRL_GENERIC is not set
- # CONFIG_REQUIRE_SERIAL_CONSOLE is not set
-+CONFIG_SYSINFO=y
-+CONFIG_SYSINFO_SMBIOS=y
- CONFIG_USB=y
- CONFIG_DM_USB=y
- CONFIG_USB_DWC2=y
-diff --git a/configs/rpi_4_32b_defconfig b/configs/rpi_4_32b_defconfig
-index 47ea466454..9b45258c74 100644
---- a/configs/rpi_4_32b_defconfig
-+++ b/configs/rpi_4_32b_defconfig
-@@ -38,6 +38,8 @@ CONFIG_DM_RESET=y
- CONFIG_DM_RNG=y
- CONFIG_RNG_IPROC200=y
- # CONFIG_REQUIRE_SERIAL_CONSOLE is not set
-+CONFIG_SYSINFO=y
-+CONFIG_SYSINFO_SMBIOS=y
- CONFIG_USB=y
- CONFIG_DM_USB=y
- CONFIG_DM_USB_GADGET=y
-diff --git a/configs/rpi_4_defconfig b/configs/rpi_4_defconfig
-index 9cd1477107..69045e839b 100644
---- a/configs/rpi_4_defconfig
-+++ b/configs/rpi_4_defconfig
-@@ -38,6 +38,8 @@ CONFIG_DM_RESET=y
- CONFIG_DM_RNG=y
- CONFIG_RNG_IPROC200=y
- # CONFIG_REQUIRE_SERIAL_CONSOLE is not set
-+CONFIG_SYSINFO=y
-+CONFIG_SYSINFO_SMBIOS=y
- CONFIG_USB=y
- CONFIG_DM_USB=y
- CONFIG_DM_USB_GADGET=y
-diff --git a/configs/rpi_arm64_defconfig b/configs/rpi_arm64_defconfig
-index aeef34c4de..c5082edbd9 100644
---- a/configs/rpi_arm64_defconfig
-+++ b/configs/rpi_arm64_defconfig
-@@ -35,6 +35,8 @@ CONFIG_DM_RESET=y
- CONFIG_DM_RNG=y
- CONFIG_RNG_IPROC200=y
- # CONFIG_REQUIRE_SERIAL_CONSOLE is not set
-+CONFIG_SYSINFO=y
-+CONFIG_SYSINFO_SMBIOS=y
- CONFIG_USB=y
- CONFIG_DM_USB=y
- CONFIG_USB_XHCI_HCD=y
-diff --git a/configs/rpi_defconfig b/configs/rpi_defconfig
-index e1966bf4ac..e58b69c878 100644
---- a/configs/rpi_defconfig
-+++ b/configs/rpi_defconfig
-@@ -27,6 +27,8 @@ CONFIG_DM_ETH=y
- CONFIG_PINCTRL=y
- # CONFIG_PINCTRL_GENERIC is not set
- # CONFIG_REQUIRE_SERIAL_CONSOLE is not set
-+CONFIG_SYSINFO=y
-+CONFIG_SYSINFO_SMBIOS=y
- CONFIG_USB=y
- CONFIG_DM_USB=y
- CONFIG_USB_DWC2=y

0013-riscv-enable-CMD_BTRFS.patch

@@ -0,0 +1,23 @@
+From ed00c40485b16b217c67adb8326b7e6d4e4f8a27 Mon Sep 17 00:00:00 2001
+From: Andreas Schwab <schwab@suse.de>
+Date: Fri, 24 Sep 2021 18:25:51 +0200
+Subject: [PATCH] riscv: enable CMD_BTRFS
+
+Signed-off-by: Matthias Brugger <mbrugger@suse.com>
+---
+ Kconfig | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Kconfig b/Kconfig
+index 01186e2098..2d17084d55 100644
+--- a/Kconfig
++++ b/Kconfig
+@@ -182,7 +182,7 @@ config DISTRO_DEFAULTS
+ 	select HUSH_PARSER
+ 	select SUPPORT_RAW_INITRD
+ 	select SYS_LONGHELP
+-	imply CMD_BTRFS if !RISCV && !MIPS
++	imply CMD_BTRFS if !MIPS
+ 	imply CMD_MII if NET
+ 	imply USB_STORAGE
+ 	imply USE_BOOTCOMMAND

0014-Disable-timer-check-in-file-loading.patch

@@ -0,0 +1,48 @@
+From 52c5c682035d9b61f69f0e25fb4db48272644bdb Mon Sep 17 00:00:00 2001
+From: Michael Chang <mchang@suse.com>
+Date: Tue, 25 May 2021 06:45:01 +0000
+Subject: [PATCH] Disable timer check in file loading
+
+The u-boot efi console service registers a timer to poll the keyboard
+input in every 50ns. In the efi block io service, this timer is
+evaluated on each block read, and since the timer interval is much less
+than the time needed to reading out a block (32kB) from the disk, the
+keyboard polling is therefore in the wake of each block read.
+
+Unfortunately USB keyboard spends too much time in polling. In my test
+usb_kbd_poll_for_event costs 40ms in usb_kbd_testc() to test if a
+character is in the queue. In combination with the number of blocks to
+be read from the disk, the extra amound of time delayed could be around
+30 seconds to load linux and initrd.
+
+For that matters, the timer check is disabled in file loading to speed
+it up. The consequence would be losing the keystroke during the time
+file is loading, but that is acceptable IMHO.
+
+Signed-off-by: Matthias Brugger <mbrugger@suse.com>
+---
+ lib/efi_loader/efi_disk.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib/efi_loader/efi_disk.c b/lib/efi_loader/efi_disk.c
+index 988907ecb9..ea75687508 100644
+--- a/lib/efi_loader/efi_disk.c
++++ b/lib/efi_loader/efi_disk.c
+@@ -15,6 +15,7 @@
+ #include <log.h>
+ #include <part.h>
+ #include <malloc.h>
++#include <watchdog.h>
+ 
+ struct efi_system_partition efi_system_partition;
+ 
+@@ -103,8 +104,7 @@ static efi_status_t efi_disk_rw_blocks(struct efi_block_io *this,
+ 	else
+ 		n = blk_dwrite(desc, lba, blocks, buffer);
+ 
+-	/* We don't do interrupts, so check for timers cooperatively */
+-	efi_timer_check();
++	WATCHDOG_RESET();
+ 
+ 	EFI_PRINT("n=%lx blocks=%x\n", n, blocks);
+ 

0014-btrfs-Use-default-subvolume-as-file.patch

@@ -1,91 +0,0 @@
-From 6d31a7a47e0a3f66304fb033a9e8c9a78e1bc661 Mon Sep 17 00:00:00 2001
-From: "Matwey V. Kornilov" <matwey.kornilov@gmail.com>
-Date: Sun, 1 Aug 2021 23:52:16 +0300
-Subject: [PATCH] btrfs: Use default subvolume as filesystem root
-
-BTRFS volume consists of a number of subvolumes which can be mounted separately
-from each other. The top-level subvolume always exists even if no subvolumes
-were created manually. A subvolume can be denoted as the default subvolume i.e.
-the subvolume which is mounted by default.
-
-The default "default subvolume" is the top-level one, but this is far from the
-common practices used in the wild. For instance, openSUSE provides an OS
-snapshot/rollback feature based on BTRFS. To achieve this, the actual OS root
-filesystem is located into a separate subvolume which is "default" but not
-"top-level". That means that the /boot/dtb/ directory is also located inside
-this default subvolume instead of top-level one.
-
-However, the existing btrfs u-boot driver always uses the top-level subvolume
-as the filesystem root. This behaviour 1) is inconsistent with
-
-    mount /dev/sda1 /target
-
-command, which mount the default subvolume 2) leads to the issues when
-/boot/dtb cannot be found properly (see the reference).
-
-This patch uses the default subvolume as the filesystem root to overcome
-mentioned issues.
-
-Reference: https://bugzilla.suse.com/show_bug.cgi?id=1185656
-Signed-off-by: Matwey V. Kornilov <matwey.kornilov@gmail.com>
-Reviewed-by: Qu Wenruo <wqu@suse.com>
----
- fs/btrfs/disk-io.c | 38 +++++++++++++++++++++++++++++++++++---
- 1 file changed, 35 insertions(+), 3 deletions(-)
-
-diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
-index 349411c3cc..12f9579fcf 100644
---- a/fs/btrfs/disk-io.c
-+++ b/fs/btrfs/disk-io.c
-@@ -804,6 +804,30 @@ static int setup_root_or_create_block(struct btrfs_fs_info *fs_info,
- 	return 0;
- }
- 
-+static int get_default_subvolume(struct btrfs_fs_info *fs_info,
-+				 struct btrfs_key *key_ret)
-+{
-+	struct btrfs_root *root = fs_info->tree_root;
-+	struct btrfs_dir_item *dir_item;
-+	struct btrfs_path path;
-+	int ret = 0;
-+
-+	btrfs_init_path(&path);
-+
-+	dir_item = btrfs_lookup_dir_item(NULL, root, &path,
-+					 BTRFS_ROOT_TREE_DIR_OBJECTID,
-+					 "default", 7, 0);
-+	if (IS_ERR(dir_item)) {
-+		ret = PTR_ERR(dir_item);
-+		goto out;
-+	}
-+
-+	btrfs_dir_item_key_to_cpu(path.nodes[0], dir_item, key_ret);
-+out:
-+	btrfs_release_path(&path);
-+	return ret;
-+}
-+
- int btrfs_setup_all_roots(struct btrfs_fs_info *fs_info)
- {
- 	struct btrfs_super_block *sb = fs_info->super_copy;
-@@ -833,9 +857,17 @@ int btrfs_setup_all_roots(struct btrfs_fs_info *fs_info)
- 
- 	fs_info->last_trans_committed = generation;
- 
--	key.objectid = BTRFS_FS_TREE_OBJECTID;
--	key.type = BTRFS_ROOT_ITEM_KEY;
--	key.offset = (u64)-1;
-+	ret = get_default_subvolume(fs_info, &key);
-+	if (ret) {
-+		/*
-+		 * The default dir item isn't there. Linux kernel behaviour is
-+		 * to silently use the top-level subvolume in this case.
-+		 */
-+		key.objectid = BTRFS_FS_TREE_OBJECTID;
-+		key.type = BTRFS_ROOT_ITEM_KEY;
-+		key.offset = (u64)-1;
-+	}
-+
- 	fs_info->fs_root = btrfs_read_fs_root(fs_info, &key);
- 
- 	if (IS_ERR(fs_info->fs_root))

_multibuild

@@ -82,6 +82,7 @@
   <flavor>rpi4</flavor>
   <flavor>rpiarm64</flavor>
   <flavor>sifiveunleashed</flavor>
+  <flavor>sifiveunmatched</flavor>
   <flavor>snow</flavor>
   <flavor>socfpgade0nanosoc</flavor>
   <flavor>spring</flavor>

u-boot-2021.07.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:312b7eeae44581d1362c3a3f02c28d806647756c82ba8c72241c7cdbe68ba77e
-size 17275746

u-boot-2021.10.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cde723e19262e646f2670d25e5ec4b1b368490de950d4e26275a988c36df0bd4
+size 17358295

u-boot.changes

@@ -1,3 +1,45 @@
+-------------------------------------------------------------------
+Tue Oct  5 08:09:14 UTC 2021 - Guillaume GARDET <guillaume.gardet@opensuse.org>
+
+- Update to 2021.10
+
+-------------------------------------------------------------------
+Thu Sep 30 02:30:51 UTC 2021 - Matthias Brugger <mbrugger@suse.com>
+
+Fix Grub loading slowdown when connecting USB keyboard (bsc#1171222).
+Enable BTRFS for Risc-V.
+
+Patch queue updated from https://github.com/openSUSE/u-boot.git tumbleweed-2021.10
+* Patches added:
+  0013-riscv-enable-CMD_BTRFS.patch
+  0014-Disable-timer-check-in-file-loading.patch
+
+-------------------------------------------------------------------
+Tue Sep 28 18:38:35 UTC 2021 - Guillaume GARDET <guillaume.gardet@opensuse.org>
+
+- Update to 2021.10-rc5
+- Patch queue updated from https://github.com/openSUSE/u-boot.git tumbleweed-2021.10
+* Patches dropped (upstreamed):
+  0013-configs-rpi-Enable-SMBIOS-sysinfo-d.patch
+
+-------------------------------------------------------------------
+Tue Sep 28 09:19:22 UTC 2021 - Andreas Schwab <schwab@suse.de>
+
+- Add hack to allow enabling CONFIG_CMD_BTRFS on riscv64
+
+-------------------------------------------------------------------
+Thu Sep 16 13:24:40 UTC 2021 - Andreas Schwab <schwab@suse.de>
+
+- Add sifiveunmatched flavor
+
+-------------------------------------------------------------------
+Wed Sep 15 06:07:56 UTC 2021 - Guillaume GARDET <guillaume.gardet@opensuse.org>
+
+- Update to 2021.10-rc4
+- Patch queue updated from https://github.com/openSUSE/u-boot.git tumbleweed-2021.10
+* Patches dropped:
+  0014-btrfs-Use-default-subvolume-as-file.patch
+
 -------------------------------------------------------------------
 Fri Aug  6 09:58:41 UTC 2021 - Matwey Kornilov <matwey.kornilov@gmail.com>
 

u-boot.spec

@@ -162,9 +162,9 @@
 %define is_armv7 1
 %define binext .img
 %endif
-%if "%target" == "qemu-riscv64" || "%target" == "qemu-riscv64smode" || "%target" == "sifiveunleashed"
+%if "%target" == "qemu-riscv64" || "%target" == "qemu-riscv64smode" || "%target" == "sifiveunleashed" || "%target" == "sifiveunmatched"
 %define is_riscv64 1
-%if "%target" == "sifiveunleashed"
+%if "%target" == "sifiveunleashed" || "%target" == "sifiveunmatched"
 %define binext .itb
 %endif
 %endif
@@ -172,7 +172,7 @@
 %define is_ppc 1
 %endif
 # archive_version differs from version for RC version only
-%define archive_version 2021.07
+%define archive_version 2021.10
 %if "%{target}" == ""
 ExclusiveArch:  do_not_build
 %else
@@ -208,7 +208,7 @@ ExclusiveArch:  do_not_build
 %else
 %bcond_with uboot_atf
 %endif
-Version:        2021.07
+Version:        2021.10
 Release:        0
 Summary:        The U-Boot firmware for the %target platform
 License:        GPL-2.0-only
@@ -232,8 +232,8 @@ Patch0009:      0009-sunxi-dts-OrangePi-Zero-Enable-SPI-.patch
 Patch0010:      0010-sunxi-Enable-SPI-support-on-Orange-.patch
 Patch0011:      0011-Disable-CONFIG_CMD_BTRFS-in-xilinx_.patch
 Patch0012:      0012-smbios-Fix-table-when-no-string-is-.patch
-Patch0013:      0013-configs-rpi-Enable-SMBIOS-sysinfo-d.patch
+Patch0013:      0013-riscv-enable-CMD_BTRFS.patch
-Patch0014:      0014-btrfs-Use-default-subvolume-as-file.patch
+Patch0014:      0014-Disable-timer-check-in-file-loading.patch
 # Patches: end
 BuildRequires:  bc
 BuildRequires:  bison
@@ -310,7 +310,7 @@ BuildRequires:  zynqmp-dts
 # For mountpoint
 Requires(post): util-linux
 %endif
-%if "%{name}" == "u-boot-sifiveunleashed"
+%if "%{name}" == "u-boot-sifiveunleashed" || "%{name}" == "u-boot-sifiveunmatched"
 BuildRequires:  opensbi >= 0.9
 %endif
 %if %x_loader == 1
@@ -394,7 +394,7 @@ export BL31=%{_datadir}/arm-trusted-firmware-sun50i_h6/bl31.bin
 %endif
 export SCP=/dev/null
 %endif
-%if "%{name}" == "u-boot-sifiveunleashed"
+%if "%{name}" == "u-boot-sifiveunleashed" || "%{name}" == "u-boot-sifiveunmatched"
 export OPENSBI=%{_datadir}/opensbi/opensbi.bin
 %endif
 
@@ -427,6 +427,29 @@ export DEVICE_TREE=zynqmp-zcu102-rev1.0
 export DEVICE_TREE=zynq-zturn-v5
 %endif
 
+%ifarch riscv64
+# Hack to allow enabling btrfs on riscv64.  CONFIG_CMD_BTRFS implies
+# CONFIG_ZSTD, which needs __clzsi2 from libgcc.  The system libgcc has
+# been built with -mabi=lp64d (double-float ABI), but U-Boot is built with
+# -mabi=lp64 (soft-float ABI).  The linker does not allow mixing objects
+# with differing float ABIs.  Since __clzsi2 does not use any floating
+# point, there is actually no compatibilty problem, so pretend that is was
+# built with the soft-float ABI.  Create a private libgcc.a that contains
+# the rebranded object files.
+libgcc=$(gcc -print-libgcc-file-name)
+mkdir arch/riscv/libgcc
+pushd arch/riscv/libgcc
+ar x $libgcc _clz.o _clzsi2.o
+# Change the header flags from 0x05 (RVC, double-float ABI) to 0x01 (RVC,
+# soft-float ABI)
+printf '\1' | dd of=_clz.o bs=1 seek=48 conv=notrunc status=none
+printf '\1' | dd of=_clzsi2.o bs=1 seek=48 conv=notrunc status=none
+ar cr libgcc.a _clz.o _clzsi2.o
+rm -f _clz.o _clzsi2.o
+popd
+extra_makeflags=PLATFORM_LIBGCC="$PWD/arch/riscv/libgcc/libgcc.a"
+%endif
+
 make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="%{optflags}" $confname
 echo "Attempting to enable fdt apply command (.dtbo) support."
 echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config
@@ -434,7 +457,7 @@ echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config
 echo "Tweaking text base for TF-A."
 echo "CONFIG_SYS_TEXT_BASE=0x11000000" >> .config
 %endif
-make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="%{optflags}" all
+make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="%{optflags}" $extra_makeflags all
 
 %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring"
 # Chromebook ARM (snow) and HP Chromebook 11 (spring) need a uImage format
@@ -548,7 +571,7 @@ echo -e "\nkernel_address=0x11000000" >> %{buildroot}%{uboot_dir}/ubootconfig.tx
 %if "%{name}" == "u-boot-rpi4" || "%{name}" == "u-boot-rpiarm64"
 echo -e "# Boot in AArch64 mode\narm_64bit=1" > %{buildroot}%{uboot_dir}/ubootconfig.txt
 %endif
-%if "%{name}" == "u-boot-sifiveunleashed"
+%if "%{name}" == "u-boot-sifiveunleashed" || "%{name}" == "u-boot-sifiveunmatched"
 install -D -m 0644 spl/u-boot-spl.bin %{buildroot}%{uboot_dir}/u-boot-spl.bin
 %endif
 

update_git.sh

@@ -13,8 +13,8 @@ set -e
 
 GIT_TREE=https://github.com/openSUSE/u-boot.git
 GIT_LOCAL_TREE=~/src/opensuse/u-boot-opensuse
-GIT_BRANCH=tumbleweed-2021.07
+GIT_BRANCH=tumbleweed-2021.10
-GIT_UPSTREAM_TAG=v2021.07
+GIT_UPSTREAM_TAG=v2021.10
 GIT_DIR=`mktemp -d -p /dev/shm`
 CMP_DIR=`mktemp -d -p /dev/shm`