ata: Migrate CONFIG_LIBATA to Kconfig

This symbol enables some library code used by various SATA drivers, so make this a non-user-visible symbol select'ed by the respective drivers, and let moveconfig handle the rest. Signed-off-by: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
7 years ago · b82e667f79
parent 9fd95ef0d3
commit b82e667f79
73 changed files with 11 additions and 86 deletions
--- a/arch/arm/include/asm/arch-ls102xa/config.h
+++ b/arch/arm/include/asm/arch-ls102xa/config.h
@ -80,7 +80,6 @@

 /* SATA */
 #define AHCI_BASE_ADDR				(CONFIG_SYS_IMMR + 0x02200000)
-#define CONFIG_LIBATA
 #define CONFIG_SCSI_AHCI_PLAT
 #define CONFIG_SYS_SCSI_MAX_SCSI_ID		1
 #define CONFIG_SYS_SCSI_MAX_LUN		1
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@ -20,8 +20,14 @@ config SATA

 	  See also CMD_SATA which provides command-line support.

+config LIBATA
+	bool
+	help
+	  Select this to build and link the libata helper functions.
+
 config SCSI_AHCI
 	bool "Enable SCSI interface to SATA devices"
+	select LIBATA
 	help
 	  Enable this to allow interfacing SATA devices via the SCSI layer.

@ -54,30 +60,35 @@ config DWC_AHCI

 config DWC_AHSATA
 	bool "Enable DWC AHSATA driver support"
+	select LIBATA
 	help
 	  Enable this driver to support the DWC AHSATA SATA controller found
 	  in i.MX5 and i.MX6 SoCs.

 config FSL_SATA
 	bool "Enable Freescale SATA controller driver support"
+	select LIBATA
 	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"
+	select LIBATA
 	help
 	  Enable this driver to support the SATA controller found in
 	  some Marvell SoCs.

 config SATA_SIL
 	bool "Enable Silicon Image SIL3131 / SIL3132 / SIL3124 SATA driver support"
+	select LIBATA
 	help
 	  Enable this driver to support the SIL3131, SIL3132 and SIL3124
 	  SATA controllers.

 config SATA_SIL3114
 	bool "Enable Silicon Image SIL3114 SATA driver support"
+	select LIBATA
 	help
 	  Enable this driver to support the SIL3114 SATA controllers.

--- a/include/configs/MPC8315ERDB.h
+++ b/include/configs/MPC8315ERDB.h
@ -395,8 +395,6 @@
 /*
 * SATA
 */
-#define CONFIG_LIBATA
-
 #define CONFIG_SYS_SATA_MAX_DEVICE	2
 #define CONFIG_SATA1
 #define CONFIG_SYS_SATA1_OFFSET	0x18000
--- a/include/configs/MPC8349ITX.h
+++ b/include/configs/MPC8349ITX.h
@ -138,7 +138,6 @@
 #ifdef CONFIG_SATA_SIL3114

 #define CONFIG_SYS_SATA_MAX_DEVICE      4
-#define CONFIG_LIBATA
 #define CONFIG_LBA48

 #endif
--- a/include/configs/MPC837XEMDS.h
+++ b/include/configs/MPC837XEMDS.h
@ -420,8 +420,6 @@ extern int board_pci_host_broken(void);
 /*
 * SATA
 */
-#define CONFIG_LIBATA
-
 #define CONFIG_SYS_SATA_MAX_DEVICE	2
 #define CONFIG_SATA1
 #define CONFIG_SYS_SATA1_OFFSET	0x18000
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@ -434,8 +434,6 @@
 /*
 * SATA
 */
-#define CONFIG_LIBATA
-
 #define CONFIG_SYS_SATA_MAX_DEVICE	2
 #define CONFIG_SATA1
 #define CONFIG_SYS_SATA1_OFFSET	0x18000
--- a/include/configs/MPC8536DS.h
+++ b/include/configs/MPC8536DS.h
@ -508,8 +508,6 @@
 #endif	/* CONFIG_PCI */

 /* SATA */
-#define CONFIG_LIBATA
-
 #define CONFIG_SYS_SATA_MAX_DEVICE	2
 #define CONFIG_SATA1
 #define CONFIG_SYS_SATA1		CONFIG_SYS_MPC85xx_SATA1_ADDR
