From: Zoltan HERPAI Date: Fri, 7 Aug 2026 08:35:47 +0000 (+0000) Subject: uboot-sifiveu: bump to 2026.04 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5b2c9ce8bf63c3a9cdd3242f63b940486d6e37a0;p=thirdparty%2Fopenwrt.git uboot-sifiveu: bump to 2026.04 Remove upstreamed patches and refresh remaining ones as required. Compile-tested: sifiveu/*, d1/* Runtime-tested: sifiveu/unleashed, sifiveu/unmatched, d1/nezha Signed-off-by: Zoltan HERPAI --- diff --git a/package/boot/uboot-sifiveu/Makefile b/package/boot/uboot-sifiveu/Makefile index 9c91fc726dc..bbd0aec5412 100644 --- a/package/boot/uboot-sifiveu/Makefile +++ b/package/boot/uboot-sifiveu/Makefile @@ -7,8 +7,8 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_RELEASE:=1 -PKG_VERSION:=2023.10 -PKG_HASH:=e00e6c6f014e046101739d08d06f328811cebcf5ae101348f409cbbd55ce6900 +PKG_VERSION:=2026.04 +PKG_HASH:=ac7c04b8b7004923b00a4e5d6699c5df4d21233bac9fda690d8cfbc209fff2fd UBOOT_USE_INTREE_DTC:=1 diff --git a/package/boot/uboot-sifiveu/patches/0006-riscv-sifive-fu740-reduce-DDR-speed-from-1866MT-s-to.patch b/package/boot/uboot-sifiveu/patches/0006-riscv-sifive-fu740-reduce-DDR-speed-from-1866MT-s-to.patch deleted file mode 100644 index 380342d4a8c..00000000000 --- a/package/boot/uboot-sifiveu/patches/0006-riscv-sifive-fu740-reduce-DDR-speed-from-1866MT-s-to.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 45f9941ddc6346b38aa9eb7f033e1e169b63bdc7 Mon Sep 17 00:00:00 2001 -From: Thomas Perrot -Date: Fri, 8 Dec 2023 11:24:37 +0100 -Subject: [PATCH] riscv: sifive: fu740: reduce DDR speed from 1866MT/s to - 1600MT/s - -Signed-off-by: Thomas Perrot ---- - arch/riscv/dts/fu740-c000-u-boot.dtsi | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/arch/riscv/dts/fu740-c000-u-boot.dtsi -+++ b/arch/riscv/dts/fu740-c000-u-boot.dtsi -@@ -77,7 +77,7 @@ - 0x0 0x100b2000 0x0 0x2000 - 0x0 0x100b8000 0x0 0x1000>; - clocks = <&prci FU740_PRCI_CLK_DDRPLL>; -- clock-frequency = <933333324>; -+ clock-frequency = <800000004>; - bootph-pre-ram; - }; - }; diff --git a/package/boot/uboot-sifiveu/patches/002-scripts-dtc-pylibfdt-libfdt-i_shipped-Use-SWIG_AppendOutp.patch b/package/boot/uboot-sifiveu/patches/002-scripts-dtc-pylibfdt-libfdt-i_shipped-Use-SWIG_AppendOutp.patch deleted file mode 100644 index f5beca8d77a..00000000000 --- a/package/boot/uboot-sifiveu/patches/002-scripts-dtc-pylibfdt-libfdt-i_shipped-Use-SWIG_AppendOutp.patch +++ /dev/null @@ -1,55 +0,0 @@ -From a63456b9191fae2fe49f4b121e025792022e3950 Mon Sep 17 00:00:00 2001 -From: Markus Volk -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 -Reported-by: Rudi Heitbaum -Link: https://github.com/dgibson/dtc/pull/154 ---- - scripts/dtc/pylibfdt/libfdt.i_shipped | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - ---- 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); - } - } - diff --git a/package/boot/uboot-sifiveu/patches/100-mkimage-check-environment-for-dtc-binary-location.patch b/package/boot/uboot-sifiveu/patches/100-mkimage-check-environment-for-dtc-binary-location.patch index fcc30ce35cd..7cda88ba567 100644 --- a/package/boot/uboot-sifiveu/patches/100-mkimage-check-environment-for-dtc-binary-location.patch +++ b/package/boot/uboot-sifiveu/patches/100-mkimage-check-environment-for-dtc-binary-location.patch @@ -17,7 +17,7 @@ Cc: Simon Glass --- a/tools/fit_image.c +++ b/tools/fit_image.c -@@ -754,9 +754,14 @@ static int fit_handle_file(struct image_ +@@ -1029,9 +1029,14 @@ static int fit_handle_file(struct image_ } *cmd = '\0'; } else if (params->datafile) { diff --git a/package/boot/uboot-sifiveu/patches/110-no-kwbimage.patch b/package/boot/uboot-sifiveu/patches/110-no-kwbimage.patch deleted file mode 100644 index f83814b9b23..00000000000 --- a/package/boot/uboot-sifiveu/patches/110-no-kwbimage.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/tools/Makefile -+++ b/tools/Makefile -@@ -114,7 +114,6 @@ dumpimage-mkimage-objs := aisimage.o \ - imximage.o \ - imx8image.o \ - imx8mimage.o \ -- kwbimage.o \ - generated/lib/md5.o \ - lpc32xximage.o \ - mxsimage.o \ diff --git a/package/boot/uboot-sifiveu/patches/130-fix-mkimage-host-build.patch b/package/boot/uboot-sifiveu/patches/130-fix-mkimage-host-build.patch deleted file mode 100644 index cd65c1321fc..00000000000 --- a/package/boot/uboot-sifiveu/patches/130-fix-mkimage-host-build.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/tools/image-host.c -+++ b/tools/image-host.c -@@ -1125,6 +1125,7 @@ static int fit_config_add_verification_d - * 2) get public key (X509_get_pubkey) - * 3) provide der format (d2i_RSAPublicKey) - */ -+#ifdef CONFIG_TOOLS_LIBCRYPTO - static int read_pub_key(const char *keydir, const void *name, - unsigned char **pubkey, int *pubkey_len) - { -@@ -1178,6 +1179,13 @@ err_cert: - fclose(f); - return ret; - } -+#else -+static int read_pub_key(const char *keydir, const void *name, -+ unsigned char **pubkey, int *pubkey_len) -+{ -+ return -ENOSYS; -+} -+#endif - - int fit_pre_load_data(const char *keydir, void *keydest, void *fit) - {