From: Paul Kocialkowski contact@paulk.fr
The init stack pointer was defined to the same value in each OMAP3 board defconfig. Move the common definition to the Kconfig option declaration instead.
Signed-off-by: Paul Kocialkowski contact@paulk.fr --- Kconfig | 2 ++ configs/am3517_evm_defconfig | 2 -- configs/devkit8000_defconfig | 2 -- configs/igep00x0_defconfig | 2 -- configs/omap35_logic_defconfig | 2 -- configs/omap35_logic_somlv_defconfig | 2 -- configs/omap3_evm_defconfig | 2 -- configs/omap3_logic_defconfig | 2 -- configs/omap3_logic_somlv_defconfig | 2 -- configs/sniper_defconfig | 2 -- 10 files changed, 2 insertions(+), 18 deletions(-)
diff --git a/Kconfig b/Kconfig index 82df59f176ec..98175a8f3362 100644 --- a/Kconfig +++ b/Kconfig @@ -236,6 +236,7 @@ config SYS_BOOT_GET_KBD config HAS_CUSTOM_SYS_INIT_SP_ADDR bool "Use a custom location for the initial stack pointer address" depends on ARC || (ARM && !INIT_SP_RELATIVE) || MIPS || PPC || RISCV + default y if OMAP34XX default y if TFABOOT help Typically, we use an initial stack pointer address that is calculated @@ -249,6 +250,7 @@ config HAS_CUSTOM_SYS_INIT_SP_ADDR config CUSTOM_SYS_INIT_SP_ADDR hex "Static location for the initial stack pointer" depends on HAS_CUSTOM_SYS_INIT_SP_ADDR + default 0x4020ff00 if OMAP34XX default TEXT_BASE if TFABOOT
config SYS_MALLOC_F diff --git a/configs/am3517_evm_defconfig b/configs/am3517_evm_defconfig index 129ffa28d272..114d1a22f4a3 100644 --- a/configs/am3517_evm_defconfig +++ b/configs/am3517_evm_defconfig @@ -7,8 +7,6 @@ CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_TI_COMMON_CMD_OPTIONS=y CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SOURCE_FILE="am3517evm" -CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y -CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x4020ff00 CONFIG_DEFAULT_DEVICE_TREE="ti/omap/am3517-evm" CONFIG_TARGET_AM3517_EVM=y CONFIG_EMIF4=y diff --git a/configs/devkit8000_defconfig b/configs/devkit8000_defconfig index db6e9386cf5f..d68bb8bfd37b 100644 --- a/configs/devkit8000_defconfig +++ b/configs/devkit8000_defconfig @@ -4,8 +4,6 @@ CONFIG_TEXT_BASE=0x80100000 CONFIG_SYS_MALLOC_LEN=0x40000 CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_NR_DRAM_BANKS=2 -CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y -CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x4020ff00 CONFIG_DEFAULT_DEVICE_TREE="omap3-devkit8000" CONFIG_TARGET_DEVKIT8000=y CONFIG_SYS_MONITOR_LEN=262144 diff --git a/configs/igep00x0_defconfig b/configs/igep00x0_defconfig index 90ef2635c899..493395847255 100644 --- a/configs/igep00x0_defconfig +++ b/configs/igep00x0_defconfig @@ -5,8 +5,6 @@ CONFIG_ARCH_OMAP2PLUS=y CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_TI_COMMON_CMD_OPTIONS=y CONFIG_NR_DRAM_BANKS=2 -CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y -CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x4020ff00 CONFIG_ENV_SIZE=0x8000 CONFIG_DEFAULT_DEVICE_TREE="ti/omap/omap3-igep0020" CONFIG_TARGET_OMAP3_IGEP00X0=y diff --git a/configs/omap35_logic_defconfig b/configs/omap35_logic_defconfig index 3b66af079c59..ca1b97a26d9e 100644 --- a/configs/omap35_logic_defconfig +++ b/configs/omap35_logic_defconfig @@ -7,8 +7,6 @@ CONFIG_SYS_MALLOC_F_LEN=0x3000 CONFIG_TI_COMMON_CMD_OPTIONS=y # CONFIG_SPL_GPIO is not set CONFIG_NR_DRAM_BANKS=2 -CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y -CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x4020ff00 CONFIG_DEFAULT_DEVICE_TREE="ti/omap/logicpd-torpedo-35xx-devkit" CONFIG_TARGET_OMAP3_LOGIC=y # CONFIG_SPL_OMAP3_ID_NAND is not set diff --git a/configs/omap35_logic_somlv_defconfig b/configs/omap35_logic_somlv_defconfig index 1b1d3dcfb203..3b0bc6d1eaf9 100644 --- a/configs/omap35_logic_somlv_defconfig +++ b/configs/omap35_logic_somlv_defconfig @@ -7,8 +7,6 @@ CONFIG_SYS_MALLOC_F_LEN=0x3000 CONFIG_TI_COMMON_CMD_OPTIONS=y # CONFIG_SPL_GPIO is not set CONFIG_NR_DRAM_BANKS=2 -CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y -CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x4020ff00 CONFIG_DEFAULT_DEVICE_TREE="ti/omap/logicpd-som-lv-35xx-devkit" CONFIG_TARGET_OMAP3_LOGIC=y # CONFIG_SPL_OMAP3_ID_NAND is not set diff --git a/configs/omap3_evm_defconfig b/configs/omap3_evm_defconfig index 4ccb9b65c8bb..d7a3fc4b25b9 100644 --- a/configs/omap3_evm_defconfig +++ b/configs/omap3_evm_defconfig @@ -4,8 +4,6 @@ CONFIG_ARM=y CONFIG_ARCH_OMAP2PLUS=y CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_NR_DRAM_BANKS=2 -CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y -CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x4020ff00 CONFIG_DEFAULT_DEVICE_TREE="omap3-evm" CONFIG_TARGET_OMAP3_EVM=y CONFIG_SYS_MONITOR_LEN=262144 diff --git a/configs/omap3_logic_defconfig b/configs/omap3_logic_defconfig index 1fa5873a42d5..52e2e459dbb0 100644 --- a/configs/omap3_logic_defconfig +++ b/configs/omap3_logic_defconfig @@ -7,8 +7,6 @@ CONFIG_SYS_MALLOC_F_LEN=0x3000 CONFIG_TI_COMMON_CMD_OPTIONS=y # CONFIG_SPL_GPIO is not set CONFIG_NR_DRAM_BANKS=2 -CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y -CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x4020ff00 CONFIG_DEFAULT_DEVICE_TREE="ti/omap/logicpd-torpedo-37xx-devkit" CONFIG_TARGET_OMAP3_LOGIC=y # CONFIG_SPL_OMAP3_ID_NAND is not set diff --git a/configs/omap3_logic_somlv_defconfig b/configs/omap3_logic_somlv_defconfig index 642d2121ceda..64bb401f7ac9 100644 --- a/configs/omap3_logic_somlv_defconfig +++ b/configs/omap3_logic_somlv_defconfig @@ -7,8 +7,6 @@ CONFIG_SYS_MALLOC_F_LEN=0x3000 CONFIG_TI_COMMON_CMD_OPTIONS=y # CONFIG_SPL_GPIO is not set CONFIG_NR_DRAM_BANKS=2 -CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y -CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x4020ff00 CONFIG_DEFAULT_DEVICE_TREE="ti/omap/logicpd-som-lv-37xx-devkit" CONFIG_TARGET_OMAP3_LOGIC=y # CONFIG_SPL_OMAP3_ID_NAND is not set diff --git a/configs/sniper_defconfig b/configs/sniper_defconfig index 72634db607bf..35cfc28006c1 100644 --- a/configs/sniper_defconfig +++ b/configs/sniper_defconfig @@ -5,8 +5,6 @@ CONFIG_TEXT_BASE=0x80100000 CONFIG_SYS_MALLOC_LEN=0x120000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_NR_DRAM_BANKS=2 -CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y -CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x4020ff00 CONFIG_TARGET_SNIPER=y CONFIG_SPL_STACK=0x4020fffc CONFIG_SPL_BSS_START_ADDR=0x80000000