--- a/include/configs/MPC8544DS.h
+++ b/include/configs/MPC8544DS.h
@ -284,7 +284,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 #define CONFIG_PCI_SCAN_SHOW		/* show pci devices on startup */

 #ifdef CONFIG_SCSI_AHCI
-#define CONFIG_LIBATA
 #define CONFIG_SATA_ULI5288
 #define CONFIG_SYS_SCSI_MAX_SCSI_ID	4
 #define CONFIG_SYS_SCSI_MAX_LUN	1
--- a/include/configs/MPC8572DS.h
+++ b/include/configs/MPC8572DS.h
@ -471,7 +471,6 @@
 #define CONFIG_PCI_SCAN_SHOW		/* show pci devices on startup */

 #ifdef CONFIG_SCSI_AHCI
-#define CONFIG_LIBATA
 #define CONFIG_SATA_ULI5288
 #define CONFIG_SYS_SCSI_MAX_SCSI_ID	4
 #define CONFIG_SYS_SCSI_MAX_LUN	1
--- a/include/configs/MPC8610HPCD.h
+++ b/include/configs/MPC8610HPCD.h
@ -282,7 +282,6 @@
 #endif

 #ifdef CONFIG_SCSI_AHCI
-#define CONFIG_LIBATA
 #define CONFIG_SATA_ULI5288
 #define CONFIG_SYS_SCSI_MAX_SCSI_ID	4
 #define CONFIG_SYS_SCSI_MAX_LUN	1
--- a/include/configs/MPC8641HPCN.h
+++ b/include/configs/MPC8641HPCN.h
@ -374,7 +374,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 #undef CONFIG_PCI_SCAN_SHOW		/* show pci devices on startup */

 #ifdef CONFIG_SCSI_AHCI
-#define CONFIG_LIBATA
 #define CONFIG_SATA_ULI5288
 #define CONFIG_SYS_SCSI_MAX_SCSI_ID	4
 #define CONFIG_SYS_SCSI_MAX_LUN	1
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@ -635,7 +635,6 @@ extern unsigned long get_sdram_size(void);

 /* SATA */
 #define CONFIG_FSL_SATA_V2
-#define CONFIG_LIBATA

 #ifdef CONFIG_FSL_SATA
 #define CONFIG_SYS_SATA_MAX_DEVICE	2
--- a/include/configs/P1022DS.h
+++ b/include/configs/P1022DS.h
@ -482,7 +482,6 @@
 #endif

 /* SATA */
-#define CONFIG_LIBATA
 #define CONFIG_FSL_SATA_V2

 #define CONFIG_SYS_SATA_MAX_DEVICE	2
--- a/include/configs/P2041RDB.h
+++ b/include/configs/P2041RDB.h
@ -527,8 +527,6 @@ unsigned long get_board_sys_clk(unsigned long dummy);
 #define CONFIG_FSL_SATA_V2

 #ifdef CONFIG_FSL_SATA_V2
-#define CONFIG_LIBATA
-
 #define CONFIG_SYS_SATA_MAX_DEVICE	2
 #define CONFIG_SATA1
 #define CONFIG_SYS_SATA1		CONFIG_SYS_MPC85xx_SATA1_ADDR
--- a/include/configs/P4080DS.h
+++ b/include/configs/P4080DS.h
@ -13,7 +13,6 @@
 #define CONFIG_PCIE3

 #define CONFIG_SYS_SATA_MAX_DEVICE  2
-#define CONFIG_LIBATA
 #define CONFIG_LBA48

 #define CONFIG_SYS_SRIO
--- a/include/configs/T102xQDS.h
+++ b/include/configs/T102xQDS.h
@ -615,7 +615,6 @@ unsigned long get_board_ddr_clk(void);
 */
 #define CONFIG_FSL_SATA_V2
 #ifdef CONFIG_FSL_SATA_V2
-#define CONFIG_LIBATA
 #define CONFIG_SYS_SATA_MAX_DEVICE	1
 #define CONFIG_SATA1
 #define CONFIG_SYS_SATA1		CONFIG_SYS_MPC85xx_SATA1_ADDR
--- a/include/configs/T1040QDS.h
+++ b/include/configs/T1040QDS.h
@ -500,8 +500,6 @@ unsigned long get_board_ddr_clk(void);
 /* SATA */
 #define CONFIG_FSL_SATA_V2
 #ifdef CONFIG_FSL_SATA_V2
