Merge tag 'u-boot-amlogic-20190704' of https://gitlab.denx.de/u-boot/custodians/u...

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

diff --git a/arch/arm/mach-imx/mx7/Kconfig b/arch/arm/mach-imx/mx7/Kconfig
index 365501d5187e94249ef77d2d4375722454a18e7b..232f33285d400a0fc57a23c8d1eb89d162b75955 100644 (file)
--- a/arch/arm/mach-imx/mx7/Kconfig
+++ b/arch/arm/mach-imx/mx7/Kconfig
@@ -2,17 +2,19 @@ if ARCH_MX7
 
 config MX7
        bool
-       select ROM_UNIFIED_SECTIONS
-       select CPU_V7_HAS_VIRT
-       select CPU_V7_HAS_NONSEC
+       default y
        select ARCH_SUPPORT_PSCI
+       select CPU_V7_HAS_NONSEC
+       select CPU_V7_HAS_VIRT
+       select ROM_UNIFIED_SECTIONS
+       select SYSCOUNTER_TIMER
        imply CMD_FUSE
-       default y
 
 config MX7D
+       bool
+       select HAS_CAAM
        select ROM_UNIFIED_SECTIONS
        imply CMD_FUSE
-       bool
 
 choice
        prompt "MX7 board select"
@@ -20,38 +22,43 @@ choice
 
 config TARGET_CL_SOM_IMX7
        bool "CL-SOM-iMX7"
-       select MX7D
        select DM
        select DM_THERMAL
+       select MX7D
        select SUPPORT_SPL
+       imply CMD_DM
 
 config TARGET_MX7DSABRESD
        bool "mx7dsabresd"
        select BOARD_LATE_INIT
-       select MX7D
        select DM
        select DM_THERMAL
+       select MX7D
+       imply CMD_DM
 
 config TARGET_PICO_IMX7D
        bool "pico-imx7d"
        select BOARD_LATE_INIT
-       select MX7D
        select DM
        select DM_THERMAL
+       select MX7D
+       select SUPPORT_SPL
+       imply CMD_DM
 
 config TARGET_WARP7
        bool "warp7"
        select BOARD_LATE_INIT
-       select MX7D
        select DM
        select DM_THERMAL
+       select MX7D
+       imply CMD_DM
 
 config TARGET_COLIBRI_IMX7
        bool "Support Colibri iMX7S/iMX7D modules"
-       select BOARD_LATE_INIT
        select DM
        select DM_SERIAL
        select DM_THERMAL
+       imply CMD_DM
 
 endchoice