Sync from SUSE:SLFO:1.1 u-boot revision 0a53c64521ebf7797948d42b6ab48c06

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

@@ -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 9d2a225e7eb..399968fca8d 100644
+index 9d2a225e7e..399968fca8 100644
 --- a/include/config_distro_bootcmd.h
 +++ b/include/config_distro_bootcmd.h
 @@ -158,7 +158,7 @@

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

@@ -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 9a342a1bf95..a7e62b80ee6 100644
+index 9a342a1bf9..a7e62b80ee 100644
 --- a/arch/arm/mach-omap2/boot-common.c
 +++ b/arch/arm/mach-omap2/boot-common.c
 @@ -143,8 +143,6 @@ void save_omap_boot_params(void)

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

@@ -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 2a442373f11..1b5c5eb9773 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 2a442373f11..1b5c5eb9773 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 1c462f36b47..7ca996d86c6 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 1c462f36b47..7ca996d86c6 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 ed14571d20f..9fbf376b63b 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 ed14571d20f..9fbf376b63b 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 eb925193712..b91574ab39f 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 eb925193712..b91574ab39f 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 dfd0c6bbae7..182a93736d3 100644
+index dfd0c6bbae..182a93736d 100644
 --- a/configs/rpi_defconfig
 +++ b/configs/rpi_defconfig
 @@ -23,7 +23,7 @@ CONFIG_CMD_GPIO=y

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

