From: Shiji Yang Date: Fri, 10 Apr 2026 11:03:30 +0000 (+0800) Subject: uboot-tools: update to v2026.04 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=55925650aabbb4e4f4ba9558c14cbe4c5b1da9f3;p=thirdparty%2Fopenwrt.git uboot-tools: update to v2026.04 Update to the latest stable version. Also add PKG_CONFIG_SYSROOT_DIR make flag to fix dtc tools build without yaml[1-2]. Patches manually refreshed: * 003-tools-dumpimage-fix-tools-compile.patch [1] https://github.com/u-boot/u-boot/commit/0535e46d55d7423094d8b553d704a0f7f678de77 [2] https://github.com/u-boot/u-boot/commit/807bcd844afeadbfe47ac132524cc7e3b699bc46 Signed-off-by: Shiji Yang Link: https://github.com/openwrt/openwrt/pull/22845 Signed-off-by: Nick Hainke --- diff --git a/package/boot/uboot-tools/Makefile b/package/boot/uboot-tools/Makefile index a8c63291bbf..9fd4dae977d 100644 --- a/package/boot/uboot-tools/Makefile +++ b/package/boot/uboot-tools/Makefile @@ -1,8 +1,8 @@ include $(TOPDIR)/rules.mk PKG_DISTNAME:=u-boot -PKG_VERSION:=2026.01 -PKG_RELEASE:=2 +PKG_VERSION:=2026.04 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_DISTNAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:= \ @@ -10,7 +10,7 @@ PKG_SOURCE_URL:= \ https://mirror.cyberbits.eu/u-boot \ ftp://ftp.denx.de/pub/u-boot PKG_URL:=https://docs.u-boot.org/en/latest/ -PKG_HASH:=b60d5865cefdbc75da8da4156c56c458e00de75a49b80c1a2e58a96e30ad0d54 +PKG_HASH:=ac7c04b8b7004923b00a4e5d6699c5df4d21233bac9fda690d8cfbc209fff2fd PKG_SOURCE_SUBDIR:=$(PKG_DISTNAME)-$(PKG_VERSION) PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_DISTNAME)-$(PKG_VERSION) @@ -78,6 +78,7 @@ MAKE_FLAGS += \ ARCH="sandbox" \ TARGET_CFLAGS="$(TARGET_CFLAGS)" \ TARGET_LDFLAGS="$(TARGET_LDFLAGS)" \ + PKG_CONFIG_SYSROOT_DIR="$(STAGING_DIR)" \ NO_PYTHON=1 \ V=$(if $(findstring c,$(OPENWRT_VERBOSE)),1,) diff --git a/package/boot/uboot-tools/patches/003-tools-dumpimage-fix-tools-compile.patch b/package/boot/uboot-tools/patches/003-tools-dumpimage-fix-tools-compile.patch index 56f14d3cba5..d5fcecff7f6 100644 --- a/package/boot/uboot-tools/patches/003-tools-dumpimage-fix-tools-compile.patch +++ b/package/boot/uboot-tools/patches/003-tools-dumpimage-fix-tools-compile.patch @@ -44,8 +44,8 @@ Signed-off-by: Scott Mercer # Enable all the config-independent tools ifneq ($(HOST_TOOLS_ALL),) CONFIG_ARCH_KIRKWOOD = y -@@ -261,15 +281,10 @@ hostprogs-$(CONFIG_MIPS) += mips-relocs - hostprogs-$(CONFIG_ASN1_COMPILER) += asn1_compiler +@@ -262,15 +282,10 @@ hostprogs-always-$(CONFIG_MIPS) += mips- + hostprogs-always-$(CONFIG_ASN1_COMPILER) += asn1_compiler HOSTCFLAGS_asn1_compiler.o = -idirafter $(srctree)/include -HOSTCFLAGS_mkeficapsule.o += \ @@ -56,15 +56,15 @@ Signed-off-by: Scott Mercer - generated/lib/sha1.o \ - $(LIBFDT_OBJS) \ - mkeficapsule.o --hostprogs-$(CONFIG_TOOLS_MKEFICAPSULE) += mkeficapsule +-hostprogs-always-$(CONFIG_TOOLS_MKEFICAPSULE) += mkeficapsule +HOSTCFLAGS_mkeficapsule.o += +HOSTLDLIBS_mkeficapsule += +mkeficapsule-objs := -+hostprogs-$(CONFIG_TOOLS_MKEFICAPSULE) += ++hostprogs-always-$(CONFIG_TOOLS_MKEFICAPSULE) += mkfwumdata-objs := mkfwumdata.o generated/lib/crc32.o HOSTLDLIBS_mkfwumdata += -luuid -@@ -330,8 +345,7 @@ HOST_EXTRACFLAGS += -include $(srctree)/ +@@ -329,8 +344,7 @@ HOST_EXTRACFLAGS += -include $(srctree)/ -I$(srctree)/scripts/dtc/libfdt \ -I$(srctree)/tools \ -DUSE_HOSTCC \ diff --git a/package/boot/uboot-tools/patches/013-tools-fit_check_sign-all-image-types.patch b/package/boot/uboot-tools/patches/013-tools-fit_check_sign-all-image-types.patch index a273a2401f7..f6dfde861f3 100644 --- a/package/boot/uboot-tools/patches/013-tools-fit_check_sign-all-image-types.patch +++ b/package/boot/uboot-tools/patches/013-tools-fit_check_sign-all-image-types.patch @@ -28,7 +28,7 @@ /* Return the first error we found */ --- a/boot/image-fit.c +++ b/boot/image-fit.c -@@ -2079,8 +2079,10 @@ int fit_image_load(struct bootm_headers +@@ -2095,8 +2095,10 @@ int fit_image_load(struct bootm_headers fit_uname_config = fit_uname_configp ? *fit_uname_configp : NULL; fit_base_uname_config = NULL; prop_name = fit_get_image_type_property(ph_type); @@ -39,7 +39,7 @@ bootstage_mark(bootstage_id + BOOTSTAGE_SUB_FORMAT); ret = fit_check_format(fit, IMAGE_SIZE_INVAL); -@@ -2117,7 +2119,9 @@ int fit_image_load(struct bootm_headers +@@ -2134,7 +2136,9 @@ int fit_image_load(struct bootm_headers cfg_noffset = ret; fit_base_uname_config = fdt_get_name(fit, cfg_noffset, NULL); @@ -49,8 +49,8 @@ /* Remember this config */ if (image_type == IH_TYPE_KERNEL) images->fit_uname_cfg = fit_base_uname_config; -@@ -2140,7 +2144,9 @@ int fit_image_load(struct bootm_headers - fit_uname = fit_get_name(fit, noffset, NULL); +@@ -2156,7 +2160,9 @@ int fit_image_load(struct bootm_headers + image_ph_phase(ph_type)); } if (noffset < 0) { +#ifndef USE_HOSTCC