colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

spl: Remove CONFIG_SPL_START_S_PATH and rework the logic behind it

Browse Source 
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>
This commit is contained in:
Tom Rini
2022-05-28 12:40:40 -04:00
parent c8836dbb01
commit dc22afb975
4 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/Makefile
View File

@@ -103,8 +103,8 @@ libs-y += $(machdirs)
head-y := arch/arm/cpu/$(CPU)/start.o head-y := arch/arm/cpu/$(CPU)/start.o
ifeq ($(CONFIG_SPL_BUILD),y) ifeq ($(CONFIG_SPL_BUILD),y)
ifneq ($(CONFIG_SPL_START_S_PATH),) ifeq ($(CONFIG_SYS_SOC)$(CONFIG_SPL_FRAMEWORK),"mxs")
head-y := $(CONFIG_SPL_START_S_PATH:"%"=%)/start.o head-y := arch/arm/cpu/arm926ejs/mxs/start.o
endif endif
endif endif

4
arch/mips/Makefile
View File

@@ -3,9 +3,7 @@
head-y := arch/mips/cpu/start.o head-y := arch/mips/cpu/start.o
ifeq ($(CONFIG_SPL_BUILD),y) ifeq ($(CONFIG_SPL_BUILD),y)
ifneq ($(CONFIG_SPL_START_S_PATH),) head-$(CONFIG_ARCH_JZ47XX) := arch/mips/mach-jz47xx/start.o
head-y := $(CONFIG_SPL_START_S_PATH:"%"=%)/start.o
endif
endif endif
libs-y += arch/mips/cpu/ libs-y += arch/mips/cpu/

4
include/configs/ci20.h
View File

@@ -30,8 +30,4 @@
/* Miscellaneous configuration options */ /* Miscellaneous configuration options */
#define CONFIG_SYS_BOOTM_LEN (64 << 20) #define CONFIG_SYS_BOOTM_LEN (64 << 20)
/* SPL */
#define CONFIG_SPL_START_S_PATH "arch/mips/mach-jz47xx"
#endif /* __CONFIG_CI20_H__ */ #endif /* __CONFIG_CI20_H__ */

5
include/configs/mxs.h
View File

@@ -43,11 +43,6 @@
/* Startup hooks */ /* Startup hooks */
/* SPL */
#ifndef CONFIG_SPL_FRAMEWORK
#define CONFIG_SPL_START_S_PATH "arch/arm/cpu/arm926ejs/mxs"
#endif
/* Memory sizes */ /* Memory sizes */
/* OCRAM at 0x0 ; 32kB on MX23 ; 128kB on MX28 */ /* OCRAM at 0x0 ; 32kB on MX23 ; 128kB on MX28 */