From a74d4379f7af72b6078c60b175f20045a970cc6b2390aeefb8c67e938cdbf312 Mon Sep 17 00:00:00 2001 From: Guillaume GARDET Date: Thu, 19 Jan 2023 13:34:38 +0000 Subject: [PATCH] Accepting request 1059595 from hardware:boot:staging - Update to 2023.01 OBS-URL: https://build.opensuse.org/request/show/1059595 OBS-URL: https://build.opensuse.org/package/show/hardware:boot/u-boot?expand=0&rev=177 --- ...-XXX-openSUSE-XXX-Prepend-partition-.patch | 6 +++--- ...-Revert-Revert-omap3-Use-raw-SPL-by-.patch | 2 +- ...-rpi-Use-firmware-provided-device-tr.patch | 12 +++++------ ...-Temp-workaround-for-Chromebook-snow.patch | 6 +++--- ...-tools-zynqmpbif-Add-support-for-loa.patch | 2 +- 0006-Kconfig-add-btrfs-to-distro-boot.patch | 4 ++-- ...-configs-Re-sync-with-CONFIG_DISTRO_.patch | 20 +++++++++--------- ...-sunxi-dts-OrangePi-Zero-Add-SPI-ali.patch | 4 ++-- ...-sunxi-dts-OrangePi-Zero-Enable-SPI-.patch | 4 ++-- ...-Disable-CONFIG_CMD_BTRFS-in-xilinx_.patch | 6 +++--- ...-smbios-Fix-table-when-no-string-is-.patch | 2 +- 0012-riscv-enable-CMD_BTRFS.patch | 4 ++-- ...-Disable-timer-check-in-file-loading.patch | 12 +++++------ ...-Enable-EFI-and-ISO-partitions-suppo.patch | 6 +++--- ...-cmd-boot-add-brom-cmd-to-reboot-to-.patch | 6 +++--- ...-cmd-boot-add-brom-cmd-to-reboot-to-.patch | 20 +++++++++--------- u-boot-2022.10.tar.bz2 | 3 --- u-boot-2022.10.tar.bz2.sig | Bin 458 -> 0 bytes u-boot-2023.01.tar.bz2 | 3 +++ u-boot-2023.01.tar.bz2.sig | Bin 0 -> 458 bytes u-boot.changes | 5 +++++ u-boot.spec | 8 +++---- update_git.sh | 4 ++-- 23 files changed, 72 insertions(+), 67 deletions(-) delete mode 100644 u-boot-2022.10.tar.bz2 delete mode 100644 u-boot-2022.10.tar.bz2.sig create mode 100644 u-boot-2023.01.tar.bz2 create mode 100644 u-boot-2023.01.tar.bz2.sig diff --git a/0001-XXX-openSUSE-XXX-Prepend-partition-.patch b/0001-XXX-openSUSE-XXX-Prepend-partition-.patch index 05c466e..68476a0 100644 --- a/0001-XXX-openSUSE-XXX-Prepend-partition-.patch +++ b/0001-XXX-openSUSE-XXX-Prepend-partition-.patch @@ -1,4 +1,4 @@ -From e0f05ece4ec906a569ac2619fbbfa47bcd491f9c Mon Sep 17 00:00:00 2001 +From 466616f11fa54dff641e1a792a01d3d1e7a59fa1 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 5506f3168f..d389f4f8b1 100644 +index c3a2414b91..9e75a72a56 100644 --- a/include/config_distro_bootcmd.h +++ b/include/config_distro_bootcmd.h @@ -158,7 +158,7 @@ @@ -24,7 +24,7 @@ index 5506f3168f..d389f4f8b1 100644 "scan_dev_for_efi=" \ "setenv efi_fdtfile ${fdtfile}; " \ BOOTENV_EFI_SET_FDTFILE_FALLBACK \ -@@ -486,7 +486,7 @@ +@@ -517,7 +517,7 @@ "scan_dev_for_boot_part=" \ "part list ${devtype} ${devnum} -bootable devplist; " \ "env exists devplist || setenv devplist 1; " \ diff --git a/0002-Revert-Revert-omap3-Use-raw-SPL-by-.patch b/0002-Revert-Revert-omap3-Use-raw-SPL-by-.patch index 7fc49a7..2fd5ea2 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 834367be91579058256a133290f5cbdbac5cc29e Mon Sep 17 00:00:00 2001 +From fe5851316aa13700ac4f2c499f7637d3af421df4 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"" diff --git a/0003-rpi-Use-firmware-provided-device-tr.patch b/0003-rpi-Use-firmware-provided-device-tr.patch index b6413e6..4dc1163 100644 --- a/0003-rpi-Use-firmware-provided-device-tr.patch +++ b/0003-rpi-Use-firmware-provided-device-tr.patch @@ -1,4 +1,4 @@ -From d670b9802e93f9d1eb694c4eeed71c58b2510115 Mon Sep 17 00:00:00 2001 +From 2793f2e362d3f744c87b79b281a86642cd7076e9 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 0bac245df3..0c095b7e81 100644 +index baa8c37810..f20aa164e5 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 0bac245df3..0c095b7e81 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 700a15267c..1ceb8b0d29 100644 +index baae6d4871..60987ad91a 100644 --- a/configs/rpi_2_defconfig +++ b/configs/rpi_2_defconfig @@ -24,7 +24,7 @@ CONFIG_CMD_GPIO=y @@ -54,7 +54,7 @@ index 700a15267c..1ceb8b0d29 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 06aefc4d43..72e32316f7 100644 +index f51f3de596..e6de8669d0 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 06aefc4d43..72e32316f7 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 c9ecc6e4d1..3e3cd814fa 100644 +index bc1a318db4..70f4f8ed70 100644 --- a/configs/rpi_3_defconfig +++ b/configs/rpi_3_defconfig @@ -22,7 +22,7 @@ CONFIG_CMD_GPIO=y @@ -80,7 +80,7 @@ index c9ecc6e4d1..3e3cd814fa 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 7a0540ac9d..9cf47bc074 100644 +index 1d356b4b2e..6f345c790b 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 4dda498..619eb41 100644 --- a/0004-Temp-workaround-for-Chromebook-snow.patch +++ b/0004-Temp-workaround-for-Chromebook-snow.patch @@ -1,4 +1,4 @@ -From c662877afbcb23764ce5d03d250f16808d6e3874 Mon Sep 17 00:00:00 2001 +From 2721a29ffb5fdf001a4620531a08308c89efaeab 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 @@ -9,10 +9,10 @@ Subject: [PATCH] Temp workaround for Chromebook snow to avoid the 'unable to 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/mmc/dw_mmc.c b/drivers/mmc/dw_mmc.c -index 4232c5eb8c..c95036699e 100644 +index 5085a3b491..6c098475be 100644 --- a/drivers/mmc/dw_mmc.c +++ b/drivers/mmc/dw_mmc.c -@@ -608,7 +608,8 @@ void dwmci_setup_cfg(struct mmc_config *cfg, struct dwmci_host *host, +@@ -609,7 +609,8 @@ void dwmci_setup_cfg(struct mmc_config *cfg, struct dwmci_host *host, cfg->host_caps |= MMC_MODE_4BIT; cfg->host_caps &= ~MMC_MODE_8BIT; } diff --git a/0005-tools-zynqmpbif-Add-support-for-loa.patch b/0005-tools-zynqmpbif-Add-support-for-loa.patch index b52760c..b6cc404 100644 --- a/0005-tools-zynqmpbif-Add-support-for-loa.patch +++ b/0005-tools-zynqmpbif-Add-support-for-loa.patch @@ -1,4 +1,4 @@ -From 05ba826f3a7f2d7eff0c6dc1af42f0a89529bac4 Mon Sep 17 00:00:00 2001 +From 99f6914149fc9e7b2d72c58fbcc8f2ffa407ea1a 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 5bad9b7..0da85b2 100644 --- a/0006-Kconfig-add-btrfs-to-distro-boot.patch +++ b/0006-Kconfig-add-btrfs-to-distro-boot.patch @@ -1,4 +1,4 @@ -From 387eb51ad949d061794574b2e8770a80b2ba2eb7 Mon Sep 17 00:00:00 2001 +From 12fb340d8e330662f0859602d159d36b815304a7 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,7 +13,7 @@ Signed-off-by: Matthias Brugger 1 file changed, 1 insertion(+) diff --git a/Kconfig b/Kconfig -index c8c22555a9..6a9e60ef66 100644 +index 0cdc9658f7..dd2c898210 100644 --- a/Kconfig +++ b/Kconfig @@ -211,6 +211,7 @@ config DISTRO_DEFAULTS diff --git a/0007-configs-Re-sync-with-CONFIG_DISTRO_.patch b/0007-configs-Re-sync-with-CONFIG_DISTRO_.patch index 6948735..5327992 100644 --- a/0007-configs-Re-sync-with-CONFIG_DISTRO_.patch +++ b/0007-configs-Re-sync-with-CONFIG_DISTRO_.patch @@ -1,4 +1,4 @@ -From 2647c22d6b8cddbbe1acffc26b07c1b6ed7f727c Mon Sep 17 00:00:00 2001 +From 00bafe5868123636fdebf358a9866648fbe83437 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 290d1506c2..e4936169c4 100644 +index ba45ac0b71..d134a24e90 100644 --- a/configs/sandbox64_defconfig +++ b/configs/sandbox64_defconfig -@@ -78,7 +78,6 @@ CONFIG_CMD_REGULATOR=y +@@ -83,7 +83,6 @@ CONFIG_CMD_REGULATOR=y CONFIG_CMD_AES=y CONFIG_CMD_TPM=y CONFIG_CMD_TPM_TEST=y @@ -30,10 +30,10 @@ index 290d1506c2..e4936169c4 100644 CONFIG_CMD_CRAMFS=y CONFIG_CMD_EXT4_WRITE=y diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig -index ab5d3f19bf..a5baf0259b 100644 +index be46cae7aa..bed9a46961 100644 --- a/configs/sandbox_defconfig +++ b/configs/sandbox_defconfig -@@ -107,7 +107,6 @@ CONFIG_CMD_REGULATOR=y +@@ -113,7 +113,6 @@ CONFIG_CMD_REGULATOR=y CONFIG_CMD_AES=y CONFIG_CMD_TPM=y CONFIG_CMD_TPM_TEST=y @@ -42,17 +42,17 @@ index ab5d3f19bf..a5baf0259b 100644 CONFIG_CMD_CRAMFS=y CONFIG_CMD_EROFS=y diff --git a/configs/socfpga_arria10_defconfig b/configs/socfpga_arria10_defconfig -index 3eac3dfa5d..b06bec23e7 100644 +index 08ae6c502b..756852279d 100644 --- a/configs/socfpga_arria10_defconfig +++ b/configs/socfpga_arria10_defconfig -@@ -67,3 +67,5 @@ CONFIG_DESIGNWARE_APB_TIMER=y +@@ -69,3 +69,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 21bd1bc4b3..e40a487d18 100644 +index 54fda4bc5e..46f1a91a21 100644 --- a/configs/turris_mox_defconfig +++ b/configs/turris_mox_defconfig @@ -50,7 +50,6 @@ CONFIG_CMD_TIME=y @@ -64,10 +64,10 @@ index 21bd1bc4b3..e40a487d18 100644 CONFIG_MAC_PARTITION=y CONFIG_ENV_OVERWRITE=y diff --git a/configs/turris_omnia_defconfig b/configs/turris_omnia_defconfig -index ba635feb44..7ca6bcdadb 100644 +index 3fbc711717..0412af6c34 100644 --- a/configs/turris_omnia_defconfig +++ b/configs/turris_omnia_defconfig -@@ -68,7 +68,6 @@ CONFIG_CMD_CACHE=y +@@ -72,7 +72,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 520a1d9..93fcd86 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 380c95d6c4ad05a18e587786a5da43237c62e7c7 Mon Sep 17 00:00:00 2001 +From dee452cc48cf8a9dbca172600107c2f60bec3d3f 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 @@ -15,7 +15,7 @@ Signed-off-by: Matthias Brugger create mode 100644 arch/arm/dts/sunxi-spi-u-boot.dtsi diff --git a/arch/arm/dts/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/dts/sun8i-h2-plus-orangepi-zero.dts -index f19ed981da..3f0d0281ba 100644 +index 3706216ffb..c3660f72d9 100644 --- a/arch/arm/dts/sun8i-h2-plus-orangepi-zero.dts +++ b/arch/arm/dts/sun8i-h2-plus-orangepi-zero.dts @@ -46,6 +46,7 @@ diff --git a/0009-sunxi-dts-OrangePi-Zero-Enable-SPI-.patch b/0009-sunxi-dts-OrangePi-Zero-Enable-SPI-.patch index acbb607..1665819 100644 --- a/0009-sunxi-dts-OrangePi-Zero-Enable-SPI-.patch +++ b/0009-sunxi-dts-OrangePi-Zero-Enable-SPI-.patch @@ -1,4 +1,4 @@ -From 2712f6becd6a59c5921ffb98b553c8fb93da72eb Mon Sep 17 00:00:00 2001 +From e847d93b0d9717e01b817ddb90b8c228df129ede 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. @@ -13,7 +13,7 @@ Signed-off-by: Matthias Brugger 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/dts/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/dts/sun8i-h2-plus-orangepi-zero.dts -index 3f0d0281ba..b08e84c616 100644 +index c3660f72d9..80c1e66b38 100644 --- a/arch/arm/dts/sun8i-h2-plus-orangepi-zero.dts +++ b/arch/arm/dts/sun8i-h2-plus-orangepi-zero.dts @@ -164,8 +164,8 @@ diff --git a/0010-Disable-CONFIG_CMD_BTRFS-in-xilinx_.patch b/0010-Disable-CONFIG_CMD_BTRFS-in-xilinx_.patch index 11419ef..481a79f 100644 --- a/0010-Disable-CONFIG_CMD_BTRFS-in-xilinx_.patch +++ b/0010-Disable-CONFIG_CMD_BTRFS-in-xilinx_.patch @@ -1,4 +1,4 @@ -From d40e9e4ccf4f93c287a318f3e817e3ec91dd1bd5 Mon Sep 17 00:00:00 2001 +From bf5706274c740f19abfc5d4862b512054c834862 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 e5ac26e038..0aec7d0d97 100644 +index 4732c39bdb..d86433b084 100644 --- a/configs/xilinx_zynqmp_virt_defconfig +++ b/configs/xilinx_zynqmp_virt_defconfig -@@ -93,6 +93,7 @@ CONFIG_CMD_TIMER=y +@@ -92,6 +92,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 6997589..a430625 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 4e662011db3f5724f45865d659bd84ac23bc9dfa Mon Sep 17 00:00:00 2001 +From d62466ff465f65a6976b8303ae9405dfec5784df 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 76d2bf5..55b1697 100644 --- a/0012-riscv-enable-CMD_BTRFS.patch +++ b/0012-riscv-enable-CMD_BTRFS.patch @@ -1,4 +1,4 @@ -From d7994712e2debd412cf1f1e9ac25be27ff8dfd1e Mon Sep 17 00:00:00 2001 +From 870ef7f07fe1aa36bd8b1a0676c0a67145dc8d30 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Fri, 24 Sep 2021 18:25:51 +0200 Subject: [PATCH] riscv: enable CMD_BTRFS @@ -9,7 +9,7 @@ Signed-off-by: Matthias Brugger 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Kconfig b/Kconfig -index 6a9e60ef66..4c24a9ad28 100644 +index dd2c898210..959e510f16 100644 --- a/Kconfig +++ b/Kconfig @@ -211,7 +211,7 @@ config DISTRO_DEFAULTS diff --git a/0013-Disable-timer-check-in-file-loading.patch b/0013-Disable-timer-check-in-file-loading.patch index 2dc6ef3..11866de 100644 --- a/0013-Disable-timer-check-in-file-loading.patch +++ b/0013-Disable-timer-check-in-file-loading.patch @@ -1,4 +1,4 @@ -From 630165c8ba3fd271beeed7280f19821727630261 Mon Sep 17 00:00:00 2001 +From cb28d31624acaa80a28647277b0600f47982dae9 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,7 +25,7 @@ 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 5feeb52ccb..217b1da415 100644 +index 7ea0334083..9f73995527 100644 --- a/lib/efi_loader/efi_disk.c +++ b/lib/efi_loader/efi_disk.c @@ -18,6 +18,7 @@ @@ -34,15 +34,15 @@ index 5feeb52ccb..217b1da415 100644 #include +#include - struct efi_system_partition efi_system_partition; - -@@ -137,8 +138,7 @@ static efi_status_t efi_disk_rw_blocks(struct efi_block_io *this, + 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, n = blk_dwrite(desc, lba, blocks, buffer); } - /* We don't do interrupts, so check for timers cooperatively */ - efi_timer_check(); -+ WATCHDOG_RESET(); ++ schedule(); EFI_PRINT("n=%lx blocks=%x\n", n, blocks); diff --git a/0014-Enable-EFI-and-ISO-partitions-suppo.patch b/0014-Enable-EFI-and-ISO-partitions-suppo.patch index 0cd77a4..1c7d5dd 100644 --- a/0014-Enable-EFI-and-ISO-partitions-suppo.patch +++ b/0014-Enable-EFI-and-ISO-partitions-suppo.patch @@ -1,4 +1,4 @@ -From 7289992f2d3a5c3e858ee8494dc64871c80f6692 Mon Sep 17 00:00:00 2001 +From 23e6300ad9a901ec81d9f9fa55f737f062a14c63 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 1ef0dd9398..a8cd5544a7 100644 +index 5f5706fbdb..93f51a43fc 100644 --- a/configs/socfpga_de0_nano_soc_defconfig +++ b/configs/socfpga_de0_nano_soc_defconfig -@@ -43,8 +43,6 @@ CONFIG_CMD_EXT4_WRITE=y +@@ -44,8 +44,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 7bde70d..cdd20ca 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 f8998b3d8dd1fb8ea6af564f97a34554f3ad8dd3 Mon Sep 17 00:00:00 2001 +From 06f80e4ba4cbd083d39ba9305db74fbe70b22137 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 @@ -24,10 +24,10 @@ index 6b2a610cf4..bcdf4420cf 100644 #endif diff --git a/cmd/boot.c b/cmd/boot.c -index be67a5980d..d48c0bf1b3 100644 +index 14839c1ced..d7c7db449c 100644 --- a/cmd/boot.c +++ b/cmd/boot.c -@@ -43,16 +43,36 @@ static int do_go(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) +@@ -44,16 +44,36 @@ static int do_go(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) printf ("## Application terminated, rc = 0x%lX\n", rc); return rcode; } 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 655765a..e4a6805 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 1184511200f355cdd39c4a603e83c9e74f776804 Mon Sep 17 00:00:00 2001 +From 68c559be4f3ca905f70669c619fcb977cc292259 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 5712576184..468fbdc0f2 100644 +index dbe6005daa..318e3f1e18 100644 --- a/arch/arm/mach-sunxi/Kconfig +++ b/arch/arm/mach-sunxi/Kconfig -@@ -1036,6 +1036,22 @@ source "board/sunxi/Kconfig" +@@ -1050,6 +1050,22 @@ source "board/sunxi/Kconfig" endif @@ -63,10 +63,10 @@ index 5712576184..468fbdc0f2 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 8f7c894286..91866a3be6 100644 +index 0c4b6dd1ca..84227dbd42 100644 --- a/arch/arm/mach-sunxi/board.c +++ b/arch/arm/mach-sunxi/board.c -@@ -297,7 +297,30 @@ uint32_t sunxi_get_boot_device(void) +@@ -301,7 +301,30 @@ uint32_t sunxi_get_boot_device(void) return -1; /* Never reached */ } @@ -97,7 +97,7 @@ index 8f7c894286..91866a3be6 100644 uint32_t sunxi_get_spl_size(void) { struct boot_file_head *egon_head = (void *)SPL_ADDR; -@@ -432,6 +455,7 @@ u32 spl_mmc_boot_mode(struct mmc *mmc, const u32 boot_device) +@@ -436,6 +459,7 @@ u32 spl_mmc_boot_mode(struct mmc *mmc, const u32 boot_device) void board_init_f(ulong dummy) { @@ -106,10 +106,10 @@ index 8f7c894286..91866a3be6 100644 #if defined CONFIG_MACH_SUN6I || defined CONFIG_MACH_SUN8I_H3 diff --git a/cmd/boot.c b/cmd/boot.c -index d48c0bf1b3..c870e6a217 100644 +index d7c7db449c..111c9d9409 100644 --- a/cmd/boot.c +++ b/cmd/boot.c -@@ -46,6 +46,7 @@ static int do_go(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) +@@ -47,6 +47,7 @@ static int do_go(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) #endif #if defined(CONFIG_ROCKCHIP_BOOT_MODE_REG) && CONFIG_ROCKCHIP_BOOT_MODE_REG @@ -117,7 +117,7 @@ index d48c0bf1b3..c870e6a217 100644 #include static int do_reboot_brom(struct cmd_tbl *cmdtp, int flag, int argc, char * const argv[]) { -@@ -56,6 +57,20 @@ static int do_reboot_brom(struct cmd_tbl *cmdtp, int flag, int argc, char * cons +@@ -57,6 +58,20 @@ static int do_reboot_brom(struct cmd_tbl *cmdtp, int flag, int argc, char * cons } #endif @@ -138,7 +138,7 @@ index d48c0bf1b3..c870e6a217 100644 /* -------------------------------------------------------------------- */ #ifdef CONFIG_CMD_GO -@@ -67,7 +82,7 @@ U_BOOT_CMD( +@@ -68,7 +83,7 @@ U_BOOT_CMD( ); #endif diff --git a/u-boot-2022.10.tar.bz2 b/u-boot-2022.10.tar.bz2 deleted file mode 100644 index 6b5bff1..0000000 --- a/u-boot-2022.10.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:50b4482a505bc281ba8470c399a3c26e145e29b23500bc35c50debd7fa46bdf8 -size 18365430 diff --git a/u-boot-2022.10.tar.bz2.sig b/u-boot-2022.10.tar.bz2.sig deleted file mode 100644 index 52c72bbb5e65607ce005019673de27bca0322b9569b950bd739d9e0c2f52aa90..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 458 zcmV;*0X6=K0mlRY0SW*y79j*0Jb!TDkE<64fSbP*d^!J?G`B1T0%JQjWD^{8a%pa9 zKx=Pqb9HQMZ!TkRZ2$@h5EOhl|CThjEPuKT0G(m6-M6*Q*5*D$RcBEpIWew&8zL^Z zff{&6MmUFo7XHs~Y&1G6;H+yz0gV+8gx0AoBy%mCa?OCBbagVOjhzNB3z=A3%+quob@W)PsJ>9EpNXCRjWyi zyQ=0DZPcXv9RoE+i$hc*6`~qu$GcWCVz8_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)} literal 0 HcmV?d00001 diff --git a/u-boot.changes b/u-boot.changes index 8c30db3..eca6429 100644 --- a/u-boot.changes +++ b/u-boot.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jan 19 10:53:37 UTC 2023 - Guillaume GARDET + +- Update to 2023.01 + ------------------------------------------------------------------- Tue Jan 10 09:07:47 UTC 2023 - Oscar Curero diff --git a/u-boot.spec b/u-boot.spec index f071ad3..b8caf12 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 2022.10 +%define archive_version 2023.01 %if "%{target}" == "" ExclusiveArch: do_not_build %else @@ -210,7 +210,7 @@ ExclusiveArch: do_not_build %endif %endif %endif -Version: 2022.10 +Version: 2023.01 Release: 0 Summary: The U-Boot firmware for the %target platform License: GPL-2.0-only @@ -546,7 +546,7 @@ install -D -m 0644 spl/arndale-spl.bin %{buildroot}%{uboot_dir}/arndale-spl.bin install -D -m 0644 %{SOURCE2} %{buildroot}%{uboot_dir}/arndale-bl1.img %endif %if %mvebu_spl == 1 -install -D -m 0644 u-boot-spl.kwb %{buildroot}%{uboot_dir}/u-boot-spl.kwb +install -D -m 0644 u-boot-with-spl.kwb %{buildroot}%{uboot_dir}/u-boot-with-spl.kwb %endif %if %rockchip_spl == 1 install -D -m 0644 spl/u-boot-spl.bin %{buildroot}%{uboot_dir}/u-boot-spl.bin @@ -632,7 +632,7 @@ fi # Generic documents %doc doc/develop/index.rst %doc doc/usage/index.rst doc/usage/netconsole.rst -%doc doc/README.JFFS2 doc/README.JFFS2_NAND +%doc doc/README.JFFS2_NAND %doc doc/README.autoboot doc/README.console doc/README.dns %doc doc/README.hwconfig doc/README.nand doc/README.serial_multi %doc doc/README.SNTP doc/README.standalone doc/README.update doc/README.usb diff --git a/update_git.sh b/update_git.sh index 083b734..2d6a84d 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-2022.10 -GIT_UPSTREAM_TAG=v2022.10 +GIT_BRANCH=tumbleweed-2023.01 +GIT_UPSTREAM_TAG=v2023.01 GIT_DIR=`mktemp -d -p /dev/shm` CMP_DIR=`mktemp -d -p /dev/shm`