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

[oweals/u-boot.git] / arch / arm / mach-imx / mx6 / Kconfig

diff --git a/arch/arm/mach-imx/mx6/Kconfig b/arch/arm/mach-imx/mx6/Kconfig
index d1990602f84ff597c79bef00f5945153f92af0e7..b82db3af22f6dfa33715b6745629fab830fafe3b 100644 (file)
--- a/arch/arm/mach-imx/mx6/Kconfig
+++ b/arch/arm/mach-imx/mx6/Kconfig
@@ -38,7 +38,6 @@ config MX6SL
 config MX6SX
        select ROM_UNIFIED_SECTIONS
        bool
-       imply ENV_IS_IN_MMC
 
 config MX6SLL
        select ROM_UNIFIED_SECTIONS
@@ -130,6 +129,15 @@ config TARGET_COLIBRI_IMX6
        select DM_SERIAL
        select DM_THERMAL
 
+config TARGET_DHCOMIMX6
+       bool "dh_imx6"
+       select BOARD_LATE_INIT
+       select BOARD_EARLY_INIT_F
+       select SUPPORT_SPL
+       select DM
+       select DM_THERMAL
+       imply CMD_SPL
+
 config TARGET_EMBESTMX6BOARDS
        bool "embestmx6boards"
        select BOARD_LATE_INIT
@@ -153,6 +161,7 @@ config TARGET_GW_VENTANA
        bool "gw_ventana"
        select SUPPORT_SPL
        imply CMD_SATA
+       imply CMD_SPL
 
 config TARGET_KOSAGI_NOVENA
        bool "Kosagi Novena"
@@ -307,6 +316,10 @@ config TARGET_MX6ULL_14X14_EVK
 
 config TARGET_NITROGEN6X
        bool "nitrogen6x"
+       imply USB_HOST_ETHER
+       imply USB_ETHER_ASIX
+       imply USB_ETHER_SMSC95XX
+       imply USB_ETHER_MCS7830
 
 config TARGET_OPOS6ULDEV
        bool "Armadeus OPOS6ULDev board"
@@ -424,6 +437,7 @@ source "board/boundary/nitrogen6x/Kconfig"
 source "board/ccv/xpress/Kconfig"
 source "board/compulab/cm_fx6/Kconfig"
 source "board/congatec/cgtqmx6eval/Kconfig"
+source "board/dhelectronics/dh_imx6/Kconfig"
 source "board/el/el6x/Kconfig"
 source "board/embest/mx6boards/Kconfig"
 source "board/engicam/geam6ul/Kconfig"