u-boot: upgrade 2025.07 -> 2025.10
PATCH 1/1 u-boot: upgrade 2025.07 -> 2025.10
Upgrade to U-Boot 2025.10.
Drop all the applied patches.
Signed-off-by Fabio Estevam <[email protected]>
---
...dependency-from-lib-to-arch-ARCH-lib.patch | 81 -----
...1-nxp-Prepare-macros-for-KVM-changes.patch | 100 ------
...02-arm-io.h-Fix-io-accessors-for-KVM.patch | 310 ------------------
...rm-Enable-virtualizable-IO-accessors.patch | 41 ---
meta/recipes-bsp/u-boot/u-boot-common.inc | 12 +-
...ols_2025.07.bb => u-boot-tools_2025.10.bb} | 0
.../{u-boot_2025.07.bb => u-boot_2025.10.bb} | 0
7 files changed, 3 insertions(+), 541 deletions(-)
delete mode 100644 meta/recipes-bsp/u-boot/files/0001-Makefile-add-dependency-from-lib-to-arch-ARCH-lib.patch
delete mode 100644 meta/recipes-bsp/u-boot/files/0001-nxp-Prepare-macros-for-KVM-changes.patch
delete mode 100644 meta/recipes-bsp/u-boot/files/0002-arm-io.h-Fix-io-accessors-for-KVM.patch
delete mode 100644 meta/recipes-bsp/u-boot/files/0003-qemu-arm-Enable-virtualizable-IO-accessors.patch
rename meta/recipes-bsp/u-boot/{u-boot-tools_2025.07.bb => u-boot-tools_2025.10.bb} (100%)
rename meta/recipes-bsp/u-boot/{u-boot_2025.07.bb => u-boot_2025.10.bb} (100%)meta/recipes-bsp/u-boot/files/0001-Makefile-add-dependency-from-lib-to-arch-ARCH-lib.patch deleted +0 -81
@@ -1,81 +0,0 @@ -From d0075e2d730a4fa48aa763a669e5edbc02c33a22 Mon Sep 17 00:00:00 2001 -From: Mikko Rapeli <[email protected]> -Date: Thu, 31 Jul 2025 14:52:48 +0300 -Subject: [PATCH] Makefile: add dependency from lib to arch/$(ARCH)/lib - -Top level Makefile starts separate "make" processes for each each -subdirectory. lib/efi_loader apps now depend on lib.a from -arch/$(ARCH)/lib if CONFIG_USE_PRIVATE_LIBGCC is enabled which creates -a race conditions since dependency from lib/efi_loader EFI apps to -arch/$(ARCH)/lib/lib.a is not explicit: - -arm-poky-linux-gnueabi-ld.bfd: cannot find arch/arm/lib/lib.a: No such file or directory -make[3]: *** [scripts/Makefile.lib:512: lib/efi_loader/testapp_efi.so] Error 1 - -This error was seen on yocto/OE-core CI builds after u-boot 2025.07 update: - -https://lists.openembedded.org/g/openembedded-core/message/220004 - -https://autobuilder.yoctoproject.org/valkyrie/api/v2/logs/2914600/raw_inline - - | rm -f lib/efi_loader/built-in.o; arm-poky-linux-gnueabi-ar cDPrsT lib/efi_loader/built-in.o lib/efi_loader/efi_bootmgr.o lib/efi_loader/efi_bootbin.o lib/efi_loader -/efi_boottime.o lib/efi_loader/efi_helper.o lib/efi_loader/efi_console.o lib/efi_loader/efi_device_path.o lib/efi_loader/efi_device_path_to_text.o lib/efi_loader/efi_device_ -path_utilities.o lib/efi_loader/efi_dt_fixup.o lib/efi_loader/efi_fdt.o lib/efi_loader/efi_file.o lib/efi_loader/efi_hii.o lib/efi_loader/efi_hii_config.o lib/efi_loader/efi -_image_loader.o lib/efi_loader/efi_load_options.o lib/efi_loader/efi_memory.o lib/efi_loader/efi_root_node.o lib/efi_loader/efi_runtime.o lib/efi_loader/efi_setup.o lib/efi_ -loader/efi_string.o lib/efi_loader/efi_unicode_collation.o lib/efi_loader/efi_var_common.o lib/efi_loader/efi_var_mem.o lib/efi_loader/efi_variable.o lib/efi_loader/efi_var_ -file.o lib/efi_loader/efi_watchdog.o lib/efi_loader/efi_disk.o lib/efi_loader/efi_net.o lib/efi_loader/efi_smbios.o lib/efi_loader/efi_load_initrd.o lib/efi_loader/efi_confo -rmance.o - | arm-poky-linux-gnueabi-ld.bfd -nostdlib -zexecstack -znocombreloc -znorelro --no-warn-rwx-segments -L /srv/pokybuild/yocto-worker/oe-selftest-armhost/build/build-st- -3119200/tmp/work/beaglebone_yocto-poky-linux-gnueabi/u-boot/2025.07/sources/u-boot-2025.07 -T arch/arm/lib/elf_arm_efi.lds -shared -Bsymbolic -s lib/efi_loader/helloworld.o -lib/efi_loader/efi_crt0.o lib/efi_loader/efi_reloc.o lib/efi_loader/efi_freestanding.o arch/arm/lib/lib.a -o lib/efi_loader/helloworld_efi.so - | arm-poky-linux-gnueabi-ld.bfd: cannot find arch/arm/lib/lib.a: No such file or directory - | make[3]: *** [scripts/Makefile.lib:512: lib/efi_loader/helloworld_efi.so] Error 1 - -The different "make" processes share common scripts/Makefile.build -and scripts/Makefile.libs but since they are separate processes -the Makefile rules can't add a dependency from lib/uefi_loader targets -to arch/$(ARCH)/lib/lib.a. Or the file level dependency can be added but -then "make" produces a too sparse error message which does not mention -that one of the dependencies like arch/$(ARCH)/lib/lib.a was not found: - -make[3]: *** No rule to make target 'lib/efi_loader/helloworld.efi', needed by '__build'. Stop. - -Fix this dependency problem by building arch/$(ARCH)/lib before lib -if CONFIG_USE_PRIVATE_LIBGCC was enabled. - -To reproduce the race condition more reliably, add a "sleep 10" delay -before linker command cmd_link_l_target with 2025.07 -or to $(lib-target): target in scripts/Makefile.build with master branch -after Kbuild update. - -Fixes: 43d43241d1c9 ("scripts/Makefile.lib: add PLATFORM_LIBGCC to efi linking") - -Cc: Adriano Cordova <[email protected]> -Cc: Fabio Estevam <[email protected]> -Signed-off-by: Mikko Rapeli <[email protected]> -Reviewed-by: Fabio Estevam <[email protected]> ---- - Makefile | 5 +++++ - 1 file changed, 5 insertions(+) - -Upstream-Status: Backport - -diff --git a/Makefile b/Makefile -index c31bf7ecea97..b03f87a93fb9 100644 ---- a/Makefile -+++ b/Makefile -@@ -2131,6 +2131,11 @@ $(filter-out tools, $(u-boot-dirs)): tools - # is "yes"), so compile examples after U-Boot is compiled. - examples: $(filter-out examples, $(u-boot-dirs)) - -+ifeq ($(CONFIG_USE_PRIVATE_LIBGCC),y) -+# lib/efi_loader apps depend on arch/$(ARCH)/lib for lib.a -+lib: $(filter arch/$(ARCH)/lib, $(u-boot-dirs)) -+endif -+ - # The setlocalversion script comes from linux and expects a - # KERNELVERSION variable in the environment for figuring out which - # annotated tags are relevant. Pass UBOOTVERSION. --- -2.43.0 -
meta/recipes-bsp/u-boot/files/0001-nxp-Prepare-macros-for-KVM-changes.patch deleted +0 -100
100 lines not on this page · raw message
meta/recipes-bsp/u-boot/files/0002-arm-io.h-Fix-io-accessors-for-KVM.patch deleted +0 -310
310 lines not on this page · raw message
meta/recipes-bsp/u-boot/files/0003-qemu-arm-Enable-virtualizable-IO-accessors.patch deleted +0 -41
41 lines not on this page · raw message
meta/recipes-bsp/u-boot/u-boot-common.inc +3 -9
@@ -12,15 +12,9 @@ PE = "1" # We use the revision in order to avoid having to fetch it from the # repo during parse -SRCREV = "e37de002fac3895e8d0b60ae2015e17bb33e2b5b" - -SRC_URI = "\ - git://source.denx.de/u-boot/u-boot.git;protocol=https;branch=master;tag=v${PV} \ - file://0001-Makefile-add-dependency-from-lib-to-arch-ARCH-lib.patch \ - file://0001-nxp-Prepare-macros-for-KVM-changes.patch \ - file://0002-arm-io.h-Fix-io-accessors-for-KVM.patch \ - file://0003-qemu-arm-Enable-virtualizable-IO-accessors.patch \ -" +SRCREV = "e50b1e8715011def8aff1588081a2649a2c6cd47" + +SRC_URI = "git://source.denx.de/u-boot/u-boot.git;protocol=https;branch=master;tag=v${PV}" SRC_URI_RISCV = "\ file://u-boot-riscv-isa_clear.cfg \
meta/recipes-bsp/u-boot/u-boot-tools_2025.10.bb renamed from meta/recipes-bsp/u-boot/u-boot-tools_2025.07.bb +0 -0
meta/recipes-bsp/u-boot/u-boot_2025.10.bb renamed from meta/recipes-bsp/u-boot/u-boot_2025.07.bb +0 -0
Signature · 1 line
2.34.1