rockchip: Move imply ROCKCHIP_COMMON_STACK_ADDR under SoC Kconfig symbol

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@kwiboo.se>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>

diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig
index adc748d..c95ac60 100644 (file)
--- 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 dcf9eb8..2b57b16 100644 (file)
--- 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 fac9662..06572d5 100644 (file)
--- 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 70770da..ec1dae8 100644 (file)
--- 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 500cfcd..b243020 100644 (file)
--- 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 ce327ed..c589fd5 100644 (file)
--- 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 155b8f0..efd1920 100644 (file)
--- 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