arm: Use CONFIG_SPL_STACK or CONFIG_SYS_INIT_SP_ADDR directly.

In some cases, we define CONFIG_SYS_INIT_SP_ADDR differently for SPL or full U-Boot. This case should be making use of CONFIG_SPL_STACK, as that's what that variable is for. In a few other cases we define CONFIG_SPL_STACK directly to CONFIG_SYS_INIT_SP_ADDR, but do not need to as the code handles this correctly, normally. Signed-off-by: Tom Rini <trini@konsulko.com>
2022-05-24 13:11:41 -04:00 · 2022-05-24 13:11:41 -04:00 · 85758d8aa1
commit 85758d8aa1
parent 3b2979eefa
15 changed files with 14 additions and 66 deletions
--- a/include/configs/imxrt1020-evk.h
+++ b/include/configs/imxrt1020-evk.h
@ -24,12 +24,7 @@
 * Configuration of the external SDRAM memory
 */

-/* For SPL */
-#ifdef CONFIG_SUPPORT_SPL
-#define CONFIG_SPL_STACK		CONFIG_SYS_INIT_SP_ADDR
 #define CONFIG_SYS_SPL_LEN		0x00008000
 #define CONFIG_SYS_UBOOT_START		0x800023FD
-#endif
-/* For SPL ends */

 #endif /* __IMXRT1020_EVK_H */
--- a/include/configs/imxrt1050-evk.h
+++ b/include/configs/imxrt1050-evk.h
@ -31,12 +31,7 @@
 * Configuration of the external SDRAM memory
 */

-/* For SPL */
-#ifdef CONFIG_SUPPORT_SPL
-#define CONFIG_SPL_STACK		CONFIG_SYS_INIT_SP_ADDR
 #define CONFIG_SYS_SPL_LEN		0x00008000
 #define CONFIG_SYS_UBOOT_START		0x800023FD
-#endif
-/* For SPL ends */

 #endif /* __IMXRT1050_EVK_H */
--- a/include/configs/sam9x60_curiosity.h
+++ b/include/configs/sam9x60_curiosity.h
@ -20,12 +20,9 @@
 #define CONFIG_SYS_SDRAM_BASE		0x20000000
 #define CONFIG_SYS_SDRAM_SIZE		0x8000000	/* 128 MB */

-#ifdef CONFIG_SPL_BUILD
-#define CONFIG_SYS_INIT_SP_ADDR         0x218000
-#else
+#define CONFIG_SPL_STACK         0x218000
 #define CONFIG_SYS_INIT_SP_ADDR \
 	(CONFIG_SYS_SDRAM_BASE + 16 * 1024 + CONFIG_SYS_MALLOC_F_LEN - \
 	 GENERATED_GBL_DATA_SIZE)
-#endif

 #endif
--- a/include/configs/sama5d27_som1_ek.h
+++ b/include/configs/sama5d27_som1_ek.h
@ -14,14 +14,11 @@
 #undef CONFIG_SYS_AT91_MAIN_CLOCK
 #define CONFIG_SYS_AT91_MAIN_CLOCK      24000000 /* from 24 MHz crystal */

-#ifdef CONFIG_SPL_BUILD
-#define CONFIG_SYS_INIT_SP_ADDR		0x218000
-#else
 #define CONFIG_SYS_INIT_SP_ADDR \
 	(0x22000000 + 16 * 1024 - GENERATED_GBL_DATA_SIZE)
-#endif

 /* SPL */
+#define CONFIG_SPL_STACK		0x218000
 #define CONFIG_SPL_BSS_START_ADDR	0x20000000
 #define CONFIG_SYS_SPL_MALLOC_START	0x20080000
 #define CONFIG_SYS_SPL_MALLOC_SIZE	0x80000
--- a/include/configs/sama5d27_wlsom1_ek.h
+++ b/include/configs/sama5d27_wlsom1_ek.h
@ -19,14 +19,11 @@
 #define CONFIG_SYS_SDRAM_BASE		0x20000000
 #define CONFIG_SYS_SDRAM_SIZE		0x10000000

-#ifdef CONFIG_SPL_BUILD
-#define CONFIG_SYS_INIT_SP_ADDR		0x218000
-#else
 #define CONFIG_SYS_INIT_SP_ADDR \
 	(CONFIG_SYS_SDRAM_BASE + 16 * 1024 - GENERATED_GBL_DATA_SIZE)
-#endif

 /* SPL */
+#define CONFIG_SPL_STACK		0x218000
 #define CONFIG_SPL_BSS_START_ADDR	0x20000000
 #define CONFIG_SYS_SPL_MALLOC_START	0x20080000
 #define CONFIG_SYS_SPL_MALLOC_SIZE	0x80000
