imx6q: engicam: Use SPL_LOAD_FIT for MMC boards

[people/ms/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 bee7eabe02667833280fb29963a759ae5c515f7d..d4ce38db8d8417415337afb1baadd842b6b01621 100644 (file)
--- a/arch/arm/mach-imx/mx6/Kconfig
+++ b/arch/arm/mach-imx/mx6/Kconfig
@@ -8,34 +8,41 @@ config MX6_SMP
        bool
 
 config MX6
-       select ARM_ERRATA_743622 if !MX6UL
+       select ARM_ERRATA_743622 if !MX6UL && !MX6ULL
+       select GPT_TIMER if !MX6UL && !MX6ULL
        bool
        default y
        imply CMD_FUSE
 
 config MX6D
+       select HAS_CAAM
        select MX6_SMP
        bool
 
 config MX6DL
+       select HAS_CAAM
        select MX6_SMP
        bool
 
 config MX6Q
+       select HAS_CAAM
        select MX6_SMP
        bool
 
 config MX6QDL
+       select HAS_CAAM
        select MX6_SMP
        bool
 
 config MX6S
+       select HAS_CAAM
        bool
 
 config MX6SL
        bool
 
 config MX6SX
+       select HAS_CAAM
        select ROM_UNIFIED_SECTIONS
        bool
 
@@ -44,8 +51,10 @@ config MX6SLL
        bool
 
 config MX6UL
+       select HAS_CAAM
        select SYS_L2CACHE_OFF
        select ROM_UNIFIED_SECTIONS
+       select SYSCOUNTER_TIMER
        bool
 
 config MX6UL_LITESOM
@@ -66,8 +75,10 @@ config MX6UL_OPOS6UL
        select SUPPORT_SPL
 
 config MX6ULL
+       select SYS_L2CACHE_OFF
+       select ROM_UNIFIED_SECTIONS
+       select SYSCOUNTER_TIMER
        bool
-       select MX6UL
 
 config MX6_DDRCAL
        bool "Include dynamic DDR calibration routines"
@@ -119,6 +130,7 @@ config TARGET_CM_FX6
        bool "CM-FX6"
        select SUPPORT_SPL
        select MX6QDL
+       select BOARD_LATE_INIT
        select DM
        select DM_SERIAL
        select DM_GPIO
@@ -202,6 +214,14 @@ config TARGET_MX6LOGICPD
        select DM_REGULATOR
        select OF_CONTROL
 
+config TARGET_MX6MEMCAL
+       bool "mx6memcal"
+       select SUPPORT_SPL
+       help
+         The mx6memcal board is a virtual board that can be used to validate
+         and characterize the memory layout of a new design during the initial
+         development and pre-production stages.
+
 config TARGET_MX6QARM2
        bool "mx6qarm2"
 
@@ -218,7 +238,6 @@ config TARGET_MX6Q_ENGICAM
        select DM_MMC
        select DM_THERMAL
        select SUPPORT_SPL
-       select SPL_LOAD_FIT
        select SPL_DM if SPL
        select SPL_OF_CONTROL if SPL
        select SPL_SEPARATE_BSS if SPL
@@ -244,6 +263,7 @@ config TARGET_MX6SABRESD
 
 config TARGET_MX6SLEVK
        bool "mx6slevk"
+       select MX6SL
        select SUPPORT_SPL
 
 config TARGET_MX6SLLEVK
@@ -255,6 +275,7 @@ config TARGET_MX6SLLEVK
 
 config TARGET_MX6SXSABRESD
        bool "mx6sxsabresd"
+       select BOARD_LATE_INIT
        select MX6SX
        select SUPPORT_SPL
        select DM
@@ -356,6 +377,10 @@ config TARGET_PFLA02
 config TARGET_SECOMX6
        bool "secomx6 boards"
 
+config TARGET_SKSIMX6
+       bool "sks-imx6"
+       select SUPPORT_SPL
+
 config TARGET_TBS2910
        bool "TBS2910 Matrix ARM mini PC"
 
@@ -395,6 +420,7 @@ config TARGET_WANDBOARD
 
 config TARGET_WARP
        bool "WaRP"
+       select MX6SL
        select BOARD_LATE_INIT
 
 config TARGET_XPRESS
@@ -441,6 +467,7 @@ source "board/embest/mx6boards/Kconfig"
 source "board/engicam/imx6q/Kconfig"
 source "board/engicam/imx6ul/Kconfig"
 source "board/freescale/mx6qarm2/Kconfig"
+source "board/freescale/mx6memcal/Kconfig"
 source "board/freescale/mx6sabreauto/Kconfig"
 source "board/freescale/mx6sabresd/Kconfig"
 source "board/freescale/mx6slevk/Kconfig"
@@ -459,6 +486,7 @@ source "board/liebherr/display5/Kconfig"
 source "board/liebherr/mccmon6/Kconfig"
 source "board/logicpd/imx6/Kconfig"
 source "board/seco/Kconfig"
+source "board/sks-kinkel/sksimx6/Kconfig"
 source "board/solidrun/mx6cuboxi/Kconfig"
 source "board/technexion/pico-imx6ul/Kconfig"
 source "board/tbs/tbs2910/Kconfig"