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>
master
Tuomas Tynkkynen 7 years ago committed by Tom Rini
parent ac2e33efda
commit c88ecf47bd
  1. 6
      arch/powerpc/cpu/mpc85xx/Kconfig
  2. 6
      drivers/ata/Kconfig
  3. 1
      include/configs/P4080DS.h
  4. 1
      include/configs/UCP1020.h
  5. 1
      include/configs/p1_p2_rdb_pc.h
  6. 1
      scripts/config_whitelist.txt

@ -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

@ -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

@ -12,7 +12,6 @@
#define CONFIG_PCIE3
#define CONFIG_SATA_SIL
#define CONFIG_SYS_SATA_MAX_DEVICE 2
#define CONFIG_LIBATA
#define CONFIG_LBA48

@ -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

@ -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

@ -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

Loading…
Cancel
Save