projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.denx.de/u-boot-arm into master
[oweals/u-boot.git]
/
arch
/
arm
/
config.mk
diff --git
a/arch/arm/config.mk
b/arch/arm/config.mk
index f4c2d81044addd5b1a6446940c29d39e49b95450..4502fd9a7334ba247ab4e593caa3fd29b244860b 100644
(file)
--- a/
arch/arm/config.mk
+++ b/
arch/arm/config.mk
@@
-126,6
+126,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