-#define CONFIG_LIBATA
-
 #define CONFIG_SYS_SATA_MAX_DEVICE	2
 #define CONFIG_SATA1
 #define CONFIG_SYS_SATA1		CONFIG_SYS_MPC85xx_SATA1_ADDR
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@ -614,8 +614,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg
 /* SATA */
 #define CONFIG_FSL_SATA_V2
 #ifdef CONFIG_FSL_SATA_V2
-#define CONFIG_LIBATA
-
 #define CONFIG_SYS_SATA_MAX_DEVICE	1
 #define CONFIG_SATA1
 #define CONFIG_SYS_SATA1		CONFIG_SYS_MPC85xx_SATA1_ADDR
--- a/include/configs/T208xQDS.h
+++ b/include/configs/T208xQDS.h
@ -678,7 +678,6 @@ unsigned long get_board_ddr_clk(void);
 * SATA
 */
 #ifdef CONFIG_FSL_SATA_V2
-#define CONFIG_LIBATA
 #define CONFIG_SYS_SATA_MAX_DEVICE	2
 #define CONFIG_SATA1
 #define CONFIG_SYS_SATA1		CONFIG_SYS_MPC85xx_SATA1_ADDR
--- a/include/configs/T208xRDB.h
+++ b/include/configs/T208xRDB.h
@ -628,7 +628,6 @@ unsigned long get_board_ddr_clk(void);
 * SATA
 */
 #ifdef CONFIG_FSL_SATA_V2
-#define CONFIG_LIBATA
 #define CONFIG_SYS_SATA_MAX_DEVICE	2
 #define CONFIG_SATA1
 #define CONFIG_SYS_SATA1		CONFIG_SYS_MPC85xx_SATA1_ADDR
--- a/include/configs/T4240QDS.h
+++ b/include/configs/T4240QDS.h
@ -468,8 +468,6 @@ unsigned long get_board_ddr_clk(void);

 /* SATA */
 #ifdef CONFIG_FSL_SATA_V2
-#define CONFIG_LIBATA
-
 #define CONFIG_SYS_SATA_MAX_DEVICE	2
 #define CONFIG_SATA1
 #define CONFIG_SYS_SATA1		CONFIG_SYS_MPC85xx_SATA1_ADDR
--- a/include/configs/T4240RDB.h
+++ b/include/configs/T4240RDB.h
@ -240,8 +240,6 @@

 /* SATA */
 #ifdef CONFIG_FSL_SATA_V2
-#define CONFIG_LIBATA
-
 #define CONFIG_SYS_SATA_MAX_DEVICE	2
 #define CONFIG_SATA1
 #define CONFIG_SYS_SATA1		CONFIG_SYS_MPC85xx_SATA1_ADDR
@ -634,8 +632,6 @@ unsigned long get_board_ddr_clk(void);

 /* SATA */
 #ifdef CONFIG_FSL_SATA_V2
-#define CONFIG_LIBATA
-
 #define CONFIG_SYS_SATA_MAX_DEVICE	2
 #define CONFIG_SATA1
 #define CONFIG_SYS_SATA1		CONFIG_SYS_MPC85xx_SATA1_ADDR
--- a/include/configs/UCP1020.h
+++ b/include/configs/UCP1020.h
@ -119,7 +119,6 @@
 #define CONFIG_ENV_OVERWRITE

 #define CONFIG_SYS_SATA_MAX_DEVICE	2
-#define CONFIG_LIBATA
 #define CONFIG_LBA48

 #define CONFIG_SYS_CLK_FREQ	66666666
--- a/include/configs/advantech_dms-ba16.h
+++ b/include/configs/advantech_dms-ba16.h
@ -43,7 +43,6 @@
 #define CONFIG_DWC_AHSATA_PORT_ID	0
 #define CONFIG_DWC_AHSATA_BASE_ADDR	SATA_ARB_BASE_ADDR
 #define CONFIG_LBA48
-#define CONFIG_LIBATA

 /* MMC Configs */
 #define CONFIG_FSL_ESDHC
--- a/include/configs/am57xx_evm.h
+++ b/include/configs/am57xx_evm.h
@ -96,7 +96,6 @@
 #define CONFIG_OMAP_USB3PHY1_HOST

 /* SATA */
