summaryrefslogtreecommitdiffstats
path: root/arch/arm/cpu/arm1136/mx35/Makefile
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2015-03-05 07:22:18 -0500
committerTom Rini <trini@konsulko.com>2015-03-05 07:22:18 -0500
commit02ebe6f702ec8d025926b0ea7c2088e302c5a302 (patch)
tree15e249ac39e9c547668327218e63a0faf54a3283 /arch/arm/cpu/arm1136/mx35/Makefile
parent7ae8350f67eea861280a4cbd2d067777a0e87153 (diff)
parent32df39c741788e8637cffe6633d73594b26d70fb (diff)
downloadblackbird-obmc-uboot-02ebe6f702ec8d025926b0ea7c2088e302c5a302.tar.gz
blackbird-obmc-uboot-02ebe6f702ec8d025926b0ea7c2088e302c5a302.zip
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Diffstat (limited to 'arch/arm/cpu/arm1136/mx35/Makefile')
-rw-r--r--arch/arm/cpu/arm1136/mx35/Makefile4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/cpu/arm1136/mx35/Makefile b/arch/arm/cpu/arm1136/mx35/Makefile
index c533215c3a..796db9c7cc 100644
--- a/arch/arm/cpu/arm1136/mx35/Makefile
+++ b/arch/arm/cpu/arm1136/mx35/Makefile
@@ -10,3 +10,7 @@
obj-y += generic.o
obj-y += timer.o
obj-y += mx35_sdram.o
+
+ifndef CONFIG_SPL_BUILD
+obj-y += relocate.o
+endif
OpenPOWER on IntegriCloud