Mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2026-06-02 09:46:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

Revert a number of incorrect commits

Browse Source 
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 dc2d8423b1 through
380ddb473c.

Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Tom Rini
2026-01-27 09:29:03 -06:00
parent aa4f687977
commit 431f1ce46b
1 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
scripts/Makefile.xpl
View File

@@ -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