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 <[email protected]>
matwey · Dec 12, 2017 · 9920d15 · 9920d15
1 parent ad0ac54
commit 9920d15
Show file tree

Hide file tree

Showing 26 changed files with 24 additions and 20 deletions.
diff --git a/arch/powerpc/cpu/mpc83xx/Kconfig b/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 a/arch/powerpc/cpu/mpc85xx/Kconfig b/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 a/configs/MPC8315ERDB_defconfig b/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 a/configs/MPC837XERDB_defconfig b/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 a/configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig b/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 a/configs/controlcenterd_36BIT_SDCARD_defconfig b/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 a/drivers/ata/Kconfig b/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 a/include/configs/MPC8315ERDB.h b/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 a/include/configs/MPC837XEMDS.h b/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 a/include/configs/MPC837XERDB.h b/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 a/include/configs/MPC8536DS.h b/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 a/include/configs/P1010RDB.h b/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 a/include/configs/P1022DS.h b/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 a/include/configs/P2041RDB.h b/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 a/include/configs/T102xQDS.h b/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 a/include/configs/T1040QDS.h b/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 a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h
@@ -615,7 +615,6 @@
 #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 a/include/configs/T208xQDS.h b/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 a/include/configs/T208xRDB.h b/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 a/include/configs/T4240QDS.h b/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 a/include/configs/T4240RDB.h b/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 a/include/configs/controlcenterd.h b/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 a/include/configs/corenet_ds.h b/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 a/include/configs/cyrus.h b/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 a/include/configs/t4qds.h b/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 a/scripts/config_whitelist.txt b/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