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 9bae748c674bf5ffc38c04d5b38a8180d2839713..d4ce38db8d8417415337afb1baadd842b6b01621 100644 (file)
--- a/arch/arm/mach-imx/mx6/Kconfig
+++ b/arch/arm/mach-imx/mx6/Kconfig
@@ -1,44 +1,60 @@
 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 && !MX6ULL
+       select GPT_TIMER if !MX6UL && !MX6ULL
        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 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
-       imply ENV_IS_IN_MMC
 
 config MX6SLL
        select ROM_UNIFIED_SECTIONS
        bool
 
 config MX6UL
+       select HAS_CAAM
        select SYS_L2CACHE_OFF
        select ROM_UNIFIED_SECTIONS
+       select SYSCOUNTER_TIMER
        bool
 
 config MX6UL_LITESOM
@@ -59,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"
@@ -102,6 +120,7 @@ config TARGET_ARISTAINETOS2B
 
 config TARGET_CGTQMX6EVAL
        bool "cgtqmx6eval"
+       select MX6QDL
        select BOARD_LATE_INIT
        select SUPPORT_SPL
        select DM
@@ -110,6 +129,8 @@ config TARGET_CGTQMX6EVAL
 config TARGET_CM_FX6
        bool "CM-FX6"
        select SUPPORT_SPL
+       select MX6QDL
+       select BOARD_LATE_INIT
        select DM
        select DM_SERIAL
        select DM_GPIO
@@ -122,6 +143,22 @@ config TARGET_COLIBRI_IMX6
        select DM_SERIAL
        select DM_THERMAL
 
+config TARGET_DHCOMIMX6
+       bool "dh_imx6"
+       select MX6QDL
+       select BOARD_LATE_INIT
+       select BOARD_EARLY_INIT_F
+       select SUPPORT_SPL
+       select DM
+       select DM_THERMAL
+       imply CMD_SPL
+
+config TARGET_DISPLAY5
+       bool "LWN DISPLAY5 board"
+       select SUPPORT_SPL
+       select DM
+       select DM_SERIAL
+
 config TARGET_EMBESTMX6BOARDS
        bool "embestmx6boards"
        select BOARD_LATE_INIT
@@ -143,6 +180,7 @@ config TARGET_GE_B850V3
 
 config TARGET_GW_VENTANA
        bool "gw_ventana"
+       select MX6QDL
        select SUPPORT_SPL
        imply CMD_SATA
        imply CMD_SPL
@@ -154,10 +192,12 @@ config TARGET_KOSAGI_NOVENA
 
 config TARGET_MCCMON6
        bool "mccmon6"
+       select MX6QDL
        select SUPPORT_SPL
 
 config TARGET_MX6CUBOXI
        bool "Solid-run mx6 boards"
+       select MX6QDL
        select BOARD_LATE_INIT
        select SUPPORT_SPL
 
@@ -174,11 +214,19 @@ 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"
 
-config TARGET_MX6Q_ICORE
-       bool "Support Engicam i.Core"
+config TARGET_MX6Q_ENGICAM
+       bool "Support Engicam i.Core(RQS)"
        select BOARD_LATE_INIT
        select MX6QDL
        select OF_CONTROL
@@ -190,25 +238,14 @@ config TARGET_MX6Q_ICORE
        select DM_MMC
        select DM_THERMAL
        select SUPPORT_SPL
-       select SPL_LOAD_FIT
-
-config TARGET_MX6Q_ICORE_RQS
-       bool "Support Engicam i.Core RQS"
-       select BOARD_LATE_INIT
-       select MX6QDL
-       select OF_CONTROL
-       select SPL_OF_LIBFDT
-       select DM
-       select DM_ETH
-       select DM_GPIO
-       select DM_I2C
-       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
+       select SPL_PINCTRL if SPL
 
 config TARGET_MX6SABREAUTO
        bool "mx6sabreauto"
