From 128c26f2875dd60ed5fafe25f63b3da11bb79f60 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Tue, 7 Oct 2025 10:05:47 +0200 Subject: [PATCH] boot/uboot: bump to version 2025.10 Release announcement: https://lists.denx.de/pipermail/u-boot/2025-October/599798.html Changelog: https://github.com/u-boot/u-boot/compare/v2025.07...v2025.10 With upstream commit a239b0b0b6db ("Add symlink from gpl-2.0.txt to a COPYING file"), COPYING is now a symlink to Licenses/gpl-2.0.txt, causing the install command in UBOOT_COPY_OLD_LICENSE_FILE to fail because the source and destination refer to the same file. To avoid this, copy the license file only if Licenses/gpl-2.0.txt does not already exist. Signed-off-by: Dario Binacchi Signed-off-by: Julien Olivain --- boot/uboot/Config.in | 6 +++--- boot/uboot/uboot.hash | 2 +- boot/uboot/uboot.mk | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index 9320f942d6..d40e1e95e0 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -41,7 +41,7 @@ choice Select the specific U-Boot version you want to use config BR2_TARGET_UBOOT_LATEST_VERSION - bool "2025.07" + bool "2025.10" config BR2_TARGET_UBOOT_CUSTOM_VERSION bool "Custom version" @@ -85,7 +85,7 @@ endif config BR2_TARGET_UBOOT_VERSION string - default "2025.07" if BR2_TARGET_UBOOT_LATEST_VERSION + default "2025.10" if BR2_TARGET_UBOOT_LATEST_VERSION default BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE \ if BR2_TARGET_UBOOT_CUSTOM_VERSION default "custom" if BR2_TARGET_UBOOT_CUSTOM_TARBALL @@ -340,7 +340,7 @@ config BR2_TARGET_UBOOT_USE_BINMAN help Use binman tool for generation and signing of boot images. - https://docs.u-boot.org/en/v2025.07/develop/package/binman.html + https://docs.u-boot.org/en/v2025.10/develop/package/binman.html menu "U-Boot binary format" diff --git a/boot/uboot/uboot.hash b/boot/uboot/uboot.hash index 40c60d6083..7b71e2d948 100644 --- a/boot/uboot/uboot.hash +++ b/boot/uboot/uboot.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 0f933f6c5a426895bf306e93e6ac53c60870e4b54cda56d95211bec99e63bec7 u-boot-2025.07.tar.bz2 +sha256 b4f032848e56cc8f213ad59f9132c084dbbb632bc29176d024e58220e0efdf4a u-boot-2025.10.tar.bz2 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 Licenses/gpl-2.0.txt diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index c92568a559..7bd0937df2 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -307,7 +307,7 @@ endif # prior to u-boot 2013.10 the license info was in COPYING. Copy it so # legal-info finds it define UBOOT_COPY_OLD_LICENSE_FILE - if [ -f $(@D)/COPYING ]; then \ + if [ -f $(@D)/COPYING ] && [ ! -f $(@D)/Licenses/gpl-2.0.txt ]; then \ $(INSTALL) -m 0644 -D $(@D)/COPYING $(@D)/Licenses/gpl-2.0.txt; \ fi endef