summaryrefslogtreecommitdiff
path: root/arch/arm/cpu/armv7/config.mk
diff options
context:
space:
mode:
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>2013-02-02 19:29:59 +0100
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2013-02-02 19:29:59 +0100
commite5f5c4a977c411c0cd3899a4f9487eea77a0e150 (patch)
tree391225b279509f4403eb6d5e973f0b25e789a8af /arch/arm/cpu/armv7/config.mk
parent7cb70a34b976e68f6348ea0718780e8f38901482 (diff)
parent81ca840976e8e418ae8decaf03ea01f59b1b5be2 (diff)
downloadu-boot-imx-e5f5c4a977c411c0cd3899a4f9487eea77a0e150.zip
u-boot-imx-e5f5c4a977c411c0cd3899a4f9487eea77a0e150.tar.gz
u-boot-imx-e5f5c4a977c411c0cd3899a4f9487eea77a0e150.tar.bz2
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Diffstat (limited to 'arch/arm/cpu/armv7/config.mk')
-rw-r--r--arch/arm/cpu/armv7/config.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/cpu/armv7/config.mk b/arch/arm/cpu/armv7/config.mk
index 9c3e2f3..350e946 100644
--- a/arch/arm/cpu/armv7/config.mk
+++ b/arch/arm/cpu/armv7/config.mk
@@ -40,5 +40,5 @@ PF_NO_UNALIGNED := $(call cc-option, -mno-unaligned-access,)
PLATFORM_NO_UNALIGNED := $(PF_NO_UNALIGNED)
ifneq ($(CONFIG_IMX_CONFIG),)
-ALL-y += $(obj)u-boot.imx
+ALL-y += $(OBJTREE)/u-boot.imx
endif