+       select MX6QDL
        select BOARD_LATE_INIT
        select SUPPORT_SPL
        select DM
@@ -217,6 +254,7 @@ config TARGET_MX6SABREAUTO
 
 config TARGET_MX6SABRESD
        bool "mx6sabresd"
+       select MX6QDL
        select BOARD_LATE_INIT
        select SUPPORT_SPL
        select DM
@@ -225,6 +263,7 @@ config TARGET_MX6SABRESD
 
 config TARGET_MX6SLEVK
        bool "mx6slevk"
+       select MX6SL
        select SUPPORT_SPL
 
 config TARGET_MX6SLLEVK
@@ -236,6 +275,7 @@ config TARGET_MX6SLLEVK
 
 config TARGET_MX6SXSABRESD
        bool "mx6sxsabresd"
+       select BOARD_LATE_INIT
        select MX6SX
        select SUPPORT_SPL
        select DM
@@ -266,20 +306,8 @@ config TARGET_MX6UL_14X14_EVK
        select DM_THERMAL
        select SUPPORT_SPL
 
-config TARGET_MX6UL_GEAM
-       bool "Support Engicam GEAM6UL"
-       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_MX6UL_ISIOT
-       bool "Support Engicam Is.IoT MX6UL"
+config TARGET_MX6UL_ENGICAM
+       bool "Support Engicam GEAM6UL/Is.IoT"
        select BOARD_LATE_INIT
        select MX6UL
        select OF_CONTROL
@@ -290,6 +318,10 @@ config TARGET_MX6UL_ISIOT
        select DM_MMC
        select DM_THERMAL
        select SUPPORT_SPL
+       select SPL_DM if SPL
+       select SPL_OF_CONTROL if SPL
+       select SPL_SEPARATE_BSS if SPL
+       select SPL_PINCTRL if SPL
 
 config TARGET_MX6ULL_14X14_EVK
        bool "Support mx6ull_14x14_evk"
@@ -300,6 +332,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"
@@ -332,9 +368,19 @@ config TARGET_PCM058
        select BOARD_LATE_INIT
        select SUPPORT_SPL
 
+config TARGET_PFLA02
+       bool "Phytec PFLA02 (PhyFlex) i.MX6 Quad"
+       select MX6QDL
+       select BOARD_LATE_INIT
+       select SUPPORT_SPL
+
 config TARGET_SECOMX6
        bool "secomx6 boards"
 
+config TARGET_SKSIMX6
+       bool "sks-imx6"
+       select SUPPORT_SPL
+
 config TARGET_TBS2910
        bool "TBS2910 Matrix ARM mini PC"
 
@@ -347,6 +393,7 @@ config TARGET_TQMA6
 
 config TARGET_UDOO
        bool "udoo"
+       select MX6QDL
        select BOARD_LATE_INIT
        select SUPPORT_SPL
 
@@ -367,11 +414,13 @@ config TARGET_SAMTEC_VINING_2000
 
 config TARGET_WANDBOARD
        bool "wandboard"
+       select MX6QDL
        select BOARD_LATE_INIT
        select SUPPORT_SPL
 
 config TARGET_WARP
        bool "WaRP"
+       select MX6SL
        select BOARD_LATE_INIT
 
 config TARGET_XPRESS
@@ -412,13 +461,13 @@ 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"
-source "board/engicam/icorem6/Kconfig"
-source "board/engicam/icorem6_rqs/Kconfig"
-source "board/engicam/isiotmx6ul/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"
@@ -429,12 +478,15 @@ source "board/freescale/mx6ul_14x14_evk/Kconfig"
 source "board/freescale/mx6ullevk/Kconfig"
 source "board/grinn/liteboard/Kconfig"
 source "board/phytec/pcm058/Kconfig"
+source "board/phytec/pfla02/Kconfig"
 source "board/gateworks/gw_ventana/Kconfig"
 source "board/kosagi/novena/Kconfig"
 source "board/samtec/vining_2000/Kconfig"
+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"