Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-24 21:54:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

ata: Make LIBATA means AHCI is enabled mandatory.

Browse source 
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>
This commit is contained in:
Tom Rini 2021-04-21 15:32:26 -04:00
parent 8c245fe7ea
commit c51f74ba7a
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Makefile
View file

@ -1089,7 +1089,6 @@ endif
$(call deprecated,CONFIG_DM_MMC CONFIG_BLK,MMC,v2019.04,$(CONFIG_MMC)) $(call deprecated,CONFIG_DM_MMC CONFIG_BLK,MMC,v2019.04,$(CONFIG_MMC))
$(call deprecated,CONFIG_DM_USB CONFIG_OF_CONTROL CONFIG_BLK,\ $(call deprecated,CONFIG_DM_USB CONFIG_OF_CONTROL CONFIG_BLK,\
USB,v2019.07,$(CONFIG_USB)) 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_PCI,PCI,v2019.07,$(CONFIG_PCI))
$(call deprecated,CONFIG_DM_VIDEO,video,v2019.07,\ $(call deprecated,CONFIG_DM_VIDEO,video,v2019.07,\
$(CONFIG_LCD)$(CONFIG_VIDEO)) $(CONFIG_LCD)$(CONFIG_VIDEO))

6
drivers/ata/Kconfig
View file

@ -77,8 +77,9 @@ config DWC_AHSATA_AHCI
config FSL_SATA config FSL_SATA
bool "Enable Freescale SATA controller driver support" bool "Enable Freescale SATA controller driver support"
select AHCI
select LIBATA select LIBATA
select AHCI if BLK depends on BLK
help help
Enable this driver to support the SATA controller found in Enable this driver to support the SATA controller found in
some Freescale PowerPC SoCs. some Freescale PowerPC SoCs.
@ -94,8 +95,9 @@ config SATA_MV
config SATA_SIL config SATA_SIL
bool "Enable Silicon Image SIL3131 / SIL3132 / SIL3124 SATA driver support" bool "Enable Silicon Image SIL3131 / SIL3132 / SIL3124 SATA driver support"
select AHCI
select LIBATA select LIBATA
select AHCI if BLK depends on BLK
help help
Enable this driver to support the SIL3131, SIL3132 and SIL3124 Enable this driver to support the SIL3131, SIL3132 and SIL3124
SATA controllers. SATA controllers.