Sync from SUSE:SLFO:Main u-boot revision 2bc08f977000506730cde432aae1a6a6

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

@@ -0,0 +1,58 @@
+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

@@ -0,0 +1,38 @@
+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,3 +1,11 @@
+-------------------------------------------------------------------
+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>
 

u-boot.spec

@@ -241,6 +241,8 @@ 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
 # Patches: end
 BuildRequires:  bc
 BuildRequires:  bison