@@ -9,7 +9,7 @@ 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 5085a3b491d..6c098475bea 100644
+index 5085a3b491..6c098475be 100644
 --- a/drivers/mmc/dw_mmc.c
 +++ b/drivers/mmc/dw_mmc.c
 @@ -609,7 +609,8 @@ void dwmci_setup_cfg(struct mmc_config *cfg, struct dwmci_host *host,

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

@@ -34,7 +34,7 @@ Signed-off-by: Alexander Graf <agraf@suse.de>
  1 file changed, 15 insertions(+)
 
 diff --git a/tools/zynqmpbif.c b/tools/zynqmpbif.c
-index 82ce0ac1a52..b4302fa67ee 100644
+index 82ce0ac1a5..b4302fa67e 100644
 --- a/tools/zynqmpbif.c
 +++ b/tools/zynqmpbif.c
 @@ -42,6 +42,7 @@ enum bif_flag {

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

@@ -13,7 +13,7 @@ Signed-off-by: Matthias Brugger <mbrugger@suse.com>
  1 file changed, 1 insertion(+)
 
 diff --git a/boot/Kconfig b/boot/Kconfig
-index ad035695a4a..f462ab0e88c 100644
+index ad035695a4..f462ab0e88 100644
 --- a/boot/Kconfig
 +++ b/boot/Kconfig
 @@ -838,6 +838,7 @@ config DISTRO_DEFAULTS

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

@@ -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 89cba40713e..846894a2a61 100644
+index 89cba40713..846894a2a6 100644
 --- a/configs/sandbox64_defconfig
 +++ b/configs/sandbox64_defconfig
 @@ -84,7 +84,6 @@ CONFIG_CMD_REGULATOR=y
@@ -30,7 +30,7 @@ index 89cba40713e..846894a2a61 100644
  CONFIG_CMD_CRAMFS=y
  CONFIG_CMD_EXT4_WRITE=y
 diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig
-index ce32dfc23a4..aff6da2d73b 100644
+index ce32dfc23a..aff6da2d73 100644
 --- a/configs/sandbox_defconfig
 +++ b/configs/sandbox_defconfig
 @@ -115,7 +115,6 @@ CONFIG_CMD_REGULATOR=y
@@ -42,7 +42,7 @@ index ce32dfc23a4..aff6da2d73b 100644
  CONFIG_CMD_CRAMFS=y
  CONFIG_CMD_EROFS=y
 diff --git a/configs/socfpga_arria10_defconfig b/configs/socfpga_arria10_defconfig
-index 82b16418a6f..73e89da98ef 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 82b16418a6f..73e89da98ef 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 db442a1ebca..5c3e2fe4860 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 db442a1ebca..5c3e2fe4860 100644
  CONFIG_MAC_PARTITION=y
  CONFIG_ENV_OVERWRITE=y
 diff --git a/configs/turris_omnia_defconfig b/configs/turris_omnia_defconfig
-index 70a1fadc020..ef5f3dd83f5 100644
+index 70a1fadc02..ef5f3dd83f 100644
 --- a/configs/turris_omnia_defconfig
 +++ b/configs/turris_omnia_defconfig
 @@ -72,7 +72,6 @@ CONFIG_CMD_CACHE=y

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

@@ -15,7 +15,7 @@ Signed-off-by: Matthias Brugger <mbrugger@suse.com>
  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 3706216ffb4..c3660f72d9e 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 @@
@@ -28,7 +28,7 @@ index 3706216ffb4..c3660f72d9e 100644
  #include <dt-bindings/input/input.h>
 diff --git a/arch/arm/dts/sunxi-spi-u-boot.dtsi b/arch/arm/dts/sunxi-spi-u-boot.dtsi
 new file mode 100644
-index 00000000000..df89d02ff2f
+index 0000000000..df89d02ff2
 --- /dev/null
 +++ b/arch/arm/dts/sunxi-spi-u-boot.dtsi
 @@ -0,0 +1,8 @@

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

@@ -13,7 +13,7 @@ Signed-off-by: Matthias Brugger <mbrugger@suse.com>
  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 c3660f72d9e..80c1e66b38c 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 @@

0010-Disable-CONFIG_CMD_BTRFS-in-xilinx_.patch

@@ -9,7 +9,7 @@ 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 fb91449ef70..da221f0b835 100644
+index fb91449ef7..da221f0b83 100644
 --- a/configs/xilinx_zynqmp_virt_defconfig
 +++ b/configs/xilinx_zynqmp_virt_defconfig
 @@ -94,6 +94,7 @@ CONFIG_CMD_TIMER=y

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

@@ -19,7 +19,7 @@ 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 d7f4999e8b2..2cdfef7a2c9 100644
+index d7f4999e8b..2cdfef7a2c 100644
 --- a/lib/smbios.c
 +++ b/lib/smbios.c
 @@ -172,7 +172,7 @@ static int smbios_add_prop(struct smbios_ctx *ctx, const char *prop)

0012-riscv-enable-CMD_BTRFS.patch

@@ -9,7 +9,7 @@ Signed-off-by: Matthias Brugger <mbrugger@suse.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/boot/Kconfig b/boot/Kconfig
-index f462ab0e88c..fe5d91dc64d 100644
+index f462ab0e88..fe5d91dc64 100644
 --- a/boot/Kconfig
 +++ b/boot/Kconfig
 @@ -838,7 +838,7 @@ config DISTRO_DEFAULTS

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

@@ -25,7 +25,7 @@ Signed-off-by: Matthias Brugger <mbrugger@suse.com>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/lib/efi_loader/efi_disk.c b/lib/efi_loader/efi_disk.c
-index d2256713a8e..4f82b5397cc 100644
+index d2256713a8..4f82b5397c 100644
 --- a/lib/efi_loader/efi_disk.c
 +++ b/lib/efi_loader/efi_disk.c
 @@ -19,6 +19,7 @@

0014-Enable-EFI-and-ISO-partitions-suppo.patch

@@ -10,7 +10,7 @@ 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 364ae912ca5..f41e8fa0b89 100644
+index 364ae912ca..f41e8fa0b8 100644
 --- a/configs/socfpga_de0_nano_soc_defconfig
 +++ b/configs/socfpga_de0_nano_soc_defconfig
 @@ -45,8 +45,6 @@ CONFIG_CMD_EXT4_WRITE=y

0015-cmd-boot-add-brom-cmd-to-reboot-to-.patch

@@ -12,7 +12,7 @@ Signed-off-by: Michal Suchanek <msuchanek@suse.de>
  2 files changed, 21 insertions(+)
 
 diff --git a/arch/arm/include/asm/arch-rockchip/boot_mode.h b/arch/arm/include/asm/arch-rockchip/boot_mode.h
-index 6b2a610cf4c..bcdf4420cfc 100644
+index 6b2a610cf4..bcdf4420cf 100644
 --- a/arch/arm/include/asm/arch-rockchip/boot_mode.h
 +++ b/arch/arm/include/asm/arch-rockchip/boot_mode.h
 @@ -19,6 +19,7 @@
@@ -24,7 +24,7 @@ index 6b2a610cf4c..bcdf4420cfc 100644
  #endif
  
 diff --git a/cmd/boot.c b/cmd/boot.c
-index 14839c1cedc..d7c7db449c5 100644
+index 14839c1ced..d7c7db449c 100644
 --- a/cmd/boot.c
 +++ b/cmd/boot.c
 @@ -44,16 +44,36 @@ static int do_go(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])

0016-cmd-boot-add-brom-cmd-to-reboot-to-.patch

@@ -16,7 +16,7 @@ Signed-off-by: Michal Suchanek <msuchanek@suse.de>
  4 files changed, 67 insertions(+), 1 deletion(-)
 
 diff --git a/arch/arm/include/asm/arch-sunxi/cpu.h b/arch/arm/include/asm/arch-sunxi/cpu.h
-index b08f2023748..36e7697b1c4 100644
+index b08f202374..36e7697b1c 100644
 --- a/arch/arm/include/asm/arch-sunxi/cpu.h
 +++ b/arch/arm/include/asm/arch-sunxi/cpu.h
 @@ -20,4 +20,15 @@
@@ -36,7 +36,7 @@ index b08f2023748..36e7697b1c4 100644
 +
  #endif /* _SUNXI_CPU_H */
 diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig
-index 6417aee944b..2c5f2e4dcb2 100644
+index 6417aee944..2c5f2e4dcb 100644
 --- a/arch/arm/mach-sunxi/Kconfig
 +++ b/arch/arm/mach-sunxi/Kconfig
 @@ -1023,6 +1023,22 @@ source "board/sunxi/Kconfig"
@@ -63,7 +63,7 @@ index 6417aee944b..2c5f2e4dcb2 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 391a65a5495..eebdebf41f9 100644
+index 391a65a549..eebdebf41f 100644
 --- a/arch/arm/mach-sunxi/board.c
 +++ b/arch/arm/mach-sunxi/board.c
 @@ -300,7 +300,30 @@ uint32_t sunxi_get_boot_device(void)
@@ -106,7 +106,7 @@ index 391a65a5495..eebdebf41f9 100644
  
  #if defined CONFIG_MACH_SUN6I || defined CONFIG_MACH_SUN8I_H3
 diff --git a/cmd/boot.c b/cmd/boot.c
-index d7c7db449c5..111c9d94090 100644
+index d7c7db449c..111c9d9409 100644
 --- a/cmd/boot.c
 +++ b/cmd/boot.c
 @@ -47,6 +47,7 @@ static int do_go(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])

