u-boot.git/scripts/Makefile.xpl, branch v2026.07

Makefile: remove block from conv=block, sync in SPL alignment dd

2026-05-08T21:49:27Z

The line that produces $(SPL_BIN)-align.bin invokes dd with conv=block,sync but no cbs= operand. The result of dd conv=block without cbs= is unspecified. GNU coreutils outputs anyway, but uutils (default in Ubuntu 26.04 LTS) errors out for files with newlines, including SPL binaries, producing: dd: conv=block or conv=ubnblock specified without cbs=N Either the block operand must be removed, or cbs=N must be added. conv=block is for converting newline-terminated variable-length records to fixed-length space-padded ones, which is meaningless for a binary SPL image. The intent of the rule is 4-byte alignment, which conv=sync alone provides by padding the final block to bs= bytes with NULs. During build, u-boot-spl-align.bin errors silently due to '@'. Reproduced with uutils dd 0.8.0: $ dd if=/dev/urandom of=/tmp/in bs=1 count=10000 $ dd if=/tmp/in of=/tmp/out conv=block,sync bs=4 dd: conv=block or conv=unblock specified without cbs=N $ dd if=/tmp/in of=/tmp/out conv=sync bs=4 [succeeds] Output is byte-identical to GNU dd's output for binary input. Signed-off-by: Brad Klingerman Reviewed-by: Simon Glass Reviewed-by: Tom Rini

kbuild: Move U-Boot .incbin rules to Makefile.lib-u-boot

2026-04-21T21:56:54Z

The font, splash-screen and EFI .incbin wrapper rules are U-Boot additions that do not exist in the upstream Linux kbuild. Keeping them in scripts/Makefile.lib makes re-syncing with Linux harder than it needs to be, as every sync must manually preserve the U-Boot additions. Move these rules into a new scripts/Makefile.lib-u-boot and include it from Makefile.build and Makefile.xpl, right after the existing Makefile.lib include. This is a pure code-move with no functional change. Suggested-by: Tom Rini Signed-off-by: Simon Glass Acked-by: Ilias Apalodimas Reviewed-by: Rasmus Villemoes

Replace TARGET namespace and cleanup properly

2026-02-14T17:06:46Z

TARGET namespace is for machines / boards / what-have-you that building U-Boot for. Simply replace from TARGET to ARCH make things more clear and proper for ALL SoCFPGA. Signed-off-by: Brian Sune Reviewed-by: Tien Fong Chee # Conflicts: # drivers/ddr/altera/Makefile

tools: sunxi-spl-image-builder: support H6/H616 NAND boot

2026-02-03T20:45:27Z

The H6/H616 boot ROM doesn't expect a SPL scrambled the same way as older SoCs. It doesn't use a specific seeds table, it expects a maximized ECC (BCH-80), a specific BBM (FF000301) and doesn't work if empty pages are skipped (it needs its specific BBM, even in the padding). So, add a --soc=h6 option to support H6/616 with: - more ECC strengths - specific BBM - default_scrambler_seeds[] with all values - no empty pages skip In Kconfig, select BCH-80 by default for SUNXI_SPL_ECC_STRENGTH to make BROM happy. And in scripts/Makefile.xpl, use --soc=h6 option when building for a SUN50I_GEN_H6 SoC. Tested on Whatsminer H616 board, booting from NAND. Reviewed-by: Miquel Raynal Co-developed-by: James Hilliard Signed-off-by: James Hilliard Signed-off-by: Richard Genoud Signed-off-by: Michael Trimarchi

Revert a number of incorrect commits

2026-01-27T15:29:59Z

As part of debugging the appended device tree failure, I inadvertently committed some changes as I was debugging to master, and not a private branch, and pushed them as part of the release. This reverts commit dc2d8423b19d30472b02e02b41504226908a4291 through 380ddb473c6bdf87e66c0fb93e256d1e233c6f5b. Signed-off-by: Tom Rini

count rel_dyn

2026-01-26T17:19:22Z

Signed-off-by: Tom Rini

kbuild: Bump the build system to 6.1

2026-01-02T16:28:14Z

Our last sync with the kernel was 5.1. We are so out of sync now, that tracking the patches and backporting them one by one makes little sense and it's going to take ages. This is an attempt to sync up Makefiles to 6.1. Unfortunately due to sheer amount of patches this is not easy to review, but that's what we decided during a community call for the bump to 5.1, so we are following the same guidelines here. Signed-off-by: Sughosh Ganu Signed-off-by: Ilias Apalodimas a #rebased on -next

Makefile: pass KEYDIR when set to sunxi-spl.bin mkimage

2025-10-27T00:44:53Z

Currently we pass this for u-boot-spl.kwb targets, however when building sunxi-spl.bin in the TOC0 format we may also need to specify a KEYDIR, as such we should also pass this when set to mkimage for the sunxi-spl.bin target. Signed-off-by: James Hilliard Reviewed-by: Andre Przywara

Makefile: Remove expansion of undefined variable

2025-08-05T00:23:16Z

The U-Boot environment was previously stored in the boot loader stream using ldr, but it has been replaced by the default environment built into the U-Boot executable or an environment on external storage Fixes: ea3310e8aafa ("Blackfin: Remove") Signed-off-by: Philip Molloy Reviewed-by: Greg Malysa

kbuild: Bump the build system to 5.1

2025-07-08T19:10:03Z

Our last sync with the kernel was 5.1. Even that was a partial one as some patches from 4.x kernels were already missing making the transition to a modern kbuild infeasible. We are so out of sync now, that tracking the patches and backporting them one by one makes little sense and it's going to take ages. This is an attempt to sync up Makefile[.lib/.kbuild]. Unfortunately due to sheer amount of patches this is not easy to review, but that's what we decided during a community call. One of the biggest changes is get rid of partial linking entirely and build .a archives isntead of .o. We diaviate from the kernel on that. Instead of calling a custom script to create the archive symbol table, we call ar with rcTP (isntead of rcSTP) since we want a resulting archive that's sauble with the linker. The only affected platforms are PPC ones. Unfortunately I don't have any of them around to test, but the objdump of the resulting files -- arch/powerpc/lib/built-in.[oa] looks identical. Signed-off-by: Ilias Apalodimas