Merge git://www.denx.de/git/u-boot-imx

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

diff --git a/arch/arm/mach-imx/mx6/Kconfig b/arch/arm/mach-imx/mx6/Kconfig
index 3ffdea20a1c07ae1ead0c6ad4d239e81aebaef2d..a1aa36bc223b8286029f2ddea743e30516ffced2 100644 (file)
--- a/arch/arm/mach-imx/mx6/Kconfig
+++ b/arch/arm/mach-imx/mx6/Kconfig
@@ -1,24 +1,32 @@
 if ARCH_MX6
 
+config MX6_SMP
+       select ARM_ERRATA_751472
+       select ARM_ERRATA_761320
+       select ARM_ERRATA_794072
+       select ARM_ERRATA_845369
+       bool
+
 config MX6
+       select ARM_ERRATA_743622 if !MX6UL
        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
        imply CMD_FUSE
 
 config MX6D
+       select MX6_SMP
        bool
 
 config MX6DL
+       select MX6_SMP
        bool
 
 config MX6Q
+       select MX6_SMP
        bool
 
 config MX6QDL
+       select MX6_SMP
        bool
 
 config MX6S
@@ -30,7 +38,6 @@ config MX6SL
 config MX6SX
        select ROM_UNIFIED_SECTIONS
        bool
-       imply ENV_IS_IN_MMC
 
 config MX6SLL
        select ROM_UNIFIED_SECTIONS
@@ -145,6 +152,7 @@ config TARGET_GW_VENTANA
        bool "gw_ventana"
        select SUPPORT_SPL
        imply CMD_SATA
+       imply CMD_SPL
 
 config TARGET_KOSAGI_NOVENA
        bool "Kosagi Novena"