0017-dlmalloc-Fix-integer-overflow-in-s-.patch

@@ -1,4 +1,4 @@
-From ea3d116e0fbbc432620c001f9cdb6cac6c2faef6 Mon Sep 17 00:00:00 2001
+From 265cf54d3b33258202bc755ff1ab67ac0f4153d8 Mon Sep 17 00:00:00 2001
 From: Richard Weinberger <richard@nod.at>
 Date: Fri, 2 Aug 2024 12:08:45 +0200
 Subject: [PATCH] dlmalloc: Fix integer overflow in sbrk()
@@ -17,7 +17,7 @@ Signed-off-by: Andrea della Porta <andrea.porta@suse.com>
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/common/dlmalloc.c b/common/dlmalloc.c
-index 41c7230424c..ce4e56da8d5 100644
+index 41c72304..ce4e56da 100644
 --- a/common/dlmalloc.c
 +++ b/common/dlmalloc.c
 @@ -604,6 +604,9 @@ void *sbrk(ptrdiff_t increment)
@@ -40,3 +40,6 @@ index 41c7230424c..ce4e56da8d5 100644
  	mem_malloc_brk = new;
  
  	return (void *)old;
+-- 
+2.35.3
+

0018-dlmalloc-Fix-integer-overflow-in-r-.patch

