ata: Migrate CONFIG_SCSI_AHCI to Kconfig

And use 'imply' liberally. Signed-off-by: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
2017-12-08 15:36:19 +02:00
parent 477b16a798
commit 9fd95ef0d3
101 changed files with 74 additions and 41 deletions
--- a/include/configs/MPC8544DS.h
+++ b/include/configs/MPC8544DS.h
@@ -282,7 +282,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 #endif

 #define CONFIG_PCI_SCAN_SHOW		/* show pci devices on startup */
-#define CONFIG_SCSI_AHCI

 #ifdef CONFIG_SCSI_AHCI
 #define CONFIG_LIBATA
--- a/include/configs/MPC8572DS.h
+++ b/include/configs/MPC8572DS.h
@@ -469,7 +469,6 @@
 #endif

 #define CONFIG_PCI_SCAN_SHOW		/* show pci devices on startup */
-#define CONFIG_SCSI_AHCI

 #ifdef CONFIG_SCSI_AHCI
 #define CONFIG_LIBATA
--- a/include/configs/MPC8610HPCD.h
+++ b/include/configs/MPC8610HPCD.h
@@ -281,8 +281,6 @@
 #define PCI_IDSEL_NUMBER	0x0c	/* slot0->3(IDSEL)=12->15 */
 #endif

-#define CONFIG_SCSI_AHCI
-
 #ifdef CONFIG_SCSI_AHCI
 #define CONFIG_LIBATA
 #define CONFIG_SATA_ULI5288
--- a/include/configs/MPC8641HPCN.h
+++ b/include/configs/MPC8641HPCN.h
@@ -373,8 +373,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);

 #undef CONFIG_PCI_SCAN_SHOW		/* show pci devices on startup */

-#define CONFIG_SCSI_AHCI
-
 #ifdef CONFIG_SCSI_AHCI
 #define CONFIG_LIBATA
 #define CONFIG_SATA_ULI5288
--- a/include/configs/am57xx_evm.h
+++ b/include/configs/am57xx_evm.h
@@ -97,7 +97,6 @@

 /* SATA */
 #define CONFIG_LIBATA
-#define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT
 #define CONFIG_SYS_SCSI_MAX_SCSI_ID	1
 #define CONFIG_SYS_SCSI_MAX_LUN		1
--- a/include/configs/cl-som-am57x.h
+++ b/include/configs/cl-som-am57x.h
@@ -63,7 +63,6 @@
 #ifndef CONFIG_SPL_BUILD
 /* SATA */
 #define CONFIG_LIBATA
-#define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT
 #define CONFIG_SYS_SCSI_MAX_SCSI_ID	1
 #define CONFIG_SYS_SCSI_MAX_LUN		1
--- a/include/configs/cm_t54.h
+++ b/include/configs/cm_t54.h
@@ -48,7 +48,6 @@
 #define CONFIG_SYS_SATA_FAT_BOOT_PARTITION	1

 #define CONFIG_LIBATA
-#define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT
 #define CONFIG_SYS_SCSI_MAX_SCSI_ID	1
 #define CONFIG_SYS_SCSI_MAX_LUN		1
--- a/include/configs/controlcenterdc.h
+++ b/include/configs/controlcenterdc.h
@@ -49,7 +49,6 @@
 * SATA/SCSI/AHCI configuration
 */
 #define CONFIG_LIBATA
-#define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT
 #define CONFIG_SYS_SCSI_MAX_SCSI_ID	2
 #define CONFIG_SYS_SCSI_MAX_LUN		1
--- a/include/configs/db-88f6820-gp.h
+++ b/include/configs/db-88f6820-gp.h
@@ -45,7 +45,6 @@
 * SATA/SCSI/AHCI configuration
 */
 #define CONFIG_LIBATA
-#define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT
 #define CONFIG_SYS_SCSI_MAX_SCSI_ID	2
 #define CONFIG_SYS_SCSI_MAX_LUN		1
--- a/include/configs/dra7xx_evm.h
+++ b/include/configs/dra7xx_evm.h
@@ -149,7 +149,6 @@

 /* SATA */
 #define CONFIG_LIBATA
