catspeed-cc/openwrt
2
1
Fork 0
Code Issues Pull Requests Activity

uboot-tools: update to v2026.04

Browse Source 
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] 0535e46d55
[2] 807bcd844a
Signed-off-by: Shiji Yang <yangshiji66@outlook.com>
Link: https://github.com/openwrt/openwrt/pull/22845
Signed-off-by: Nick Hainke <vincent@systemli.org>
This commit is contained in:
Shiji Yang 2026-04-10 19:03:30 +08:00 committed by Nick Hainke
parent e95990f202
commit 55925650aa
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
package/boot/uboot-tools/Makefile
View File

@ -1,8 +1,8 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_DISTNAME:=u-boot PKG_DISTNAME:=u-boot
PKG_VERSION:=2026.01 PKG_VERSION:=2026.04
PKG_RELEASE:=2 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_DISTNAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_DISTNAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:= \ PKG_SOURCE_URL:= \
@ -10,7 +10,7 @@ PKG_SOURCE_URL:= \
https://mirror.cyberbits.eu/u-boot \ https://mirror.cyberbits.eu/u-boot \
ftp://ftp.denx.de/pub/u-boot ftp://ftp.denx.de/pub/u-boot
PKG_URL:=https://docs.u-boot.org/en/latest/ PKG_URL:=https://docs.u-boot.org/en/latest/
PKG_HASH:=b60d5865cefdbc75da8da4156c56c458e00de75a49b80c1a2e58a96e30ad0d54 PKG_HASH:=ac7c04b8b7004923b00a4e5d6699c5df4d21233bac9fda690d8cfbc209fff2fd
PKG_SOURCE_SUBDIR:=$(PKG_DISTNAME)-$(PKG_VERSION) PKG_SOURCE_SUBDIR:=$(PKG_DISTNAME)-$(PKG_VERSION)
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_DISTNAME)-$(PKG_VERSION) PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_DISTNAME)-$(PKG_VERSION)
@ -78,6 +78,7 @@ MAKE_FLAGS += \
ARCH="sandbox" \ ARCH="sandbox" \
TARGET_CFLAGS="$(TARGET_CFLAGS)" \ TARGET_CFLAGS="$(TARGET_CFLAGS)" \
TARGET_LDFLAGS="$(TARGET_LDFLAGS)" \ TARGET_LDFLAGS="$(TARGET_LDFLAGS)" \
PKG_CONFIG_SYSROOT_DIR="$(STAGING_DIR)" \
NO_PYTHON=1 \ NO_PYTHON=1 \
V=$(if $(findstring c,$(OPENWRT_VERBOSE)),1,) V=$(if $(findstring c,$(OPENWRT_VERBOSE)),1,)

10
package/boot/uboot-tools/patches/003-tools-dumpimage-fix-tools-compile.patch
View File

@ -44,8 +44,8 @@ Signed-off-by: Scott Mercer <TheRootEd24@gmail.com>
# Enable all the config-independent tools # Enable all the config-independent tools
ifneq ($(HOST_TOOLS_ALL),) ifneq ($(HOST_TOOLS_ALL),)
CONFIG_ARCH_KIRKWOOD = y CONFIG_ARCH_KIRKWOOD = y
@@ -261,15 +281,10 @@ hostprogs-$(CONFIG_MIPS) += mips-relocs @@ -262,15 +282,10 @@ hostprogs-always-$(CONFIG_MIPS) += mips-
hostprogs-$(CONFIG_ASN1_COMPILER) += asn1_compiler hostprogs-always-$(CONFIG_ASN1_COMPILER) += asn1_compiler
HOSTCFLAGS_asn1_compiler.o = -idirafter $(srctree)/include HOSTCFLAGS_asn1_compiler.o = -idirafter $(srctree)/include
-HOSTCFLAGS_mkeficapsule.o += \ -HOSTCFLAGS_mkeficapsule.o += \
@ -56,15 +56,15 @@ Signed-off-by: Scott Mercer <TheRootEd24@gmail.com>
- generated/lib/sha1.o \ - generated/lib/sha1.o \
- $(LIBFDT_OBJS) \ - $(LIBFDT_OBJS) \
- mkeficapsule.o - mkeficapsule.o
-hostprogs-$(CONFIG_TOOLS_MKEFICAPSULE) += mkeficapsule -hostprogs-always-$(CONFIG_TOOLS_MKEFICAPSULE) += mkeficapsule
+HOSTCFLAGS_mkeficapsule.o += +HOSTCFLAGS_mkeficapsule.o +=
+HOSTLDLIBS_mkeficapsule += +HOSTLDLIBS_mkeficapsule +=
+mkeficapsule-objs := +mkeficapsule-objs :=
+hostprogs-$(CONFIG_TOOLS_MKEFICAPSULE) += +hostprogs-always-$(CONFIG_TOOLS_MKEFICAPSULE) +=
mkfwumdata-objs := mkfwumdata.o generated/lib/crc32.o mkfwumdata-objs := mkfwumdata.o generated/lib/crc32.o
HOSTLDLIBS_mkfwumdata += -luuid 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)/scripts/dtc/libfdt \
-I$(srctree)/tools \ -I$(srctree)/tools \
-DUSE_HOSTCC \ -DUSE_HOSTCC \

8
package/boot/uboot-tools/patches/013-tools-fit_check_sign-all-image-types.patch
View File

@ -28,7 +28,7 @@
/* Return the first error we found */ /* Return the first error we found */
--- a/boot/image-fit.c --- a/boot/image-fit.c
+++ b/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_uname_config = fit_uname_configp ? *fit_uname_configp : NULL;
fit_base_uname_config = NULL; fit_base_uname_config = NULL;
prop_name = fit_get_image_type_property(ph_type); prop_name = fit_get_image_type_property(ph_type);
@ -39,7 +39,7 @@
bootstage_mark(bootstage_id + BOOTSTAGE_SUB_FORMAT); bootstage_mark(bootstage_id + BOOTSTAGE_SUB_FORMAT);
ret = fit_check_format(fit, IMAGE_SIZE_INVAL); 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; cfg_noffset = ret;
fit_base_uname_config = fdt_get_name(fit, cfg_noffset, NULL); fit_base_uname_config = fdt_get_name(fit, cfg_noffset, NULL);
@ -49,8 +49,8 @@
/* Remember this config */ /* Remember this config */
if (image_type == IH_TYPE_KERNEL) if (image_type == IH_TYPE_KERNEL)
images->fit_uname_cfg = fit_base_uname_config; images->fit_uname_cfg = fit_base_uname_config;
@@ -2140,7 +2144,9 @@ int fit_image_load(struct bootm_headers @@ -2156,7 +2160,9 @@ int fit_image_load(struct bootm_headers
fit_uname = fit_get_name(fit, noffset, NULL); image_ph_phase(ph_type));
} }
if (noffset < 0) { if (noffset < 0) {
+#ifndef USE_HOSTCC +#ifndef USE_HOSTCC