Merge branch 'master' of git://git.denx.de/u-boot-video

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

diff --git a/arch/arm/mach-rockchip/rk3288/Kconfig b/arch/arm/mach-rockchip/rk3288/Kconfig
index 8ec1920d192e1c9f2cb8bb898f0810d97e4546a1..54545f378ca77a6637258d8fbcb29776dc21a596 100644 (file)
--- a/arch/arm/mach-rockchip/rk3288/Kconfig
+++ b/arch/arm/mach-rockchip/rk3288/Kconfig
@@ -33,6 +33,14 @@ config TARGET_POPMETAL_RK3288
          2GB DDR3. Expansion connectors provide access to I2C, SPI, UART,
          GPIOs and display interface.
 
+config TARGET_MINIARM_RK3288
+       bool "miniarm-RK3288"
+       help
+         Miniarm is a RK3288-based development board with 2 USB ports, HDMI,
+         micro-SD card, audio, Gigabit Ethernet. It also includes on-board
+         8GB eMMC and 2GB of SDRAM. Expansion connectors provide access to
+         I2C, SPI, UART, GPIOs.
+
 config TARGET_CHROMEBOOK_JERRY
        bool "Google/Rockchip Veyron-Jerry Chromebook"
        help
@@ -41,6 +49,25 @@ config TARGET_CHROMEBOOK_JERRY
          WiFi. It includes a Chrome OS EC (Cortex-M3) to provide access to
          the keyboard and battery functions.
 
+config TARGET_CHROMEBIT_MICKEY
+       bool "Google/Rockchip Veyron-Mickey Chromebit"
+       help
+         Mickey is a small RK3288-based device with one USB 3.0 port, HDMI
+         and WiFi. It has a separate power port and is designed to connect
+         to the HDMI input of a monitor or TV. It has no internal battery.
+         Typically a USB hub or wireless keyboard/touchpad is used to get
+         keyboard and mouse access.
+
+config TARGET_CHROMEBOOK_MINNIE
+       bool "Google/Rockchip Veyron-Minnie Chromebook"
+       help
+         Minnie is a RK3288-based convertible clamshell device with 2 USB 3.0
+         ports, micro HDMI, a 10.1-inch 1280x800 EDP display, micro-SD card,
+         HD camera, touchpad, WiFi and Bluetooth. It includes a Chrome OS
+         EC (Cortex-M3) to provide access to the keyboard and battery
+         functions. It includes 2 or 4GB of SDRAM and 16 or 32GB of
+         internal MMC. The product name is ASUS Chromebook Flip.
+
 config TARGET_ROCK2
        bool "Radxa Rock 2"
        help
@@ -64,16 +91,30 @@ config SYS_SOC
 config SYS_MALLOC_F_LEN
        default 0x0800
 
-source "board/google/chromebook_jerry/Kconfig"
+config SPL_DRIVERS_MISC_SUPPORT
+       default y
+
+config SPL_LIBCOMMON_SUPPORT
+       default y
+
+config SPL_LIBGENERIC_SUPPORT
+       default y
+
+config SPL_SERIAL_SUPPORT
+       default y
+
+source "board/chipspark/popmetal_rk3288/Kconfig"
 
 source "board/firefly/firefly-rk3288/Kconfig"
 
+source "board/google/veyron/Kconfig"
+
 source "board/radxa/rock2/Kconfig"
 
 source "board/rockchip/evb_rk3288/Kconfig"
 
 source "board/rockchip/fennec_rk3288/Kconfig"
 
-source "board/chipspark/popmetal_rk3288/Kconfig"
+source "board/rockchip/miniarm_rk3288/Kconfig"
 
 endif