ata: Migrate CONFIG_FSL_SATA 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>
This commit is contained in:
Tuomas Tynkkynen 2017-12-08 15:36:17 +02:00 committed by Tom Rini
parent ad0ac54361
commit 9920d151c4
26 changed files with 24 additions and 20 deletions

View File

@ -55,6 +55,7 @@ config TARGET_MPC837XEMDS
bool "Support MPC837XEMDS"
select BOARD_EARLY_INIT_F
imply CMD_SATA
imply FSL_SATA
config TARGET_MPC837XERDB
bool "Support MPC837XERDB"

View File

@ -92,6 +92,7 @@ config TARGET_MPC8536DS
# Use DDR3 controller with DDR2 DIMMs on this board
select SYS_FSL_DDRC_GEN3
imply CMD_SATA
imply FSL_SATA
config TARGET_MPC8541CDS
bool "Support MPC8541CDS"
@ -148,6 +149,7 @@ config TARGET_P1022DS
select SUPPORT_SPL
select SUPPORT_TPL
imply CMD_SATA
imply FSL_SATA
config TARGET_P1023RDB
bool "Support P1023RDB"
@ -230,6 +232,7 @@ config TARGET_P2041RDB
select BOARD_LATE_INIT if CHAIN_OF_TRUST
select PHYS_64BIT
imply CMD_SATA
imply FSL_SATA
config TARGET_QEMU_PPCE500
bool "Support qemu-ppce500"
@ -244,6 +247,7 @@ config TARGET_T1024QDS
select PHYS_64BIT
imply CMD_EEPROM
imply CMD_SATA
imply FSL_SATA
config TARGET_T1023RDB
bool "Support T1023RDB"
@ -642,6 +646,7 @@ config ARCH_P1010
imply CMD_SATA
imply CMD_PCI
imply CMD_REGINFO
imply FSL_SATA
config ARCH_P1011
bool
@ -826,6 +831,7 @@ config ARCH_P3041
imply CMD_NAND
imply CMD_SATA
imply CMD_REGINFO
imply FSL_SATA
config ARCH_P4080
bool
@ -887,6 +893,7 @@ config ARCH_P5020
select FSL_ELBC
imply CMD_SATA
imply CMD_REGINFO
imply FSL_SATA
config ARCH_P5040
bool
@ -910,6 +917,7 @@ config ARCH_P5040
select FSL_ELBC
imply CMD_SATA
imply CMD_REGINFO
imply FSL_SATA
config ARCH_QEMU_E500
bool
@ -976,6 +984,7 @@ config ARCH_T1040
imply CMD_NAND
imply CMD_SATA
imply CMD_REGINFO
imply FSL_SATA
config ARCH_T1042
bool
@ -998,6 +1007,7 @@ config ARCH_T1042
imply CMD_NAND
imply CMD_SATA
imply CMD_REGINFO
imply FSL_SATA
config ARCH_T2080
bool
@ -1023,6 +1033,7 @@ config ARCH_T2080
imply CMD_SATA
imply CMD_NAND
imply CMD_REGINFO
imply FSL_SATA
config ARCH_T2081
bool
@ -1069,6 +1080,7 @@ config ARCH_T4160
imply CMD_SATA
imply CMD_NAND
imply CMD_REGINFO
imply FSL_SATA
config ARCH_T4240
bool
@ -1096,6 +1108,7 @@ config ARCH_T4240
imply CMD_SATA
imply CMD_NAND
imply CMD_REGINFO
imply FSL_SATA
config BOOKE
bool

View File

@ -19,6 +19,7 @@ CONFIG_CMD_EXT2=y
CONFIG_CMD_MTDPARTS=y
CONFIG_MTDIDS_DEFAULT="nand0=e0600000.flash"
CONFIG_MTDPARTS_DEFAULT="mtdparts=e0600000.flash:512k(uboot),128k(env),6m@1m(kernel),-(fs)"
CONFIG_FSL_SATA=y
# CONFIG_MMC is not set
CONFIG_MTD_NOR_FLASH=y
CONFIG_PHYLIB=y

