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 --- arch/arm/Makefile | 4 ++-- arch/mips/Makefile | 4 +--- include/configs/ci20.h | 4 ---- include/configs/mxs.h | 5 ----- 4 files changed, 3 insertions(+), 14 deletions(-)
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 85c23bcf775b..4afa8e4adf02 100644 --- 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 6502aebd2960..32c436f2bcb6 100644 --- 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 bcec88415f92..01f636490536 100644 --- 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 ebabc92b303b..fc15ed82c6ed 100644 --- 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 */