rockchip: rk3188: move CONFIG_SPL_* entries from rk3188_common.h to Kconfig

There still are a few CONFIG_SPL_* options selected using defines from
rk3188_common.h instead of via Kconfig.  This migrates those over to
Kconfig.

Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>

diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig
index 09f2c45..36df484 100644 (file)
--- a/arch/arm/mach-rockchip/Kconfig
+++ b/arch/arm/mach-rockchip/Kconfig
@@ -16,8 +16,13 @@ config ROCKCHIP_RK3188
        select CPU_V7
        select SPL_BOARD_INIT if SPL
        select SUPPORT_SPL
-       select SUPPORT_TPL
        select SPL
+       select SPL_CLK
+       select SPL_PINCTRL
+       select SPL_REGMAP
+       select SPL_SYSCON
+       select SPL_RAM
+       select SPL_DRIVERS_MISC_SUPPORT
        select SPL_ROCKCHIP_EARLYRETURN_TO_BROM
        select BOARD_LATE_INIT
        select ROCKCHIP_BROM_HELPER

diff --git a/include/configs/rk3188_common.h b/include/configs/rk3188_common.h
index 68a42a9..0cb0762 100644 (file)
--- a/include/configs/rk3188_common.h
+++ b/include/configs/rk3188_common.h
@@ -40,12 +40,6 @@
 /* spl size 32kb sram - 2kb bootrom */
 #define CONFIG_SPL_MAX_SIZE            (0x8000 - 0x800)
 #define CONFIG_SPL_FRAMEWORK           1
-#define CONFIG_SPL_CLK                 1
-#define CONFIG_SPL_PINCTRL             1
-#define CONFIG_SPL_REGMAP              1
-#define CONFIG_SPL_SYSCON              1
-#define CONFIG_SPL_RAM                 1
-#define CONFIG_SPL_DRIVERS_MISC_SUPPORT        1
 #define CONFIG_ROCKCHIP_SERIAL         1
 
 #define CONFIG_SPL_STACK               0x10087fff