From aaf705b7084031c48a9f20e0df9e11c4498e6869bb44978dbefeaf0409f80793 Mon Sep 17 00:00:00 2001 From: Matthias Brugger Date: Mon, 4 Oct 2021 10:32:24 +0000 Subject: [PATCH] Accepting request 922056 from hardware:boot:staging - 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 - Add hack to allow enabling CONFIG_CMD_BTRFS on riscv64 - Add sifiveunmatched flavor - 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 OBS-URL: https://build.opensuse.org/request/show/922056 OBS-URL: https://build.opensuse.org/package/show/hardware:boot/u-boot?expand=0&rev=151 --- ...-XXX-openSUSE-XXX-Prepend-partition-.patch | 4 +- ...-Revert-Revert-omap3-Use-raw-SPL-by-.patch | 4 +- ...-rpi-Use-firmware-provided-device-tr.patch | 12 +- ...-Temp-workaround-for-Chromebook-snow.patch | 2 +- ...-tools-zynqmpbif-Add-support-for-loa.patch | 2 +- 0006-Kconfig-add-btrfs-to-distro-boot.patch | 6 +- ...-configs-Re-sync-with-CONFIG_DISTRO_.patch | 22 +-- ...-sunxi-dts-OrangePi-Zero-Add-SPI-ali.patch | 2 +- ...-sunxi-dts-OrangePi-Zero-Enable-SPI-.patch | 2 +- ...-sunxi-Enable-SPI-support-on-Orange-.patch | 2 +- ...-Disable-CONFIG_CMD_BTRFS-in-xilinx_.patch | 8 +- ...-smbios-Fix-table-when-no-string-is-.patch | 6 +- ...-configs-rpi-Enable-SMBIOS-sysinfo-d.patch | 138 ------------------ ...-btrfs-Use-default-subvolume-as-file.patch | 91 ------------ _multibuild | 1 + u-boot-2021.07.tar.bz2 | 3 - u-boot-2021.07.tar.bz2.sig | Bin 458 -> 0 bytes u-boot-2021.10-rc5.tar.bz2 | 3 + u-boot-2021.10-rc5.tar.bz2.sig | Bin 0 -> 458 bytes u-boot.changes | 26 ++++ u-boot.spec | 41 ++++-- update_git.sh | 4 +- 22 files changed, 99 insertions(+), 280 deletions(-) delete mode 100644 0013-configs-rpi-Enable-SMBIOS-sysinfo-d.patch delete mode 100644 0014-btrfs-Use-default-subvolume-as-file.patch delete mode 100644 u-boot-2021.07.tar.bz2 delete mode 100644 u-boot-2021.07.tar.bz2.sig create mode 100644 u-boot-2021.10-rc5.tar.bz2 create mode 100644 u-boot-2021.10-rc5.tar.bz2.sig diff --git a/0001-XXX-openSUSE-XXX-Prepend-partition-.patch b/0001-XXX-openSUSE-XXX-Prepend-partition-.patch index e8e1f8b..f403ff7 100644 --- a/0001-XXX-openSUSE-XXX-Prepend-partition-.patch +++ b/0001-XXX-openSUSE-XXX-Prepend-partition-.patch @@ -1,4 +1,4 @@ -From e65aad38b22eceaf1e841e6ea1fe0defb51040e8 Mon Sep 17 00:00:00 2001 +From d547eaaabdd35fff44fb9c26c2bce6399c539dbc Mon Sep 17 00:00:00 2001 From: Guillaume GARDET 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 @@ diff --git a/0002-Revert-Revert-omap3-Use-raw-SPL-by-.patch b/0002-Revert-Revert-omap3-Use-raw-SPL-by-.patch index e284c2f..26e0890 100644 --- a/0002-Revert-Revert-omap3-Use-raw-SPL-by-.patch +++ b/0002-Revert-Revert-omap3-Use-raw-SPL-by-.patch @@ -1,4 +1,4 @@ -From b127a4fcc738e26627b468245cbd04c6352b28e6 Mon Sep 17 00:00:00 2001 +From b65fd55b8a88f691c41617f553665d8844bf24cb Mon Sep 17 00:00:00 2001 From: Alexander Graf 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) diff --git a/0003-rpi-Use-firmware-provided-device-tr.patch b/0003-rpi-Use-firmware-provided-device-tr.patch index 9c9106a..e808d9c 100644 --- a/0003-rpi-Use-firmware-provided-device-tr.patch +++ b/0003-rpi-Use-firmware-provided-device-tr.patch @@ -1,4 +1,4 @@ -From 399ff5b15c070f6d36cfafbc687f3dc35f8edafc Mon Sep 17 00:00:00 2001 +From b47a0c9da4a6f4460f1c81607c92ab6d68762370 Mon Sep 17 00:00:00 2001 From: Guillaume Gardet 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 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 diff --git a/0004-Temp-workaround-for-Chromebook-snow.patch b/0004-Temp-workaround-for-Chromebook-snow.patch index 3589998..ec9d87d 100644 --- a/0004-Temp-workaround-for-Chromebook-snow.patch +++ b/0004-Temp-workaround-for-Chromebook-snow.patch @@ -1,4 +1,4 @@ -From 55d58bdeb37fa6b3b1922ea07c8b610d72d86825 Mon Sep 17 00:00:00 2001 +From 940492c0a974f5e165bedcb96a925bb859d3889c Mon Sep 17 00:00:00 2001 From: Guillaume GARDET Date: Mon, 9 Apr 2018 10:28:26 +0200 Subject: [PATCH] Temp workaround for Chromebook snow to avoid the 'unable to diff --git a/0005-tools-zynqmpbif-Add-support-for-loa.patch b/0005-tools-zynqmpbif-Add-support-for-loa.patch index 3100a2b..b7698c7 100644 --- a/0005-tools-zynqmpbif-Add-support-for-loa.patch +++ b/0005-tools-zynqmpbif-Add-support-for-loa.patch @@ -1,4 +1,4 @@ -From ea78f8ede3e9512fcc6569b2693225cdfa54601b Mon Sep 17 00:00:00 2001 +From bf3fe233ee3c55796d9733232eb14d439260519f Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Thu, 26 Apr 2018 13:30:32 +0200 Subject: [PATCH] tools: zynqmpbif: Add support for load=after diff --git a/0006-Kconfig-add-btrfs-to-distro-boot.patch b/0006-Kconfig-add-btrfs-to-distro-boot.patch index 4097829..2f879b6 100644 --- a/0006-Kconfig-add-btrfs-to-distro-boot.patch +++ b/0006-Kconfig-add-btrfs-to-distro-boot.patch @@ -1,4 +1,4 @@ -From 62be4dbf9b2de5d7d9dea38b3cf7d3dc824fe8ea Mon Sep 17 00:00:00 2001 +From 7fa6ccd62ca3bbf68fc0f2f5ccb1acbc69ba162d Mon Sep 17 00:00:00 2001 From: Matthias Brugger 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 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 diff --git a/0007-configs-Re-sync-with-CONFIG_DISTRO_.patch b/0007-configs-Re-sync-with-CONFIG_DISTRO_.patch index 189027f..0822cba 100644 --- a/0007-configs-Re-sync-with-CONFIG_DISTRO_.patch +++ b/0007-configs-Re-sync-with-CONFIG_DISTRO_.patch @@ -1,4 +1,4 @@ -From 657a96f61883211216c3b4bf89df106397c5408e Mon Sep 17 00:00:00 2001 +From 7834a28a8e0dcffb3fecddaaa85a7759582e55d4 Mon Sep 17 00:00:00 2001 From: Matthias Brugger 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 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 - CONFIG_DM_USB=y +@@ -53,3 +53,5 @@ CONFIG_DESIGNWARE_APB_TIMER=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 diff --git a/0008-sunxi-dts-OrangePi-Zero-Add-SPI-ali.patch b/0008-sunxi-dts-OrangePi-Zero-Add-SPI-ali.patch index 72b4cb0..0862948 100644 --- a/0008-sunxi-dts-OrangePi-Zero-Add-SPI-ali.patch +++ b/0008-sunxi-dts-OrangePi-Zero-Add-SPI-ali.patch @@ -1,4 +1,4 @@ -From 559ee1b8af9b10b311581965bae912c05cea29e7 Mon Sep 17 00:00:00 2001 +From 51f848d472723da6c97fd7ad86425ffe28876c8c Mon Sep 17 00:00:00 2001 From: Michal Suchanek Date: Tue, 29 Sep 2020 10:13:33 +0200 Subject: [PATCH] sunxi: dts: OrangePi Zero: Add SPI aliases to make bus usable diff --git a/0009-sunxi-dts-OrangePi-Zero-Enable-SPI-.patch b/0009-sunxi-dts-OrangePi-Zero-Enable-SPI-.patch index d27e6d5..69dcc85 100644 --- a/0009-sunxi-dts-OrangePi-Zero-Enable-SPI-.patch +++ b/0009-sunxi-dts-OrangePi-Zero-Enable-SPI-.patch @@ -1,4 +1,4 @@ -From f1a2fe50d6eb11584d962a19b1b95747c12638f8 Mon Sep 17 00:00:00 2001 +From 33cf14f4d4a1af33b13b32698213e95201f5e6ba Mon Sep 17 00:00:00 2001 From: Michal Suchanek Date: Mon, 28 Sep 2020 23:02:01 +0200 Subject: [PATCH] sunxi: dts: OrangePi Zero: Enable SPI flash. diff --git a/0010-sunxi-Enable-SPI-support-on-Orange-.patch b/0010-sunxi-Enable-SPI-support-on-Orange-.patch index 7fe3519..d53b1a3 100644 --- a/0010-sunxi-Enable-SPI-support-on-Orange-.patch +++ b/0010-sunxi-Enable-SPI-support-on-Orange-.patch @@ -1,4 +1,4 @@ -From 47ef0cfeb241574a8473b6458ca3f9d615669a46 Mon Sep 17 00:00:00 2001 +From 3c75d26e8169a80eb8832b1b04eb1b8327c3bd90 Mon Sep 17 00:00:00 2001 From: Michal Suchanek Date: Mon, 28 Sep 2020 23:02:02 +0200 Subject: [PATCH] sunxi: Enable SPI support on Orange Pi Zero diff --git a/0011-Disable-CONFIG_CMD_BTRFS-in-xilinx_.patch b/0011-Disable-CONFIG_CMD_BTRFS-in-xilinx_.patch index 0791fe6..3c1e52b 100644 --- a/0011-Disable-CONFIG_CMD_BTRFS-in-xilinx_.patch +++ b/0011-Disable-CONFIG_CMD_BTRFS-in-xilinx_.patch @@ -1,4 +1,4 @@ -From eb590062a71cd22c74ee84f37ef0438f8281f79c Mon Sep 17 00:00:00 2001 +From 042e8f8b9eb5846b66167ebed94a5a38e986f21a Mon Sep 17 00:00:00 2001 From: Guillaume Gardet 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 - CONFIG_CMD_TIMER=y +@@ -73,6 +73,7 @@ CONFIG_CMD_TIMER=y + CONFIG_CMD_REGULATOR=y CONFIG_CMD_TPM=y CONFIG_CMD_EXT4_WRITE=y +# CONFIG_CMD_BTRFS is not set diff --git a/0012-smbios-Fix-table-when-no-string-is-.patch b/0012-smbios-Fix-table-when-no-string-is-.patch index e9481a3..6555dc5 100644 --- a/0012-smbios-Fix-table-when-no-string-is-.patch +++ b/0012-smbios-Fix-table-when-no-string-is-.patch @@ -1,4 +1,4 @@ -From 58c14d948350826f50b6cdb405fe42c89e7ecae3 Mon Sep 17 00:00:00 2001 +From 24bc073e2808f10fa43412d5734476bdbeb7145a Mon Sep 17 00:00:00 2001 From: Matthias Brugger 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; diff --git a/0013-configs-rpi-Enable-SMBIOS-sysinfo-d.patch b/0013-configs-rpi-Enable-SMBIOS-sysinfo-d.patch deleted file mode 100644 index beccafe..0000000 --- a/0013-configs-rpi-Enable-SMBIOS-sysinfo-d.patch +++ /dev/null @@ -1,138 +0,0 @@ -From d0f1ad9f231651f440a262b2dd187bba78fa35f9 Mon Sep 17 00:00:00 2001 -From: Matthias Brugger -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 ---- - 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 diff --git a/0014-btrfs-Use-default-subvolume-as-file.patch b/0014-btrfs-Use-default-subvolume-as-file.patch deleted file mode 100644 index 1d12f50..0000000 --- a/0014-btrfs-Use-default-subvolume-as-file.patch +++ /dev/null @@ -1,91 +0,0 @@ -From 6d31a7a47e0a3f66304fb033a9e8c9a78e1bc661 Mon Sep 17 00:00:00 2001 -From: "Matwey V. Kornilov" -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 -Reviewed-by: Qu Wenruo ---- - 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)) diff --git a/_multibuild b/_multibuild index 34a0008..469ce93 100644 --- a/_multibuild +++ b/_multibuild @@ -82,6 +82,7 @@ rpi4 rpiarm64 sifiveunleashed + sifiveunmatched snow socfpgade0nanosoc spring diff --git a/u-boot-2021.07.tar.bz2 b/u-boot-2021.07.tar.bz2 deleted file mode 100644 index 35d6d0a..0000000 --- a/u-boot-2021.07.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:312b7eeae44581d1362c3a3f02c28d806647756c82ba8c72241c7cdbe68ba77e -size 17275746 diff --git a/u-boot-2021.07.tar.bz2.sig b/u-boot-2021.07.tar.bz2.sig deleted file mode 100644 index a07f144375a7f39b679bf8eb9850766ab2ef40b2f6bbe3e65304f9cd2e31df94..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 458 zcmV;*0X6=K0mlRY0SW*y79j*0Jb!TDkE<64fSbP*d^!J?G`B1T0$}4IRudd_a%pa9 zKx=Pqb9HQMZ!TkRZ2$@h5EOhl|CThjEMzAO|3hrHFjfm2hKoDh#?ab;1^VOupCCxZ zbM!r4S>KN)A4S7+!+$|)7!=rwzVqNn?|g8Wr4C&!^4zA!yZm)~RsAgBKc_QFdLB zy`zBcj&bNmz0)QP-`e(*a%-wCcL}tFxT0w(nT#}XXq%i)wS5~aHwHFXnzVE^@j#PD zbB*>k2=u*u`n0o63A6k&W~}_Is?24xPc2v4>m}q$He;G$8oyp~d=I{S=UqCmAAq() zyrg0w=Csvn0Yo(9P54H@FX{q`*`e-bPn|-b(qHd?G&pP#}^i+t_fm&#-(}$?f?|E<`3E1)-YWxVR9j zT_}z-C&3wLjIRN4&?>4jlpHPJitzRu{(soNFeSpQ!Tv^)Qdr%iLxqE7MTN6OXsVw- zW-TJSn5;pn6tPh=s7M^Gbio1r#aoXbx}uz;dWs!tMr=^wKLUPU$(UFUp0Q;`6^` + +- 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 + +- Add hack to allow enabling CONFIG_CMD_BTRFS on riscv64 + +------------------------------------------------------------------- +Thu Sep 16 13:24:40 UTC 2021 - Andreas Schwab + +- Add sifiveunmatched flavor + +------------------------------------------------------------------- +Wed Sep 15 06:07:56 UTC 2021 - Guillaume GARDET + +- 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 diff --git a/u-boot.spec b/u-boot.spec index ac42e01..d859652 100644 --- a/u-boot.spec +++ b/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-rc5 %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~rc5 Release: 0 Summary: The U-Boot firmware for the %target platform License: GPL-2.0-only @@ -232,8 +232,6 @@ 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 -Patch0014: 0014-btrfs-Use-default-subvolume-as-file.patch # Patches: end BuildRequires: bc BuildRequires: bison @@ -310,7 +308,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 +392,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 +425,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 +455,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 +569,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 diff --git a/update_git.sh b/update_git.sh index 5251456..6ce0954 100644 --- a/update_git.sh +++ b/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_UPSTREAM_TAG=v2021.07 +GIT_BRANCH=tumbleweed-2021.10 +GIT_UPSTREAM_TAG=v2021.10-rc5 GIT_DIR=`mktemp -d -p /dev/shm` CMP_DIR=`mktemp -d -p /dev/shm`