-#define CONFIG_LIBATA
 #define CONFIG_SCSI_AHCI_PLAT
 #define CONFIG_SYS_SCSI_MAX_SCSI_ID	1
 #define CONFIG_SYS_SCSI_MAX_LUN		1
--- a/include/configs/apalis_imx6.h
+++ b/include/configs/apalis_imx6.h
@ -74,7 +74,6 @@
 #define CONFIG_DWC_AHSATA_PORT_ID	0
 #define CONFIG_DWC_AHSATA_BASE_ADDR	SATA_ARB_BASE_ADDR
 #define CONFIG_LBA48
-#define CONFIG_LIBATA
 #endif

 /* Network */
--- a/include/configs/cgtqmx6eval.h
+++ b/include/configs/cgtqmx6eval.h
@ -85,7 +85,6 @@
 #define CONFIG_DWC_AHSATA_PORT_ID	0
 #define CONFIG_DWC_AHSATA_BASE_ADDR	SATA_ARB_BASE_ADDR
 #define CONFIG_LBA48
-#define CONFIG_LIBATA

 /* Ethernet */
 #define CONFIG_FEC_MXC
--- a/include/configs/cl-som-am57x.h
+++ b/include/configs/cl-som-am57x.h
@ -62,7 +62,6 @@

 #ifndef CONFIG_SPL_BUILD
 /* SATA */
-#define CONFIG_LIBATA
 #define CONFIG_SCSI_AHCI_PLAT
 #define CONFIG_SYS_SCSI_MAX_SCSI_ID	1
 #define CONFIG_SYS_SCSI_MAX_LUN		1
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@ -209,7 +209,6 @@

 /* SATA */
 #define CONFIG_SYS_SATA_MAX_DEVICE	1
-#define CONFIG_LIBATA
 #define CONFIG_LBA48
 #define CONFIG_DWC_AHSATA_PORT_ID	0
 #define CONFIG_DWC_AHSATA_BASE_ADDR	SATA_ARB_BASE_ADDR
--- a/include/configs/cm_t54.h
+++ b/include/configs/cm_t54.h
@ -47,7 +47,6 @@
 #define CONFIG_SPL_SATA_BOOT_DEVICE		0
 #define CONFIG_SYS_SATA_FAT_BOOT_PARTITION	1

-#define CONFIG_LIBATA
 #define CONFIG_SCSI_AHCI_PLAT
 #define CONFIG_SYS_SCSI_MAX_SCSI_ID	1
 #define CONFIG_SYS_SCSI_MAX_LUN		1
--- a/include/configs/controlcenterd.h
+++ b/include/configs/controlcenterd.h
@ -245,7 +245,6 @@
 /*
 * SATA
 */
-#define CONFIG_LIBATA
 #define CONFIG_LBA48

 #define CONFIG_SYS_SATA_MAX_DEVICE	2
--- a/include/configs/controlcenterdc.h
+++ b/include/configs/controlcenterdc.h
@ -48,7 +48,6 @@
 /*
 * SATA/SCSI/AHCI configuration
 */
-#define CONFIG_LIBATA
 #define CONFIG_SCSI_AHCI_PLAT
 #define CONFIG_SYS_SCSI_MAX_SCSI_ID	2
 #define CONFIG_SYS_SCSI_MAX_LUN		1
--- a/include/configs/corenet_ds.h
+++ b/include/configs/corenet_ds.h
@ -541,8 +541,6 @@

 /* SATA */
 #ifdef CONFIG_FSL_SATA_V2
-#define CONFIG_LIBATA
-
 #define CONFIG_SYS_SATA_MAX_DEVICE	2
 #define CONFIG_SATA1
 #define CONFIG_SYS_SATA1		CONFIG_SYS_MPC85xx_SATA1_ADDR
--- a/include/configs/cyrus.h
+++ b/include/configs/cyrus.h
@ -376,8 +376,6 @@

 /* SATA */
 #ifdef CONFIG_FSL_SATA_V2
-#define CONFIG_LIBATA
-
 #define CONFIG_SYS_SATA_MAX_DEVICE	2
 #define CONFIG_SATA1
 #define CONFIG_SYS_SATA1		CONFIG_SYS_MPC85xx_SATA1_ADDR
--- a/include/configs/db-88f6820-gp.h
+++ b/include/configs/db-88f6820-gp.h
@ -44,7 +44,6 @@
 /*
 * SATA/SCSI/AHCI configuration
 */
