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>

diff --git a/arch/arm/include/asm/arch-ls102xa/config.h b/arch/arm/include/asm/arch-ls102xa/config.h
index 2fbd4ef5577b7bc059b5d8168adcaf7b45a114c3..940461137eb455ccee63c735957fdc19ed08f1d8 100644 (file)
--- 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

diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index 38318b46158e273a60247e52354967653a085aed..43e662696911f8a8ba5134375901279ccbe40fb0 100644 (file)
--- 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.
 

diff --git a/include/configs/MPC8315ERDB.h b/include/configs/MPC8315ERDB.h
index a23c4ef5222b78b35799e6c469ac3652e406b5cf..bd1a7b267930028de906409049ddde3c7fa85eb6 100644 (file)
--- 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

diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h
index 23fe158f747de6b093d190cb65a9499a59a42fee..c88aa9563221028ebec081f6473af7defd5fca9a 100644 (file)
--- 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

diff --git a/include/configs/MPC837XEMDS.h b/include/configs/MPC837XEMDS.h
index f0b856c2c8cecf6c43909c1e93ca539634363230..3cc1a4717b6406cbce047be5efbc6749404b4c82 100644 (file)
--- 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

diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index d865c22644c9b5c582dcd6ce2f63c19f98be5490..656180f91a8bc8e7ee862c1927ab7a2c745b53da 100644 (file)
--- 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

diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h
index d060e8c2351a1d888a9a306e5b898ee9dd7b3c17..7587225bda67a5c719f3a71ff6567e793eb8d7ec 100644 (file)
--- 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

diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h
index 433294177982b01dd51cff078fb8e0e7ce09a4d1..bec8a09b5f324a5e7b4de2f09f88608d112bccac 100644 (file)
--- 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

diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h
index 0ad13d2c6362e3aeb35cbe186272c91da89bd751..ebc2e3aad493e162553ed3dece03e9ebee217f59 100644 (file)
--- 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

diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h
index befd3f776ed041a3e9d7cfc57d44bf416ccee277..bd14bc0607eb748bb85a30e611013de2d9c5f971 100644 (file)
--- 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

diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h
index 882c4c271b9cc5ed079ddaa954485f45006401fb..567111798bf2c6f5976240911a147b723ebda71c 100644 (file)
--- 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

diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h
index 87c8962a9d58d759090687580c2843f5e517893a..72b6e3ad6d2a86714a3ae69302233341e449bb08 100644 (file)
--- 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

diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h
index 7d4ac611941cd902cb7a359ef0fba9af30341a3e..30e20bc6e48a81f0c78b22ce64756176ba25e51e 100644 (file)
--- 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

diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h
index 9046567baac24ae04e4b2cd60f369ce352a5c89c..917e5d5a064e454c174beff9568559fca3d55c50 100644 (file)
--- 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

diff --git a/include/configs/P4080DS.h b/include/configs/P4080DS.h
index 8b884411ac7a4f54bb855a75622205a33eeff731..117def9dc2fed4b62569ff8b34b632366f4c9dcc 100644 (file)
--- 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

diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h
index 974717fde67721446259d7b71e02f4ab12e36cd2..ed6df539167e99e8621bed022fe81efb1f372f84 100644 (file)
--- 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

diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h
index ac3d19301ac72fd5ea378eaeda90c3d943e72188..bc5c0d2e68f3ab839382ef525d72b139de1d3062 100644 (file)
--- 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

diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h
index bd735ed66f6d32d7d06d3700f5bec0d128698cda..2b9c77f7c882b8880d27bf8fda1ee33e0be7d79c 100644 (file)
--- 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

diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h
index b19a677eb9c58bc468f6cab73f1b24f037d8956c..43fcc6f5ddc4499847cb429c3445e72c732e47b4 100644 (file)
--- 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

diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h
index 66ce31bc0c52ec2e73a217d44cc08183ca589af9..e1c57de2af790a7613acac146782e4795a441b97 100644 (file)
--- 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

