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

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

diff --git a/arch/arm/cpu/armv7/mx6/Kconfig b/arch/arm/cpu/armv7/mx6/Kconfig
index 19cc1f671f57f1b70d7f65ce76501c5b9a365ee7..af6dad3aa938a119ba16ab91df3ef44a82055a7b 100644 (file)
--- a/arch/arm/cpu/armv7/mx6/Kconfig
+++ b/arch/arm/cpu/armv7/mx6/Kconfig
@@ -3,6 +3,10 @@ if ARCH_MX6
 config MX6
        bool
        default y
+       select ARM_ERRATA_743622 if !MX6UL
+       select ARM_ERRATA_751472 if !MX6UL
+       select ARM_ERRATA_761320 if !MX6UL
+       select ARM_ERRATA_794072 if !MX6UL
 
 config MX6D
        bool
@@ -42,6 +46,16 @@ config MX6UL_LITESOM
        select DM_THERMAL
        select SUPPORT_SPL
 
+config MX6UL_OPOS6UL
+       bool
+       select MX6UL
+       select BOARD_LATE_INIT
+       select DM
+       select DM_GPIO
+       select DM_MMC
+       select DM_THERMAL
+       select SUPPORT_SPL
+
 config MX6ULL
        bool
        select MX6UL
@@ -141,6 +155,19 @@ config TARGET_MX6CUBOXI
        select BOARD_LATE_INIT
        select SUPPORT_SPL
 
+config TARGET_MX6LOGICPD
+       bool "Logic PD i.MX6 SOM"
+       select BOARD_EARLY_INIT_F
+       select BOARD_LATE_INIT
+       select DM
+       select DM_ETH
+       select DM_GPIO
+       select DM_I2C
+       select DM_MMC
+       select DM_PMIC
+       select DM_REGULATOR
+       select OF_CONTROL
+
 config TARGET_MX6QARM2
        bool "mx6qarm2"
 
@@ -158,6 +185,7 @@ config TARGET_MX6Q_ICORE
 
 config TARGET_MX6Q_ICORE_RQS
        bool "Support Engicam i.Core RQS"
+       select BOARD_LATE_INIT
        select MX6QDL
        select OF_CONTROL
        select DM
@@ -237,6 +265,18 @@ config TARGET_MX6UL_GEAM
        select DM_MMC
        select DM_THERMAL
        select SUPPORT_SPL
+config TARGET_MX6UL_ISIOT
+       bool "Support Engicam Is.IoT MX6UL"
+       select BOARD_LATE_INIT
+       select MX6UL
+       select OF_CONTROL
+       select DM
+       select DM_ETH
+       select DM_GPIO
+       select DM_I2C
+       select DM_MMC
+       select DM_THERMAL
+       select SUPPORT_SPL
 
 config TARGET_MX6ULL_14X14_EVK
        bool "Support mx6ull_14x14_evk"
@@ -248,6 +288,10 @@ config TARGET_MX6ULL_14X14_EVK
 config TARGET_NITROGEN6X
        bool "nitrogen6x"
 
+config TARGET_OPOS6ULDEV
+       bool "Armadeus OPOS6ULDev board"
+       select MX6UL_OPOS6UL
+
 config TARGET_OT1200
        bool "Bachmann OT1200"
        select SUPPORT_SPL
@@ -346,6 +390,7 @@ config SYS_SOC
 source "board/ge/bx50v3/Kconfig"
 source "board/advantech/dms-ba16/Kconfig"
 source "board/aristainetos/Kconfig"
+source "board/armadeus/opos6uldev/Kconfig"
 source "board/bachmann/ot1200/Kconfig"
 source "board/barco/platinum/Kconfig"
 source "board/barco/titanium/Kconfig"
@@ -358,6 +403,7 @@ source "board/embest/mx6boards/Kconfig"
 source "board/engicam/geam6ul/Kconfig"
 source "board/engicam/icorem6/Kconfig"
 source "board/engicam/icorem6_rqs/Kconfig"
+source "board/engicam/isiotmx6ul/Kconfig"
 source "board/freescale/mx6qarm2/Kconfig"
 source "board/freescale/mx6qsabreauto/Kconfig"
 source "board/freescale/mx6sabresd/Kconfig"
@@ -373,6 +419,7 @@ source "board/gateworks/gw_ventana/Kconfig"
 source "board/kosagi/novena/Kconfig"
 source "board/samtec/vining_2000/Kconfig"
 source "board/liebherr/mccmon6/Kconfig"
+source "board/logicpd/imx6/Kconfig"
 source "board/seco/Kconfig"
 source "board/solidrun/mx6cuboxi/Kconfig"
 source "board/technexion/pico-imx6ul/Kconfig"