commit bf5de82eea8e15fab5fe61546c9f44980d54a350
author Aneesh Bansal <aneesh.bansal@freescale.com> Wed Dec 23 14:16:23 2015 +0530
committer Tom Rini <trini@konsulko.com> Fri Jan 08 10:15:43 2016 -0500
tree cc13eeffcad496b2ca20d63d83068293d3ddf77b
parent 26a4e399fb18470525105934477d8fa39160af75

arm, Makefile: correct compilation flag for u-boot-dtb

The compilation of u-boot-dtb.img should be controlled by
CONFIG_OF_CONTROL and not CONFIG_DM.
CONFIG_DM may be defined even without Device Tree requirement.

This was added in commit 947cee1127c5fa97529c8cda4f0b48d141f92560.

Signed-off-by: Ruchika Gupta <ruchika.gupta@freescale.com>
Signed-off-by: Aneesh Bansal <aneesh.bansal@freescale.com>
CC: Alison Wang <alison.wang@freescale.com>

Makefile

diff --git a/Makefile b/Makefile
index aa19cc6..8fe7787 100644
--- a/Makefile
+++ b/Makefile
@@ -1136,7 +1136,7 @@
 	$(call if_changed,mkimage)
 
 ifeq ($(ARCH),arm)
-ifdef CONFIG_DM
+ifdef CONFIG_OF_CONTROL
 UBOOT_BINLOAD := u-boot-dtb.img
 else
 UBOOT_BINLOAD := u-boot.img