-#define CONFIG_LIBATA
 #define CONFIG_SCSI_AHCI_PLAT
 #define CONFIG_SYS_SCSI_MAX_SCSI_ID	2
 #define CONFIG_SYS_SCSI_MAX_LUN		1
--- a/include/configs/db-mv784mp-gp.h
+++ b/include/configs/db-mv784mp-gp.h
@ -49,7 +49,6 @@

 /* SATA support */
 #define CONFIG_SYS_SATA_MAX_DEVICE	2
-#define CONFIG_LIBATA
 #define CONFIG_LBA48

 /* Additional FS support/configuration */
--- a/include/configs/dh_imx6.h
+++ b/include/configs/dh_imx6.h
@ -88,7 +88,6 @@
 #define CONFIG_DWC_AHSATA_PORT_ID	0
 #define CONFIG_DWC_AHSATA_BASE_ADDR	SATA_ARB_BASE_ADDR
 #define CONFIG_LBA48
-#define CONFIG_LIBATA
 #endif

 /* SPI Flash Configs */
--- a/include/configs/dra7xx_evm.h
+++ b/include/configs/dra7xx_evm.h
@ -148,7 +148,6 @@
 #define CONFIG_OMAP_USB2PHY2_HOST

 /* SATA */
-#define CONFIG_LIBATA
 #define CONFIG_SCSI_AHCI_PLAT
 #define CONFIG_SYS_SCSI_MAX_SCSI_ID	1
 #define CONFIG_SYS_SCSI_MAX_LUN		1
--- a/include/configs/ge_bx50v3.h
+++ b/include/configs/ge_bx50v3.h
@ -55,7 +55,6 @@
 #define CONFIG_DWC_AHSATA_PORT_ID	0
 #define CONFIG_DWC_AHSATA_BASE_ADDR	SATA_ARB_BASE_ADDR
 #define CONFIG_LBA48
-#define CONFIG_LIBATA
 #endif

 /* MMC Configs */
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@ -106,7 +106,6 @@
  #define CONFIG_DWC_AHSATA_PORT_ID	0
  #define CONFIG_DWC_AHSATA_BASE_ADDR	SATA_ARB_BASE_ADDR
  #define CONFIG_LBA48
-  #define CONFIG_LIBATA
 #endif

 /*
--- a/include/configs/highbank.h
+++ b/include/configs/highbank.h
@ -33,7 +33,6 @@
 #define CONFIG_SYS_BOOTCOUNT_ADDR	0xfff3cf0c

 #define CONFIG_MISC_INIT_R
-#define CONFIG_LIBATA
 #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
@ -125,7 +125,6 @@
 #endif

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

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

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

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

 /* SATA */
-#define CONFIG_LIBATA
 #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
@ -94,7 +94,6 @@ unsigned long get_board_ddr_clk(void);
 #endif

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

 /* EEPROM */
--- a/include/configs/ls1043ardb.h
+++ b/include/configs/ls1043ardb.h
@ -286,7 +286,6 @@

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

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

 /* EEPROM */
--- a/include/configs/ls1046ardb.h
+++ b/include/configs/ls1046ardb.h
@ -211,7 +211,6 @@

 /* SATA */
 #ifndef SPL_NO_SATA
-#define CONFIG_LIBATA
 #define CONFIG_SCSI_AHCI_PLAT

 #define CONFIG_SYS_SATA				AHCI_BASE_ADDR
--- a/include/configs/ls1088a_common.h
+++ b/include/configs/ls1088a_common.h
@ -153,7 +153,6 @@ unsigned long long get_qixis_addr(void);

 /* SATA */
 #ifdef CONFIG_SCSI
-#define CONFIG_LIBATA
 #define CONFIG_SCSI_AHCI_PLAT
 #define CONFIG_SYS_SATA1		AHCI_BASE_ADDR1

--- a/include/configs/ls2080aqds.h
+++ b/include/configs/ls2080aqds.h
@ -46,7 +46,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_FSL_DDR_BIST	/* enable built-in memory test */

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

 #define CONFIG_SYS_SATA1			AHCI_BASE_ADDR1
