ata: Migrate CONFIG_SATA_SIL to Kconfig

Use 'imply' here liberally to avoid the combinatorial explosion of
defconfig changes in the PowerPC boards.

Signed-off-by: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>

diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig
index 92187d371be39f0dfbb16ace7577cc3352f1c8cc..1b0e3d3a2ffb5c674aaf7bf1d0ab9b88903108b9 100644 (file)
--- a/arch/powerpc/cpu/mpc85xx/Kconfig
+++ b/arch/powerpc/cpu/mpc85xx/Kconfig
@@ -209,6 +209,7 @@ config TARGET_P1025RDB
        select ARCH_P1025
        imply CMD_EEPROM
        imply CMD_SATA
+       imply SATA_SIL
 
 config TARGET_P2020RDB
        bool "Support P2020RDB-PC"
@@ -217,6 +218,7 @@ config TARGET_P2020RDB
        select ARCH_P2020
        imply CMD_EEPROM
        imply CMD_SATA
+       imply SATA_SIL
 
 config TARGET_P1_TWR
        bool "Support p1_twr"
@@ -672,6 +674,7 @@ config ARCH_P1020
        imply CMD_SATA
        imply CMD_PCI
        imply CMD_REGINFO
+       imply SATA_SIL
 
 config ARCH_P1021
        bool
@@ -690,6 +693,7 @@ config ARCH_P1021
        imply CMD_NAND
        imply CMD_SATA
        imply CMD_REGINFO
+       imply SATA_SIL
 
 config ARCH_P1022
        bool
@@ -737,6 +741,7 @@ config ARCH_P1024
        imply CMD_SATA
        imply CMD_PCI
        imply CMD_REGINFO
+       imply SATA_SIL
 
 config ARCH_P1025
        bool
@@ -858,6 +863,7 @@ config ARCH_P4080
        select FSL_ELBC
        imply CMD_SATA
        imply CMD_REGINFO
+       imply SATA_SIL
 
 config ARCH_P5020
        bool

diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index 803064aaf110a11c8da5e529084839e4f9b7b05b..617c80f01158089173b045364fa89046dcf0ba32 100644 (file)
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -47,4 +47,10 @@ config DWC_AHCI
          Enable this driver to support Sata devices through
          Synopsys DWC AHCI module.
 
+config SATA_SIL
+       bool "Enable Silicon Image SIL3131 / SIL3132 / SIL3124 SATA driver support"
+       help
+         Enable this driver to support the SIL3131, SIL3132 and SIL3124
+         SATA controllers.
+
 endmenu

diff --git a/include/configs/P4080DS.h b/include/configs/P4080DS.h
index f192181c0844c00a44f49eeebcf5d37a74153606..8b884411ac7a4f54bb855a75622205a33eeff731 100644 (file)
--- a/include/configs/P4080DS.h
+++ b/include/configs/P4080DS.h
@@ -12,7 +12,6 @@
 
 #define CONFIG_PCIE3
 
-#define CONFIG_SATA_SIL
 #define CONFIG_SYS_SATA_MAX_DEVICE  2
 #define CONFIG_LIBATA
 #define CONFIG_LBA48

diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h
index 902abc48cecc7fa36055cd2864497209854d8682..455298751c2410621ddf0ea23dc28b29b637fb08 100644 (file)
--- a/include/configs/UCP1020.h
+++ b/include/configs/UCP1020.h
@@ -118,7 +118,6 @@
 
 #define CONFIG_ENV_OVERWRITE
 
-#define CONFIG_SATA_SIL
 #define CONFIG_SYS_SATA_MAX_DEVICE     2
 #define CONFIG_LIBATA
 #define CONFIG_LBA48

diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index c51ca275028658fcc4431b96b138ffb060976359..07a75b9a1e77aae9d6c1c50a48b11b072a9e2b9d 100644 (file)
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -244,7 +244,6 @@
 #define CONFIG_TSEC_ENET       /* tsec ethernet support */
 #define CONFIG_ENV_OVERWRITE
 
-#define CONFIG_SATA_SIL
 #define CONFIG_SYS_SATA_MAX_DEVICE     2
 #define CONFIG_LIBATA
 #define CONFIG_LBA48

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index d5ae1f468552aaafdf4ef9a73b0cee7892827ac8..53f0857d739b3644c73543acc60b41f317e87048 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1904,7 +1904,6 @@ CONFIG_SAR_REG
 CONFIG_SATA1
 CONFIG_SATA2
 CONFIG_SATA_MV
-CONFIG_SATA_SIL
 CONFIG_SATA_SIL3114
 CONFIG_SATA_ULI5288
 CONFIG_SBC8349