arm: imx: Rework i.MX specific commands to be excluded from SPL

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

diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig
index d59a1d5ccb2de053a9afb178be1b17c29e0325d3..85107817f4187f403758bfae32d1fb513c09a838 100644 (file)
--- a/arch/arm/mach-rockchip/Kconfig
+++ b/arch/arm/mach-rockchip/Kconfig
@@ -11,14 +11,28 @@ config ROCKCHIP_RK3036
          and video codec support. Peripherals include Gigabit Ethernet,
          USB2 host and OTG, SDIO, I2S, UART, SPI, I2C and PWMs.
 
          and video codec support. Peripherals include Gigabit Ethernet,
          USB2 host and OTG, SDIO, I2S, UART, SPI, I2C and PWMs.
 

+config ROCKCHIP_RK3128
+       bool "Support Rockchip RK3128"
+       select CPU_V7
+       help
+         The Rockchip RK3128 is a ARM-based SoC with a quad-core Cortex-A7
+         including NEON and GPU, Mali-400 graphics, several DDR3 options
+         and video codec support. Peripherals include Gigabit Ethernet,
+         USB2 host and OTG, SDIO, I2S, UART, SPI, I2C and PWMs.
+

 config ROCKCHIP_RK3188
        bool "Support Rockchip RK3188"
        select CPU_V7
        select SPL_BOARD_INIT if SPL
        select SUPPORT_SPL
 config ROCKCHIP_RK3188
        bool "Support Rockchip RK3188"
        select CPU_V7
        select SPL_BOARD_INIT if SPL
        select SUPPORT_SPL

-       select SUPPORT_TPL

        select SPL
        select SPL

-       select TPL
+       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
        help
        select BOARD_LATE_INIT
        select ROCKCHIP_BROM_HELPER
        help


@@ -47,6 +61,8 @@ config ROCKCHIP_RK3288
        select SPL_BOARD_INIT if SPL
        select SUPPORT_SPL
        select SPL
        select SPL_BOARD_INIT if SPL
        select SUPPORT_SPL
        select SPL

+       imply USB_FUNCTION_ROCKUSB
+       imply CMD_ROCKUSB

        help
          The Rockchip RK3288 is a ARM-based SoC with a quad-core Cortex-A17
          including NEON and GPU, 1MB L2 cache, Mali-T7 graphics, two
        help
          The Rockchip RK3288 is a ARM-based SoC with a quad-core Cortex-A17
          including NEON and GPU, 1MB L2 cache, Mali-T7 graphics, two


@@ -112,6 +128,8 @@ config ROCKCHIP_RK3399
        select SPL_SERIAL_SUPPORT
        select SPL_DRIVERS_MISC_SUPPORT
        select DEBUG_UART_BOARD_INIT
        select SPL_SERIAL_SUPPORT
        select SPL_DRIVERS_MISC_SUPPORT
        select DEBUG_UART_BOARD_INIT

+       select BOARD_LATE_INIT
+       select ROCKCHIP_BROM_HELPER

        help
          The Rockchip RK3399 is a ARM-based SoC with a dual-core Cortex-A72
          and quad-core Cortex-A53.
        help
          The Rockchip RK3399 is a ARM-based SoC with a dual-core Cortex-A72
          and quad-core Cortex-A53.


@@ -147,9 +165,23 @@ config TPL_ROCKCHIP_BACK_TO_BROM
           SPL will return to the boot rom, which will then load the U-Boot
           binary to keep going on.
 
           SPL will return to the boot rom, which will then load the U-Boot
           binary to keep going on.
 

+config ROCKCHIP_BOOT_MODE_REG
+       hex "Rockchip boot mode flag register address"
+       default 0x200081c8 if ROCKCHIP_RK3036
+       default 0x20004040 if ROCKCHIP_RK3188
+       default 0x110005c8 if ROCKCHIP_RK322X
+       default 0xff730094 if ROCKCHIP_RK3288
+       default 0xff738200 if ROCKCHIP_RK3368
+       default 0xff320300 if ROCKCHIP_RK3399
+       default 0x10300580 if ROCKCHIP_RV1108
+       default 0
+       help
+         The Soc will enter to different boot mode(defined in asm/arch/boot_mode.h)
+         according to the value from this register.
+

 config ROCKCHIP_SPL_RESERVE_IRAM
        hex "Size of IRAM reserved in SPL"
 config ROCKCHIP_SPL_RESERVE_IRAM
        hex "Size of IRAM reserved in SPL"

-       default 0x4000
+       default 0

        help
          SPL may need reserve memory for firmware loaded by SPL, whose load
          address is in IRAM and may overlay with SPL text area if not
        help
          SPL may need reserve memory for firmware loaded by SPL, whose load
          address is in IRAM and may overlay with SPL text area if not


@@ -190,6 +222,7 @@ config SPL_MMC_SUPPORT
        default y if !SPL_ROCKCHIP_BACK_TO_BROM
 
 source "arch/arm/mach-rockchip/rk3036/Kconfig"
        default y if !SPL_ROCKCHIP_BACK_TO_BROM
 
 source "arch/arm/mach-rockchip/rk3036/Kconfig"

+source "arch/arm/mach-rockchip/rk3128/Kconfig"

 source "arch/arm/mach-rockchip/rk3188/Kconfig"
 source "arch/arm/mach-rockchip/rk322x/Kconfig"
 source "arch/arm/mach-rockchip/rk3288/Kconfig"
 source "arch/arm/mach-rockchip/rk3188/Kconfig"
 source "arch/arm/mach-rockchip/rk322x/Kconfig"
 source "arch/arm/mach-rockchip/rk3288/Kconfig"