--- a/include/configs/ls2080ardb.h
+++ b/include/configs/ls2080ardb.h
@ -64,7 +64,6 @@ unsigned long get_board_sys_clk(void);
 #define CONFIG_FSL_DDR_BIST	/* enable built-in memory test */

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

 #define CONFIG_SYS_SATA1			AHCI_BASE_ADDR1
--- a/include/configs/m53evk.h
+++ b/include/configs/m53evk.h
@ -145,7 +145,6 @@
 #define CONFIG_DWC_AHSATA_PORT_ID	0
 #define CONFIG_DWC_AHSATA_BASE_ADDR	SATA_BASE_ADDR
 #define CONFIG_LBA48
-#define CONFIG_LIBATA
 #endif

 /*
--- a/include/configs/mvebu_armada-37xx.h
+++ b/include/configs/mvebu_armada-37xx.h
@ -97,7 +97,6 @@
 * SATA/SCSI/AHCI configuration
 */
 #define CONFIG_SCSI_AHCI_PLAT
-#define CONFIG_LIBATA
 #define CONFIG_LBA48
 #define CONFIG_SYS_64BIT_LBA

--- a/include/configs/mvebu_armada-8k.h
+++ b/include/configs/mvebu_armada-8k.h
@ -97,7 +97,6 @@
 * SATA/SCSI/AHCI configuration
 */
 #define CONFIG_SCSI_AHCI_PLAT
-#define CONFIG_LIBATA
 #define CONFIG_LBA48
 #define CONFIG_SYS_64BIT_LBA

--- a/include/configs/mx53loco.h
+++ b/include/configs/mx53loco.h
@ -186,7 +186,6 @@
 	#define CONFIG_DWC_AHSATA_PORT_ID       0
 	#define CONFIG_DWC_AHSATA_BASE_ADDR     SATA_BASE_ADDR
 	#define CONFIG_LBA48
-	#define CONFIG_LIBATA
 #endif

 /* Framebuffer and LCD */
--- a/include/configs/mx6cuboxi.h
+++ b/include/configs/mx6cuboxi.h
@ -27,7 +27,6 @@
 #define CONFIG_DWC_AHSATA_PORT_ID       0
 #define CONFIG_DWC_AHSATA_BASE_ADDR     SATA_ARB_BASE_ADDR
 #define CONFIG_LBA48
-#define CONFIG_LIBATA
 #endif

 /* Ethernet Configuration */
--- a/include/configs/nitrogen6x.h
+++ b/include/configs/nitrogen6x.h
@ -53,7 +53,6 @@
 #define CONFIG_DWC_AHSATA_PORT_ID	0
 #define CONFIG_DWC_AHSATA_BASE_ADDR	SATA_ARB_BASE_ADDR
 #define CONFIG_LBA48
-#define CONFIG_LIBATA
 #endif

 #define CONFIG_FEC_MXC
--- a/include/configs/novena.h
+++ b/include/configs/novena.h
@ -112,7 +112,6 @@
 #define CONFIG_DWC_AHSATA_PORT_ID	0
 #define CONFIG_DWC_AHSATA_BASE_ADDR	SATA_ARB_BASE_ADDR
 #define CONFIG_LBA48
-#define CONFIG_LIBATA
 #endif

 /* UART */
--- a/include/configs/omap5_uevm.h
+++ b/include/configs/omap5_uevm.h
@ -61,7 +61,6 @@

 #define CONSOLEDEV		"ttyO2"

-#define CONFIG_LIBATA
 #define CONFIG_SCSI_AHCI_PLAT
 #define CONFIG_SYS_SCSI_MAX_SCSI_ID	1
 #define CONFIG_SYS_SCSI_MAX_LUN		1
--- a/include/configs/ot1200.h
+++ b/include/configs/ot1200.h
@ -63,7 +63,6 @@
 #define CONFIG_DWC_AHSATA_PORT_ID	0
 #define CONFIG_DWC_AHSATA_BASE_ADDR	SATA_ARB_BASE_ADDR
 #define CONFIG_LBA48
-#define CONFIG_LIBATA
 #endif

 /* SPL */
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@ -245,7 +245,6 @@
 #define CONFIG_ENV_OVERWRITE

 #define CONFIG_SYS_SATA_MAX_DEVICE	2
-#define CONFIG_LIBATA
 #define CONFIG_LBA48

 #if defined(CONFIG_TARGET_P2020RDB)
