spl: Remove CONFIG_SPL_START_S_PATH and rework the logic behind it

In some cases, when we don't use CONFIG_SPL_FRAMEWORK nor are we on
PowerPC using their specific SPL/TPL framework, we need to specify the
start.S file to use for these typically very constrained systems.  Do
this within the Makefile logic, rather than introducing a string-based
CONFIG option, as this would get slightly complex to do in Kconfig for a
very limited number of users.

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 85c23bcf775b7607278a58ff75777565d6e617f0..4afa8e4adf02c3d8701ac74e4ce5dfe8d3a0468b 100644 (file)
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -103,8 +103,8 @@ libs-y += $(machdirs)
 head-y := arch/arm/cpu/$(CPU)/start.o
 
 ifeq ($(CONFIG_SPL_BUILD),y)
-ifneq ($(CONFIG_SPL_START_S_PATH),)
-head-y := $(CONFIG_SPL_START_S_PATH:"%"=%)/start.o
+ifeq ($(CONFIG_SYS_SOC)$(CONFIG_SPL_FRAMEWORK),"mxs")
+head-y := arch/arm/cpu/arm926ejs/mxs/start.o
 endif
 endif
 

diff --git a/arch/mips/Makefile b/arch/mips/Makefile
index 6502aebd2960f420762874116909a79e77fe3ce7..32c436f2bcb690575a337c151e66db1ae094bd12 100644 (file)
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
@@ -3,9 +3,7 @@
 head-y := arch/mips/cpu/start.o
 
 ifeq ($(CONFIG_SPL_BUILD),y)
-ifneq ($(CONFIG_SPL_START_S_PATH),)
-head-y := $(CONFIG_SPL_START_S_PATH:"%"=%)/start.o
-endif
+head-$(CONFIG_ARCH_JZ47XX) := arch/mips/mach-jz47xx/start.o
 endif
 
 libs-y += arch/mips/cpu/

diff --git a/include/configs/ci20.h b/include/configs/ci20.h
index bcec88415f92cb38644c498ccf393dc5b6a4bd2b..01f63649053601805ae04e41d59c4bb63bf14475 100644 (file)
--- a/include/configs/ci20.h
+++ b/include/configs/ci20.h
@@ -30,8 +30,4 @@
 /* Miscellaneous configuration options */
 #define CONFIG_SYS_BOOTM_LEN           (64 << 20)
 
-/* SPL */
-
-#define CONFIG_SPL_START_S_PATH                "arch/mips/mach-jz47xx"
-
 #endif /* __CONFIG_CI20_H__ */

diff --git a/include/configs/mxs.h b/include/configs/mxs.h
index ebabc92b303b7ba3063bd8e110fe3799375aa5b5..fc15ed82c6ed1ad18eb4be8719c451b273b1f7f3 100644 (file)
--- a/include/configs/mxs.h
+++ b/include/configs/mxs.h
@@ -43,11 +43,6 @@
 
 /* Startup hooks */
 
-/* SPL */
-#ifndef CONFIG_SPL_FRAMEWORK
-#define CONFIG_SPL_START_S_PATH        "arch/arm/cpu/arm926ejs/mxs"
-#endif
-
 /* Memory sizes */
 
 /* OCRAM at 0x0 ; 32kB on MX23 ; 128kB on MX28 */