summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorKever Yang <kever.yang@rock-chips.com>2018-01-25 22:07:11 +0800
committerKever Yang <kever.yang@rock-chips.com>2018-01-26 16:40:37 +0800
commit87ea017b04ee51af055650d38ebe6a099dc8013d (patch)
treef34376a079ea12388052cbb5e396b40c087a7834 /Makefile
parentd5b5cd14713142f67d8742cbfdc5990b2fd32732 (diff)
Makefile: use dt-spl.dtb when using kernel dtb
We only need a simple dtb for pre-relocate and then we convert to use kernel dtb. Change-Id: I06c2b5303a89cf229da44f3edce4f698299aeef8 Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile11
1 files changed, 10 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index c27875d336..a86fd4d544 100644
--- a/Makefile
+++ b/Makefile
@@ -870,11 +870,16 @@ endif
$(call cmd,cfgcheck,u-boot.cfg)
PHONY += dtbs
-dtbs: dts/dt.dtb
+dtbs: dts/dt.dtb dts/dt-spl.dtb
@:
dts/dt.dtb: u-boot
$(Q)$(MAKE) $(build)=dts dtbs
+ifeq ($(CONFIG_USING_KERNEL_DTB),y)
+dts/dt-spl.dtb: dts/dt.dtb
+ @:
+endif
+
quiet_cmd_copy = COPY $@
cmd_copy = cp $< $@
@@ -893,7 +898,11 @@ u-boot-fit-dtb.bin: u-boot-nodtb.bin fit-dtb.blob
u-boot.bin: u-boot-fit-dtb.bin FORCE
$(call if_changed,copy)
else ifeq ($(CONFIG_OF_SEPARATE),y)
+ifeq ($(CONFIG_USING_KERNEL_DTB),y)
+u-boot-dtb.bin: u-boot-nodtb.bin dts/dt-spl.dtb FORCE
+else
u-boot-dtb.bin: u-boot-nodtb.bin dts/dt.dtb FORCE
+endif
$(call if_changed,cat)
u-boot.bin: u-boot-dtb.bin FORCE