Merge git://git.denx.de/u-boot-dm

[platform/kernel/u-boot.git] / arch / arm / mach-mvebu / Kconfig

diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig
index 412bda4..3e48d58 100644 (file)
--- a/arch/arm/mach-mvebu/Kconfig
+++ b/arch/arm/mach-mvebu/Kconfig
@@ -57,6 +57,7 @@ config MV78230
 config MV78260
        bool
        select ARMADA_XP
+       imply CMD_SATA
 
 config MV78460
        bool
@@ -74,9 +75,10 @@ config TARGET_CLEARFOG
        bool "Support ClearFog"
        select 88F6820
 
-config TARGET_MVEBU_DB_88F3720
-       bool "Support DB-88F3720 Armada 3720"
+config TARGET_MVEBU_ARMADA_37XX
+       bool "Support Armada 37xx platforms"
        select ARMADA_3700
+       imply SCSI
 
 config TARGET_DB_88F6720
        bool "Support DB-88F6720 Armada 375"
@@ -94,6 +96,7 @@ config TARGET_MVEBU_ARMADA_8K
        bool "Support Armada 7k/8k platforms"
        select ARMADA_8K
        select BOARD_LATE_INIT
+       imply SCSI
 
 config TARGET_DB_MV784MP_GP
        bool "Support db-mv784mp-gp"
@@ -111,12 +114,17 @@ config TARGET_THEADORABLE
        bool "Support theadorable Armada XP"
        select BOARD_LATE_INIT if USB
        select MV78260
+       imply CMD_SATA
+
+config TARGET_CONTROLCENTERDC
+       bool "Support CONTROLCENTERDC"
+       select 88F6820
 
 endchoice
 
 config SYS_BOARD
        default "clearfog" if TARGET_CLEARFOG
-       default "mvebu_db-88f3720" if TARGET_MVEBU_DB_88F3720
+       default "mvebu_armada-37xx" if TARGET_MVEBU_ARMADA_37XX
        default "db-88f6720" if TARGET_DB_88F6720
        default "db-88f6820-gp" if TARGET_DB_88F6820_GP
        default "db-88f6820-amc" if TARGET_DB_88F6820_AMC
@@ -128,7 +136,7 @@ config SYS_BOARD
 
 config SYS_CONFIG_NAME
        default "clearfog" if TARGET_CLEARFOG
-       default "mvebu_db-88f3720" if TARGET_MVEBU_DB_88F3720
+       default "mvebu_armada-37xx" if TARGET_MVEBU_ARMADA_37XX
        default "db-88f6720" if TARGET_DB_88F6720
        default "db-88f6820-gp" if TARGET_DB_88F6820_GP
        default "db-88f6820-amc" if TARGET_DB_88F6820_AMC
@@ -140,7 +148,7 @@ config SYS_CONFIG_NAME
 
 config SYS_VENDOR
        default "Marvell" if TARGET_DB_MV784MP_GP
-       default "Marvell" if TARGET_MVEBU_DB_88F3720
+       default "Marvell" if TARGET_MVEBU_ARMADA_37XX
        default "Marvell" if TARGET_DB_88F6720
        default "Marvell" if TARGET_DB_88F6820_GP
        default "Marvell" if TARGET_DB_88F6820_AMC