diff --git a/include/configs/T4240QDS.h b/include/configs/T4240QDS.h
index e2caa02f678e44e261b15a52424e20533df95198..099e9e1d94ce838278f76e68acebefb9cc68e5ce 100644 (file)
--- 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

diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h
index 70705a7b490ab3cb53eb9950512649263d08a310..98f8f4f10c5838778f695a66c39320a71cab2db1 100644 (file)
--- 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

diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h
index 455298751c2410621ddf0ea23dc28b29b637fb08..e8b1a74c64a82414c4ee1dd7407419297e8f7407 100644 (file)
--- 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

diff --git a/include/configs/advantech_dms-ba16.h b/include/configs/advantech_dms-ba16.h
index 34daf14db3f6bbb6dd72727cbbfc5b20186ff971..f370fe5b7814f350d4f9db930941b3363cff5bea 100644 (file)
--- 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

diff --git a/include/configs/am57xx_evm.h b/include/configs/am57xx_evm.h
index 2ebe0f50bf4c1123b8cc7f114732b3bdcefc8513..28618a579cd89cc7afae8466aec7a19fb37e2c6e 100644 (file)
--- 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

diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
index c32c5607d6a087871ab7da5824b685a951a42b2f..c4e93562b5fca24c30aeb7e6f0b48267885190b9 100644 (file)
--- 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 */

diff --git a/include/configs/cgtqmx6eval.h b/include/configs/cgtqmx6eval.h
index d24d9a45f130a6e55cf304b12e204c6f5da453e1..b50535f9b06b65c161e02f85f8ac7eb53c9016be 100644 (file)
--- 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

diff --git a/include/configs/cl-som-am57x.h b/include/configs/cl-som-am57x.h
index 7115bb81113487d81a2633943c30ebe3befe2d29..6935b06d5c15ac91c014296bae206cbc518a75fa 100644 (file)
--- 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

diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
index b6164ca66de6b4f6afb00d0d7f62be0affca75f6..51956102335105e974821906c24b0fed8fe6cf22 100644 (file)
--- 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

diff --git a/include/configs/cm_t54.h b/include/configs/cm_t54.h
index f756e77c06c0b6e0cf495266bd9ce7f561a6a7b7..1351eb85f2f7b55441b438d02e6e91dbaf25131b 100644 (file)
--- 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

diff --git a/include/configs/controlcenterd.h b/include/configs/controlcenterd.h
index bb038f14c28472b3f149c2a2f118b3aa040e426a..4312ddd4fc64fb0a0f93f34efae31f38f65be631 100644 (file)
--- 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

diff --git a/include/configs/controlcenterdc.h b/include/configs/controlcenterdc.h
index 92f3619992a870063f1007605f788ba26dc23137..a882fa650b987dfc33dbed711ae5fd8ecbf48367 100644 (file)
--- 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

diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h
index b49b826eb4ec6b92b49a58b5e274cef9ccf1690c..d0e8bfbed7713d12bef0b41efe377e59bf71fd13 100644 (file)
--- 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

diff --git a/include/configs/cyrus.h b/include/configs/cyrus.h
index b6597034e26a46b8620f4f6ead7417798627d4e2..4fea53bf797cdb6801ddd069eda874f1a09dfa0a 100644 (file)
--- 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

diff --git a/include/configs/db-88f6820-gp.h b/include/configs/db-88f6820-gp.h
index 672bfbc9460a6f0d6854db59fae9c1095055d594..32f93f2f46e9d63f3def6e7ebf0b96dca10af306 100644 (file)
--- 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

diff --git a/include/configs/db-mv784mp-gp.h b/include/configs/db-mv784mp-gp.h
index 105578ffc6dae74b0f6182fd1aaf3933193b7afa..3dcc28710bb1765ac859addac682e1c97f9d228f 100644 (file)
--- 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 */

diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h
index b988a196463aa5737eca40129b54e53256d2a83b..fb49997ebd3aed87fe663f24c048b1113b5d46cd 100644 (file)
--- 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 */

diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h
index 4b622365aed9180cfff289979bb521c6c7360346..f777d576dd35eed5801a8a23bd7e12235554f513 100644 (file)
--- 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

diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h
index a522120de64c26aa601474233a23648cb2a3b95a..1454577dbfc49eaa320e08cd3fede8f7e5e31e17 100644 (file)
--- 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 */

diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index e68ddbcc2ad39756a960cff6672b65d6967935c3..068962d6135405da53f77fdf044e4199e218b658 100644 (file)
--- 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
 
 /*

diff --git a/include/configs/highbank.h b/include/configs/highbank.h
index 544e38ff3ad28d45ded2e03a87a50d2f5af84d0b..a5a524008b4a216da740655e1ebf3bdc90124bc2 100644 (file)
--- 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

diff --git a/include/configs/ls1012aqds.h b/include/configs/ls1012aqds.h
index 5410549ce6f0ce94fe16616bc2a260e292cd2f2b..af5f37cca3fbc726d59d7af57c0271e2cefdad70 100644 (file)
--- 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

diff --git a/include/configs/ls1012ardb.h b/include/configs/ls1012ardb.h
index 1659fc5a76caaa554506971329f5c0c50c857c2e..89aa952dc61ff6a9adf7773458c051d87b3e8049 100644 (file)
--- 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

diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h
index cc76c4e5e8a747116b116e6e86bb4630a4779045..4a63efc5ef893a3fbd9885b342c382e5101eb5b5 100644 (file)
--- 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

diff --git a/include/configs/ls1043aqds.h b/include/configs/ls1043aqds.h
index a63e9f4981af42031a98b8b9f54b1890c290474a..a7f78f46ae5079c4b715b04a15ab5bb2c9268eea 100644 (file)
--- 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 */

diff --git a/include/configs/ls1043ardb.h b/include/configs/ls1043ardb.h
index 9e71e8f4308f1eeeea962893e2d3ca70ebe13ca2..34f82281c839ac74f3f11df5927915e9b3280db1 100644 (file)
--- 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

diff --git a/include/configs/ls1046aqds.h b/include/configs/ls1046aqds.h
index 74b1c1127b44accbe0085f18006a953db2cd7296..f510f2457a58d009c7ec3a488487bbad1b3b142e 100644 (file)
--- 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 */

diff --git a/include/configs/ls1046ardb.h b/include/configs/ls1046ardb.h
index 1b02ee3ef466d5f06466c58601fe720a9150203f..784894f0b7b94973cabbeb5fb615690b3267d894 100644 (file)
--- 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

diff --git a/include/configs/ls1088a_common.h b/include/configs/ls1088a_common.h
index 48b4af080692760d71c3e83d6c4b92a89be8ff8b..0cd2f3c2bc9d9f30e3c60f6c9bed954d0dcaad8e 100644 (file)
--- 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
 

diff --git a/include/configs/ls2080aqds.h b/include/configs/ls2080aqds.h
index 0a14cf48cf92f0c8bd5bd474a87f4343f87fe900..815d8adc92a24573c8aa5103b45d33a62ed45c07 100644 (file)
--- 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

diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h
index ab9c4ef8c3daa2c9c6ed67b9d789e31cc61afefa..6f3301c2fdc8381bec4dac9caf2403ad11e97b9b 100644 (file)
--- 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

diff --git a/include/configs/m53evk.h b/include/configs/m53evk.h
index c1634e53bf5c5fd2384aee3445fe7d5539824f7c..50379c7b21abf7912f75f66ebc7bb0f0bd55c73a 100644 (file)
--- 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
 
 /*

diff --git a/include/configs/mvebu_armada-37xx.h b/include/configs/mvebu_armada-37xx.h
index 52d494455470d74ffdb65710e7815899963c3868..af16b9454a39b39ded1f898e65f4df15522479e8 100644 (file)
--- 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
 

diff --git a/include/configs/mvebu_armada-8k.h b/include/configs/mvebu_armada-8k.h
index c2b2d126782c0e26303b412a927067cb41b183d3..7f143164c3acd3767fbf8abe41a41bf83ee0978b 100644 (file)
--- 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
 

diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h
index 0c5e9831aeb1663b76a12fd3c074af7081d7d8dd..323aa3d907256edf36c9cfc4068d2e34420c5007 100644 (file)
--- 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 */

diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h
index 392f9529de2c0166bf037794c99878a0880a483c..d649172d5fc8b5414ae406d3067acd8e88cce5ab 100644 (file)
--- 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 */

diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
index faf21cb5ae6b2684bbdffdd6f05db324a0a44a6c..8e0d6df93d5c9e2c76ce26fe9c28d2db3bc73a36 100644 (file)
--- 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

diff --git a/include/configs/novena.h b/include/configs/novena.h
index 736ac931e4a5fe1aae9f7f4a8c788fda15c1b8bb..f82b6a44d2473875a3406b49d830452ab90d3f46 100644 (file)
--- 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 */

diff --git a/include/configs/omap5_uevm.h b/include/configs/omap5_uevm.h
index 124657f61a00debf56d432ea89fedc1480fb1230..38a00552975e0206626e55273642913db873c8b6 100644 (file)
--- 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

diff --git a/include/configs/ot1200.h b/include/configs/ot1200.h
index 1146838f34f1b1ba9aa86cb5c6e65597989dbe6b..051416eab87548ddd32e21cc3e7cb23727ef2d30 100644 (file)
--- 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 */

diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index 07a75b9a1e77aae9d6c1c50a48b11b072a9e2b9d..07c192aecc1d216934e5892f26ae332d9dfe858e 100644 (file)
--- 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)

diff --git a/include/configs/p1_twr.h b/include/configs/p1_twr.h
index 5edf07197fb92a51d9b4e6e294e3dc38249e08ca..d2302636ac90a79caaec9fa08024d7efaefce9f9 100644 (file)
--- 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__

diff --git a/include/configs/qemu-arm.h b/include/configs/qemu-arm.h
index 69e886b43e1a3d82f9c2e95b3544fa8fc6a62dbd..c8852cef349c0baff60a9f82f31270648d51a4fa 100644 (file)
--- 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

diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index 5ffd69664cb6e2d562fd7a83df2506f07d0f7af9..26f889dd3eed2cb800b73d05c4bfda51fdc64743 100644 (file)
--- 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

diff --git a/include/configs/t4qds.h b/include/configs/t4qds.h
index 07060e681395517d706f182d413a027933abf0e9..5a69708e30356f3e65d763a28523c46e0db8aca0 100644 (file)
--- 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

diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h
index 281809d87a63190746cfc28c610559d8d84021b7..3a3bab0fea91ef48a3ccb34638ef09d83ad93b10 100644 (file)
--- 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 */

diff --git a/include/configs/theadorable.h b/include/configs/theadorable.h
index 774324f28b5dc395be524ce7335efa7cad70b088..6e95aa1626e509bf9ac2a7dc78764489924ae86f 100644 (file)
--- 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 */

diff --git a/include/configs/turris_omnia.h b/include/configs/turris_omnia.h
index 7a7a157bbb6aed0dbfb2996031f2b8391c88f811..3dbd2cacbae71dbcc1ad1b9d1f9b322274519184 100644 (file)
--- 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

diff --git a/include/configs/udoo.h b/include/configs/udoo.h
index f21ee521cc6c01ebbf73c2194c2160a96c7e94a5..989014a177a0c11fbfde4066a5f1a083539b0c90 100644 (file)
--- 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 */

diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
index 2155358561d7c27425e242487f8790064ed6c7f1..e42bfc51f8432111ebe091c9b6d7ff97618977af 100644 (file)
--- 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

diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h
index 5554df94843d34166ad24d91e40f960d5d79ccab..064c546403627bea6d192e74beb810de5f6443d5 100644 (file)
--- 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
 

diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
index 493e3e30d567fc540462293ec182ab24d69b5f22..57fee6a4c8a562dc3c071614d39a4877f8471061 100644 (file)
--- 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 * \

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 798befe0ca3b8e0398bd8d11d96611c8e7816c31..f815ac06b56e0e6492b09de6ed134655bedbcafe 100644 (file)
--- 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