@@ -1,4 +1,4 @@
-From 9db1410e72c0ca3549de12b7984cb50d32b20d9b Mon Sep 17 00:00:00 2001
+From eebd284f830ba900b7eeb0a48a476d47780450e4 Mon Sep 17 00:00:00 2001
 From: Richard Weinberger <richard@nod.at>
 Date: Fri, 2 Aug 2024 12:08:44 +0200
 Subject: [PATCH] dlmalloc: Fix integer overflow in request2size()
@@ -22,7 +22,7 @@ Signed-off-by: Andrea della Porta <andrea.porta@suse.com>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/common/dlmalloc.c b/common/dlmalloc.c
-index ce4e56da8d5..62935009e73 100644
+index ce4e56da..62935009 100644
 --- a/common/dlmalloc.c
 +++ b/common/dlmalloc.c
 @@ -379,8 +379,8 @@ nextchunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
@@ -36,3 +36,6 @@ index ce4e56da8d5..62935009e73 100644
     (((req) + (SIZE_SZ + MALLOC_ALIGN_MASK)) & ~(MALLOC_ALIGN_MASK)))
  
  /* Check if m has acceptable alignment */
+-- 
+2.35.3
+

0019-ext4-Fix-integer-overflow-in-ext4f-.patch

@@ -1,4 +1,4 @@
-From dc39df99c7c00dd3bacc363eef99fec191f23a97 Mon Sep 17 00:00:00 2001
+From 6f4fd2e38aa87535f1a03a5fb4fc172a260acf25 Mon Sep 17 00:00:00 2001
 From: Richard Weinberger <richard@nod.at>
 Date: Fri, 9 Aug 2024 11:54:28 +0200
 Subject: [PATCH] ext4: Fix integer overflow in ext4fs_read_symlink()
@@ -21,7 +21,7 @@ Signed-off-by: Andrea della Porta <andrea.porta@suse.com>
  1 file changed, 6 insertions(+), 1 deletion(-)
 
 diff --git a/fs/ext4/ext4_common.c b/fs/ext4/ext4_common.c
-index 9a9c520e22c..903c87db452 100644
+index 9a9c520e..903c87db 100644
 --- a/fs/ext4/ext4_common.c
 +++ b/fs/ext4/ext4_common.c
 @@ -2188,13 +2188,18 @@ static char *ext4fs_read_symlink(struct ext2fs_node *node)
@@ -44,3 +44,6 @@ index 9a9c520e22c..903c87db452 100644
  	if (!symlink)
  		return NULL;
  
+-- 
+2.35.3
+

0020-scripts-dtc-pylibfdt-libfdt.i_shipp.patch

