rockchip: Move imply TPL_ROCKCHIP_COMMON_BOARD under SoC Kconfig symbol

The Kconfig symbol ROCKCHIP_COMMON_STACK_ADDR currently imply the
TPL_ROCKCHIP_COMMON_BOARD option when TPL=y. This is inconvenient for a
SoC with very limited SRAM to use a custom tpl.c together with the
common stack addresses.

Move any imply TPL_ROCKCHIP_COMMON_BOARD to under the SoC symbol, where
it belongs. Add the missing imply to RK3328 and PX30 use a SoC specific
tpl.c and only expect imply TPL_LIBGENERIC_SUPPORT.

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 c6e347b..5a90e78 100644 (file)
--- a/arch/arm/mach-rockchip/Kconfig
+++ b/arch/arm/mach-rockchip/Kconfig
@@ -16,6 +16,7 @@ config ROCKCHIP_PX30
        select DEBUG_UART_BOARD_INIT
        imply ROCKCHIP_COMMON_BOARD
        imply SPL_ROCKCHIP_COMMON_BOARD
+       imply TPL_LIBGENERIC_SUPPORT
        imply ARMV8_CRYPTO
        imply ARMV8_SET_SMPEN
        help
@@ -213,6 +214,7 @@ config ROCKCHIP_RK3328
        imply SPL_ROCKCHIP_COMMON_BOARD
        imply SPL_SEPARATE_BSS
        imply SPL_SERIAL
+       imply TPL_ROCKCHIP_COMMON_BOARD
        imply TPL_SERIAL
        help
          The Rockchip RK3328 is a ARM-based SoC with a quad-core Cortex-A53.
@@ -609,11 +611,10 @@ config ROCKCHIP_COMMON_STACK_ADDR
        imply SPL_ROCKCHIP_COMMON_BOARD if SPL
        imply SPL_SYS_MALLOC_F if SPL
        imply SPL_SYS_MALLOC_SIMPLE if SPL
-       imply TPL_LIBCOMMON_SUPPORT if TPL
-       imply TPL_LIBGENERIC_SUPPORT if TPL
-       imply TPL_ROCKCHIP_COMMON_BOARD if TPL
-       imply TPL_SYS_MALLOC_F if TPL
-       imply TPL_SYS_MALLOC_SIMPLE if TPL
+       imply TPL_LIBCOMMON_SUPPORT if TPL && TPL_ROCKCHIP_COMMON_BOARD
+       imply TPL_LIBGENERIC_SUPPORT if TPL && TPL_ROCKCHIP_COMMON_BOARD
+       imply TPL_SYS_MALLOC_F if TPL && TPL_ROCKCHIP_COMMON_BOARD
+       imply TPL_SYS_MALLOC_SIMPLE if TPL && TPL_ROCKCHIP_COMMON_BOARD
 
 config NR_DRAM_BANKS
        default 10 if ROCKCHIP_EXTERNAL_TPL