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 adc748d5308d93f21be0c5faca5bf0c158abae13..c95ac601e66c8280b0455bd3b346c6d43ea8495a 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 dcf9eb8144b800ec5db5dec300070f30e7e9f9fb..2b57b1668942b9f6bcddbbfb28507a83bba70a74 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 fac966207a926f4b09a19e66ed1142bde5d9f4c2..06572d545f6e352b34099423e802090ed058734c 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 70770da5fdf2f1faf0c26b1ec9c34f4e1f44ce1b..ec1dae8d413a112d53f41aaeb41709cab3d720bb 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 500cfcd87afd23782bb64d231e337330e12497da..b2430207ee9d0130b5a0c303a41a7375c7db26fa 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 ce327ed6f9e05ec6494996e86e13a013a42c2565..c589fd586993b1f6e264fc094bf155c3e82ce46d 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 155b8f00ca2cdf4ae49abe7b19153f761415aa24..efd192068ad14ac77e0b88ce1422e7dfd06a1237 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