Merge branch '2019-05-28-master-imports'

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

diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig
index aa8c2a41a553e2a3c1a7f9f8c6699e712c8f2e36..1669e62a6d2e3dea7974dd91f421a90e625f03a3 100644 (file)
--- a/arch/arm/mach-sunxi/Kconfig
+++ b/arch/arm/mach-sunxi/Kconfig
@@ -154,8 +154,6 @@ config MACH_SUN4I
        bool "sun4i (Allwinner A10)"
        select CPU_V7A
        select ARM_CORTEX_CPU_IS_UP
-       select DM_MMC if MMC
-       select DM_SCSI if SCSI
        select PHY_SUN4I_USB
        select DRAM_SUN4I
        select SUNXI_GEN_SUN4I
@@ -165,7 +163,6 @@ config MACH_SUN5I
        bool "sun5i (Allwinner A13)"
        select CPU_V7A
        select ARM_CORTEX_CPU_IS_UP
-       select DM_MMC if MMC
        select DRAM_SUN4I
        select PHY_SUN4I_USB
        select SUNXI_GEN_SUN4I
@@ -178,7 +175,6 @@ config MACH_SUN6I
        select CPU_V7_HAS_NONSEC
        select CPU_V7_HAS_VIRT
        select ARCH_SUPPORT_PSCI
-       select DM_MMC if MMC
        select DRAM_SUN6I
        select PHY_SUN4I_USB
        select SUN6I_P2WI
@@ -205,7 +201,6 @@ config MACH_SUN8I_A23
        select CPU_V7_HAS_NONSEC
        select CPU_V7_HAS_VIRT
        select ARCH_SUPPORT_PSCI
-       select DM_MMC if MMC
        select DRAM_SUN8I_A23
        select PHY_SUN4I_USB
        select SUNXI_GEN_SUN6I
@@ -219,7 +214,6 @@ config MACH_SUN8I_A33
        select CPU_V7_HAS_NONSEC
        select CPU_V7_HAS_VIRT
        select ARCH_SUPPORT_PSCI
-       select DM_MMC if MMC
        select DRAM_SUN8I_A33
        select PHY_SUN4I_USB
        select SUNXI_GEN_SUN6I
@@ -230,7 +224,6 @@ config MACH_SUN8I_A33
 config MACH_SUN8I_A83T
        bool "sun8i (Allwinner A83T)"
        select CPU_V7A
-       select DM_MMC if MMC
        select DRAM_SUN8I_A83T
        select PHY_SUN4I_USB
        select SUNXI_GEN_SUN6I
@@ -246,7 +239,6 @@ config MACH_SUN8I_H3
        select ARCH_SUPPORT_PSCI
        select MACH_SUNXI_H3_H5
        select ARMV7_BOOT_SEC_DEFAULT if OLD_SUNXI_KERNEL_COMPAT
-       select DM_MMC if MMC
 
 config MACH_SUN8I_R40
        bool "sun8i (Allwinner R40)"
@@ -265,7 +257,6 @@ config MACH_SUN8I_V3S
        select CPU_V7_HAS_NONSEC
        select CPU_V7_HAS_VIRT
        select ARCH_SUPPORT_PSCI
-       select DM_MMC if MMC
        select SUNXI_GEN_SUN6I
        select SUNXI_DRAM_DW
        select SUNXI_DRAM_DW_16BIT
@@ -280,13 +271,11 @@ config MACH_SUN9I
        select SUNXI_GEN_SUN6I
        select SUN8I_RSB
        select SUPPORT_SPL
-       select DM_MMC if MMC
 
 config MACH_SUN50I
        bool "sun50i (Allwinner A64)"
        select ARM64
        select DM_I2C
-       select DM_MMC if MMC
        select PHY_SUN4I_USB
        select SUN6I_PRCM
        select SUNXI_DE2
@@ -303,7 +292,6 @@ config MACH_SUN50I_H5
        bool "sun50i (Allwinner H5)"
        select ARM64
        select MACH_SUNXI_H3_H5
-       select DM_MMC if MMC
        select FIT
        select SPL_LOAD_FIT
 
@@ -311,7 +299,6 @@ config MACH_SUN50I_H6
        bool "sun50i (Allwinner H6)"
        select ARM64
        select SUPPORT_SPL
-       select DM_MMC if MMC
        select FIT
        select SPL_LOAD_FIT
        select DRAM_SUN50I_H6
@@ -439,6 +426,7 @@ config DRAM_ZQ
 config DRAM_ODT_EN
        bool "sunxi dram odt enable"
        default y if MACH_SUN8I_A23
+       default y if MACH_SUNXI_H3_H5
        default y if MACH_SUN8I_R40
        default y if MACH_SUN50I
        default y if MACH_SUN50I_H6