diff options
| author | Tom Rini <[email protected]> | 2022-05-28 12:40:40 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2022-06-06 12:09:29 -0400 |
| commit | dc22afb975fc4e4d99f1f8b47318c66867cec42c (patch) | |
| tree | 600dbfe17ba6db682fc97429f59b74fc7f5870a4 /arch | |
| parent | c8836dbb01f2f891c407b3f9e2d3238267c0452e (diff) | |
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 <[email protected]>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/Makefile | 4 | ||||
| -rw-r--r-- | arch/mips/Makefile | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 85c23bcf775..4afa8e4adf0 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 6502aebd296..32c436f2bcb 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/ |