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 --- arch/powerpc/cpu/mpc83xx/Kconfig | 1 + arch/powerpc/cpu/mpc85xx/Kconfig | 13 +++++++++++++ configs/MPC8315ERDB_defconfig | 1 + configs/MPC837XERDB_defconfig | 1 + configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig | 1 + configs/controlcenterd_36BIT_SDCARD_defconfig | 1 + drivers/ata/Kconfig | 6 ++++++ include/configs/MPC8315ERDB.h | 1 - include/configs/MPC837XEMDS.h | 1 - include/configs/MPC837XERDB.h | 1 - include/configs/MPC8536DS.h | 1 - include/configs/P1010RDB.h | 1 - include/configs/P1022DS.h | 1 - include/configs/P2041RDB.h | 1 - include/configs/T102xQDS.h | 1 - include/configs/T1040QDS.h | 1 - include/configs/T104xRDB.h | 1 - include/configs/T208xQDS.h | 1 - include/configs/T208xRDB.h | 1 - include/configs/T4240QDS.h | 1 - include/configs/T4240RDB.h | 2 -- include/configs/controlcenterd.h | 1 - include/configs/corenet_ds.h | 1 - include/configs/cyrus.h | 1 - include/configs/t4qds.h | 1 - scripts/config_whitelist.txt | 1 - 26 files changed, 24 insertions(+), 20 deletions(-)
diff --git arch/powerpc/cpu/mpc83xx/Kconfig arch/powerpc/cpu/mpc83xx/Kconfig index a3779734c1..05d29d2fd9 100644 --- arch/powerpc/cpu/mpc83xx/Kconfig +++ arch/powerpc/cpu/mpc83xx/Kconfig @@ -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" diff --git arch/powerpc/cpu/mpc85xx/Kconfig arch/powerpc/cpu/mpc85xx/Kconfig index 1b0e3d3a2f..5df8175f1e 100644 --- arch/powerpc/cpu/mpc85xx/Kconfig +++ arch/powerpc/cpu/mpc85xx/Kconfig @@ -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 diff --git configs/MPC8315ERDB_defconfig configs/MPC8315ERDB_defconfig index fc846b26bd..473b9a6d5a 100644 --- configs/MPC8315ERDB_defconfig +++ configs/MPC8315ERDB_defconfig @@ -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 diff --git configs/MPC837XERDB_defconfig configs/MPC837XERDB_defconfig index 14b7a5a8ba..bc54b3ac52 100644 --- configs/MPC837XERDB_defconfig +++ configs/MPC837XERDB_defconfig @@ -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 diff --git configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig index 48e9f6e920..67fa8e4e87 100644 --- configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig +++ configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig @@ -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 diff --git configs/controlcenterd_36BIT_SDCARD_defconfig configs/controlcenterd_36BIT_SDCARD_defconfig index 58729b62ad..19a4daa2c2 100644 --- configs/controlcenterd_36BIT_SDCARD_defconfig +++ configs/controlcenterd_36BIT_SDCARD_defconfig @@ -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 diff --git drivers/ata/Kconfig drivers/ata/Kconfig index 8dfa4670cc..2eab570b35 100644 --- drivers/ata/Kconfig +++ drivers/ata/Kconfig @@ -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 diff --git include/configs/MPC8315ERDB.h include/configs/MPC8315ERDB.h index b6715418fc..a23c4ef522 100644 --- include/configs/MPC8315ERDB.h +++ include/configs/MPC8315ERDB.h @@ -396,7 +396,6 @@ * SATA */ #define CONFIG_LIBATA -#define CONFIG_FSL_SATA
#define CONFIG_SYS_SATA_MAX_DEVICE 2 #define CONFIG_SATA1 diff --git include/configs/MPC837XEMDS.h include/configs/MPC837XEMDS.h index 264aa90cb3..f0b856c2c8 100644 --- include/configs/MPC837XEMDS.h +++ include/configs/MPC837XEMDS.h @@ -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 diff --git include/configs/MPC837XERDB.h include/configs/MPC837XERDB.h index beec38f934..d865c22644 100644 --- include/configs/MPC837XERDB.h +++ include/configs/MPC837XERDB.h @@ -435,7 +435,6 @@ * SATA */ #define CONFIG_LIBATA -#define CONFIG_FSL_SATA
#define CONFIG_SYS_SATA_MAX_DEVICE 2 #define CONFIG_SATA1 diff --git include/configs/MPC8536DS.h include/configs/MPC8536DS.h index 3319a6f958..d060e8c235 100644 --- include/configs/MPC8536DS.h +++ include/configs/MPC8536DS.h @@ -509,7 +509,6 @@
/* SATA */ #define CONFIG_LIBATA -#define CONFIG_FSL_SATA
#define CONFIG_SYS_SATA_MAX_DEVICE 2 #define CONFIG_SATA1 diff --git include/configs/P1010RDB.h include/configs/P1010RDB.h index cbc15ae4c5..87c8962a9d 100644 --- include/configs/P1010RDB.h +++ include/configs/P1010RDB.h @@ -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
diff --git include/configs/P1022DS.h include/configs/P1022DS.h index 4756a7102d..7d4ac61194 100644 --- include/configs/P1022DS.h +++ include/configs/P1022DS.h @@ -483,7 +483,6 @@
/* SATA */ #define CONFIG_LIBATA -#define CONFIG_FSL_SATA #define CONFIG_FSL_SATA_V2
#define CONFIG_SYS_SATA_MAX_DEVICE 2 diff --git include/configs/P2041RDB.h include/configs/P2041RDB.h index 600823798c..9046567baa 100644 --- include/configs/P2041RDB.h +++ include/configs/P2041RDB.h @@ -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 diff --git include/configs/T102xQDS.h include/configs/T102xQDS.h index 259e8a01f3..974717fde6 100644 --- include/configs/T102xQDS.h +++ include/configs/T102xQDS.h @@ -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 diff --git include/configs/T1040QDS.h include/configs/T1040QDS.h index c694e50c2c..ac3d19301a 100644 --- include/configs/T1040QDS.h +++ include/configs/T1040QDS.h @@ -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 diff --git include/configs/T104xRDB.h include/configs/T104xRDB.h index 2dbeffdd2a..ebcae95722 100644 --- include/configs/T104xRDB.h +++ include/configs/T104xRDB.h @@ -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 diff --git include/configs/T208xQDS.h include/configs/T208xQDS.h index 41926f76e6..b19a677eb9 100644 --- include/configs/T208xQDS.h +++ include/configs/T208xQDS.h @@ -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 diff --git include/configs/T208xRDB.h include/configs/T208xRDB.h index d2ddb17fce..66ce31bc0c 100644 --- include/configs/T208xRDB.h +++ include/configs/T208xRDB.h @@ -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 diff --git include/configs/T4240QDS.h include/configs/T4240QDS.h index 885dc776eb..e2caa02f67 100644 --- include/configs/T4240QDS.h +++ include/configs/T4240QDS.h @@ -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 diff --git include/configs/T4240RDB.h include/configs/T4240RDB.h index 625130aafc..70705a7b49 100644 --- include/configs/T4240RDB.h +++ include/configs/T4240RDB.h @@ -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 diff --git include/configs/controlcenterd.h include/configs/controlcenterd.h index 37c8be48ac..bb038f14c2 100644 --- include/configs/controlcenterd.h +++ include/configs/controlcenterd.h @@ -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 diff --git include/configs/corenet_ds.h include/configs/corenet_ds.h index 0dbf149725..b49b826eb4 100644 --- include/configs/corenet_ds.h +++ include/configs/corenet_ds.h @@ -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 diff --git include/configs/cyrus.h include/configs/cyrus.h index 1b20d85acf..b6597034e2 100644 --- include/configs/cyrus.h +++ include/configs/cyrus.h @@ -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 diff --git include/configs/t4qds.h include/configs/t4qds.h index 4938f43985..07060e6813 100644 --- include/configs/t4qds.h +++ include/configs/t4qds.h @@ -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 diff --git scripts/config_whitelist.txt scripts/config_whitelist.txt index 955369abde..db2e6d28f9 100644 --- scripts/config_whitelist.txt +++ scripts/config_whitelist.txt @@ -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