diff mbox

[U-Boot] arm, Makefile: correct compilation flag for u-boot-dtb

Message ID 1450860383-9234-1-git-send-email-aneesh.bansal@freescale.com
State Accepted
Delegated to: Tom Rini
Headers show

Commit Message

Aneesh Bansal Dec. 23, 2015, 8:46 a.m. UTC
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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Tom Rini Jan. 9, 2016, 3:34 a.m. UTC | #1
On Wed, Dec 23, 2015 at 02:16:23PM +0530, Aneesh Bansal wrote:

> 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>

Applied to u-boot/master, thanks!
diff mbox

Patch

diff --git a/Makefile b/Makefile
index b58f283..a6af95d 100644
--- a/Makefile
+++ b/Makefile
@@ -1136,7 +1136,7 @@  spl/u-boot-spl.pbl: spl/u-boot-spl.bin FORCE
 	$(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