projects
/
platform
/
kernel
/
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-spi
[platform/kernel/u-boot.git]
/
arch
/
arm
/
cpu
/
armv7
/
config.mk
diff --git
a/arch/arm/cpu/armv7/config.mk
b/arch/arm/cpu/armv7/config.mk
index
350e946
..
56b8053
100644
(file)
--- a/
arch/arm/cpu/armv7/config.mk
+++ b/
arch/arm/cpu/armv7/config.mk
@@
-40,5
+40,11
@@
PF_NO_UNALIGNED := $(call cc-option, -mno-unaligned-access,)
PLATFORM_NO_UNALIGNED := $(PF_NO_UNALIGNED)
ifneq ($(CONFIG_IMX_CONFIG),)
-ALL-y += $(OBJTREE)/u-boot.imx
+ifdef CONFIG_SPL
+ifdef CONFIG_SPL_BUILD
+ALL-y += $(OBJTREE)/SPL
+endif
+else
+ALL-y += $(obj)u-boot.imx
+endif
endif