summaryrefslogtreecommitdiffstats
path: root/arch/arm/cpu/armv7/config.mk
diff options
context:
space:
mode:
authorBenoît Thébaudeau <benoit.thebaudeau@advansee.com>2013-04-11 09:35:50 +0000
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2013-04-12 07:55:06 +0200
commit8b7cd098ddd130c0dc0d8a3820c3c592978aa9d3 (patch)
treec5b38ede681b341565e73414d0372450c9f91fe2 /arch/arm/cpu/armv7/config.mk
parent6113d3f27ca1414c98ffee90ed8f287898b73322 (diff)
downloadblackbird-obmc-uboot-8b7cd098ddd130c0dc0d8a3820c3c592978aa9d3.tar.gz
blackbird-obmc-uboot-8b7cd098ddd130c0dc0d8a3820c3c592978aa9d3.zip
imx: Fix automatic make targets for imx images
Automatically build the 'u-boot.imx' (i.e. imx header + u-boot.bin) and 'SPL' (i.e. imx header + u-boot-spl.bin) make targets for all imx processors supporting this header, so for arm926ejs, arm1136 and armv7. Some combinations were missing. At the same time, fix the build of SPL targets not supporting the imx header on arm1136. For arm1136, the 'SPL' make target was forced to build in all cases if CONFIG_SPL_BUILD was defined, even for non-imx platforms or imx setups without an imx header. Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
Diffstat (limited to 'arch/arm/cpu/armv7/config.mk')
-rw-r--r--arch/arm/cpu/armv7/config.mk6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/cpu/armv7/config.mk b/arch/arm/cpu/armv7/config.mk
index 9c3e2f3ce4..56b8053770 100644
--- 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),)
+ifdef CONFIG_SPL
+ifdef CONFIG_SPL_BUILD
+ALL-y += $(OBJTREE)/SPL
+endif
+else
ALL-y += $(obj)u-boot.imx
endif
+endif
OpenPOWER on IntegriCloud