-#define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT
 #define CONFIG_SYS_SCSI_MAX_SCSI_ID	1
 #define CONFIG_SYS_SCSI_MAX_LUN		1
--- a/include/configs/efi-x86.h
+++ b/include/configs/efi-x86.h
@@ -11,8 +11,6 @@

 #undef CONFIG_TPM_TIS_BASE_ADDRESS

-#undef CONFIG_SCSI_AHCI
-
 #define CONFIG_STD_DEVICES_SETTINGS     "stdin=usbkbd,vga,serial\0" \
 					"stdout=vga,serial\0" \
 					"stderr=vga,serial\0"
--- a/include/configs/galileo.h
+++ b/include/configs/galileo.h
@@ -22,9 +22,6 @@
 					"stdout=serial\0" \
 					"stderr=serial\0"

-/* SATA is not supported in Quark SoC */
-#undef CONFIG_SCSI_AHCI
-
 /* 10/100M Ethernet support */
 #define CONFIG_DESIGNWARE_ETH
 #define CONFIG_DW_ALTDESCRIPTOR
--- a/include/configs/highbank.h
+++ b/include/configs/highbank.h
@@ -34,7 +34,6 @@

 #define CONFIG_MISC_INIT_R
 #define CONFIG_LIBATA
-#define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT
 #define CONFIG_SYS_SCSI_MAX_SCSI_ID	5
 #define CONFIG_SYS_SCSI_MAX_LUN		1
--- a/include/configs/ls1012aqds.h
+++ b/include/configs/ls1012aqds.h
@@ -126,7 +126,6 @@

 /* SATA */
 #define CONFIG_LIBATA
-#define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT

 #define CONFIG_SYS_SATA				AHCI_BASE_ADDR
--- a/include/configs/ls1012ardb.h
+++ b/include/configs/ls1012ardb.h
@@ -41,7 +41,6 @@

 /* SATA */
 #define CONFIG_LIBATA
-#define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT

 #define CONFIG_SYS_SATA				AHCI_BASE_ADDR
--- a/include/configs/ls1021aiot.h
+++ b/include/configs/ls1021aiot.h
@@ -128,7 +128,6 @@

 /* SATA */
 #define CONFIG_LIBATA
-#define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT
 #ifndef PCI_DEVICE_ID_FREESCALE_AHCI
 #define PCI_DEVICE_ID_FREESCALE_AHCI	0x0440
--- a/include/configs/ls1043aqds.h
+++ b/include/configs/ls1043aqds.h
@@ -95,7 +95,6 @@ unsigned long get_board_ddr_clk(void);

 /* SATA */
 #define CONFIG_LIBATA
-#define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT

 /* EEPROM */
--- a/include/configs/ls1043ardb.h
+++ b/include/configs/ls1043ardb.h
@@ -287,7 +287,6 @@
 /* SATA */
 #ifndef SPL_NO_SATA
 #define CONFIG_LIBATA
-#define CONFIG_SCSI_AHCI
 #ifndef CONFIG_CMD_EXT2
 #define CONFIG_CMD_EXT2
 #endif
--- a/include/configs/ls1046aqds.h
+++ b/include/configs/ls1046aqds.h
@@ -138,7 +138,6 @@ unsigned long get_board_ddr_clk(void);

 /* SATA */
 #define CONFIG_LIBATA
-#define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT

 /* EEPROM */
--- a/include/configs/ls1046ardb.h
+++ b/include/configs/ls1046ardb.h
@@ -212,7 +212,6 @@
 /* SATA */
 #ifndef SPL_NO_SATA
 #define CONFIG_LIBATA
-#define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT

 #define CONFIG_SYS_SATA				AHCI_BASE_ADDR
--- a/include/configs/ls1088a_common.h
+++ b/include/configs/ls1088a_common.h
@@ -154,7 +154,6 @@ unsigned long long get_qixis_addr(void);
 /* SATA */
 #ifdef CONFIG_SCSI
 #define CONFIG_LIBATA
-#define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT
 #define CONFIG_SYS_SATA1		AHCI_BASE_ADDR1