@@ -1,58 +0,0 @@
-From c1fecde177c610d5d8a60e798d2d72b23451a830 Mon Sep 17 00:00:00 2001
-From: Markus Volk <f_l_k@t-online.de>
-Date: Wed, 30 Oct 2024 06:07:16 +0100
-Subject: [PATCH] scripts/dtc/pylibfdt/libfdt.i_shipped: Use SWIG_AppendOutput
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Swig has changed language specific AppendOutput functions. The helper
-macro SWIG_AppendOutput remains unchanged. Use that instead
-of SWIG_Python_AppendOutput, which would require an extra parameter
-since swig 4.3.0.
-
-/home/flk/poky/build-test/tmp/work/qemux86_64-poky-linux/u-boot/2024.10/git/arch/x86/cpu/u-boot-64.lds
-| scripts/dtc/pylibfdt/libfdt_wrap.c: In function ‘_wrap_fdt_next_node’:
-| scripts/dtc/pylibfdt/libfdt_wrap.c:5581:17: error: too few arguments to function ‘SWIG_Python_AppendOutput’
-|  5581 |     resultobj = SWIG_Python_AppendOutput(resultobj, val);
-|       |                 ^~~~~~~~~~~~~~~~~~~~~~~~
-
-Signed-off-by: Markus Volk <f_l_k@t-online.de>
-Reported-by: Rudi Heitbaum <rudi@heitbaum.com>
-Link: https://github.com/dgibson/dtc/pull/154
-(cherry picked from commit a63456b9191fae2fe49f4b121e025792022e3950)
----
- scripts/dtc/pylibfdt/libfdt.i_shipped | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/scripts/dtc/pylibfdt/libfdt.i_shipped b/scripts/dtc/pylibfdt/libfdt.i_shipped
-index 56cc5d48f4f..e4659489a96 100644
---- a/scripts/dtc/pylibfdt/libfdt.i_shipped
-+++ b/scripts/dtc/pylibfdt/libfdt.i_shipped
-@@ -1037,7 +1037,7 @@ typedef uint32_t fdt32_t;
- 			fdt_string(fdt1, fdt32_to_cpu($1->nameoff)));
- 		buff = PyByteArray_FromStringAndSize(
- 			(const char *)($1 + 1), fdt32_to_cpu($1->len));
--		resultobj = SWIG_Python_AppendOutput(resultobj, buff);
-+		resultobj = SWIG_AppendOutput(resultobj, buff);
- 	}
- }
- 
-@@ -1076,7 +1076,7 @@ typedef uint32_t fdt32_t;
- 
- %typemap(argout) int *depth {
-         PyObject *val = Py_BuildValue("i", *arg$argnum);
--        resultobj = SWIG_Python_AppendOutput(resultobj, val);
-+        resultobj = SWIG_AppendOutput(resultobj, val);
- }
- 
- %apply int *depth { int *depth };
-@@ -1092,7 +1092,7 @@ typedef uint32_t fdt32_t;
-            if (PyTuple_GET_SIZE(resultobj) == 0)
-               resultobj = val;
-            else
--              resultobj = SWIG_Python_AppendOutput(resultobj, val);
-+              resultobj = SWIG_AppendOutput(resultobj, val);
-         }
- }
- 

0021-pylibfdt-Fix-invalid-escape-sequenc.patch

@@ -1,38 +0,0 @@
-From cfde6c872ae02650020158befd45f36a22c97fef Mon Sep 17 00:00:00 2001
-From: Florian Schmaus <flo@geekplace.eu>
-Date: Tue, 20 Feb 2024 08:52:48 -0500
-Subject: [PATCH] pylibfdt: Fix "invalid escape sequence '\w'" in setup.py
-
-Once u-boot's build system invokes
-
-python3 scripts/dtc/pylibfdt/setup.py --quiet build_ext --inplace
-
-it may fail with
-
-scripts/dtc/pylibfdt/setup.py:40: SyntaxWarning: invalid escape sequence '\w'
-  RE_KEY_VALUE = re.compile('(?P<key>\w+) *(?P<plus>[+])?= *(?P<value>.*)$')
-
-depending on the used Python version.
-
-Explicitly mark the regex string as raw string to avoid the warning.
-
-Signed-off-by: Florian Schmaus <flo@geekplace.eu>
-Reviewed-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
-(cherry picked from commit d4c84d7062ecd739de8ed509782f52ddb9109f32)
----
- scripts/dtc/pylibfdt/setup.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/scripts/dtc/pylibfdt/setup.py b/scripts/dtc/pylibfdt/setup.py
-index 8baae08770c..c6fe5a6a446 100755
---- a/scripts/dtc/pylibfdt/setup.py
-+++ b/scripts/dtc/pylibfdt/setup.py
-@@ -37,7 +37,7 @@ with open(os.path.join(srcdir, "../README"), "r") as fh:
-     long_description = fh.read()
- 
- # Decodes a Makefile assignment line into key and value (and plus for +=)
--RE_KEY_VALUE = re.compile('(?P<key>\w+) *(?P<plus>[+])?= *(?P<value>.*)$')
-+RE_KEY_VALUE = re.compile(r'(?P<key>\w+) *(?P<plus>[+])?= *(?P<value>.*)$')
- 
- def get_top_builddir():
-     if '--top-builddir' in sys.argv:

u-boot.changes

@@ -1,28 +1,5 @@
 -------------------------------------------------------------------
