LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Makefile: Build SPL dtbs in the spl/ directory 

Rather than putting these in the top-level dts/ directory (which is
intended for U-Boot proper), put them in the correct subdirectory for
SPL (either spl/ or tpl/). This is where other SPL targets are kept,
so this is more consistent.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2020-12-22 19:30:14 -07:00
parent 53db2eec7a
commit de3e372abd
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dts/Makefile
View File

@ -16,10 +16,11 @@ else
DTB := arch/$(ARCH)/dts/$(DEVICE_TREE).dtb DTB := arch/$(ARCH)/dts/$(DEVICE_TREE).dtb
endif endif
$(obj)/dt-spl.dtb: $(DTB) $(objtree)/tools/fdtgrep FORCE spl/$(obj)/dt-spl.dtb: $(DTB) $(objtree)/tools/fdtgrep FORCE
mkdir -p $(dir $@)
$(call if_changed,fdtgrep) $(call if_changed,fdtgrep)
$(obj)/dt-tpl.dtb: $(DTB) $(objtree)/tools/fdtgrep FORCE tpl/$(obj)/dt-tpl.dtb: $(DTB) $(objtree)/tools/fdtgrep FORCE
$(call if_changed,fdtgrep) $(call if_changed,fdtgrep)
ifeq ($(CONFIG_OF_DTB_PROPS_REMOVE),y) ifeq ($(CONFIG_OF_DTB_PROPS_REMOVE),y)
@ -55,8 +56,8 @@ obj-$(CONFIG_OF_EMBED) := dt.dtb.o
endif endif
dtbs: $(obj)/dt.dtb \ dtbs: $(obj)/dt.dtb \
$(if $(CONFIG_SPL),$(obj)/dt-spl.dtb) \ $(if $(CONFIG_SPL),spl/$(obj)/dt-spl.dtb) \
$(if $(CONFIG_TPL),$(obj)/dt-tpl.dtb) $(if $(CONFIG_TPL),tpl/$(obj)/dt-tpl.dtb)
@: @:
clean-files := dt.dtb.S dt-spl.dtb.S dt-tpl.dtb.S clean-files := dt.dtb.S dt-spl.dtb.S dt-tpl.dtb.S

2
scripts/Makefile.spl
View File

@ -300,7 +300,7 @@ $(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); \ @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; dd if=/dev/zero of=$@ bs=1 count=$${bss_size_str} 2>/dev/null;
$(obj)/$(SPL_BIN).dtb: dts/dt-$(SPL_NAME).dtb FORCE $(obj)/$(SPL_BIN).dtb: $(obj)/dts/dt-$(SPL_NAME).dtb FORCE
$(call if_changed,copy) $(call if_changed,copy)
pythonpath = PYTHONPATH=scripts/dtc/pylibfdt pythonpath = PYTHONPATH=scripts/dtc/pylibfdt