serial: Rename SERIAL_SUPPORT to SERIAL

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

diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig
index e2b632658467705ed2bb5a6fd92bc0e430fefd18..da6871eb182b65de5e61131aacd2162b427ce90b 100644 (file)
--- a/arch/arm/mach-rockchip/Kconfig
+++ b/arch/arm/mach-rockchip/Kconfig
@@ -11,8 +11,8 @@ config ROCKCHIP_PX30
        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 +56,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
@@ -82,11 +82,11 @@ config ROCKCHIP_RK322X
        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
@@ -99,6 +99,8 @@ config ROCKCHIP_RK322X
 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
@@ -107,7 +109,7 @@ 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
@@ -117,7 +119,7 @@ config ROCKCHIP_RK3288
        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
@@ -144,8 +146,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
@@ -163,8 +165,8 @@ config ROCKCHIP_RK3328
        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
@@ -186,8 +188,8 @@ config ROCKCHIP_RK3368
        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
@@ -217,8 +219,8 @@ config ROCKCHIP_RK3399
        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
@@ -233,11 +235,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
@@ -256,6 +258,23 @@ config ROCKCHIP_RK3399
          and video codec support. Peripherals include Gigabit Ethernet,
          USB2 host and OTG, SDIO, I2S, UARTs, SPI, I2C and PWMs.
 
+config ROCKCHIP_RK3568
+       bool "Support Rockchip RK3568"
+       select ARM64
+       select CLK
+       select PINCTRL
+       select RAM
+       select REGMAP
+       select SYSCON
+       select BOARD_LATE_INIT
+       imply ROCKCHIP_COMMON_BOARD
+       help
+         The Rockchip RK3568 is a ARM-based SoC with quad-core Cortex-A55,
+         including NEON and GPU, 512K L3 cache, Mali-G52 based graphics,
+         two video interfaces supporting HDMI and eDP, several DDR3 options
+         and video codec support. Peripherals include Gigabit Ethernet,
+         USB2 host and OTG, SDIO, I2S, UARTs, SPI, I2C and PWMs.
+
 config ROCKCHIP_RV1108
        bool "Support Rockchip RV1108"
        select CPU_V7A
@@ -363,9 +382,18 @@ 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
+       bool "Build a SPI image for rockchip"
+       depends on HAS_ROM
+       help
+         Some Rockchip SoCs support booting from SPI flash. Enable this
+         option to produce a 4MB SPI-flash image (called u-boot.rom)
+         containing U-Boot. The image is built by binman. U-Boot sits near
+         the start of the image.
+
 source "arch/arm/mach-rockchip/px30/Kconfig"
 source "arch/arm/mach-rockchip/rk3036/Kconfig"
 source "arch/arm/mach-rockchip/rk3128/Kconfig"
@@ -376,5 +404,6 @@ source "arch/arm/mach-rockchip/rk3308/Kconfig"
 source "arch/arm/mach-rockchip/rk3328/Kconfig"
 source "arch/arm/mach-rockchip/rk3368/Kconfig"
 source "arch/arm/mach-rockchip/rk3399/Kconfig"
+source "arch/arm/mach-rockchip/rk3568/Kconfig"
 source "arch/arm/mach-rockchip/rv1108/Kconfig"
 endif