Merge git://git.denx.de/u-boot-fsl-qoriq

[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 031dbfc06146236cd38cfc8d0a949f12e724c6d3..94863a925e32fcb0462885a1069ac3b46d153052 100644 (file)
--- a/arch/arm/mach-rockchip/rk3288/Kconfig
+++ b/arch/arm/mach-rockchip/rk3288/Kconfig
@@ -16,6 +16,31 @@ config TARGET_EVB_RK3288
          also includes on-board eMMC and 2GB of SDRAM. Expansion connectors
          provide access to display pins, I2C, SPI, UART and GPIOs.
 
+config TARGET_FENNEC_RK3288
+       bool "Fennec-RK3288"
+       help
+         Fennec is a RK3288-based development board with 2 USB ports,
+         HDMI, micro-SD card, audio, WiFi and Gigabit Ethernet. It also
+         includes on-board eMMC and 2GB of SDRAM. Expansion connectors
+         provide access to display pins, I2C, SPI, UART and GPIOs.
+
+config TARGET_POPMETAL_RK3288
+       bool "PopMetal-RK3288"
+       help
+         PopMetal is a RK3288-based development board with 3 USB host ports,
+         1 micro USB OTG port, HDMI, VGA, micro-SD card, audio, WiFi, Gigabit
+         Ethernet and lots of sensors. It also includes on-board 8 GeMMC and
+         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
@@ -47,12 +72,33 @@ 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_MMC_SUPPORT
+       default y
+
+config SPL_SERIAL_SUPPORT
+       default y
+
+source "board/chipspark/popmetal_rk3288/Kconfig"
 
 source "board/firefly/firefly-rk3288/Kconfig"
 
+source "board/google/chromebook_jerry/Kconfig"
+
 source "board/radxa/rock2/Kconfig"
 
-source "board/evb-rk3288/evb-rk3288/Kconfig"
+source "board/rockchip/evb_rk3288/Kconfig"
+
+source "board/rockchip/fennec_rk3288/Kconfig"
+
+source "board/rockchip/miniarm_rk3288/Kconfig"
 
 endif