diff options
| author | Tom Rini <trini@ti.com> | 2013-04-15 07:46:11 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-04-15 07:46:11 -0400 |
| commit | 17059f972fa6768ebf15a575c00083b3a431b79a (patch) | |
| tree | 30df6b88fa1dc57dada54f9a16ab1619cc4f3c52 /arch/arm/cpu/armv7/config.mk | |
| parent | 277f037074fbb73be10a7bff27079b6eb0a3bfbb (diff) | |
| parent | 8960af8ba9488fc54e2e4733cbada26d3cece225 (diff) | |
| download | talos-obmc-uboot-17059f972fa6768ebf15a575c00083b3a431b79a.tar.gz talos-obmc-uboot-17059f972fa6768ebf15a575c00083b3a431b79a.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'arch/arm/cpu/armv7/config.mk')
| -rw-r--r-- | arch/arm/cpu/armv7/config.mk | 6 |
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 |
