[PATCH 16/16] ata: Make LIBATA means AHCI is enabled mandatory.

public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed

From: Tom Rini <trini@konsulko.com>
To: u-boot@lists.denx.de
Subject: [PATCH 16/16] ata: Make LIBATA means AHCI is enabled mandatory.
Date: Tue,  9 Feb 2021 21:42:57 -0500	[thread overview]
Message-ID: <20210210024257.20193-16-trini@konsulko.com> (raw)
In-Reply-To: <20210210024257.20193-1-trini@konsulko.com>

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>
---
 Makefile            | 11 -----------
 drivers/ata/Kconfig |  6 ++++--
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/Makefile b/Makefile
index 9d6ac5e16fe5..a71b66c8449a 100644
--- a/Makefile
+++ b/Makefile
@@ -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 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

next prev parent reply	other threads:[~2021-02-10  2:42 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-02-10  2:42 [PATCH 01/16] ls1012aqds_tfa_SECURE_BOOT: Remove unused CONFIG_SCSI_AHCI Tom Rini
2021-02-10  2:42 ` [PATCH 02/16] am57xx_hs_evm_usb: Enable AHCI and BLK Tom Rini
2021-04-12  0:24   ` Tom Rini
2021-02-10  2:42 ` [PATCH 03/16] ata: DWC_AHSATA depends on BLK Tom Rini
2021-04-12  0:25   ` Tom Rini
2021-02-10  2:42 ` [PATCH 04/16] ppc: configs: Remove a few non-updated build configurations Tom Rini
2021-02-10  2:42 ` [PATCH 05/16] arm: Remove highbank board Tom Rini
2021-02-19 13:04   ` André Przywara
2021-02-19 13:30     ` Tom Rini
2021-02-10  2:42 ` [PATCH 06/16] arm: Remove dms-ba16 board Tom Rini
2021-04-12  0:25   ` Tom Rini
2021-02-10  2:42 ` [PATCH 07/16] arm: Remove ot1200 board Tom Rini
2021-02-17  9:58   ` Christian Gmeiner
2021-03-01 14:47     ` Christian Gmeiner
2021-04-12  0:25   ` Tom Rini
2021-02-10  2:42 ` [PATCH 08/16] arm: Remove mx53loco board Tom Rini
2021-02-13 14:14   ` Fabio Estevam
2021-02-13 16:14     ` Tom Rini
2021-02-14  1:53     ` Fabio Estevam
2021-02-10  2:42 ` [PATCH 09/16] ppc: Remove MPC8349ITX board Tom Rini
2021-04-12  0:25   ` Tom Rini
2021-02-10  2:42 ` [PATCH 10/16] ppc: Remove MPC8544DS board Tom Rini
2021-02-11 10:34   ` Priyanka Jain
2021-02-15 15:44   ` Tom Rini
2021-02-10  2:42 ` [PATCH 11/16] ppc: Remove MPC8572DS board Tom Rini
2021-02-11 10:34   ` Priyanka Jain
2021-02-15 15:44   ` Tom Rini
2021-02-10  2:42 ` [PATCH 12/16] ppc: Remove MPC8610HPCD board Tom Rini
2021-02-11 10:33   ` Priyanka Jain
2021-02-15 15:44   ` Tom Rini
2021-02-10  2:42 ` [PATCH 13/16] ppc: Remove MPC8641HPCN board Tom Rini
2021-02-11 10:33   ` Priyanka Jain
2021-02-15 15:44   ` Tom Rini
2021-02-10  2:42 ` [PATCH 14/16] boards: Disable CMD_SATA on platforms that no longer have a SATA driver enabled Tom Rini
2021-02-10  2:42 ` [PATCH 15/16] drivers: ata: Remove mvsata_ide driver Tom Rini
2021-04-12  0:25   ` Tom Rini
2021-02-10  2:42 ` Tom Rini [this message]
2021-04-12  0:24 ` [PATCH 01/16] ls1012aqds_tfa_SECURE_BOOT: Remove unused CONFIG_SCSI_AHCI Tom Rini

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:9d6ac5e16fe dfblob:a71b66c8449 dfblob:9ff4b8736c1
dfblob:5bbd76a3c70 )
 OR (
bs:"[PATCH 16/16] ata: Make LIBATA means AHCI is enabled mandatory." )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210210024257.20193-16-trini@konsulko.com \
    --to=trini@konsulko.com \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox