Merge branch 'master' of git://git.denx.de/u-boot-sunxi

[oweals/u-boot.git] / drivers / ata / Kconfig

diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index 49a056e9416a55333004d03c6e5d27ea63261267..4e95a68a2d1cf31997b80d2ac382cea6addc0b73 100644 (file)
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -66,6 +66,14 @@ config DWC_AHSATA
          Enable this driver to support the DWC AHSATA SATA controller found
          in i.MX5 and i.MX6 SoCs.
 
          Enable this driver to support the DWC AHSATA SATA controller found
          in i.MX5 and i.MX6 SoCs.
 

+config DWC_AHSATA_AHCI
+       bool "Enable DWC AHSATA AHCI driver support"
+       depends on DWC_AHSATA
+       depends on AHCI
+       default y
+       help
+         Enable this option unless you need your private ahci implementation
+

 config FSL_SATA
        bool "Enable Freescale SATA controller driver support"
        select LIBATA
 config FSL_SATA
        bool "Enable Freescale SATA controller driver support"
        select LIBATA


@@ -81,7 +89,9 @@ config MVSATA_IDE
 
 config SATA_MV
        bool "Enable Marvell SATA controller driver support"
 
 config SATA_MV
        bool "Enable Marvell SATA controller driver support"

+       select AHCI

        select LIBATA
        select LIBATA

+       depends on BLK

        help
          Enable this driver to support the SATA controller found in
          some Marvell SoCs.
        help
          Enable this driver to support the SATA controller found in
          some Marvell SoCs.


@@ -99,6 +109,14 @@ config SATA_SIL3114
        help
          Enable this driver to support the SIL3114 SATA controllers.
 
        help
          Enable this driver to support the SIL3114 SATA controllers.
 

+config SUNXI_AHCI
+       bool "Enable Allwinner SATA driver support"
+       depends on AHCI
+       default y if ARCH_SUNXI
+       help
+         Enable this driver to support the SATA controllers found in the
+         Allwinner A10, A20 and R40 SoCs.
+

 config AHCI_MVEBU
        bool "Marvell EBU AHCI SATA support"
        depends on ARCH_MVEBU
 config AHCI_MVEBU
        bool "Marvell EBU AHCI SATA support"
        depends on ARCH_MVEBU