--- a/include/configs/ls2080aqds.h
+++ b/include/configs/ls2080aqds.h
@@ -47,7 +47,6 @@ unsigned long get_board_ddr_clk(void);

 /* SATA */
 #define CONFIG_LIBATA
-#define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT

 #define CONFIG_SYS_SATA1			AHCI_BASE_ADDR1
--- a/include/configs/ls2080ardb.h
+++ b/include/configs/ls2080ardb.h
@@ -65,7 +65,6 @@ unsigned long get_board_sys_clk(void);

 /* SATA */
 #define CONFIG_LIBATA
-#define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT

 #define CONFIG_SYS_SATA1			AHCI_BASE_ADDR1
--- a/include/configs/mvebu_armada-37xx.h
+++ b/include/configs/mvebu_armada-37xx.h
@@ -96,7 +96,6 @@
 /*
 * SATA/SCSI/AHCI configuration
 */
-#define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT
 #define CONFIG_LIBATA
 #define CONFIG_LBA48
--- a/include/configs/mvebu_armada-8k.h
+++ b/include/configs/mvebu_armada-8k.h
@@ -96,7 +96,6 @@
 /*
 * SATA/SCSI/AHCI configuration
 */
-#define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT
 #define CONFIG_LIBATA
 #define CONFIG_LBA48
--- a/include/configs/omap5_uevm.h
+++ b/include/configs/omap5_uevm.h
@@ -62,7 +62,6 @@
 #define CONSOLEDEV		"ttyO2"

 #define CONFIG_LIBATA
-#define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT
 #define CONFIG_SYS_SCSI_MAX_SCSI_ID	1
 #define CONFIG_SYS_SCSI_MAX_LUN		1
--- a/include/configs/qemu-arm.h
+++ b/include/configs/qemu-arm.h
@@ -31,7 +31,6 @@

 /* For block devices, QEMU emulates an ICH9 AHCI controller over PCI */
 #define CONFIG_SYS_SCSI_MAX_SCSI_ID 6
-#define CONFIG_SCSI_AHCI
 #define CONFIG_LIBATA

 /* Environment options */
--- a/include/configs/sbc8641d.h
+++ b/include/configs/sbc8641d.h
@@ -300,8 +300,6 @@

 #define CONFIG_PCI_SCAN_SHOW		/* show pci devices on startup */

-#undef CONFIG_SCSI_AHCI
-
 #ifdef CONFIG_SCSI_AHCI
 #define CONFIG_SATA_ULI5288
 #define CONFIG_SYS_SCSI_MAX_SCSI_ID	4
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -114,7 +114,6 @@

 #ifdef CONFIG_AHCI
 #define CONFIG_LIBATA
-#define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT
 #define CONFIG_SUNXI_AHCI
 #define CONFIG_SYS_64BIT_LBA
--- a/include/configs/turris_omnia.h
+++ b/include/configs/turris_omnia.h
@@ -54,7 +54,6 @@
 * SATA/SCSI/AHCI configuration
 */
 #define CONFIG_LIBATA
-#define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT
 #define CONFIG_SYS_SCSI_MAX_SCSI_ID	2
 #define CONFIG_SYS_SCSI_MAX_LUN		1
--- a/include/configs/x86-common.h
+++ b/include/configs/x86-common.h
@@ -28,8 +28,6 @@
 #define CONFIG_SYS_BOOTM_LEN		(16 << 20)

 /* SATA AHCI storage */
-
-#define CONFIG_SCSI_AHCI
 #ifdef CONFIG_SCSI_AHCI
 #define CONFIG_LIBATA
 #define CONFIG_LBA48
--- a/include/configs/xilinx_zynqmp.h
+++ b/include/configs/xilinx_zynqmp.h
@@ -158,7 +158,6 @@

 #ifdef CONFIG_SATA_CEVA
 #define CONFIG_LIBATA
-#define CONFIG_SCSI_AHCI
 #define CONFIG_SYS_SCSI_MAX_SCSI_ID	2
 #define CONFIG_SYS_SCSI_MAX_LUN		1
 #define CONFIG_SYS_SCSI_MAX_DEVICE	(CONFIG_SYS_SCSI_MAX_SCSI_ID * \