Hi,

I've prepared an NMU for u-boot (versioned as 2025.01-3.1) and
uploaded it to DELAYED/10. Please feel free to tell me if I
should delay it longer.

This fixes both the FTBFS caused by the newer binutils #1122489,
see bug #1122406 for additional details, and drops the mips64el
targets #1124308.

Chris
diff -Nru u-boot-2025.01/debian/changelog u-boot-2025.01/debian/changelog
--- u-boot-2025.01/debian/changelog	2025-04-09 01:07:41.000000000 +0200
+++ u-boot-2025.01/debian/changelog	2026-01-05 20:15:58.000000000 +0100
@@ -1,3 +1,12 @@
+u-boot (2025.01-3.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTBFS with binutils/objcopy strict --target validation
+    (Closes: #1122489)
+  * Drop remaining mips64el (qemu) targets (Closes: #1124308)
+
+ -- Chris Hofstaedtler <[email protected]>  Mon, 05 Jan 2026 20:15:58 +0100
+
 u-boot (2025.01-3) unstable; urgency=medium
 
   [ Marek Vasut ]
diff -Nru u-boot-2025.01/debian/control u-boot-2025.01/debian/control
--- u-boot-2025.01/debian/control	2025-03-18 08:16:11.000000000 +0100
+++ u-boot-2025.01/debian/control	2026-01-05 20:15:15.000000000 +0100
@@ -41,8 +41,6 @@
  gcc-riscv64-linux-gnu [!riscv64],
  gcc-x86-64-linux-gnu [!amd64],
  gcc-powerpc-linux-gnu [!powerpc],
- gcc-mips64el-linux-gnuabi64 [!mips64el],
- gcc-mipsel-linux-gnu [!mipsel],
 Rules-Requires-Root: no
 Standards-Version: 4.7.2
 Homepage: https://www.denx.de/wiki/U-Boot/
diff -Nru u-boot-2025.01/debian/patches/binutils-output-target.patch u-boot-2025.01/debian/patches/binutils-output-target.patch
--- u-boot-2025.01/debian/patches/binutils-output-target.patch	1970-01-01 01:00:00.000000000 +0100
+++ u-boot-2025.01/debian/patches/binutils-output-target.patch	2026-01-05 20:13:16.000000000 +0100
@@ -0,0 +1,43 @@
+Update objcopy --target argument to --output-target,
+per binutils upstream commit 5e83077d552ed6f81dbc092eb3ccf827a43de42c.
+
+diff --git i/arch/sandbox/config.mk w/arch/sandbox/config.mk
+index 405843800e..2ee5981725 100644
+--- i/arch/sandbox/config.mk
++++ w/arch/sandbox/config.mk
+@@ -46,10 +46,10 @@ cmd_u-boot-spl = (cd $(obj) && $(CC) -o $(SPL_BIN) -Wl,-T u-boot-spl.lds \
+ 
+ ifeq ($(HOST_ARCH),$(HOST_ARCH_X86_64))
+ EFI_LDS := ${SRCDIR}/../../../arch/x86/lib/elf_x86_64_efi.lds
+-EFI_TARGET := --target=efi-app-x86_64
++EFI_TARGET := --output-target=efi-app-x86_64
+ else ifeq ($(HOST_ARCH),$(HOST_ARCH_X86))
+ EFI_LDS := ${SRCDIR}/../../../arch/x86/lib/elf_ia32_efi.lds
+-EFI_TARGET := --target=efi-app-ia32
++EFI_TARGET := --output-target=efi-app-ia32
+ else ifeq ($(HOST_ARCH),$(HOST_ARCH_AARCH64))
+ EFI_LDS := ${SRCDIR}/../../../arch/arm/lib/elf_aarch64_efi.lds
+ OBJCOPYFLAGS += -j .text -j .secure_text -j .secure_data -j .rodata -j .data \
+diff --git i/arch/x86/config.mk w/arch/x86/config.mk
+index 6d4839dfb3..c2bb5549b7 100644
+--- i/arch/x86/config.mk
++++ w/arch/x86/config.mk
+@@ -69,7 +69,7 @@ endif
+ 
+ LDSCRIPT_EFI := $(srctree)/arch/x86/lib/elf_$(EFIARCH)_efi.lds
+ EFISTUB := crt0_$(EFIARCH)_efi.o reloc_$(EFIARCH)_efi.o
+-OBJCOPYFLAGS_EFI += --target=efi-app-$(EFIARCH)
++OBJCOPYFLAGS_EFI += --output-target=efi-app-$(EFIARCH)
+ 
+ CPPFLAGS_REMOVE_crt0-efi-$(EFIARCH).o += $(CFLAGS_NON_EFI)
+ CPPFLAGS_crt0-efi-$(EFIARCH).o += $(CFLAGS_EFI)
+@@ -127,7 +127,7 @@ endif
+ endif
+ 
+ ifdef CONFIG_X86_64
+-EFI_TARGET := --target=efi-app-x86_64
++EFI_TARGET := --output-target=efi-app-x86_64
+ else
+-EFI_TARGET := --target=efi-app-ia32
++EFI_TARGET := --output-target=efi-app-ia32
+ endif
diff -Nru u-boot-2025.01/debian/patches/series u-boot-2025.01/debian/patches/series
--- u-boot-2025.01/debian/patches/series	2025-03-18 08:16:11.000000000 +0100
+++ u-boot-2025.01/debian/patches/series	2026-01-05 20:12:06.000000000 +0100
@@ -11,3 +11,5 @@
 Makefile-Use-relative-paths-for-debugging-symbols.patch
 
 sitara/Don-t-attempt-to-build-final-firmware-images.patch
+
+binutils-output-target.patch
diff -Nru u-boot-2025.01/debian/targets.mk u-boot-2025.01/debian/targets.mk
--- u-boot-2025.01/debian/targets.mk	2025-03-27 19:52:43.000000000 +0100
+++ u-boot-2025.01/debian/targets.mk	2026-01-05 20:14:54.000000000 +0100
@@ -694,14 +694,6 @@
 
 # u-boot-qemu (Architecture: all)
 
-  u-boot-qemu_platforms += malta64el
-  malta64el_CROSS_COMPILE := mips64el-linux-gnuabi64-
-  malta64el_targets := u-boot.bin uboot.elf
-
-  u-boot-qemu_platforms += maltael
-  maltael_CROSS_COMPILE := mipsel-linux-gnu-
-  maltael_targets := u-boot.bin uboot.elf
-
   u-boot-qemu_platforms += qemu-ppce500
   qemu-ppce500_CROSS_COMPILE := powerpc-linux-gnu-
   qemu-ppce500_targets := u-boot.bin uboot.elf

Reply via email to