]> git.ipfire.org Git - people/ms/u-boot.git/commitdiff
arm, Makefile: correct compilation flag for u-boot-dtb
authorAneesh Bansal <aneesh.bansal@freescale.com>
Wed, 23 Dec 2015 08:46:23 +0000 (14:16 +0530)
committerTom Rini <trini@konsulko.com>
Fri, 8 Jan 2016 15:15:43 +0000 (10:15 -0500)
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

index aa19cc6eede5b210ad8b9dbcaff5ad7c4d8d955a..8fe7787cd5fecd03140a2a065d27fe915ccea04f 100644 (file)
--- 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