diff options
| author | Tom Rini <trini@konsulko.com> | 2020-05-20 12:13:24 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-05-20 14:09:00 -0400 |
| commit | 118efffa529b527ff5fc92e6293d99ab91b4a370 (patch) | |
| tree | 78945c11cbdbf2e9e26864ae434fb711cbd30c10 | |
| parent | 902be5e1d4629b0a050bfaa57c389a80ae6bdf5f (diff) | |
| download | u-boot-118efffa529b527ff5fc92e6293d99ab91b4a370.tar.gz | |
WIP: Force AHCI on under LIBATA
LIBATA without AHCI is long deprecated, force this to see what breaks
and in turn needs removal.
Signed-off-by: Tom Rini <trini@konsulko.com>
| -rw-r--r-- | arch/x86/Kconfig | 3 | ||||
| -rw-r--r-- | cmd/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/ata/Kconfig | 25 |
3 files changed, 21 insertions, 8 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index c8eae24c07..40c9cc4eb2 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -121,9 +121,6 @@ source "arch/x86/cpu/tangier/Kconfig" # architecture-specific options below -config AHCI - default y - config SYS_MALLOC_F_LEN default 0x800 diff --git a/cmd/Kconfig b/cmd/Kconfig index f9be1988f6..91de92e3ee 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -1217,6 +1217,7 @@ config CMD_REMOTEPROC config CMD_SATA bool "sata - Access SATA subsystem" + depends on DM select SATA help SATA (Serial Advanced Technology Attachment) is a serial bus diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig index 807b242581..1b37db6a41 100644 --- a/drivers/ata/Kconfig +++ b/drivers/ata/Kconfig @@ -1,5 +1,5 @@ config AHCI - bool "Support SATA controllers with driver model" + bool depends on DM help This enables a uclass for disk controllers in U-Boot. Various driver @@ -9,7 +9,9 @@ config AHCI config SATA bool "Support SATA controllers" + depends on DM select HAVE_BLOCK_DEVICE + select AHCI help This enables support for SATA (Serial Advanced Technology Attachment), a serial bus standard for connecting to hard drives and @@ -28,6 +30,8 @@ config LIBATA config SCSI_AHCI bool "Enable SCSI interface to SATA devices" + depends on DM + select AHCI select LIBATA help Enable this to allow interfacing SATA devices via the SCSI layer. @@ -42,7 +46,8 @@ config AHCI_PCI config SATA_CEVA bool "Ceva Sata controller" - depends on AHCI + depends on DM + select AHCI depends on DM_SCSI help This option enables Ceva Sata controller hard IP available on Xilinx @@ -61,6 +66,8 @@ config DWC_AHCI config DWC_AHSATA bool "Enable DWC AHSATA driver support" + depends on DM + select AHCI select LIBATA help Enable this driver to support the DWC AHSATA SATA controller found @@ -69,13 +76,15 @@ config DWC_AHSATA config DWC_AHSATA_AHCI bool "Enable DWC AHSATA AHCI driver support" depends on DWC_AHSATA - depends on AHCI + depends on DM + select AHCI default y help Enable this option unless you need your private ahci implementation config FSL_SATA bool "Enable Freescale SATA controller driver support" + depends on DM select LIBATA select AHCI if BLK help @@ -87,12 +96,14 @@ config SATA_MV select AHCI select LIBATA depends on BLK + depends on DM help Enable this driver to support the SATA controller found in some Marvell SoCs. config SATA_SIL bool "Enable Silicon Image SIL3131 / SIL3132 / SIL3124 SATA driver support" + depends on DM select LIBATA select AHCI if BLK help @@ -101,13 +112,16 @@ config SATA_SIL config SATA_SIL3114 bool "Enable Silicon Image SIL3114 SATA driver support" + depends on DM + select AHCI select LIBATA help Enable this driver to support the SIL3114 SATA controllers. config SUNXI_AHCI bool "Enable Allwinner SATA driver support" - depends on AHCI + depends on DM + select AHCI default y if ARCH_SUNXI help Enable this driver to support the SATA controllers found in the @@ -116,7 +130,8 @@ config SUNXI_AHCI config AHCI_MVEBU bool "Marvell EBU AHCI SATA support" depends on ARCH_MVEBU - depends on AHCI + depends on DM + select AHCI select SCSI_AHCI select DM_SCSI help |