From: Stefano Babic <sbabic@denx.de>
Date: Mon, 31 Mar 2014 07:50:35 +0000 (+0200)
Subject: imx: add rules for U-Boot DTB support
X-Git-Tag: v2014.04~28
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e64348f5eb4aef7e119a46b97bdba2cc9cb15fc5;p=oweals%2Fu-boot.git

imx: add rules for U-Boot DTB support

Signed-off-by: Stefano Babic <sbabic@denx.de>
---

diff --git a/Makefile b/Makefile
index 64e8296239..4df6118764 100644
--- a/Makefile
+++ b/Makefile
@@ -757,6 +757,9 @@ dtbs dts/dt.dtb: checkdtc u-boot
 u-boot-dtb.bin: u-boot.bin dts/dt.dtb FORCE
 	$(call if_changed,cat)
 
+%.imx: %.bin
+	$(Q)$(MAKE) $(build)=arch/arm/imx-common $@
+
 quiet_cmd_copy = COPY    $@
       cmd_copy = cp $< $@
 
@@ -810,9 +813,6 @@ MKIMAGEFLAGS_u-boot.pbl = -n $(CONFIG_SYS_FSL_PBL_RCW) \
 u-boot.img u-boot.kwb u-boot.pbl: u-boot.bin FORCE
 	$(call if_changed,mkimage)
 
-u-boot.imx: u-boot.bin
-	$(Q)$(MAKE) $(build)=arch/arm/imx-common $@
-
 u-boot.sha1:	u-boot.bin
 		tools/ubsha1 u-boot.bin
 
diff --git a/arch/arm/config.mk b/arch/arm/config.mk
index 17b7408835..5bd39617bb 100644
--- a/arch/arm/config.mk
+++ b/arch/arm/config.mk
@@ -119,6 +119,10 @@ ifndef CONFIG_SPL_BUILD
 ALL-y += SPL
 endif
 else
+ifeq ($(CONFIG_OF_SEPARATE),y)
+ALL-y += u-boot-dtb.imx
+else
 ALL-y += u-boot.imx
 endif
 endif
+endif
diff --git a/arch/arm/imx-common/Makefile b/arch/arm/imx-common/Makefile
index 16809fee5f..025cfed84a 100644
--- a/arch/arm/imx-common/Makefile
+++ b/arch/arm/imx-common/Makefile
@@ -42,6 +42,14 @@ MKIMAGEFLAGS_u-boot.imx = -n $(filter-out $< $(PHONY),$^) -T imximage \
 u-boot.imx: u-boot.bin $(IMX_CONFIG) FORCE
 	$(call if_changed,mkimage)
 
+ifeq ($(CONFIG_OF_SEPARATE),y)
+MKIMAGEFLAGS_u-boot-dtb.imx = -n $(filter-out $< $(PHONY),$^) -T imximage \
+	-e $(CONFIG_SYS_TEXT_BASE)
+
+u-boot-dtb.imx: u-boot-dtb.bin $(IMX_CONFIG) FORCE
+	$(call if_changed,mkimage)
+endif
+
 MKIMAGEFLAGS_SPL = -n $(filter-out $< $(PHONY),$^) -T imximage \
 	-e $(CONFIG_SPL_TEXT_BASE)