--- a/include/configs/sama5d2_icp.h
+++ b/include/configs/sama5d2_icp.h
@ -18,12 +18,9 @@
 #define CONFIG_SYS_SDRAM_BASE		0x20000000
 #define CONFIG_SYS_SDRAM_SIZE		0x20000000

-#ifdef CONFIG_SPL_BUILD
-#define CONFIG_SYS_INIT_SP_ADDR		0x218000
-#else
+#define CONFIG_SPL_STACK		0x218000
 #define CONFIG_SYS_INIT_SP_ADDR \
 	(CONFIG_SYS_SDRAM_BASE + 16 * 1024 - GENERATED_GBL_DATA_SIZE)
-#endif

 #ifdef CONFIG_SD_BOOT
 /* u-boot env in sd/mmc card */
--- a/include/configs/sama5d2_xplained.h
+++ b/include/configs/sama5d2_xplained.h
@ -11,14 +11,11 @@

 #include "at91-sama5_common.h"

-#ifdef CONFIG_SPL_BUILD
-#define CONFIG_SYS_INIT_SP_ADDR		0x218000
-#else
 #define CONFIG_SYS_INIT_SP_ADDR \
 	(0x22000000 + 16 * 1024 - GENERATED_GBL_DATA_SIZE)
-#endif

 /* SPL */
+#define CONFIG_SPL_STACK		0x218000
 #define CONFIG_SPL_BSS_START_ADDR	0x20000000
 #define CONFIG_SYS_SPL_MALLOC_START	0x20080000
 #define CONFIG_SYS_SPL_MALLOC_SIZE	0x80000
--- a/include/configs/sama5d3_xplained.h
+++ b/include/configs/sama5d3_xplained.h
@ -27,12 +27,9 @@
 #define CONFIG_SYS_SDRAM_BASE           0x20000000
 #define CONFIG_SYS_SDRAM_SIZE		0x10000000

-#ifdef CONFIG_SPL_BUILD
-#define CONFIG_SYS_INIT_SP_ADDR		0x318000
-#else
+#define CONFIG_SPL_STACK		0x318000
 #define CONFIG_SYS_INIT_SP_ADDR \
 	(CONFIG_SYS_SDRAM_BASE + 16 * 1024 - GENERATED_GBL_DATA_SIZE)
-#endif

 /* NAND flash */
 #ifdef CONFIG_CMD_NAND
--- a/include/configs/sama5d3xek.h
+++ b/include/configs/sama5d3xek.h
@ -38,12 +38,9 @@
 #define CONFIG_SYS_SDRAM_BASE           0x20000000
 #define CONFIG_SYS_SDRAM_SIZE		0x20000000

-#ifdef CONFIG_SPL_BUILD
-#define CONFIG_SYS_INIT_SP_ADDR		0x318000
-#else
+#define CONFIG_SPL_STACK		0x318000
 #define CONFIG_SYS_INIT_SP_ADDR \
 	(CONFIG_SYS_SDRAM_BASE + 16 * 1024 - GENERATED_GBL_DATA_SIZE)
-#endif

 /* SerialFlash */

--- a/include/configs/sama5d4_xplained.h
+++ b/include/configs/sama5d4_xplained.h
@ -15,12 +15,9 @@
 #define CONFIG_SYS_SDRAM_BASE           0x20000000
 #define CONFIG_SYS_SDRAM_SIZE		0x20000000

-#ifdef CONFIG_SPL_BUILD
-#define CONFIG_SYS_INIT_SP_ADDR		0x218000
-#else
+#define CONFIG_SPL_STACK		0x218000
 #define CONFIG_SYS_INIT_SP_ADDR \
 	(CONFIG_SYS_SDRAM_BASE + 16 * 1024 - GENERATED_GBL_DATA_SIZE)
-#endif

 /* NAND flash */
 #ifdef CONFIG_CMD_NAND
--- a/include/configs/sama5d4ek.h
+++ b/include/configs/sama5d4ek.h
@ -15,12 +15,9 @@
 #define CONFIG_SYS_SDRAM_BASE           0x20000000
 #define CONFIG_SYS_SDRAM_SIZE		0x20000000

-#ifdef CONFIG_SPL_BUILD
-#define CONFIG_SYS_INIT_SP_ADDR		0x218000
-#else
+#define CONFIG_SPL_STACK		0x218000
 #define CONFIG_SYS_INIT_SP_ADDR \
 	(CONFIG_SYS_SDRAM_BASE + 16 * 1024 - GENERATED_GBL_DATA_SIZE)
-#endif

 /* NAND flash */
 #ifdef CONFIG_CMD_NAND
