[PATCH v2 4/6] rockchip: Move imply ROCKCHIP_COMMON_STACK_ADDR under SoC Kconfig symbol

Kever Yang kever.yang at rock-chips.com
Tue Apr 8 02:50:20 CEST 2025


On 2025/2/21 05:56, Jonas Karlman wrote:
> The ROCKCHIP_COMMON_STACK_ADDR Kconfig option was originally enabled
> in the SoC specific Kconfig files to ease during the initial migration
> to use common stack addresses.
>
> All boards for the affected SoCs have been migrated to use common stack
> addresses. Migrate to use an imply under the SoC symbol instead of
> re-define the symbol in each SoC specific Kconfig file.
>
> Signed-off-by: Jonas Karlman <jonas at kwiboo.se>
Reviewed-by: Kever Yang <kever.yang at rock-chips.com>

Thanks,
- Kever
> ---
> v2: No change
> ---
>   arch/arm/mach-rockchip/Kconfig        | 6 ++++++
>   arch/arm/mach-rockchip/px30/Kconfig   | 3 ---
>   arch/arm/mach-rockchip/rk3308/Kconfig | 3 ---
>   arch/arm/mach-rockchip/rk3328/Kconfig | 3 ---
>   arch/arm/mach-rockchip/rk3399/Kconfig | 3 ---
>   arch/arm/mach-rockchip/rk3568/Kconfig | 3 ---
>   arch/arm/mach-rockchip/rk3588/Kconfig | 3 ---
>   7 files changed, 6 insertions(+), 18 deletions(-)
>
> diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig
> index 6c68b3f6a83e..7d867173fa1d 100644
> --- a/arch/arm/mach-rockchip/Kconfig
> +++ b/arch/arm/mach-rockchip/Kconfig
> @@ -15,6 +15,7 @@ config ROCKCHIP_PX30
>   	select TPL_SERIAL
>   	select DEBUG_UART_BOARD_INIT
>   	imply ROCKCHIP_COMMON_BOARD
> +	imply ROCKCHIP_COMMON_STACK_ADDR
>   	imply SPL_ROCKCHIP_COMMON_BOARD
>   	imply TPL_LIBGENERIC_SUPPORT
>   	imply ARMV8_CRYPTO
> @@ -177,6 +178,7 @@ config ROCKCHIP_RK3308
>   	imply OF_UPSTREAM
>   	imply RNG_ROCKCHIP
>   	imply ROCKCHIP_COMMON_BOARD
> +	imply ROCKCHIP_COMMON_STACK_ADDR
>   	imply ROCKCHIP_OTP
>   	imply SPL_CLK
>   	imply SPL_DM_SEQ_ALIAS
> @@ -209,6 +211,7 @@ config ROCKCHIP_RK3328
>   	imply OF_UPSTREAM
>   	imply PRE_CONSOLE_BUFFER
>   	imply ROCKCHIP_COMMON_BOARD
> +	imply ROCKCHIP_COMMON_STACK_ADDR
>   	imply ROCKCHIP_EFUSE
>   	imply ROCKCHIP_SDRAM_COMMON
>   	imply SPL_ROCKCHIP_COMMON_BOARD
> @@ -287,6 +290,7 @@ config ROCKCHIP_RK3399
>   	imply PRE_CONSOLE_BUFFER
>   	imply RNG_ROCKCHIP
>   	imply ROCKCHIP_COMMON_BOARD
> +	imply ROCKCHIP_COMMON_STACK_ADDR
>   	imply ROCKCHIP_EFUSE
>   	imply ROCKCHIP_SDRAM_COMMON
>   	imply SPL_DM_SEQ_ALIAS
> @@ -336,6 +340,7 @@ config ROCKCHIP_RK3568
>   	imply PHY_GIGE if DWC_ETH_QOS_ROCKCHIP
>   	imply RNG_ROCKCHIP
>   	imply ROCKCHIP_COMMON_BOARD
> +	imply ROCKCHIP_COMMON_STACK_ADDR
>   	imply ROCKCHIP_OTP
>   	imply SPL_ATF_NO_PLATFORM_PARAM if SPL_ATF
>   	imply SPL_MMC_HS200_SUPPORT if SPL_MMC && MMC_HS200_SUPPORT
> @@ -369,6 +374,7 @@ config ROCKCHIP_RK3588
>   	imply PHY_GIGE if DWC_ETH_QOS_ROCKCHIP
>   	imply RNG_ROCKCHIP
>   	imply ROCKCHIP_COMMON_BOARD
> +	imply ROCKCHIP_COMMON_STACK_ADDR
>   	imply ROCKCHIP_OTP
>   	imply SCMI_FIRMWARE
>   	imply SPL_ATF_NO_PLATFORM_PARAM if SPL_ATF
> diff --git a/arch/arm/mach-rockchip/px30/Kconfig b/arch/arm/mach-rockchip/px30/Kconfig
> index dcf9eb8144b8..2b57b1668942 100644
> --- a/arch/arm/mach-rockchip/px30/Kconfig
> +++ b/arch/arm/mach-rockchip/px30/Kconfig
> @@ -68,9 +68,6 @@ config ROCKCHIP_STIMER_BASE
>   config SYS_SOC
>   	default "px30"
>   
> -config ROCKCHIP_COMMON_STACK_ADDR
> -	default y
> -
>   config SYS_MALLOC_F_LEN
>   	default 0x400 if !SPL_SHARES_INIT_SP_ADDR
>   
> diff --git a/arch/arm/mach-rockchip/rk3308/Kconfig b/arch/arm/mach-rockchip/rk3308/Kconfig
> index fac966207a92..06572d545f6e 100644
> --- a/arch/arm/mach-rockchip/rk3308/Kconfig
> +++ b/arch/arm/mach-rockchip/rk3308/Kconfig
> @@ -17,9 +17,6 @@ config ROCKCHIP_STIMER_BASE
>   config SYS_SOC
>   	default "rk3308"
>   
> -config ROCKCHIP_COMMON_STACK_ADDR
> -	default y
> -
>   config TEXT_BASE
>   	default 0x00600000
>   
> diff --git a/arch/arm/mach-rockchip/rk3328/Kconfig b/arch/arm/mach-rockchip/rk3328/Kconfig
> index 70770da5fdf2..ec1dae8d413a 100644
> --- a/arch/arm/mach-rockchip/rk3328/Kconfig
> +++ b/arch/arm/mach-rockchip/rk3328/Kconfig
> @@ -21,9 +21,6 @@ config ROCKCHIP_STIMER_BASE
>   config SYS_SOC
>   	default "rk3328"
>   
> -config ROCKCHIP_COMMON_STACK_ADDR
> -	default y
> -
>   config TPL_LDSCRIPT
>   	default "arch/arm/mach-rockchip/u-boot-tpl-v8.lds"
>   
> diff --git a/arch/arm/mach-rockchip/rk3399/Kconfig b/arch/arm/mach-rockchip/rk3399/Kconfig
> index 500cfcd87afd..b2430207ee9d 100644
> --- a/arch/arm/mach-rockchip/rk3399/Kconfig
> +++ b/arch/arm/mach-rockchip/rk3399/Kconfig
> @@ -143,9 +143,6 @@ config ROCKCHIP_STIMER_BASE
>   config SYS_SOC
>   	default "rk3399"
>   
> -config ROCKCHIP_COMMON_STACK_ADDR
> -	default y
> -
>   config TPL_LDSCRIPT
>   	default "arch/arm/mach-rockchip/u-boot-tpl-v8.lds"
>   
> diff --git a/arch/arm/mach-rockchip/rk3568/Kconfig b/arch/arm/mach-rockchip/rk3568/Kconfig
> index ce327ed6f9e0..c589fd586993 100644
> --- a/arch/arm/mach-rockchip/rk3568/Kconfig
> +++ b/arch/arm/mach-rockchip/rk3568/Kconfig
> @@ -71,9 +71,6 @@ config ROCKCHIP_STIMER_BASE
>   config SYS_SOC
>   	default "rk3568"
>   
> -config ROCKCHIP_COMMON_STACK_ADDR
> -	default y
> -
>   config TEXT_BASE
>   	default 0x00a00000
>   
> diff --git a/arch/arm/mach-rockchip/rk3588/Kconfig b/arch/arm/mach-rockchip/rk3588/Kconfig
> index 155b8f00ca2c..efd192068ad1 100644
> --- a/arch/arm/mach-rockchip/rk3588/Kconfig
> +++ b/arch/arm/mach-rockchip/rk3588/Kconfig
> @@ -420,9 +420,6 @@ config ROCKCHIP_STIMER_BASE
>   config SYS_SOC
>   	default "rk3588"
>   
> -config ROCKCHIP_COMMON_STACK_ADDR
> -	default y
> -
>   config TEXT_BASE
>   	default 0x00a00000
>   


More information about the U-Boot mailing list