summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2016-03-16 09:24:00 -0400
committerTom Rini <trini@konsulko.com>2016-03-16 15:03:34 -0400
commit80485af24392a6a1816cc8b9692ac3d7193a62fc (patch)
tree6c740faf0ae40f5074a94a623849817bfa763ff8
parent534bc70e35878bd437d0e665e5ee8c371c9c3b49 (diff)
downloadtalos-obmc-uboot-80485af24392a6a1816cc8b9692ac3d7193a62fc.tar.gz
talos-obmc-uboot-80485af24392a6a1816cc8b9692ac3d7193a62fc.zip
ARM: keystone2: Only link cmd_ddr3.o on non-SPL builds
When we switch to including all linker lists in SPL it is important to not include commands as that may lead to link errors due to other things we have already discarded. In this case simply move cmd_ddr3.o over to the list with the rest. Cc: Vitaly Andrianov <vitalya@ti.com> Cc: Nishanth Menon <nm@ti.com> Cc: Lokesh Vutla <lokeshvutla@ti.com> Signed-off-by: Tom Rini <trini@konsulko.com>
-rw-r--r--arch/arm/mach-keystone/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-keystone/Makefile b/arch/arm/mach-keystone/Makefile
index 8829e7ff6f..b2ffe5bc2f 100644
--- a/arch/arm/mach-keystone/Makefile
+++ b/arch/arm/mach-keystone/Makefile
@@ -13,9 +13,10 @@ ifndef CONFIG_SPL_BUILD
obj-y += cmd_clock.o
obj-y += cmd_mon.o
obj-y += cmd_poweroff.o
+obj-y += cmd_ddr3.o
endif
obj-y += msmc.o
-obj-y += ddr3.o cmd_ddr3.o
+obj-y += ddr3.o
obj-y += keystone.o
obj-$(CONFIG_K2E_EVM) += ddr3_spd.o
obj-$(CONFIG_K2HK_EVM) += ddr3_spd.o
OpenPOWER on IntegriCloud