diff options
| author | Tom Rini <[email protected]> | 2026-06-15 12:50:04 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2026-06-15 12:50:04 -0600 |
| commit | badd97fe24dfb73b2728c26b433cabe315a27971 (patch) | |
| tree | aabb4d09fb385f7c0746971a3392175b94a6ee0b | |
| parent | 1e80ee41441c612f05787a93bbef4e6e422e29d1 (diff) | |
| parent | 3ac35afdd2cc73db0ac3911937ce75b58a6f90b8 (diff) | |
Merge patch series "Repair boards broken by the 6.1 kbuild bump"
Simon Glass <[email protected]> says:
Commit bd3f9ee679b4 added FORCE to several if_changed rules whose
recipes expand $^, so FORCE leaks in as a stray argument and the
command fails. Use $< to restore the Edison and i.MX23/28 images.
Link: https://lore.kernel.org/r/[email protected]
| -rw-r--r-- | arch/arm/cpu/arm926ejs/mxs/Makefile | 14 | ||||
| -rw-r--r-- | board/intel/edison/config.mk | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/arch/arm/cpu/arm926ejs/mxs/Makefile b/arch/arm/cpu/arm926ejs/mxs/Makefile index 0df501e91db..6bd95a5185b 100644 --- a/arch/arm/cpu/arm926ejs/mxs/Makefile +++ b/arch/arm/cpu/arm926ejs/mxs/Makefile @@ -26,7 +26,7 @@ MKIMAGE_TARGET-$(CONFIG_MX28) = mxsimage$(CONFIG_SPL_FRAMEWORK:%=-spl).mx28.cfg # quiet_cmd_mkivt_mxs = MXSIVT $@ cmd_mkivt_mxs = \ - sz=`expr \`stat -c "%s" $^\` + 64 + 3904 + 128` ; \ + sz=`expr \`stat -c "%s" $<\` + 64 + 3904 + 128` ; \ echo -n "0x402000d1 $2 0 0 0 $3 $4 0 $$sz 0 0 0 0 0 0 0" | \ tr -s " " | xargs -d " " -i printf "%08x\n" "{}" | rev | \ sed "s/\(.\)\(.\)/\\\\\\\\x\2\1\n/g" | xargs -i printf "{}" >$@ @@ -34,15 +34,15 @@ cmd_mkivt_mxs = \ # Align binary to 64B quiet_cmd_mkalign_mxs = MXSALGN $@ cmd_mkalign_mxs = \ - dd if=$^ of=$@ ibs=64 conv=sync 2>/dev/null && \ - mv $@ $^ + dd if=$< of=$@ ibs=64 conv=sync 2>/dev/null && \ + mv $@ $< # Assemble the CSF file quiet_cmd_mkcsfreq_mxs = MXSCSFR $@ cmd_mkcsfreq_mxs = \ - ivt=$(word 1,$^) ; \ - bin=$(word 2,$^) ; \ - csf=$(word 3,$^) ; \ + ivt=$(word 1,$(real-prereqs)) ; \ + bin=$(word 2,$(real-prereqs)) ; \ + csf=$(word 3,$(real-prereqs)) ; \ sed "s@VENDOR@$(VENDOR)@g;s@BOARD@$(BOARD)@g" "$$csf" | \ sed '/^\#\#Blocks/ d' > $@ ; \ echo " Blocks = $2 0x0 `stat -c '%s' $$bin` \"$$bin\" , \\" >> $@ ; \ @@ -50,7 +50,7 @@ cmd_mkcsfreq_mxs = \ # Sign files quiet_cmd_mkcst_mxs = MXSCST $@ -cmd_mkcst_mxs = cst -o $@ < $^ \ +cmd_mkcst_mxs = cst -o $@ < $< \ $(if $(KBUILD_VERBOSE:1=), >/dev/null) spl/u-boot-spl.ivt: spl/u-boot-spl.bin FORCE diff --git a/board/intel/edison/config.mk b/board/intel/edison/config.mk index 3afebf0f0b1..fff187caa15 100644 --- a/board/intel/edison/config.mk +++ b/board/intel/edison/config.mk @@ -7,8 +7,8 @@ # Add 4096 bytes of zeroes to u-boot.bin quiet_cmd_mkalign_eds = EDSALGN $@ cmd_mkalign_eds = \ - dd if=$^ of=$@ bs=4k seek=1 2>/dev/null && \ - mv $@ $^ + dd if=$< of=$@ bs=4k seek=1 2>/dev/null && \ + mv $@ $< INPUTS-y += u-boot-align.bin u-boot-align.bin: u-boot.bin FORCE |