--- a/include/configs/sama7g5ek.h
+++ b/include/configs/sama7g5ek.h
@ -16,12 +16,9 @@
 #define CONFIG_SYS_SDRAM_BASE		0x60000000
 #define CONFIG_SYS_SDRAM_SIZE		0x20000000

-#ifdef CONFIG_SPL_BUILD
-#define CONFIG_SYS_INIT_SP_ADDR		0x218000
-#else
+#define CONFIG_SPL_STACK		0x218000
 #define CONFIG_SYS_INIT_SP_ADDR \
 	(CONFIG_SYS_SDRAM_BASE + 16 * 1024 + CONFIG_SYS_MALLOC_F_LEN - \
 	 GENERATED_GBL_DATA_SIZE)
-#endif

 #endif
--- a/include/configs/smartweb.h
+++ b/include/configs/smartweb.h
@ -104,9 +104,6 @@
 									\
 	"mtdparts="CONFIG_MTDPARTS_DEFAULT"\0"

-#ifdef CONFIG_SPL_BUILD
-#define CONFIG_SYS_INIT_SP_ADDR		0x301000
-#else
 /*
 * Initial stack pointer: 4k - GENERATED_GBL_DATA_SIZE in internal SRAM,
 * leaving the correct space for initial global data structure above that
@ -114,10 +111,10 @@
 */
 #define CONFIG_SYS_INIT_SP_ADDR \
 	(ATMEL_BASE_SRAM1 + 0x1000 - GENERATED_GBL_DATA_SIZE)
-#endif

 /* Defines for SPL */

+#define CONFIG_SPL_STACK		0x301000
 #define CONFIG_SPL_BSS_START_ADDR	CONFIG_SYS_SDRAM_BASE
 #define CONFIG_SYS_SPL_MALLOC_START     (CONFIG_SPL_BSS_START_ADDR + \
 					CONFIG_SPL_BSS_MAX_SIZE)
--- a/include/configs/socfpga_soc64_common.h
+++ b/include/configs/socfpga_soc64_common.h
@ -29,14 +29,8 @@
 */
 #define CONFIG_SYS_INIT_RAM_ADDR	0xFFE00000
 #define CONFIG_SYS_INIT_RAM_SIZE	0x40000
-#ifdef CONFIG_SPL_BUILD
-#define CONFIG_SYS_INIT_SP_ADDR		(CONFIG_SYS_INIT_RAM_ADDR  \
-					+ CONFIG_SYS_INIT_RAM_SIZE \
-					- SOC64_HANDOFF_SIZE)
-#else
 #define CONFIG_SYS_INIT_SP_ADDR		(CONFIG_SYS_TEXT_BASE \
 					+ 0x100000)
-#endif
 #define CONFIG_SYS_INIT_SP_OFFSET	(CONFIG_SYS_INIT_SP_ADDR)

 /*
@ -153,7 +147,9 @@ unsigned int cm_get_l4_sys_free_clk_hz(void);
 *
 */
 #define CONFIG_SPL_TARGET		"spl/u-boot-spl-dtb.hex"
-#define CONFIG_SPL_STACK		CONFIG_SYS_INIT_SP_ADDR
+#define CONFIG_SPL_STACK		(CONFIG_SYS_INIT_RAM_ADDR  \
+					+ CONFIG_SYS_INIT_RAM_SIZE \
+					- SOC64_HANDOFF_SIZE)
 #define CONFIG_SPL_BSS_START_ADDR	(PHYS_SDRAM_1 + PHYS_SDRAM_1_SIZE \
 					- CONFIG_SPL_BSS_MAX_SIZE)
 #define CONFIG_SYS_SPL_MALLOC_SIZE	(CONFIG_SYS_MALLOC_LEN)
--- a/include/configs/stm32f746-disco.h
+++ b/include/configs/stm32f746-disco.h
@ -39,9 +39,6 @@
 			"ramdisk_addr_r=0xC0438000\0"		\
 			BOOTENV

-/* For SPL */
-#ifdef CONFIG_SUPPORT_SPL
-#define CONFIG_SPL_STACK		CONFIG_SYS_INIT_SP_ADDR
 #define CONFIG_SYS_MONITOR_LEN		(512 * 1024)
 #define CONFIG_SYS_SPL_LEN		0x00008000
 #define CONFIG_SYS_UBOOT_START		0x080083FD
@ -51,8 +48,6 @@
 /* DT blob (fdt) address */
 #define CONFIG_SYS_FDT_BASE		(CONFIG_SYS_FLASH_BASE + \
 					0x1C0000)
-#endif
-/* For SPL ends */

 /* For splashcreen */