View File

@ -17,6 +17,7 @@ CONFIG_CMD_PING=y
CONFIG_CMD_DATE=y
CONFIG_CMD_EXT2=y
CONFIG_CMD_FAT=y
CONFIG_FSL_SATA=y
CONFIG_MTD_NOR_FLASH=y
CONFIG_PHYLIB=y
CONFIG_SYS_NS16550=y

View File

@ -32,6 +32,7 @@ CONFIG_CMD_EXT2=y
CONFIG_CMD_FAT=y
CONFIG_ENV_IS_IN_MMC=y
CONFIG_DM=y
CONFIG_FSL_SATA=y
CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_STMICRO=y
CONFIG_PHYLIB=y

View File

@ -32,6 +32,7 @@ CONFIG_CMD_EXT2=y
CONFIG_CMD_FAT=y
CONFIG_ENV_IS_IN_MMC=y
CONFIG_DM=y
CONFIG_FSL_SATA=y
CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_STMICRO=y
CONFIG_PHYLIB=y

View File

@ -47,6 +47,12 @@ config DWC_AHCI
Enable this driver to support Sata devices through
Synopsys DWC AHCI module.
config FSL_SATA
bool "Enable Freescale SATA controller driver support"
help
Enable this driver to support the SATA controller found in
some Freescale PowerPC SoCs.
config SATA_MV
bool "Enable Marvell SATA controller driver support"
help

View File

@ -396,7 +396,6 @@
* SATA
*/
#define CONFIG_LIBATA
#define CONFIG_FSL_SATA
#define CONFIG_SYS_SATA_MAX_DEVICE 2
#define CONFIG_SATA1

View File

@ -421,7 +421,6 @@ extern int board_pci_host_broken(void);
* SATA
*/
#define CONFIG_LIBATA
#define CONFIG_FSL_SATA
#define CONFIG_SYS_SATA_MAX_DEVICE 2
#define CONFIG_SATA1

View File

@ -435,7 +435,6 @@
* SATA
*/
#define CONFIG_LIBATA
#define CONFIG_FSL_SATA
#define CONFIG_SYS_SATA_MAX_DEVICE 2
#define CONFIG_SATA1

View File

@ -509,7 +509,6 @@
/* SATA */
#define CONFIG_LIBATA
#define CONFIG_FSL_SATA
#define CONFIG_SYS_SATA_MAX_DEVICE 2
#define CONFIG_SATA1

View File

@ -634,7 +634,6 @@ extern unsigned long get_sdram_size(void);
#endif /* CONFIG_TSEC_ENET */
/* SATA */
#define CONFIG_FSL_SATA
#define CONFIG_FSL_SATA_V2
#define CONFIG_LIBATA

View File

@ -483,7 +483,6 @@
/* SATA */
#define CONFIG_LIBATA
#define CONFIG_FSL_SATA
#define CONFIG_FSL_SATA_V2
#define CONFIG_SYS_SATA_MAX_DEVICE 2

View File

@ -527,7 +527,6 @@ unsigned long get_board_sys_clk(unsigned long dummy);
#define CONFIG_FSL_SATA_V2
#ifdef CONFIG_FSL_SATA_V2
#define CONFIG_FSL_SATA
#define CONFIG_LIBATA
#define CONFIG_SYS_SATA_MAX_DEVICE 2

View File

@ -616,7 +616,6 @@ unsigned long get_board_ddr_clk(void);
#define CONFIG_FSL_SATA_V2
#ifdef CONFIG_FSL_SATA_V2
#define CONFIG_LIBATA
#define CONFIG_FSL_SATA
#define CONFIG_SYS_SATA_MAX_DEVICE 1
#define CONFIG_SATA1
#define CONFIG_SYS_SATA1 CONFIG_SYS_MPC85xx_SATA1_ADDR

View File

@ -501,7 +501,6 @@ unsigned long get_board_ddr_clk(void);
#define CONFIG_FSL_SATA_V2
#ifdef CONFIG_FSL_SATA_V2
#define CONFIG_LIBATA
#define CONFIG_FSL_SATA
#define CONFIG_SYS_SATA_MAX_DEVICE 2
#define CONFIG_SATA1

