diff options
| author | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2017-12-08 15:36:14 +0200 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-12-12 14:05:48 -0500 |
| commit | c88ecf47bdcd0af21b23a3317116bcd956f1e775 (patch) | |
| tree | 3435e5d3674ed25a62c606b2552db8f2ae0329a0 | |
| parent | ac2e33efdaee4ef9a5f8dace42f1e6cc321a4fab (diff) | |
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>
| -rw-r--r-- | arch/powerpc/cpu/mpc85xx/Kconfig | 6 | ||||
| -rw-r--r-- | drivers/ata/Kconfig | 6 | ||||
| -rw-r--r-- | include/configs/P4080DS.h | 1 | ||||
| -rw-r--r-- | include/configs/UCP1020.h | 1 | ||||
| -rw-r--r-- | include/configs/p1_p2_rdb_pc.h | 1 | ||||
| -rw-r--r-- | scripts/config_whitelist.txt | 1 |
6 files changed, 12 insertions, 4 deletions
diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig index 92187d371b..1b0e3d3a2f 100644 --- 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 803064aaf1..617c80f011 100644 --- 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 f192181c08..8b884411ac 100644 --- 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 902abc48ce..455298751c 100644 --- 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 c51ca27502..07a75b9a1e 100644 --- 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 d5ae1f4685..53f0857d73 100644 --- 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 |