eaw/u-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'dm-pull-next-27sep21' of https://source.denx.de/u-boot/custodians/u-boot-dm into next

Browse Source 
Various of-platdata improvements, including CONFIG_OF_REAL
This commit is contained in:
Tom Rini
2021-09-27 11:09:23 -04:00
parent e908d20fcb 933bf26445
commit 1d1f98c8ee
138 changed files with 813 additions and 484 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
scripts/Makefile.spl
View File

@@ -295,18 +295,15 @@ else
FINAL_DTB_CONTAINER = $(obj)/$(SPL_BIN).multidtb.fit
endif
# Build the .dtb file if:
# - we are not using OF_PLATDATA
# - we are using OF_CONTROL
# Build the .dtb file if needed
# - OF_REAL is enabled
# - we have either OF_SEPARATE or OF_HOSTFILE
build_dtb :=
ifeq ($(CONFIG_$(SPL_TPL_)OF_PLATDATA),)
ifneq ($(CONFIG_$(SPL_TPL_)OF_CONTROL),)
ifneq ($(CONFIG_$(SPL_TPL_)OF_REAL),)
ifeq ($(CONFIG_OF_SEPARATE)$(CONFIG_OF_HOSTFILE),y)
build_dtb := y
endif
endif
endif
ifneq ($(build_dtb),)
$(obj)/$(SPL_BIN)-dtb.bin: $(obj)/$(SPL_BIN)-nodtb.bin \