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 4214ab5dc61286bce7c11197e18cf3732b76736a..8c96ba37c39ec3aa84719538dda01f7d53d8a758 100644 (file)
--- a/arch/arm/cpu/armv7/mx6/Kconfig
+++ b/arch/arm/cpu/armv7/mx6/Kconfig
@@ -31,6 +31,18 @@ config MX6UL
        select ROM_UNIFIED_SECTIONS
        bool
 
+config MX6ULL
+       bool
+       select MX6UL
+
+config MX6_DDRCAL
+       bool "Include dynamic DDR calibration routines"
+       depends on SPL
+       default n
+       help
+         Say "Y" if your board uses dynamic (per-boot) DDR calibration.
+         If unsure, say N.
+
 choice
        prompt "MX6 board select"
        optional
@@ -91,6 +103,16 @@ config TARGET_MX6CUBOXI
 config TARGET_MX6QARM2
        bool "mx6qarm2"
 
+config TARGET_MX6Q_ICORE
+       bool "Support Engicam i.Core"
+       select MX6QDL
+       select OF_CONTROL
+       select DM
+       select DM_GPIO
+       select DM_MMC
+       select DM_THERMAL
+       select SUPPORT_SPL
+
 config TARGET_MX6QSABREAUTO
        bool "mx6qsabreauto"
        select DM
@@ -133,6 +155,12 @@ config TARGET_MX6UL_14X14_EVK
        select DM_THERMAL
        select SUPPORT_SPL
 
+config TARGET_MX6ULL_14X14_EVK
+       bool "Support mx6ull_14x14_evk"
+       select MX6ULL
+       select DM
+       select DM_THERMAL
+
 config TARGET_NITROGEN6X
        bool "nitrogen6x"
 
@@ -172,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
@@ -215,6 +253,7 @@ source "board/compulab/cm_fx6/Kconfig"
 source "board/congatec/cgtqmx6eval/Kconfig"
 source "board/el/el6x/Kconfig"
 source "board/embest/mx6boards/Kconfig"
+source "board/engicam/icorem6/Kconfig"
 source "board/freescale/mx6qarm2/Kconfig"
 source "board/freescale/mx6qsabreauto/Kconfig"
 source "board/freescale/mx6sabresd/Kconfig"
@@ -222,15 +261,18 @@ source "board/freescale/mx6slevk/Kconfig"
 source "board/freescale/mx6sxsabresd/Kconfig"
 source "board/freescale/mx6sxsabreauto/Kconfig"
 source "board/freescale/mx6ul_14x14_evk/Kconfig"
+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"