diff --git a/package/boot/uboot-tools/Makefile b/package/boot/uboot-tools/Makefile index 09f2034ae1f..215bd35554b 100644 --- a/package/boot/uboot-tools/Makefile +++ b/package/boot/uboot-tools/Makefile @@ -1,18 +1,15 @@ include $(TOPDIR)/rules.mk PKG_DISTNAME:=u-boot -PKG_VERSION:=2026.07 -PKG_RELEASE:=5 +PKG_VERSION:=2026.10 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_DISTNAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:= \ - https://git.u-boot-project.org/u-boot/u-boot/-/releases/v$(PKG_VERSION)/downloads \ - https://ftp.denx.de/pub/u-boot \ - https://mirror.cyberbits.eu/u-boot + https://git.u-boot-project.org/u-boot/u-boot/-/releases/v$(PKG_VERSION)/downloads PKG_URL:=https://docs.u-boot-project.org/en/latest/ -PKG_HASH:=78e8bfc382fe388f9b55aa1daf8c563522a037779b5d4c349d1415e381f1243e -PKG_SOURCE_SUBDIR:=$(PKG_DISTNAME)-$(PKG_VERSION) -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_DISTNAME)-$(PKG_VERSION) +PKG_HASH:=3f856da3cbbc93af51ff95fde18588a348b4a26723b01d9841e999d988481015 +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_DISTNAME)-v$(PKG_VERSION) PKG_BUILD_DEPENDS:=fstools 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 7bd7608482e..6c87c650a85 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,7 +44,7 @@ Signed-off-by: Scott Mercer # Enable all the config-independent tools ifneq ($(HOST_TOOLS_ALL),) CONFIG_ARCH_KIRKWOOD = y -@@ -327,8 +347,7 @@ HOST_EXTRACFLAGS += -include $(srctree)/ +@@ -328,8 +348,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 58cef5c5881..68a3fc77cc2 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 @@ -1,6 +1,6 @@ --- a/boot/bootm.c +++ b/boot/bootm.c -@@ -1270,20 +1270,18 @@ static int bootm_host_load_image(const v +@@ -1318,20 +1318,18 @@ static int bootm_host_load_image(const v int bootm_host_load_images(const void *fit, int cfg_noffset) { @@ -28,7 +28,7 @@ /* Return the first error we found */ --- a/boot/image-fit.c +++ b/boot/image-fit.c -@@ -2095,8 +2095,10 @@ int fit_image_load(struct bootm_headers +@@ -2156,8 +2156,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); -@@ -2134,7 +2136,9 @@ int fit_image_load(struct bootm_headers +@@ -2195,7 +2197,9 @@ int fit_image_load(struct bootm_headers cfg_noffset = ret; fit_base_uname_config = fdt_get_name(fit, cfg_noffset, NULL); @@ -49,7 +49,7 @@ /* Remember this config */ if (image_type == IH_TYPE_KERNEL) images->fit_uname_cfg = fit_base_uname_config; -@@ -2156,7 +2160,9 @@ int fit_image_load(struct bootm_headers +@@ -2217,7 +2221,9 @@ int fit_image_load(struct bootm_headers image_ph_phase(ph_type)); } if (noffset < 0) { 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 8e750b4cfa2..9630896047b 100644 --- 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 -@@ -1229,10 +1229,6 @@ static int bootm_host_load_image(const v +@@ -1276,10 +1276,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); -@@ -1244,26 +1240,6 @@ static int bootm_host_load_image(const v +@@ -1291,27 +1287,6 @@ static int bootm_host_load_image(const v FIT_LOAD_IGNORED, &data, &len); if (noffset < 0) return noffset; @@ -31,7 +31,8 @@ - free(load_buf); - - if (ret) { -- ret = handle_decomp_error(image_comp, load_end - 0, buf_size, ret); +- ret = handle_decomp_error(image_comp, load_end - 0, buf_size, +- BOOTM_DECOMP_LIMIT_GLOBAL, ret); - if (ret != BOOTM_ERR_UNIMPLEMENTED) - return ret; - }