-Wed May 28 14:19:44 UTC 2025 - Matthias Brugger <mbrugger@suse.com>
-
-Patch queue updated from https://github.com/openSUSE/u-boot.git sle16
-* Patches added:
-  0020-scripts-dtc-pylibfdt-libfdt.i_shipp.patch
-  0021-pylibfdt-Fix-invalid-escape-sequenc.patch
-
--------------------------------------------------------------------
-Thu Mar 13 16:59:44 UTC 2025 - Matthias Brugger <mbrugger@suse.com>
-
-Update package to use git workflow
-
-Patch queue updated from https://github.com/openSUSE/u-boot.git sle16
-* Patches dropped:
-  0017-dlmalloc-Fix-integer-overflow-in-s-.patch
-  0018-dlmalloc-Fix-integer-overflow-in-r-.patch
-  0019-ext4-Fix-integer-overflow-in-ext4f-.patch
-* Patches added:
-  0017-dlmalloc-Fix-integer-overflow-in-sb.patch
-  0018-dlmalloc-Fix-integer-overflow-in-re.patch
-  0019-ext4-Fix-integer-overflow-in-ext4fs.patch
-
--------------------------------------------------------------------
-Wed Feb 26 14:58:41 UTC 2025 - Andrea della Porta <andrea.porta@suse.com>
+Wed Feb 26 14:53:24 UTC 2025 - Andrea della Porta <andrea.porta@suse.com>
 
 - Fix CVE-2024-57256 (bsc#1237284)
 
@@ -30,13 +7,13 @@ Wed Feb 26 14:58:41 UTC 2025 - Andrea della Porta <andrea.porta@suse.com>
   0019-ext4-Fix-integer-overflow-in-ext4f-.patch
 
 -------------------------------------------------------------------
-Tue Feb 25 09:51:21 UTC 2025 - Andrea della Porta <andrea.porta@suse.com>
+Tue Feb 25 09:45:47 UTC 2025 - Andrea della Porta <andrea.porta@suse.com>
 
 - Fix CVE-2024-57258 (bsc#1237287)
 
 * Patches added:
   0017-dlmalloc-Fix-integer-overflow-in-s-.patch
-  0018-dlmalloc-Fix-integer-overflow-in-r-.patch 
+  0018-dlmalloc-Fix-integer-overflow-in-r-.patch
 
 -------------------------------------------------------------------
 Mon Apr 24 12:32:54 UTC 2023 - Guillaume GARDET <guillaume.gardet@opensuse.org>

u-boot.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package u-boot
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 # Copyright (c) 2010 Texas Instruments Inc by Nishanth Menon
 # Copyright (c) 2007-2010 by Silvan Calarco <silvan.calarco@mambasoft.it>
 #
@@ -238,11 +238,9 @@ 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-dlmalloc-Fix-integer-overflow-in-sb.patch
-Patch0018:      0018-dlmalloc-Fix-integer-overflow-in-re.patch
-Patch0019:      0019-ext4-Fix-integer-overflow-in-ext4fs.patch
-Patch0020:      0020-scripts-dtc-pylibfdt-libfdt.i_shipp.patch
-Patch0021:      0021-pylibfdt-Fix-invalid-escape-sequenc.patch
+Patch0017:      0017-dlmalloc-Fix-integer-overflow-in-s-.patch
+Patch0018:      0018-dlmalloc-Fix-integer-overflow-in-r-.patch
+Patch0019:      0019-ext4-Fix-integer-overflow-in-ext4f-.patch
 # Patches: end
 BuildRequires:  bc
 BuildRequires:  bison

update_git.sh

@@ -13,7 +13,7 @@ set -e
 
 GIT_TREE=https://github.com/openSUSE/u-boot.git
 GIT_LOCAL_TREE=~/src/opensuse/u-boot-opensuse
-GIT_BRANCH=sle16
+GIT_BRANCH=tumbleweed-2023.04
 GIT_UPSTREAM_TAG=v2023.04
 GIT_DIR=`mktemp -d -p /dev/shm`
 CMP_DIR=`mktemp -d -p /dev/shm`