uboot-tools: update to v2026.07

Update to the latest stable version. Also remove obsolete symbol
PKG_CONFIG_SYSROOT_DIR[1].

[1] https://github.com/u-boot/u-boot/commit/8ef8dee4f3a2b2021decfefd853dbd2a1632b77f
Signed-off-by: Shiji Yang <yangshiji66@outlook.com>
Link: https://github.com/openwrt/openwrt/pull/24123
Signed-off-by: Jonas Jelonek <jelonek.jonas@gmail.com>

diff --git a/package/boot/uboot-tools/Makefile b/package/boot/uboot-tools/Makefile
index 9a1bc79f4825dc34b3f5db781b6d1eddfa5feb43..d31215aa8b681b45d9e482980353ef668aed3b6d 100644 (file)
--- a/package/boot/uboot-tools/Makefile
+++ b/package/boot/uboot-tools/Makefile
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_DISTNAME:=u-boot
-PKG_VERSION:=2026.04
+PKG_VERSION:=2026.07
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_DISTNAME)-$(PKG_VERSION).tar.bz2
@@ -9,7 +9,7 @@ PKG_SOURCE_URL:= \
        https://ftp.denx.de/pub/u-boot \
        https://mirror.cyberbits.eu/u-boot
 PKG_URL:=https://docs.u-boot.org/en/latest/
-PKG_HASH:=ac7c04b8b7004923b00a4e5d6699c5df4d21233bac9fda690d8cfbc209fff2fd
+PKG_HASH:=78e8bfc382fe388f9b55aa1daf8c563522a037779b5d4c349d1415e381f1243e
 PKG_SOURCE_SUBDIR:=$(PKG_DISTNAME)-$(PKG_VERSION)
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_DISTNAME)-$(PKG_VERSION)
 
@@ -81,7 +81,6 @@ MAKE_FLAGS += \
        ARCH="sandbox" \
        TARGET_CFLAGS="$(TARGET_CFLAGS)" \
        TARGET_LDFLAGS="$(TARGET_LDFLAGS)" \
-       PKG_CONFIG_SYSROOT_DIR="$(STAGING_DIR_HOST)" \
        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 33c956d219df61d7d544859f232eab24b6785d8e..7bd7608482e8e6b3481e563ae7d2ca434cdf43cf 100644 (file)
--- 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,7 +44,7 @@ Signed-off-by: Scott Mercer <TheRootEd24@gmail.com>
  # Enable all the config-independent tools
  ifneq ($(HOST_TOOLS_ALL),)
  CONFIG_ARCH_KIRKWOOD = y
-@@ -329,8 +349,7 @@ HOST_EXTRACFLAGS += -include $(srctree)/
+@@ -327,8 +347,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 f6dfde861f3188b2cb6919847f6e6f4a80845b61..58cef5c588154b50eff440ba04b0abf1ac5af36c 100644 (file)
--- 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
@@ -1,6 +1,6 @@
 --- a/boot/bootm.c
 +++ b/boot/bootm.c
-@@ -1245,20 +1245,18 @@ static int bootm_host_load_image(const v
+@@ -1270,20 +1270,18 @@ static int bootm_host_load_image(const v
  
  int bootm_host_load_images(const void *fit, int cfg_noffset)
  {

diff --git a/package/boot/uboot-tools/patches/014-tools-fit_check_sign-no-decompress.patch b/package/boot/uboot-tools/patches/014-tools-fit_check_sign-no-decompress.patch
index c906cb3b769c041713d6896939a233c1097a1892..8e750b4cfa2b17ec2ab94c069a75d1f43b065b91 100644 (file)
--- a/package/boot/uboot-tools/patches/014-tools-fit_check_sign-no-decompress.patch
+++ b/package/boot/uboot-tools/patches/014-tools-fit_check_sign-no-decompress.patch
@@ -1,6 +1,6 @@
 --- a/boot/bootm.c
 +++ b/boot/bootm.c
-@@ -1204,10 +1204,6 @@ static int bootm_host_load_image(const v
+@@ -1229,10 +1229,6 @@ static int bootm_host_load_image(const v
        ulong data, len;
        struct bootm_headers images;
        int noffset;
@@ -11,7 +11,7 @@
        int ret;
  
        fit_uname_config = fdt_get_name(fit, cfg_noffset, NULL);
-@@ -1219,26 +1215,6 @@ static int bootm_host_load_image(const v
+@@ -1244,26 +1240,6 @@ static int bootm_host_load_image(const v
                FIT_LOAD_IGNORED, &data, &len);
        if (noffset < 0)
                return noffset;