--- a/include/configs/p1_twr.h
+++ b/include/configs/p1_twr.h
@ -51,7 +51,6 @@
 #define CONFIG_ENV_OVERWRITE

 #define CONFIG_SYS_SATA_MAX_DEVICE	2
-#define CONFIG_LIBATA
 #define CONFIG_LBA48

 #ifndef __ASSEMBLY__
--- 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_LIBATA

 /* Environment options */
 #define CONFIG_ENV_SIZE				SZ_64K
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@ -113,7 +113,6 @@
 #define PHYS_SDRAM_0_SIZE		0x80000000 /* 2 GiB */

 #ifdef CONFIG_AHCI
-#define CONFIG_LIBATA
 #define CONFIG_SCSI_AHCI_PLAT
 #define CONFIG_SUNXI_AHCI
 #define CONFIG_SYS_64BIT_LBA
--- a/include/configs/t4qds.h
+++ b/include/configs/t4qds.h
@ -209,8 +209,6 @@

 /* SATA */
 #ifdef CONFIG_FSL_SATA_V2
-#define CONFIG_LIBATA
-
 #define CONFIG_SYS_SATA_MAX_DEVICE	2
 #define CONFIG_SATA1
 #define CONFIG_SYS_SATA1		CONFIG_SYS_MPC85xx_SATA1_ADDR
--- a/include/configs/tbs2910.h
+++ b/include/configs/tbs2910.h
@ -82,7 +82,6 @@
 #define CONFIG_DWC_AHSATA_PORT_ID	0
 #define CONFIG_DWC_AHSATA_BASE_ADDR	SATA_ARB_BASE_ADDR
 #define CONFIG_LBA48
-#define CONFIG_LIBATA
 #endif

 /* USB */
--- a/include/configs/theadorable.h
+++ b/include/configs/theadorable.h
@ -65,7 +65,6 @@

 /* SATA support */
 #define CONFIG_SYS_SATA_MAX_DEVICE	1
-#define CONFIG_LIBATA
 #define CONFIG_LBA48

 /* Additional FS support/configuration */
--- a/include/configs/turris_omnia.h
+++ b/include/configs/turris_omnia.h
@ -53,7 +53,6 @@
 /*
 * SATA/SCSI/AHCI configuration
 */
-#define CONFIG_LIBATA
 #define CONFIG_SCSI_AHCI_PLAT
 #define CONFIG_SYS_SCSI_MAX_SCSI_ID	2
 #define CONFIG_SYS_SCSI_MAX_LUN		1
--- a/include/configs/udoo.h
+++ b/include/configs/udoo.h
@ -29,7 +29,6 @@
 #define CONFIG_DWC_AHSATA_PORT_ID	0
 #define CONFIG_DWC_AHSATA_BASE_ADDR	SATA_ARB_BASE_ADDR
 #define CONFIG_LBA48
-#define CONFIG_LIBATA
 #endif

 /* Network support */
--- a/include/configs/wandboard.h
+++ b/include/configs/wandboard.h
@ -30,7 +30,6 @@
 #define CONFIG_DWC_AHSATA_PORT_ID	0
 #define CONFIG_DWC_AHSATA_BASE_ADDR	SATA_ARB_BASE_ADDR
 #define CONFIG_LBA48
-#define CONFIG_LIBATA
 #endif

 #define CONFIG_SYS_MEMTEST_START	0x10000000
--- a/include/configs/x86-common.h
+++ b/include/configs/x86-common.h
@ -29,7 +29,6 @@

 /* SATA AHCI storage */
 #ifdef CONFIG_SCSI_AHCI
-#define CONFIG_LIBATA
 #define CONFIG_LBA48
 #define CONFIG_SYS_64BIT_LBA

--- a/include/configs/xilinx_zynqmp.h
+++ b/include/configs/xilinx_zynqmp.h
@ -157,7 +157,6 @@
 #endif

 #ifdef CONFIG_SATA_CEVA
-#define CONFIG_LIBATA
 #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 * \
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@ -1245,7 +1245,6 @@ CONFIG_LEGACY_BOOTCMD_ENV
 CONFIG_LG4573
 CONFIG_LG4573_BUS
 CONFIG_LG4573_CS
-CONFIG_LIBATA
 CONFIG_LIB_HW_RAND
 CONFIG_LIB_UUID
 CONFIG_LINUX