From 46c6861eeb05c0fe14725cbda722947e5fc99c2a6dbf07d18206a0255d8a090d Mon Sep 17 00:00:00 2001 From: Guillaume GARDET Date: Fri, 21 Apr 2023 11:57:50 +0000 Subject: [PATCH] Accepting request 1081247 from hardware:boot:staging OBS-URL: https://build.opensuse.org/request/show/1081247 OBS-URL: https://build.opensuse.org/package/show/hardware:boot/u-boot?expand=0&rev=186 --- ...-XXX-openSUSE-XXX-Prepend-partition-.patch | 4 +- ...-Revert-Revert-omap3-Use-raw-SPL-by-.patch | 6 +-- ...-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 | 26 ++++++------ ...-configs-Re-sync-with-CONFIG_DISTRO_.patch | 16 +++---- ...-sunxi-dts-OrangePi-Zero-Add-SPI-ali.patch | 2 +- ...-sunxi-dts-OrangePi-Zero-Enable-SPI-.patch | 2 +- ...-Disable-CONFIG_CMD_BTRFS-in-xilinx_.patch | 6 +-- ...-smbios-Fix-table-when-no-string-is-.patch | 2 +- 0012-riscv-enable-CMD_BTRFS.patch | 26 ++++++------ ...-Disable-timer-check-in-file-loading.patch | 8 ++-- ...-Enable-EFI-and-ISO-partitions-suppo.patch | 6 +-- ...-cmd-boot-add-brom-cmd-to-reboot-to-.patch | 2 +- ...-cmd-boot-add-brom-cmd-to-reboot-to-.patch | 12 +++--- 0017-Bump-LMB_MAX_REGIONS-default-to-16.patch | 39 ------------------ ...-lmb-Treat-a-region-which-is-a-subse.patch | 34 --------------- u-boot-2023.01.tar.bz2 | 3 -- u-boot-2023.01.tar.bz2.sig | Bin 458 -> 0 bytes u-boot-2023.04.tar.bz2 | 3 ++ u-boot-2023.04.tar.bz2.sig | Bin 0 -> 458 bytes u-boot.changes | 18 ++++++++ u-boot.spec | 8 ++-- update_git.sh | 4 +- 25 files changed, 93 insertions(+), 150 deletions(-) delete mode 100644 0017-Bump-LMB_MAX_REGIONS-default-to-16.patch delete mode 100644 0018-lmb-Treat-a-region-which-is-a-subse.patch delete mode 100644 u-boot-2023.01.tar.bz2 delete mode 100644 u-boot-2023.01.tar.bz2.sig create mode 100644 u-boot-2023.04.tar.bz2 create mode 100644 u-boot-2023.04.tar.bz2.sig diff --git a/0001-XXX-openSUSE-XXX-Prepend-partition-.patch b/0001-XXX-openSUSE-XXX-Prepend-partition-.patch index 68476a0..f8bb5a3 100644 --- a/0001-XXX-openSUSE-XXX-Prepend-partition-.patch +++ b/0001-XXX-openSUSE-XXX-Prepend-partition-.patch @@ -1,4 +1,4 @@ -From 466616f11fa54dff641e1a792a01d3d1e7a59fa1 Mon Sep 17 00:00:00 2001 +From 113d5bd59da4e43700aea71eae96321d65586471 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 c3a2414b91..9e75a72a56 100644 +index 9d2a225e7e..399968fca8 100644 --- a/include/config_distro_bootcmd.h +++ b/include/config_distro_bootcmd.h @@ -158,7 +158,7 @@ diff --git a/0002-Revert-Revert-omap3-Use-raw-SPL-by-.patch b/0002-Revert-Revert-omap3-Use-raw-SPL-by-.patch index 2fd5ea2..2e273de 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 fe5851316aa13700ac4f2c499f7637d3af421df4 Mon Sep 17 00:00:00 2001 +From a9f62e4e79728a3fefbd67f1e825b7b4a146f336 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,10 +9,10 @@ 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 c463c96c74..4cf57e09ff 100644 +index 9a342a1bf9..a7e62b80ee 100644 --- a/arch/arm/mach-omap2/boot-common.c +++ b/arch/arm/mach-omap2/boot-common.c -@@ -141,8 +141,6 @@ void save_omap_boot_params(void) +@@ -143,8 +143,6 @@ void save_omap_boot_params(void) (boot_device <= MMC_BOOT_DEVICES_END)) { switch (boot_device) { case BOOT_DEVICE_MMC1: diff --git a/0003-rpi-Use-firmware-provided-device-tr.patch b/0003-rpi-Use-firmware-provided-device-tr.patch index 4dc1163..f43cc45 100644 --- a/0003-rpi-Use-firmware-provided-device-tr.patch +++ b/0003-rpi-Use-firmware-provided-device-tr.patch @@ -1,4 +1,4 @@ -From 2793f2e362d3f744c87b79b281a86642cd7076e9 Mon Sep 17 00:00:00 2001 +From b2c0b8dbe9e52e835fa770e95509ef74c0e95304 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 baa8c37810..f20aa164e5 100644 +index 2a442373f1..1b5c5eb977 100644 --- a/configs/rpi_0_w_defconfig +++ b/configs/rpi_0_w_defconfig @@ -23,7 +23,7 @@ CONFIG_CMD_GPIO=y @@ -41,7 +41,7 @@ index baa8c37810..f20aa164e5 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 baae6d4871..60987ad91a 100644 +index 1c462f36b4..7ca996d86c 100644 --- a/configs/rpi_2_defconfig +++ b/configs/rpi_2_defconfig @@ -24,7 +24,7 @@ CONFIG_CMD_GPIO=y @@ -54,7 +54,7 @@ index baae6d4871..60987ad91a 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 f51f3de596..e6de8669d0 100644 +index ed14571d20..9fbf376b63 100644 --- a/configs/rpi_3_32b_defconfig +++ b/configs/rpi_3_32b_defconfig @@ -23,7 +23,7 @@ CONFIG_CMD_GPIO=y @@ -67,7 +67,7 @@ index f51f3de596..e6de8669d0 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 bc1a318db4..70f4f8ed70 100644 +index eb92519371..b91574ab39 100644 --- a/configs/rpi_3_defconfig +++ b/configs/rpi_3_defconfig @@ -22,7 +22,7 @@ CONFIG_CMD_GPIO=y @@ -80,7 +80,7 @@ index bc1a318db4..70f4f8ed70 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 1d356b4b2e..6f345c790b 100644 +index dfd0c6bbae..182a93736d 100644 --- a/configs/rpi_defconfig +++ b/configs/rpi_defconfig @@ -23,7 +23,7 @@ CONFIG_CMD_GPIO=y diff --git a/0004-Temp-workaround-for-Chromebook-snow.patch b/0004-Temp-workaround-for-Chromebook-snow.patch index 619eb41..175ab32 100644 --- a/0004-Temp-workaround-for-Chromebook-snow.patch +++ b/0004-Temp-workaround-for-Chromebook-snow.patch @@ -1,4 +1,4 @@ -From 2721a29ffb5fdf001a4620531a08308c89efaeab Mon Sep 17 00:00:00 2001 +From 8664fa0475922d0265ef1db88d9b6428b93f5267 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 b6cc404..e1785e2 100644 --- a/0005-tools-zynqmpbif-Add-support-for-loa.patch +++ b/0005-tools-zynqmpbif-Add-support-for-loa.patch @@ -1,4 +1,4 @@ -From 99f6914149fc9e7b2d72c58fbcc8f2ffa407ea1a Mon Sep 17 00:00:00 2001 +From 6a56358a5a0179689888ebf22cca3dc2f30c2457 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 0da85b2..a3d5374 100644 --- a/0006-Kconfig-add-btrfs-to-distro-boot.patch +++ b/0006-Kconfig-add-btrfs-to-distro-boot.patch @@ -1,6 +1,6 @@ -From 12fb340d8e330662f0859602d159d36b815304a7 Mon Sep 17 00:00:00 2001 -From: Matthias Brugger -Date: Fri, 17 Jan 2020 20:59:02 +0100 +From f871287c2816f989f8d61ac4e3ef4efedbd473d5 Mon Sep 17 00:00:00 2001 +From: Guillaume Gardet +Date: Wed, 5 Apr 2023 14:25:29 +0200 Subject: [PATCH] Kconfig: add btrfs to distro boot Some distributions use btrfs as the default file system. @@ -9,18 +9,18 @@ architectures but riscv, as it breaks compilation due to size problems. Signed-off-by: Matthias Brugger --- - Kconfig | 1 + + boot/Kconfig | 1 + 1 file changed, 1 insertion(+) -diff --git a/Kconfig b/Kconfig -index 0cdc9658f7..dd2c898210 100644 ---- a/Kconfig -+++ b/Kconfig -@@ -211,6 +211,7 @@ config DISTRO_DEFAULTS +diff --git a/boot/Kconfig b/boot/Kconfig +index ad035695a4..f462ab0e88 100644 +--- a/boot/Kconfig ++++ b/boot/Kconfig +@@ -838,6 +838,7 @@ config DISTRO_DEFAULTS + select CMD_SYSBOOT select HUSH_PARSER - select SUPPORT_RAW_INITRD select SYS_LONGHELP + imply CMD_BTRFS if !RISCV && !MIPS - imply CMD_MII if NET - imply USB_STORAGE - imply USE_BOOTCOMMAND + help + Select this to enable various options and commands which are suitable + for building u-boot for booting general purpose Linux distributions. diff --git a/0007-configs-Re-sync-with-CONFIG_DISTRO_.patch b/0007-configs-Re-sync-with-CONFIG_DISTRO_.patch index 5327992..bee0cec 100644 --- a/0007-configs-Re-sync-with-CONFIG_DISTRO_.patch +++ b/0007-configs-Re-sync-with-CONFIG_DISTRO_.patch @@ -1,4 +1,4 @@ -From 00bafe5868123636fdebf358a9866648fbe83437 Mon Sep 17 00:00:00 2001 +From bc484cdfa38a3c60f94cfde7ccfa5a928ea30472 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,10 +18,10 @@ Signed-off-by: Matthias Brugger 5 files changed, 2 insertions(+), 4 deletions(-) diff --git a/configs/sandbox64_defconfig b/configs/sandbox64_defconfig -index ba45ac0b71..d134a24e90 100644 +index 89cba40713..846894a2a6 100644 --- a/configs/sandbox64_defconfig +++ b/configs/sandbox64_defconfig -@@ -83,7 +83,6 @@ CONFIG_CMD_REGULATOR=y +@@ -84,7 +84,6 @@ CONFIG_CMD_REGULATOR=y CONFIG_CMD_AES=y CONFIG_CMD_TPM=y CONFIG_CMD_TPM_TEST=y @@ -30,10 +30,10 @@ index ba45ac0b71..d134a24e90 100644 CONFIG_CMD_CRAMFS=y CONFIG_CMD_EXT4_WRITE=y diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig -index be46cae7aa..bed9a46961 100644 +index ce32dfc23a..aff6da2d73 100644 --- a/configs/sandbox_defconfig +++ b/configs/sandbox_defconfig -@@ -113,7 +113,6 @@ CONFIG_CMD_REGULATOR=y +@@ -115,7 +115,6 @@ CONFIG_CMD_REGULATOR=y CONFIG_CMD_AES=y CONFIG_CMD_TPM=y CONFIG_CMD_TPM_TEST=y @@ -42,7 +42,7 @@ index be46cae7aa..bed9a46961 100644 CONFIG_CMD_CRAMFS=y CONFIG_CMD_EROFS=y diff --git a/configs/socfpga_arria10_defconfig b/configs/socfpga_arria10_defconfig -index 08ae6c502b..756852279d 100644 +index 82b16418a6..73e89da98e 100644 --- a/configs/socfpga_arria10_defconfig +++ b/configs/socfpga_arria10_defconfig @@ -69,3 +69,5 @@ CONFIG_DESIGNWARE_APB_TIMER=y @@ -52,7 +52,7 @@ index 08ae6c502b..756852279d 100644 +# 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 54fda4bc5e..46f1a91a21 100644 +index db442a1ebc..5c3e2fe486 100644 --- a/configs/turris_mox_defconfig +++ b/configs/turris_mox_defconfig @@ -50,7 +50,6 @@ CONFIG_CMD_TIME=y @@ -64,7 +64,7 @@ index 54fda4bc5e..46f1a91a21 100644 CONFIG_MAC_PARTITION=y CONFIG_ENV_OVERWRITE=y diff --git a/configs/turris_omnia_defconfig b/configs/turris_omnia_defconfig -index 3fbc711717..0412af6c34 100644 +index 70a1fadc02..ef5f3dd83f 100644 --- a/configs/turris_omnia_defconfig +++ b/configs/turris_omnia_defconfig @@ -72,7 +72,6 @@ CONFIG_CMD_CACHE=y diff --git a/0008-sunxi-dts-OrangePi-Zero-Add-SPI-ali.patch b/0008-sunxi-dts-OrangePi-Zero-Add-SPI-ali.patch index 93fcd86..cab404d 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 dee452cc48cf8a9dbca172600107c2f60bec3d3f Mon Sep 17 00:00:00 2001 +From 4480a4b55b939c1be7608fe7d2e9534f4b9ab699 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 1665819..659559f 100644 --- a/0009-sunxi-dts-OrangePi-Zero-Enable-SPI-.patch +++ b/0009-sunxi-dts-OrangePi-Zero-Enable-SPI-.patch @@ -1,4 +1,4 @@ -From e847d93b0d9717e01b817ddb90b8c228df129ede Mon Sep 17 00:00:00 2001 +From d6e08d9277b271ef4a7bf44dc8959cd2ba1c3712 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-Disable-CONFIG_CMD_BTRFS-in-xilinx_.patch b/0010-Disable-CONFIG_CMD_BTRFS-in-xilinx_.patch index 481a79f..0724f30 100644 --- a/0010-Disable-CONFIG_CMD_BTRFS-in-xilinx_.patch +++ b/0010-Disable-CONFIG_CMD_BTRFS-in-xilinx_.patch @@ -1,4 +1,4 @@ -From bf5706274c740f19abfc5d4862b512054c834862 Mon Sep 17 00:00:00 2001 +From 57bebd36592bfc2b7a178d7f92c711f3ac3bfb90 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,10 +9,10 @@ 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 4732c39bdb..d86433b084 100644 +index fb91449ef7..da221f0b83 100644 --- a/configs/xilinx_zynqmp_virt_defconfig +++ b/configs/xilinx_zynqmp_virt_defconfig -@@ -92,6 +92,7 @@ CONFIG_CMD_TIMER=y +@@ -94,6 +94,7 @@ CONFIG_CMD_TIMER=y CONFIG_CMD_REGULATOR=y CONFIG_CMD_TPM=y CONFIG_CMD_EXT4_WRITE=y diff --git a/0011-smbios-Fix-table-when-no-string-is-.patch b/0011-smbios-Fix-table-when-no-string-is-.patch index a430625..0c0788a 100644 --- a/0011-smbios-Fix-table-when-no-string-is-.patch +++ b/0011-smbios-Fix-table-when-no-string-is-.patch @@ -1,4 +1,4 @@ -From d62466ff465f65a6976b8303ae9405dfec5784df Mon Sep 17 00:00:00 2001 +From c6536334c219d2290129c5c54b54aac5fabf9e64 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 diff --git a/0012-riscv-enable-CMD_BTRFS.patch b/0012-riscv-enable-CMD_BTRFS.patch index 55b1697..20d0fed 100644 --- a/0012-riscv-enable-CMD_BTRFS.patch +++ b/0012-riscv-enable-CMD_BTRFS.patch @@ -1,23 +1,23 @@ -From 870ef7f07fe1aa36bd8b1a0676c0a67145dc8d30 Mon Sep 17 00:00:00 2001 -From: Andreas Schwab -Date: Fri, 24 Sep 2021 18:25:51 +0200 +From 44939288ab16748b84e31241684e0b8563749156 Mon Sep 17 00:00:00 2001 +From: Guillaume Gardet +Date: Wed, 5 Apr 2023 14:27:09 +0200 Subject: [PATCH] riscv: enable CMD_BTRFS Signed-off-by: Matthias Brugger --- - Kconfig | 2 +- + boot/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/Kconfig b/Kconfig -index dd2c898210..959e510f16 100644 ---- a/Kconfig -+++ b/Kconfig -@@ -211,7 +211,7 @@ config DISTRO_DEFAULTS +diff --git a/boot/Kconfig b/boot/Kconfig +index f462ab0e88..fe5d91dc64 100644 +--- a/boot/Kconfig ++++ b/boot/Kconfig +@@ -838,7 +838,7 @@ config DISTRO_DEFAULTS + select CMD_SYSBOOT 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 + help + Select this to enable various options and commands which are suitable + for building u-boot for booting general purpose Linux distributions. diff --git a/0013-Disable-timer-check-in-file-loading.patch b/0013-Disable-timer-check-in-file-loading.patch index 11866de..53b8d9c 100644 --- a/0013-Disable-timer-check-in-file-loading.patch +++ b/0013-Disable-timer-check-in-file-loading.patch @@ -1,4 +1,4 @@ -From cb28d31624acaa80a28647277b0600f47982dae9 Mon Sep 17 00:00:00 2001 +From 94ffe4f51fb990760d68eb2f5eb8fa0dda3a7e7a Mon Sep 17 00:00:00 2001 From: Michael Chang Date: Tue, 25 May 2021 06:45:01 +0000 Subject: [PATCH] Disable timer check in file loading @@ -25,10 +25,10 @@ Signed-off-by: Matthias Brugger 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/efi_loader/efi_disk.c b/lib/efi_loader/efi_disk.c -index 7ea0334083..9f73995527 100644 +index d2256713a8..4f82b5397c 100644 --- a/lib/efi_loader/efi_disk.c +++ b/lib/efi_loader/efi_disk.c -@@ -18,6 +18,7 @@ +@@ -19,6 +19,7 @@ #include #include #include @@ -36,7 +36,7 @@ index 7ea0334083..9f73995527 100644 struct efi_system_partition efi_system_partition = { .uclass_id = UCLASS_INVALID, -@@ -141,8 +142,7 @@ static efi_status_t efi_disk_rw_blocks(struct efi_block_io *this, +@@ -142,8 +143,7 @@ static efi_status_t efi_disk_rw_blocks(struct efi_block_io *this, n = blk_dwrite(desc, lba, blocks, buffer); } diff --git a/0014-Enable-EFI-and-ISO-partitions-suppo.patch b/0014-Enable-EFI-and-ISO-partitions-suppo.patch index 1c7d5dd..281420f 100644 --- a/0014-Enable-EFI-and-ISO-partitions-suppo.patch +++ b/0014-Enable-EFI-and-ISO-partitions-suppo.patch @@ -1,4 +1,4 @@ -From 23e6300ad9a901ec81d9f9fa55f737f062a14c63 Mon Sep 17 00:00:00 2001 +From a62d08f11ec8b06eb31bb7ce3e3923c69fd009a6 Mon Sep 17 00:00:00 2001 From: Guillaume Gardet Date: Thu, 21 Oct 2021 09:55:50 +0200 Subject: [PATCH] Enable EFI and ISO partitions support on socfpga_de0_nano_soc @@ -10,10 +10,10 @@ Subject: [PATCH] Enable EFI and ISO partitions support on socfpga_de0_nano_soc 1 file changed, 2 deletions(-) diff --git a/configs/socfpga_de0_nano_soc_defconfig b/configs/socfpga_de0_nano_soc_defconfig -index 5f5706fbdb..93f51a43fc 100644 +index 364ae912ca..f41e8fa0b8 100644 --- a/configs/socfpga_de0_nano_soc_defconfig +++ b/configs/socfpga_de0_nano_soc_defconfig -@@ -44,8 +44,6 @@ CONFIG_CMD_EXT4_WRITE=y +@@ -45,8 +45,6 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_MTDIDS_DEFAULT="nor0=ff705000.spi.0" CONFIG_MTDPARTS_DEFAULT="mtdparts=ff705000.spi.0:1m(u-boot),256k(env1),256k(env2),14848k(boot),16m(rootfs),-@1536k(UBI)" CONFIG_CMD_UBI=y diff --git a/0015-cmd-boot-add-brom-cmd-to-reboot-to-.patch b/0015-cmd-boot-add-brom-cmd-to-reboot-to-.patch index cdd20ca..cd22573 100644 --- a/0015-cmd-boot-add-brom-cmd-to-reboot-to-.patch +++ b/0015-cmd-boot-add-brom-cmd-to-reboot-to-.patch @@ -1,4 +1,4 @@ -From 06f80e4ba4cbd083d39ba9305db74fbe70b22137 Mon Sep 17 00:00:00 2001 +From aa75cb09f8616f4234e71a2abe73f095bf3ee7c0 Mon Sep 17 00:00:00 2001 From: Andy Yan Date: Tue, 6 Feb 2018 09:51:12 +0800 Subject: [PATCH] cmd: boot: add brom cmd to reboot to brom dnl mode diff --git a/0016-cmd-boot-add-brom-cmd-to-reboot-to-.patch b/0016-cmd-boot-add-brom-cmd-to-reboot-to-.patch index e4a6805..bd49c9c 100644 --- a/0016-cmd-boot-add-brom-cmd-to-reboot-to-.patch +++ b/0016-cmd-boot-add-brom-cmd-to-reboot-to-.patch @@ -1,4 +1,4 @@ -From 68c559be4f3ca905f70669c619fcb977cc292259 Mon Sep 17 00:00:00 2001 +From 47e88407164dec3f5e89edcc2bf81f0cfe52412b Mon Sep 17 00:00:00 2001 From: Michal Suchanek Date: Sun, 3 Jul 2022 18:25:39 +0200 Subject: [PATCH] cmd: boot: add brom cmd to reboot to FEL mode @@ -36,10 +36,10 @@ index b08f202374..36e7697b1c 100644 + #endif /* _SUNXI_CPU_H */ diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig -index dbe6005daa..318e3f1e18 100644 +index 6417aee944..2c5f2e4dcb 100644 --- a/arch/arm/mach-sunxi/Kconfig +++ b/arch/arm/mach-sunxi/Kconfig -@@ -1050,6 +1050,22 @@ source "board/sunxi/Kconfig" +@@ -1023,6 +1023,22 @@ source "board/sunxi/Kconfig" endif @@ -63,10 +63,10 @@ index dbe6005daa..318e3f1e18 100644 bool "Enable DIPs detection for CHIP board" select SUPPORT_EXTENSION_SCAN diff --git a/arch/arm/mach-sunxi/board.c b/arch/arm/mach-sunxi/board.c -index 0c4b6dd1ca..84227dbd42 100644 +index 391a65a549..eebdebf41f 100644 --- a/arch/arm/mach-sunxi/board.c +++ b/arch/arm/mach-sunxi/board.c -@@ -301,7 +301,30 @@ uint32_t sunxi_get_boot_device(void) +@@ -300,7 +300,30 @@ uint32_t sunxi_get_boot_device(void) return -1; /* Never reached */ } @@ -97,7 +97,7 @@ index 0c4b6dd1ca..84227dbd42 100644 uint32_t sunxi_get_spl_size(void) { struct boot_file_head *egon_head = (void *)SPL_ADDR; -@@ -436,6 +459,7 @@ u32 spl_mmc_boot_mode(struct mmc *mmc, const u32 boot_device) +@@ -442,6 +465,7 @@ u32 spl_mmc_boot_mode(struct mmc *mmc, const u32 boot_device) void board_init_f(ulong dummy) { diff --git a/0017-Bump-LMB_MAX_REGIONS-default-to-16.patch b/0017-Bump-LMB_MAX_REGIONS-default-to-16.patch deleted file mode 100644 index a26f44d..0000000 --- a/0017-Bump-LMB_MAX_REGIONS-default-to-16.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 1760447d478bd16aceebe67b8e03d7e2d9e87fbc Mon Sep 17 00:00:00 2001 -From: Sjoerd Simons -Date: Thu, 19 Jan 2023 09:38:17 +0100 -Subject: [PATCH] Bump LMB_MAX_REGIONS default to 16 - -Since commit 06d514d77c37 ("lmb: consider EFI memory map") the EFI regions -are also pushed into the lmb if EFI_LOADER is enabled (which is by -default on most system). Which can cause the number of entries to go -over the maximum as it's default is only 8. - -Specifically i ran into this case on an TI am62 which has an fdt with -4 reserved regions (in practice 3 lmb entries due to adjecent ranges). - -As this is likely to impact more devices bump the default max -regions to 16 so there is a bit more slack. - -Fixes: 06d514d77c ("lmb: consider EFI memory map") -Link: https://bugzilla.opensuse.org/show_bug.cgi?id=1207562 -Reviewed-by: Francesco Dolcini -Signed-off-by: Sjoerd Simons -Signed-off-by: Michal Suchanek -[trini: collect tags from the other equivalent patch] ---- - lib/Kconfig | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/Kconfig b/lib/Kconfig -index 3c5a4ab386..7d1b88656d 100644 ---- a/lib/Kconfig -+++ b/lib/Kconfig -@@ -1002,7 +1002,7 @@ config LMB_USE_MAX_REGIONS - config LMB_MAX_REGIONS - int "Number of memory and reserved regions in lmb lib" - depends on LMB && LMB_USE_MAX_REGIONS -- default 8 -+ default 16 - help - Define the number of supported regions, memory and reserved, in the - library logical memory blocks. diff --git a/0018-lmb-Treat-a-region-which-is-a-subse.patch b/0018-lmb-Treat-a-region-which-is-a-subse.patch deleted file mode 100644 index 813b1f0..0000000 --- a/0018-lmb-Treat-a-region-which-is-a-subse.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 8a5a3aa5d3ee1a06f654fad4f648aa9c550f889e Mon Sep 17 00:00:00 2001 -From: Sjoerd Simons -Date: Sun, 12 Feb 2023 16:07:05 +0100 -Subject: [PATCH] lmb: Treat a region which is a subset as equal - -In various cases logical memory blocks are coalesced; As a result doing -a strict check whether memory blocks are the same doesn't necessarily -work as a previous addition of a given block might have been merged into -a bigger block. - -Fix this by considering a block is already registered if it's a pure -subset of one of the existing blocks. - -Signed-off-by: Sjoerd Simons ---- - lib/lmb.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/lib/lmb.c b/lib/lmb.c -index ec790760db..866b0699d5 100644 ---- a/lib/lmb.c -+++ b/lib/lmb.c -@@ -244,8 +244,10 @@ static long lmb_add_region_flags(struct lmb_region *rgn, phys_addr_t base, - phys_addr_t rgnbase = rgn->region[i].base; - phys_size_t rgnsize = rgn->region[i].size; - phys_size_t rgnflags = rgn->region[i].flags; -+ phys_addr_t end = base + size - 1; -+ phys_addr_t rgnend = rgnbase + rgnsize - 1; - -- if (rgnbase == base && rgnsize == size) { -+ if (rgnbase <= base && end <= rgnend) { - if (flags == rgnflags) - /* Already have this region, so we're done */ - return 0; diff --git a/u-boot-2023.01.tar.bz2 b/u-boot-2023.01.tar.bz2 deleted file mode 100644 index 8f33094..0000000 --- a/u-boot-2023.01.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:69423bad380f89a0916636e89e6dcbd2e4512d584308d922d1039d1e4331950f -size 18560442 diff --git a/u-boot-2023.01.tar.bz2.sig b/u-boot-2023.01.tar.bz2.sig deleted file mode 100644 index 3ffbebb01baea5226def0270492f17db9abaf6f400e9f27f6883244e5cdf9864..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 458 zcmV;*0X6=K0mlRY0SW*y79j*0Jb!TDkE<64fSbP*d^!J?G`B1T0%N>8_Y)j+a%pa9 zKx=Pqb9HQMZ!TkRZ2$@h5EOhl|CThjEQ+)Y0FYJC0;xg>E2fS}je3z^!xrxVx0#}| z@A3LkfSL;Q{EXrG-tH=2ahNgIeK zDvt_ShDr5hzMCoRUBy7EZU`#}jDNdS17;(12&uYY?gxF%aFCtG;`N4ldI+MQ+95P! zP(GQ>66%^!P^}!=uep=T-A!Yy`+pT@iVwPB6 z@hqe82O3)JG|ha%26&A#z~>#{VSE#Le(*Eh6wB9+||_Ye_22 ze#pGwl*v~bBXj05XFW5s=0*nYnVdPklil==vLvoh_{ Ar~m)} diff --git a/u-boot-2023.04.tar.bz2 b/u-boot-2023.04.tar.bz2 new file mode 100644 index 0000000..d894537 --- /dev/null +++ b/u-boot-2023.04.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e31cac91545ff41b71cec5d8c22afd695645cd6e2a442ccdacacd60534069341 +size 19130089 diff --git a/u-boot-2023.04.tar.bz2.sig b/u-boot-2023.04.tar.bz2.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..09f41697317e0c525ab2527278473849560148f9f1d783dd5d4bf601124e6dae GIT binary patch literal 458 zcmV;*0X6=K0mlRY0SW*y79j*0Jb!TDkE<64fSbP*d^!J?G`B1T0%R*Wd=ngWa%pa9 zKx=Pqb9HQMZ!TkRZ2$@h5EOhl|CThjEH%Rn0JdUj)L)2nB-T+dNwN1g_?;*4nSAYo z3bz^`0q1p;bbi1husWM#DKQR~u_XE&_5hFx5*QxLj5xpTY$prIbzI3I@XU6%Bk_9@ z{zntD0|k8Ud}aRkONwPP7z45#zS1caI*7P`aPST{YhSLeJJ{co?0=KNv#cq%cO2A_ z{t0rJ(|hpL2A!h0ln759bw2##g-aa75bAXk0~5}z>vQ{Zfg(HSafn5My@dyHD#i2>9F6UHz+1rx{C zKHg66!UB=O)~aM{XGj*<9_YP_ + +- Update to 2023.04: + * Full changelog available at: + https://source.denx.de/u-boot/u-boot/-/compare/v2023.01...v2023.04 + +------------------------------------------------------------------- +Wed Apr 5 12:28:46 UTC 2023 - Guillaume GARDET + +- Update to 2023.04-rc5: + * Full changelog available at: + https://source.denx.de/u-boot/u-boot/-/compare/v2023.01...v2023.04-rc5 + * Patch queue updated from https://github.com/openSUSE/u-boot.git tumbleweed-2023.04 + * Patches dropped: + 0017-Bump-LMB_MAX_REGIONS-default-to-16.patch + 0018-lmb-Treat-a-region-which-is-a-subse.patch + ------------------------------------------------------------------- Mon Feb 20 07:54:47 UTC 2023 - Guillaume GARDET diff --git a/u-boot.spec b/u-boot.spec index 6640698..c087c61 100644 --- a/u-boot.spec +++ b/u-boot.spec @@ -180,7 +180,7 @@ %define is_ppc 1 %endif # archive_version differs from version for RC version only -%define archive_version 2023.01 +%define archive_version 2023.04 %if "%{target}" == "" ExclusiveArch: do_not_build %else @@ -210,7 +210,7 @@ ExclusiveArch: do_not_build %endif %endif %endif -Version: 2023.01 +Version: 2023.04 Release: 0 Summary: The U-Boot firmware for the %target platform License: GPL-2.0-only @@ -238,8 +238,6 @@ Patch0013: 0013-Disable-timer-check-in-file-loading.patch Patch0014: 0014-Enable-EFI-and-ISO-partitions-suppo.patch Patch0015: 0015-cmd-boot-add-brom-cmd-to-reboot-to-.patch Patch0016: 0016-cmd-boot-add-brom-cmd-to-reboot-to-.patch -Patch0017: 0017-Bump-LMB_MAX_REGIONS-default-to-16.patch -Patch0018: 0018-lmb-Treat-a-region-which-is-a-subse.patch # Patches: end BuildRequires: bc BuildRequires: bison @@ -418,7 +416,7 @@ export OPENSBI=%{_datadir}/opensbi/opensbi.bin cp %{_datadir}/arm-trusted-firmware-rk3328/bl31.elf . %endif %if 0%{?is_rk3399} -cp %{_datadir}/arm-trusted-firmware-rk3399/bl31.elf . +cp %{_datadir}/arm-trusted-firmware-rk3399/bl31.elf ./atf-bl31 %endif %if %{is_zynq} diff --git a/update_git.sh b/update_git.sh index 2d6a84d..120956f 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-2023.01 -GIT_UPSTREAM_TAG=v2023.01 +GIT_BRANCH=tumbleweed-2023.04 +GIT_UPSTREAM_TAG=v2023.04 GIT_DIR=`mktemp -d -p /dev/shm` CMP_DIR=`mktemp -d -p /dev/shm`