From: Tom Rini <trini@konsulko.com>
Date: Wed, 16 Mar 2016 13:24:00 +0000 (-0400)
Subject: ARM: keystone2: Only link cmd_ddr3.o on non-SPL builds
X-Git-Tag: v2016.05-rc1~339
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=80485af24392a6a1816cc8b9692ac3d7193a62fc;p=u-boot

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>
---

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