Convert CONFIG_TPL_TEXT_BASE to Kconfig

[u-boot.git] / arch / arm / mach-rockchip / Kconfig

diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig
index 35bdef29fe611ef38340ed8889a89848bb287dbd..c4645a0e4c5f1d52620f9e5a3a89538361914f2d 100644 (file)
--- a/arch/arm/mach-rockchip/Kconfig
+++ b/arch/arm/mach-rockchip/Kconfig
@@ -8,11 +8,10 @@ config ROCKCHIP_PX30
        select SPL
        select TPL
        select TPL_TINY_FRAMEWORK if TPL
-       select TPL_NEEDS_SEPARATE_TEXT_BASE if SPL
        select TPL_NEEDS_SEPARATE_STACK if TPL
        imply SPL_SEPARATE_BSS
-       select SPL_SERIAL_SUPPORT
-       select TPL_SERIAL_SUPPORT
+       select SPL_SERIAL
+       select TPL_SERIAL
        select DEBUG_UART_BOARD_INIT
        imply ROCKCHIP_COMMON_BOARD
        imply SPL_ROCKCHIP_COMMON_BOARD
@@ -56,7 +55,7 @@ config ROCKCHIP_RK3188
        select SPL_REGMAP
        select SPL_SYSCON
        select SPL_RAM
-       select SPL_DRIVERS_MISC_SUPPORT
+       select SPL_DRIVERS_MISC
        select SPL_ROCKCHIP_EARLYRETURN_TO_BROM
        select SPL_ROCKCHIP_BACK_TO_BROM
        select BOARD_LATE_INIT
@@ -80,13 +79,12 @@ config ROCKCHIP_RK322X
        select TPL
        select TPL_DM
        select TPL_OF_LIBFDT
-       select TPL_NEEDS_SEPARATE_TEXT_BASE if SPL
        select TPL_NEEDS_SEPARATE_STACK if TPL
-       select SPL_DRIVERS_MISC_SUPPORT
+       select SPL_DRIVERS_MISC
        imply ROCKCHIP_COMMON_BOARD
-       imply SPL_SERIAL_SUPPORT
+       imply SPL_SERIAL
        imply SPL_ROCKCHIP_COMMON_BOARD
-       imply TPL_SERIAL_SUPPORT
+       imply TPL_SERIAL
        imply TPL_ROCKCHIP_COMMON_BOARD
        select TPL_LIBCOMMON_SUPPORT
        select TPL_LIBGENERIC_SUPPORT
@@ -100,6 +98,7 @@ config ROCKCHIP_RK3288
        bool "Support Rockchip RK3288"
        select CPU_V7A
        select OF_BOARD_SETUP
+       select SKIP_LOWLEVEL_INIT_ONLY
        select SUPPORT_SPL
        select SPL
        select SUPPORT_TPL
@@ -108,17 +107,16 @@ config ROCKCHIP_RK3288
        imply SPL_ROCKCHIP_COMMON_BOARD
        imply TPL_CLK
        imply TPL_DM
-       imply TPL_DRIVERS_MISC_SUPPORT
+       imply TPL_DRIVERS_MISC
        imply TPL_LIBCOMMON_SUPPORT
        imply TPL_LIBGENERIC_SUPPORT
-       imply TPL_NEEDS_SEPARATE_TEXT_BASE
        imply TPL_NEEDS_SEPARATE_STACK
        imply TPL_OF_CONTROL
        imply TPL_OF_PLATDATA
        imply TPL_RAM
        imply TPL_REGMAP
        imply TPL_ROCKCHIP_COMMON_BOARD
-       imply TPL_SERIAL_SUPPORT
+       imply TPL_SERIAL
        imply TPL_SYSCON
        imply USB_FUNCTION_ROCKUSB
        imply CMD_ROCKUSB
@@ -145,8 +143,8 @@ config ROCKCHIP_RK3308
        imply SPL_REGMAP
        imply SPL_SYSCON
        imply SPL_RAM
-       imply SPL_SERIAL_SUPPORT
-       imply TPL_SERIAL_SUPPORT
+       imply SPL_SERIAL
+       imply TPL_SERIAL
        imply SPL_SEPARATE_BSS
        help
          The Rockchip RK3308 is a ARM-based Soc which embedded with quad
@@ -159,13 +157,12 @@ config ROCKCHIP_RK3328
        select SPL
        select SUPPORT_TPL
        select TPL
-       select TPL_NEEDS_SEPARATE_TEXT_BASE if TPL
        select TPL_NEEDS_SEPARATE_STACK if TPL
        imply ROCKCHIP_COMMON_BOARD
        imply ROCKCHIP_SDRAM_COMMON
        imply SPL_ROCKCHIP_COMMON_BOARD
-       imply SPL_SERIAL_SUPPORT
-       imply TPL_SERIAL_SUPPORT
+       imply SPL_SERIAL
+       imply TPL_SERIAL
        imply SPL_SEPARATE_BSS
        select ENABLE_ARM_SOC_BOOT0_HOOK
        select DEBUG_UART_BOARD_INIT
@@ -182,13 +179,12 @@ config ROCKCHIP_RK3368
        select ARM64
        select SUPPORT_SPL
        select SUPPORT_TPL
-       select TPL_NEEDS_SEPARATE_TEXT_BASE if SPL
        select TPL_NEEDS_SEPARATE_STACK if TPL
        imply ROCKCHIP_COMMON_BOARD
        imply SPL_ROCKCHIP_COMMON_BOARD
        imply SPL_SEPARATE_BSS
-       imply SPL_SERIAL_SUPPORT
-       imply TPL_SERIAL_SUPPORT
+       imply SPL_SERIAL
+       imply TPL_SERIAL
        imply TPL_ROCKCHIP_COMMON_BOARD
        help
          The Rockchip RK3368 is a ARM-based SoC with a octa-core (organised
@@ -215,11 +211,10 @@ config ROCKCHIP_RK3399
        select SPL_RAM if SPL
        select SPL_REGMAP if SPL
        select SPL_SYSCON if SPL
-       select TPL_NEEDS_SEPARATE_TEXT_BASE if TPL
        select TPL_NEEDS_SEPARATE_STACK if TPL
        select SPL_SEPARATE_BSS
-       select SPL_SERIAL_SUPPORT
-       select SPL_DRIVERS_MISC_SUPPORT
+       select SPL_SERIAL
+       select SPL_DRIVERS_MISC
        select CLK
        select FIT
        select PINCTRL
@@ -234,11 +229,11 @@ config ROCKCHIP_RK3399
        imply ROCKCHIP_SDRAM_COMMON
        imply SPL_ATF_NO_PLATFORM_PARAM if SPL_ATF
        imply SPL_ROCKCHIP_COMMON_BOARD
-       imply TPL_SERIAL_SUPPORT
+       imply TPL_SERIAL
        imply TPL_LIBCOMMON_SUPPORT
        imply TPL_LIBGENERIC_SUPPORT
        imply TPL_SYS_MALLOC_SIMPLE
-       imply TPL_DRIVERS_MISC_SUPPORT
+       imply TPL_DRIVERS_MISC
        imply TPL_OF_CONTROL
        imply TPL_DM
        imply TPL_REGMAP
@@ -381,7 +376,7 @@ config TPL_ROCKCHIP_EARLYRETURN_TO_BROM
          This enables support code in the BOOT0 hook for the TPL stage
          to allow multiple entries.
 
-config SPL_MMC_SUPPORT
+config SPL_MMC
        default y if !SPL_ROCKCHIP_BACK_TO_BROM
 
 config ROCKCHIP_SPI_IMAGE