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

[oweals/u-boot.git] / arch / arm / cpu / armv7 / mx6 / Kconfig

diff --git a/arch/arm/cpu/armv7/mx6/Kconfig b/arch/arm/cpu/armv7/mx6/Kconfig
index 8b2217edbdabfab04db1614bb10a8fb63e3ae137..8c96ba37c39ec3aa84719538dda01f7d53d8a758 100644 (file)
--- a/arch/arm/cpu/armv7/mx6/Kconfig
+++ b/arch/arm/cpu/armv7/mx6/Kconfig
@@ -200,6 +200,16 @@ config TARGET_UDOO
        bool "udoo"
        select SUPPORT_SPL
 
+config TARGET_UDOO_NEO
+       bool "UDOO Neo"
+       select SUPPORT_SPL
+
+config TARGET_SAMTEC_VINING_2000
+       bool "samtec VIN|ING 2000"
+       select MX6SX
+       select DM
+       select DM_THERMAL
+
 config TARGET_WANDBOARD
        bool "wandboard"
        select SUPPORT_SPL
@@ -255,12 +265,14 @@ source "board/freescale/mx6ullevk/Kconfig"
 source "board/phytec/pcm058/Kconfig"
 source "board/gateworks/gw_ventana/Kconfig"
 source "board/kosagi/novena/Kconfig"
+source "board/samtec/vining_2000/Kconfig"
 source "board/seco/Kconfig"
 source "board/solidrun/mx6cuboxi/Kconfig"
 source "board/technexion/pico-imx6ul/Kconfig"
 source "board/tbs/tbs2910/Kconfig"
 source "board/tqc/tqma6/Kconfig"
 source "board/udoo/Kconfig"
+source "board/udoo/neo/Kconfig"
 source "board/wandboard/Kconfig"
 source "board/warp/Kconfig"