From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tom Rini Date: Wed, 21 Apr 2021 15:32:26 -0400 Subject: [PATCH 2/3] ata: Make LIBATA means AHCI is enabled mandatory. In-Reply-To: <20210421193227.23780-1-trini@konsulko.com> References: <20210421193227.23780-1-trini@konsulko.com> Message-ID: <20210421193227.23780-2-trini@konsulko.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de 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 --- Makefile | 1 - drivers/ata/Kconfig | 6 ++++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 3fc9777b0b2a..68dba4cec7fa 100644 --- 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 9ff4b8736c1f..5bbd76a3c70c 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. -- 2.17.1