ata: Make LIBATA means AHCI is enabled mandatory.

The migration deadline for having LIBATA mean that AHCI is also enabled
was v2019.07.  As that has long since passed, adjust the Kconfig
dependencies.

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/Makefile b/Makefile
index 77d55735a4cfac847e2913084697aa8bc1a4e865..bb7145e189cb5973272256b2500fed9ff2c20817 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1089,7 +1089,6 @@ endif
        $(call deprecated,CONFIG_DM_MMC CONFIG_BLK,MMC,v2019.04,$(CONFIG_MMC))
        $(call deprecated,CONFIG_DM_USB CONFIG_OF_CONTROL CONFIG_BLK,\
                USB,v2019.07,$(CONFIG_USB))
-       $(call deprecated,CONFIG_AHCI,AHCI,v2019.07, $(CONFIG_LIBATA))
        $(call deprecated,CONFIG_DM_PCI,PCI,v2019.07,$(CONFIG_PCI))
        $(call deprecated,CONFIG_DM_VIDEO,video,v2019.07,\
                $(CONFIG_LCD)$(CONFIG_VIDEO))

diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index b5a279862ad3af549e886365d93953a93d34b393..6f0b7723836470ac19d8c66ffef0435faafae563 100644 (file)
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -77,8 +77,9 @@ config DWC_AHSATA_AHCI
 
 config FSL_SATA
        bool "Enable Freescale SATA controller driver support"
+       select AHCI
        select LIBATA
-       select AHCI if BLK
+       depends on BLK
        help
          Enable this driver to support the SATA controller found in
          some Freescale PowerPC SoCs.
@@ -94,8 +95,9 @@ config SATA_MV
 
 config SATA_SIL
        bool "Enable Silicon Image SIL3131 / SIL3132 / SIL3124 SATA driver support"
+       select AHCI
        select LIBATA
-       select AHCI if BLK
+       depends on BLK
        help
          Enable this driver to support the SIL3131, SIL3132 and SIL3124
          SATA controllers.