View File

@ -615,7 +615,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg
#define CONFIG_FSL_SATA_V2
#ifdef CONFIG_FSL_SATA_V2
#define CONFIG_LIBATA
#define CONFIG_FSL_SATA
#define CONFIG_SYS_SATA_MAX_DEVICE 1
#define CONFIG_SATA1

View File

@ -679,7 +679,6 @@ unsigned long get_board_ddr_clk(void);
*/
#ifdef CONFIG_FSL_SATA_V2
#define CONFIG_LIBATA
#define CONFIG_FSL_SATA
#define CONFIG_SYS_SATA_MAX_DEVICE 2
#define CONFIG_SATA1
#define CONFIG_SYS_SATA1 CONFIG_SYS_MPC85xx_SATA1_ADDR

View File

@ -629,7 +629,6 @@ unsigned long get_board_ddr_clk(void);
*/
#ifdef CONFIG_FSL_SATA_V2
#define CONFIG_LIBATA
#define CONFIG_FSL_SATA
#define CONFIG_SYS_SATA_MAX_DEVICE 2
#define CONFIG_SATA1
#define CONFIG_SYS_SATA1 CONFIG_SYS_MPC85xx_SATA1_ADDR

View File

@ -469,7 +469,6 @@ unsigned long get_board_ddr_clk(void);
/* SATA */
#ifdef CONFIG_FSL_SATA_V2
#define CONFIG_LIBATA
#define CONFIG_FSL_SATA
#define CONFIG_SYS_SATA_MAX_DEVICE 2
#define CONFIG_SATA1

View File

@ -241,7 +241,6 @@
/* SATA */
#ifdef CONFIG_FSL_SATA_V2
#define CONFIG_LIBATA
#define CONFIG_FSL_SATA
#define CONFIG_SYS_SATA_MAX_DEVICE 2
#define CONFIG_SATA1
@ -636,7 +635,6 @@ unsigned long get_board_ddr_clk(void);
/* SATA */
#ifdef CONFIG_FSL_SATA_V2
#define CONFIG_LIBATA
#define CONFIG_FSL_SATA
#define CONFIG_SYS_SATA_MAX_DEVICE 2
#define CONFIG_SATA1

View File

@ -248,7 +248,6 @@
#define CONFIG_LIBATA
#define CONFIG_LBA48
#define CONFIG_FSL_SATA
#define CONFIG_SYS_SATA_MAX_DEVICE 2
#define CONFIG_SATA1
#define CONFIG_SYS_SATA1 CONFIG_SYS_MPC85xx_SATA1_ADDR

View File

@ -542,7 +542,6 @@
/* SATA */
#ifdef CONFIG_FSL_SATA_V2
#define CONFIG_LIBATA
#define CONFIG_FSL_SATA
#define CONFIG_SYS_SATA_MAX_DEVICE 2
#define CONFIG_SATA1

View File

@ -377,7 +377,6 @@
/* SATA */
#ifdef CONFIG_FSL_SATA_V2
#define CONFIG_LIBATA
#define CONFIG_FSL_SATA
#define CONFIG_SYS_SATA_MAX_DEVICE 2
#define CONFIG_SATA1

View File

@ -210,7 +210,6 @@
/* SATA */
#ifdef CONFIG_FSL_SATA_V2
#define CONFIG_LIBATA
#define CONFIG_FSL_SATA
#define CONFIG_SYS_SATA_MAX_DEVICE 2
#define CONFIG_SATA1

View File

@ -754,7 +754,6 @@ CONFIG_FSL_PMIC_MODE
CONFIG_FSL_QIXIS
CONFIG_FSL_QIXIS_CLOCK_MEASUREMENT
CONFIG_FSL_QIXIS_V2
CONFIG_FSL_SATA
CONFIG_FSL_SATA_V2
CONFIG_FSL_SDHC_V2_3
CONFIG_FSL_SDRAM_TYPE