diff options
| author | Tom Rini <[email protected]> | 2026-01-27 09:29:03 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2026-01-27 09:29:59 -0600 |
| commit | 431f1ce46bbffff0db8f03437a34400b11b30175 (patch) | |
| tree | cca35709026672fd3a7e8ec933304e972eac7e3e /scripts | |
| parent | aa4f687977a449686498236722ee5e93d8b39918 (diff) | |
Revert a number of incorrect commits
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 <[email protected]>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.xpl | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/scripts/Makefile.xpl b/scripts/Makefile.xpl index 1be0057e6b8..5e65d7b2498 100644 --- a/scripts/Makefile.xpl +++ b/scripts/Makefile.xpl @@ -343,17 +343,8 @@ $(obj)/$(SPL_BIN).bin: $(obj)/$(SPL_BIN)-nodtb.bin FORCE endif # Create a file that pads from the end of u-boot-spl-nodtb.bin to bss_end -$(obj)/$(SPL_BIN)-pad.bin: $(obj)/$(SPL_BIN)-nodtb.bin - bss_size_str=$(shell cat $(obj)/$(SPL_BIN).map | \ - awk ' \ - /__rel_dyn_start/ { start = $$1 } \ - /__rel_dyn_end/ { end = $$1 } \ - /__bss_size/ { size = $$1 } \ - END { \ - if (start != "" && end != "" && size != "") \ - print end " " start " " size; \ - }' \ - | sh -c 'read end start size && echo $$(( size - (end - start) ))'); \ +$(obj)/$(SPL_BIN)-pad.bin: $(obj)/$(SPL_BIN) + @bss_size_str=$(shell $(NM) $< | awk 'BEGIN {size = 0} /__bss_size/ {size = $$1} END {print "ibase=16; " toupper(size)}' | bc); \ dd if=/dev/zero of=$@ bs=1 count=$${bss_size_str} 2>/dev/null; $(obj)/$(SPL_BIN).dtb: $(obj)/dts/dt-$(SPL_NAME).dtb FORCE |