[PATCH 01/12] omap3: Define common SPL text base in Kconfig instead of defconfigs

[Adam Ford]

On Sun, Jul 28, 2024 at 3:25 PM Paul Kocialkowski <paulk at sys-base.io> wrote:
>
> From: Paul Kocialkowski <contact at paulk.fr>
>
> The SPL text base was defined to the same value in each OMAP3 board
> defconfig. Move the common definition to the Kconfig option
> declaration instead.

Thanks for doing this.
>
> Signed-off-by: Paul Kocialkowski <contact at paulk.fr>

For the series,

Tested-by: Adam Ford <aford173 at gmail.com> #am3517-evm

> ---
>  common/spl/Kconfig                   | 1 +
>  configs/am3517_evm_defconfig         | 1 -
>  configs/devkit8000_defconfig         | 1 -
>  configs/igep00x0_defconfig           | 1 -
>  configs/omap35_logic_defconfig       | 1 -
>  configs/omap35_logic_somlv_defconfig | 1 -
>  configs/omap3_evm_defconfig          | 1 -
>  configs/omap3_logic_defconfig        | 1 -
>  configs/omap3_logic_somlv_defconfig  | 1 -
>  configs/sniper_defconfig             | 1 -
>  10 files changed, 1 insertion(+), 9 deletions(-)
>
> diff --git a/common/spl/Kconfig b/common/spl/Kconfig
> index 6f56ca911c1e..6fc97f4ccbd8 100644
> --- a/common/spl/Kconfig
> +++ b/common/spl/Kconfig
> @@ -261,6 +261,7 @@ config SPL_LDSCRIPT
>
>  config SPL_TEXT_BASE
>         hex "SPL Text Base"
> +       default 0x40200000 if OMAP34XX
>         default 0x402F4000 if AM43XX
>         default 0x402F0400 if AM33XX
>         default 0x40301350 if OMAP54XX
> diff --git a/configs/am3517_evm_defconfig b/configs/am3517_evm_defconfig
> index 3236f1dd672f..129ffa28d272 100644
> --- a/configs/am3517_evm_defconfig
> +++ b/configs/am3517_evm_defconfig
> @@ -10,7 +10,6 @@ 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_SPL_TEXT_BASE=0x40200000
>  CONFIG_TARGET_AM3517_EVM=y
>  CONFIG_EMIF4=y
>  CONFIG_SYS_MONITOR_LEN=262144
> diff --git a/configs/devkit8000_defconfig b/configs/devkit8000_defconfig
> index 7653fbbe7e5a..db6e9386cf5f 100644
> --- a/configs/devkit8000_defconfig
> +++ b/configs/devkit8000_defconfig
> @@ -7,7 +7,6 @@ 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_SPL_TEXT_BASE=0x40200000
>  CONFIG_TARGET_DEVKIT8000=y
>  CONFIG_SYS_MONITOR_LEN=262144
>  CONFIG_SPL_SYS_MALLOC_F_LEN=0x400
> diff --git a/configs/igep00x0_defconfig b/configs/igep00x0_defconfig
> index 473891607b0f..90ef2635c899 100644
> --- a/configs/igep00x0_defconfig
> +++ b/configs/igep00x0_defconfig
> @@ -9,7 +9,6 @@ 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_SPL_TEXT_BASE=0x40200000
>  CONFIG_TARGET_OMAP3_IGEP00X0=y
>  CONFIG_SYS_MONITOR_LEN=262144
>  CONFIG_SPL_SYS_MALLOC_F_LEN=0x400
> diff --git a/configs/omap35_logic_defconfig b/configs/omap35_logic_defconfig
> index 23b2e503385d..3b66af079c59 100644
> --- a/configs/omap35_logic_defconfig
> +++ b/configs/omap35_logic_defconfig
> @@ -10,7 +10,6 @@ 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_SPL_TEXT_BASE=0x40200000
>  CONFIG_TARGET_OMAP3_LOGIC=y
>  # CONFIG_SPL_OMAP3_ID_NAND is not set
>  CONFIG_SYS_MONITOR_LEN=262144
> diff --git a/configs/omap35_logic_somlv_defconfig b/configs/omap35_logic_somlv_defconfig
> index a5f242ff40cf..1b1d3dcfb203 100644
> --- a/configs/omap35_logic_somlv_defconfig
> +++ b/configs/omap35_logic_somlv_defconfig
> @@ -10,7 +10,6 @@ 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_SPL_TEXT_BASE=0x40200000
>  CONFIG_TARGET_OMAP3_LOGIC=y
>  # CONFIG_SPL_OMAP3_ID_NAND is not set
>  CONFIG_SYS_MONITOR_LEN=262144
> diff --git a/configs/omap3_evm_defconfig b/configs/omap3_evm_defconfig
> index 3c8d974fbd09..4ccb9b65c8bb 100644
> --- a/configs/omap3_evm_defconfig
> +++ b/configs/omap3_evm_defconfig
> @@ -7,7 +7,6 @@ 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_SPL_TEXT_BASE=0x40200000
>  CONFIG_TARGET_OMAP3_EVM=y
>  CONFIG_SYS_MONITOR_LEN=262144
>  CONFIG_SPL_SYS_MALLOC_F_LEN=0x400
> diff --git a/configs/omap3_logic_defconfig b/configs/omap3_logic_defconfig
> index d081d4e0fb46..1fa5873a42d5 100644
> --- a/configs/omap3_logic_defconfig
> +++ b/configs/omap3_logic_defconfig
> @@ -10,7 +10,6 @@ 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_SPL_TEXT_BASE=0x40200000
>  CONFIG_TARGET_OMAP3_LOGIC=y
>  # CONFIG_SPL_OMAP3_ID_NAND is not set
>  CONFIG_SYS_MONITOR_LEN=262144
> diff --git a/configs/omap3_logic_somlv_defconfig b/configs/omap3_logic_somlv_defconfig
> index 68e89d245eee..642d2121ceda 100644
> --- a/configs/omap3_logic_somlv_defconfig
> +++ b/configs/omap3_logic_somlv_defconfig
> @@ -10,7 +10,6 @@ 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_SPL_TEXT_BASE=0x40200000
>  CONFIG_TARGET_OMAP3_LOGIC=y
>  # CONFIG_SPL_OMAP3_ID_NAND is not set
>  CONFIG_SYS_MONITOR_LEN=262144
> diff --git a/configs/sniper_defconfig b/configs/sniper_defconfig
> index 0243b15f31ce..72634db607bf 100644
> --- a/configs/sniper_defconfig
> +++ b/configs/sniper_defconfig
> @@ -7,7 +7,6 @@ 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_SPL_TEXT_BASE=0x40200000
>  CONFIG_TARGET_SNIPER=y
>  CONFIG_SPL_STACK=0x4020fffc
>  CONFIG_SPL_BSS_START_ADDR=0x80000000
> --
> 2.45.2
>