u-boot: upgrade 2024.10 -> 2025.01
PATCH 1/1 u-boot: upgrade 2024.10 -> 2025.01
From: Fabio Estevam <[email protected]>
Upgrade to U-Boot 2025.01.
Remove the patch as it has been upstreamed.
Signed-off-by Fabio Estevam <[email protected]>
---
...bfdt-libfdt.i_shipped-Use-SWIG_Appen.patch | 60 -------------------
meta/recipes-bsp/u-boot/u-boot-common.inc | 3 +-
...ols_2024.10.bb => u-boot-tools_2025.01.bb} | 0
.../{u-boot_2024.10.bb => u-boot_2025.01.bb} | 0
4 files changed, 1 insertion(+), 62 deletions(-)
delete mode 100644 meta/recipes-bsp/u-boot/files/0001-scripts-dtc-pylibfdt-libfdt.i_shipped-Use-SWIG_Appen.patch
rename meta/recipes-bsp/u-boot/{u-boot-tools_2024.10.bb => u-boot-tools_2025.01.bb} (100%)
rename meta/recipes-bsp/u-boot/{u-boot_2024.10.bb => u-boot_2025.01.bb} (100%)meta/recipes-bsp/u-boot/files/0001-scripts-dtc-pylibfdt-libfdt.i_shipped-Use-SWIG_Appen.patch deleted +0 -60
@@ -1,60 +0,0 @@ -From e093607e9a08e9c29b7bbaa6aeb137036db798a6 Mon Sep 17 00:00:00 2001 -From: Markus Volk <[email protected]> -Date: Wed, 30 Oct 2024 05:46:00 +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); -| | ^~~~~~~~~~~~~~~~~~~~~~~~ - -Upstream-Status: Backport [https://github.com/u-boot/u-boot/commit/a63456b9191fae2fe49f4b121e025792022e3950] - -Signed-off-by: Markus Volk <[email protected]> ---- - 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 56cc5d48f4..e4659489a9 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); - } - } - --- -2.47.0 -
meta/recipes-bsp/u-boot/u-boot-common.inc +1 -2
@@ -12,10 +12,9 @@ PE = "1" # We use the revision in order to avoid having to fetch it from the # repo during parse -SRCREV = "f919c3a889f0ec7d63a48b5d0ed064386b0980bd" +SRCREV = "6d41f0a39d6423c8e57e92ebbe9f8c0333a63f72" SRC_URI = "git://source.denx.de/u-boot/u-boot.git;protocol=https;branch=master" -SRC_URI += "file://0001-scripts-dtc-pylibfdt-libfdt.i_shipped-Use-SWIG_Appen.patch" S = "${WORKDIR}/git" B = "${WORKDIR}/build"
meta/recipes-bsp/u-boot/u-boot-tools_2025.01.bb renamed from meta/recipes-bsp/u-boot/u-boot-tools_2024.10.bb +0 -0
meta/recipes-bsp/u-boot/u-boot_2025.01.bb renamed from meta/recipes-bsp/u-boot/u-boot_2024.10.bb +0 -0
Signature · 1 line
2.37.3