summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad Klingerman <[email protected]>2026-05-01 09:38:50 -0500
committerTom Rini <[email protected]>2026-05-08 15:49:27 -0600
commit26b17dbdb0f19efa67365b30d939d3572871e8ca (patch)
tree65e0447f5befb6216feb9b0ed332af00cdb9bd7b
parent3cdd19089f1b1b7cd08530f33ff4708abcfd426c (diff)
Makefile: remove block from conv=block, sync in SPL alignment dd
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 <[email protected]> Reviewed-by: Simon Glass <[email protected]> Reviewed-by: Tom Rini <[email protected]>
-rw-r--r--scripts/Makefile.xpl2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/Makefile.xpl b/scripts/Makefile.xpl
index 862a8e6f231..a3fd3e1375f 100644
--- a/scripts/Makefile.xpl
+++ b/scripts/Makefile.xpl
@@ -257,7 +257,7 @@ MKIMAGEFLAGS_boot.bin = -T zynqmpimage -R $(srctree)/$(CONFIG_BOOT_INIT_FILE) \
endif
$(obj)/$(SPL_BIN)-align.bin: $(obj)/$(SPL_BIN).bin
- @dd if=$< of=$@ conv=block,sync bs=4 2>/dev/null;
+ @dd if=$< of=$@ conv=sync bs=4 2>/dev/null;
spl/boot.bin: $(obj)/$(SPL_BIN)-align.bin FORCE
$(call if_changed,mkimage)