diff options
| author | Tom Rini <trini@konsulko.com> | 2021-02-08 17:00:12 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-02-09 19:48:36 -0500 |
| commit | 4fa91885a6467f55f23d99a419e10ad80895579e (patch) | |
| tree | 0662c0f7294cd6b18e24e77df8b908ef6d50460f | |
| parent | 3e20105bb5bc256f3512663a06cee6d7ab5a1802 (diff) | |
| download | u-boot-WIP/remove-non-AHCI_LIBATA-drivers-v1.tar.gz | |
ata: Make LIBATA means AHCI is enabled mandatory.WIP/remove-non-AHCI_LIBATA-drivers-v1
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>
| -rw-r--r-- | Makefile | 11 | ||||
| -rw-r--r-- | drivers/ata/Kconfig | 6 |
2 files changed, 4 insertions, 13 deletions
@@ -1064,17 +1064,6 @@ ifneq ($(CONFIG_DM_USB)$(CONFIG_OF_CONTROL)$(CONFIG_BLK),yyy) @echo >&2 "====================================================" endif endif -ifeq ($(CONFIG_LIBATA),y) -ifneq ($(CONFIG_AHCI),y) - @echo >&2 "===================== WARNING ======================" - @echo >&2 "This board does use CONFIG_LIBATA but has CONFIG_AHCI not" - @echo >&2 "enabled. Please update the storage controller driver to use" - @echo >&2 "CONFIG_AHCI before the v2019.07 release." - @echo >&2 "Failure to update by the deadline may result in board removal." - @echo >&2 "See doc/driver-model/migration.rst for more info." - @echo >&2 "====================================================" -endif -endif ifeq ($(CONFIG_PCI),y) ifneq ($(CONFIG_DM_PCI),y) @echo >&2 "===================== WARNING ======================" diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig index 9ff4b8736c..5bbd76a3c7 100644 --- 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. |