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 --- arch/arm/include/asm/arch-ls102xa/config.h | 1 - drivers/ata/Kconfig | 11 +++++++++++ include/configs/MPC8315ERDB.h | 2 -- include/configs/MPC8349ITX.h | 1 - include/configs/MPC837XEMDS.h | 2 -- include/configs/MPC837XERDB.h | 2 -- include/configs/MPC8536DS.h | 2 -- include/configs/MPC8544DS.h | 1 - include/configs/MPC8572DS.h | 1 - include/configs/MPC8610HPCD.h | 1 - include/configs/MPC8641HPCN.h | 1 - include/configs/P1010RDB.h | 1 - include/configs/P1022DS.h | 1 - include/configs/P2041RDB.h | 2 -- include/configs/P4080DS.h | 1 - include/configs/T102xQDS.h | 1 - include/configs/T1040QDS.h | 2 -- include/configs/T104xRDB.h | 2 -- include/configs/T208xQDS.h | 1 - include/configs/T208xRDB.h | 1 - include/configs/T4240QDS.h | 2 -- include/configs/T4240RDB.h | 4 ---- include/configs/UCP1020.h | 1 - include/configs/advantech_dms-ba16.h | 1 - include/configs/am57xx_evm.h | 1 - include/configs/apalis_imx6.h | 1 - include/configs/cgtqmx6eval.h | 1 - include/configs/cl-som-am57x.h | 1 - include/configs/cm_fx6.h | 1 - include/configs/cm_t54.h | 1 - include/configs/controlcenterd.h | 1 - include/configs/controlcenterdc.h | 1 - include/configs/corenet_ds.h | 2 -- include/configs/cyrus.h | 2 -- include/configs/db-88f6820-gp.h | 1 - include/configs/db-mv784mp-gp.h | 1 - include/configs/dh_imx6.h | 1 - include/configs/dra7xx_evm.h | 1 - include/configs/ge_bx50v3.h | 1 - include/configs/gw_ventana.h | 1 - include/configs/highbank.h | 1 - include/configs/ls1012aqds.h | 1 - include/configs/ls1012ardb.h | 1 - include/configs/ls1021aiot.h | 1 - include/configs/ls1043aqds.h | 1 - include/configs/ls1043ardb.h | 1 - include/configs/ls1046aqds.h | 1 - include/configs/ls1046ardb.h | 1 - include/configs/ls1088a_common.h | 1 - include/configs/ls2080aqds.h | 1 - include/configs/ls2080ardb.h | 1 - include/configs/m53evk.h | 1 - include/configs/mvebu_armada-37xx.h | 1 - include/configs/mvebu_armada-8k.h | 1 - include/configs/mx53loco.h | 1 - include/configs/mx6cuboxi.h | 1 - include/configs/nitrogen6x.h | 1 - include/configs/novena.h | 1 - include/configs/omap5_uevm.h | 1 - include/configs/ot1200.h | 1 - include/configs/p1_p2_rdb_pc.h | 1 - include/configs/p1_twr.h | 1 - include/configs/qemu-arm.h | 1 - include/configs/sunxi-common.h | 1 - include/configs/t4qds.h | 2 -- include/configs/tbs2910.h | 1 - include/configs/theadorable.h | 1 - include/configs/turris_omnia.h | 1 - include/configs/udoo.h | 1 - include/configs/wandboard.h | 1 - include/configs/x86-common.h | 1 - include/configs/xilinx_zynqmp.h | 1 - scripts/config_whitelist.txt | 1 - 73 files changed, 11 insertions(+), 86 deletions(-)
diff --git arch/arm/include/asm/arch-ls102xa/config.h arch/arm/include/asm/arch-ls102xa/config.h index 2fbd4ef557..940461137e 100644 --- arch/arm/include/asm/arch-ls102xa/config.h +++ 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 diff --git drivers/ata/Kconfig drivers/ata/Kconfig index 38318b4615..43e6626969 100644 --- drivers/ata/Kconfig +++ 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.
diff --git include/configs/MPC8315ERDB.h include/configs/MPC8315ERDB.h index a23c4ef522..bd1a7b2679 100644 --- include/configs/MPC8315ERDB.h +++ 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 diff --git include/configs/MPC8349ITX.h include/configs/MPC8349ITX.h index 23fe158f74..c88aa95632 100644 --- include/configs/MPC8349ITX.h +++ 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 diff --git include/configs/MPC837XEMDS.h include/configs/MPC837XEMDS.h index f0b856c2c8..3cc1a4717b 100644 --- include/configs/MPC837XEMDS.h +++ 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 diff --git include/configs/MPC837XERDB.h include/configs/MPC837XERDB.h index d865c22644..656180f91a 100644 --- include/configs/MPC837XERDB.h +++ 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 diff --git include/configs/MPC8536DS.h include/configs/MPC8536DS.h index d060e8c235..7587225bda 100644 --- include/configs/MPC8536DS.h +++ 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 diff --git include/configs/MPC8544DS.h include/configs/MPC8544DS.h index 4332941779..bec8a09b5f 100644 --- include/configs/MPC8544DS.h +++ 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 diff --git include/configs/MPC8572DS.h include/configs/MPC8572DS.h index 0ad13d2c63..ebc2e3aad4 100644 --- include/configs/MPC8572DS.h +++ 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 diff --git include/configs/MPC8610HPCD.h include/configs/MPC8610HPCD.h index befd3f776e..bd14bc0607 100644 --- include/configs/MPC8610HPCD.h +++ 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 diff --git include/configs/MPC8641HPCN.h include/configs/MPC8641HPCN.h index 882c4c271b..567111798b 100644 --- include/configs/MPC8641HPCN.h +++ 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 diff --git include/configs/P1010RDB.h include/configs/P1010RDB.h index 87c8962a9d..72b6e3ad6d 100644 --- include/configs/P1010RDB.h +++ 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 diff --git include/configs/P1022DS.h include/configs/P1022DS.h index 7d4ac61194..30e20bc6e4 100644 --- include/configs/P1022DS.h +++ 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 diff --git include/configs/P2041RDB.h include/configs/P2041RDB.h index 9046567baa..917e5d5a06 100644 --- include/configs/P2041RDB.h +++ 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 diff --git include/configs/P4080DS.h include/configs/P4080DS.h index 8b884411ac..117def9dc2 100644 --- include/configs/P4080DS.h +++ 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 diff --git include/configs/T102xQDS.h include/configs/T102xQDS.h index 974717fde6..ed6df53916 100644 --- include/configs/T102xQDS.h +++ 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 diff --git include/configs/T1040QDS.h include/configs/T1040QDS.h index ac3d19301a..bc5c0d2e68 100644 --- include/configs/T1040QDS.h +++ 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 diff --git include/configs/T104xRDB.h include/configs/T104xRDB.h index ebcae95722..3159c62004 100644 --- include/configs/T104xRDB.h +++ 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 diff --git include/configs/T208xQDS.h include/configs/T208xQDS.h index b19a677eb9..43fcc6f5dd 100644 --- include/configs/T208xQDS.h +++ 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 diff --git include/configs/T208xRDB.h include/configs/T208xRDB.h index 66ce31bc0c..e1c57de2af 100644 --- include/configs/T208xRDB.h +++ 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 diff --git include/configs/T4240QDS.h include/configs/T4240QDS.h index e2caa02f67..099e9e1d94 100644 --- include/configs/T4240QDS.h +++ 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 diff --git include/configs/T4240RDB.h include/configs/T4240RDB.h index 70705a7b49..98f8f4f10c 100644 --- include/configs/T4240RDB.h +++ 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 diff --git include/configs/UCP1020.h include/configs/UCP1020.h index 455298751c..e8b1a74c64 100644 --- include/configs/UCP1020.h +++ 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 diff --git include/configs/advantech_dms-ba16.h include/configs/advantech_dms-ba16.h index 34daf14db3..f370fe5b78 100644 --- include/configs/advantech_dms-ba16.h +++ 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 diff --git include/configs/am57xx_evm.h include/configs/am57xx_evm.h index 2ebe0f50bf..28618a579c 100644 --- include/configs/am57xx_evm.h +++ 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 diff --git include/configs/apalis_imx6.h include/configs/apalis_imx6.h index c32c5607d6..c4e93562b5 100644 --- include/configs/apalis_imx6.h +++ 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 */ diff --git include/configs/cgtqmx6eval.h include/configs/cgtqmx6eval.h index d24d9a45f1..b50535f9b0 100644 --- include/configs/cgtqmx6eval.h +++ 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 diff --git include/configs/cl-som-am57x.h include/configs/cl-som-am57x.h index 7115bb8111..6935b06d5c 100644 --- include/configs/cl-som-am57x.h +++ 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 diff --git include/configs/cm_fx6.h include/configs/cm_fx6.h index b6164ca66d..5195610233 100644 --- include/configs/cm_fx6.h +++ 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 diff --git include/configs/cm_t54.h include/configs/cm_t54.h index f756e77c06..1351eb85f2 100644 --- include/configs/cm_t54.h +++ 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 diff --git include/configs/controlcenterd.h include/configs/controlcenterd.h index bb038f14c2..4312ddd4fc 100644 --- include/configs/controlcenterd.h +++ include/configs/controlcenterd.h @@ -245,7 +245,6 @@ /* * SATA */ -#define CONFIG_LIBATA #define CONFIG_LBA48
#define CONFIG_SYS_SATA_MAX_DEVICE 2 diff --git include/configs/controlcenterdc.h include/configs/controlcenterdc.h index 92f3619992..a882fa650b 100644 --- include/configs/controlcenterdc.h +++ 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 diff --git include/configs/corenet_ds.h include/configs/corenet_ds.h index b49b826eb4..d0e8bfbed7 100644 --- include/configs/corenet_ds.h +++ 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 diff --git include/configs/cyrus.h include/configs/cyrus.h index b6597034e2..4fea53bf79 100644 --- include/configs/cyrus.h +++ 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 diff --git include/configs/db-88f6820-gp.h include/configs/db-88f6820-gp.h index 672bfbc946..32f93f2f46 100644 --- include/configs/db-88f6820-gp.h +++ 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 diff --git include/configs/db-mv784mp-gp.h include/configs/db-mv784mp-gp.h index 105578ffc6..3dcc28710b 100644 --- include/configs/db-mv784mp-gp.h +++ 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 */ diff --git include/configs/dh_imx6.h include/configs/dh_imx6.h index b988a19646..fb49997ebd 100644 --- include/configs/dh_imx6.h +++ 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 */ diff --git include/configs/dra7xx_evm.h include/configs/dra7xx_evm.h index 4b622365ae..f777d576dd 100644 --- include/configs/dra7xx_evm.h +++ 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 diff --git include/configs/ge_bx50v3.h include/configs/ge_bx50v3.h index a522120de6..1454577dbf 100644 --- include/configs/ge_bx50v3.h +++ 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 */ diff --git include/configs/gw_ventana.h include/configs/gw_ventana.h index e68ddbcc2a..068962d613 100644 --- include/configs/gw_ventana.h +++ 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
/* diff --git include/configs/highbank.h include/configs/highbank.h index 544e38ff3a..a5a524008b 100644 --- include/configs/highbank.h +++ 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 diff --git include/configs/ls1012aqds.h include/configs/ls1012aqds.h index 5410549ce6..af5f37cca3 100644 --- include/configs/ls1012aqds.h +++ 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 diff --git include/configs/ls1012ardb.h include/configs/ls1012ardb.h index 1659fc5a76..89aa952dc6 100644 --- include/configs/ls1012ardb.h +++ 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 diff --git include/configs/ls1021aiot.h include/configs/ls1021aiot.h index cc76c4e5e8..4a63efc5ef 100644 --- include/configs/ls1021aiot.h +++ 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 diff --git include/configs/ls1043aqds.h include/configs/ls1043aqds.h index a63e9f4981..a7f78f46ae 100644 --- include/configs/ls1043aqds.h +++ 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 */ diff --git include/configs/ls1043ardb.h include/configs/ls1043ardb.h index 9e71e8f430..34f82281c8 100644 --- include/configs/ls1043ardb.h +++ 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 diff --git include/configs/ls1046aqds.h include/configs/ls1046aqds.h index 74b1c1127b..f510f2457a 100644 --- include/configs/ls1046aqds.h +++ 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 */ diff --git include/configs/ls1046ardb.h include/configs/ls1046ardb.h index f143a9ea3f..6e64077673 100644 --- include/configs/ls1046ardb.h +++ 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 diff --git include/configs/ls1088a_common.h include/configs/ls1088a_common.h index 602c5745ca..bc6a52247c 100644 --- include/configs/ls1088a_common.h +++ include/configs/ls1088a_common.h @@ -156,7 +156,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
diff --git include/configs/ls2080aqds.h include/configs/ls2080aqds.h index 0a14cf48cf..815d8adc92 100644 --- include/configs/ls2080aqds.h +++ 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 diff --git include/configs/ls2080ardb.h include/configs/ls2080ardb.h index ab9c4ef8c3..6f3301c2fd 100644 --- include/configs/ls2080ardb.h +++ 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 diff --git include/configs/m53evk.h include/configs/m53evk.h index c1634e53bf..50379c7b21 100644 --- include/configs/m53evk.h +++ 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
/* diff --git include/configs/mvebu_armada-37xx.h include/configs/mvebu_armada-37xx.h index 52d4944554..af16b9454a 100644 --- include/configs/mvebu_armada-37xx.h +++ 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
diff --git include/configs/mvebu_armada-8k.h include/configs/mvebu_armada-8k.h index c2b2d12678..7f143164c3 100644 --- include/configs/mvebu_armada-8k.h +++ 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
diff --git include/configs/mx53loco.h include/configs/mx53loco.h index 0c5e9831ae..323aa3d907 100644 --- include/configs/mx53loco.h +++ 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 */ diff --git include/configs/mx6cuboxi.h include/configs/mx6cuboxi.h index 392f9529de..d649172d5f 100644 --- include/configs/mx6cuboxi.h +++ 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 */ diff --git include/configs/nitrogen6x.h include/configs/nitrogen6x.h index faf21cb5ae..8e0d6df93d 100644 --- include/configs/nitrogen6x.h +++ 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 diff --git include/configs/novena.h include/configs/novena.h index 736ac931e4..f82b6a44d2 100644 --- include/configs/novena.h +++ 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 */ diff --git include/configs/omap5_uevm.h include/configs/omap5_uevm.h index 124657f61a..38a0055297 100644 --- include/configs/omap5_uevm.h +++ 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 diff --git include/configs/ot1200.h include/configs/ot1200.h index 1146838f34..051416eab8 100644 --- include/configs/ot1200.h +++ 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 */ diff --git include/configs/p1_p2_rdb_pc.h include/configs/p1_p2_rdb_pc.h index 3f073d06cb..c64314c640 100644 --- include/configs/p1_p2_rdb_pc.h +++ 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) diff --git include/configs/p1_twr.h include/configs/p1_twr.h index 5edf07197f..d2302636ac 100644 --- include/configs/p1_twr.h +++ 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__ diff --git include/configs/qemu-arm.h include/configs/qemu-arm.h index 69e886b43e..c8852cef34 100644 --- include/configs/qemu-arm.h +++ 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 diff --git include/configs/sunxi-common.h include/configs/sunxi-common.h index 5ffd69664c..26f889dd3e 100644 --- include/configs/sunxi-common.h +++ 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 diff --git include/configs/t4qds.h include/configs/t4qds.h index 07060e6813..5a69708e30 100644 --- include/configs/t4qds.h +++ 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 diff --git include/configs/tbs2910.h include/configs/tbs2910.h index 281809d87a..3a3bab0fea 100644 --- include/configs/tbs2910.h +++ 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 */ diff --git include/configs/theadorable.h include/configs/theadorable.h index 774324f28b..6e95aa1626 100644 --- include/configs/theadorable.h +++ 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 */ diff --git include/configs/turris_omnia.h include/configs/turris_omnia.h index 7a7a157bbb..3dbd2cacba 100644 --- include/configs/turris_omnia.h +++ 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 diff --git include/configs/udoo.h include/configs/udoo.h index f21ee521cc..989014a177 100644 --- include/configs/udoo.h +++ 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 */ diff --git include/configs/wandboard.h include/configs/wandboard.h index 2155358561..e42bfc51f8 100644 --- include/configs/wandboard.h +++ 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 diff --git include/configs/x86-common.h include/configs/x86-common.h index 5554df9484..064c546403 100644 --- include/configs/x86-common.h +++ 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
diff --git include/configs/xilinx_zynqmp.h include/configs/xilinx_zynqmp.h index 493e3e30d5..57fee6a4c8 100644 --- include/configs/xilinx_zynqmp.h +++ 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 * \ diff --git scripts/config_whitelist.txt scripts/config_whitelist.txt index 67feedfbf2..b65eb0936c 100644 --- scripts/config_whitelist.txt +++ 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