diff options
| author | Tom Rini <[email protected]> | 2021-05-11 10:05:03 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2021-05-11 10:05:03 -0400 |
| commit | 8eee38886089de8a50e78bbe5099dafa3846fc15 (patch) | |
| tree | ee6dc77d34e1828e1d6440ab146f2051e9b362de /drivers | |
| parent | b107761b817c421fb8eadee739656e1db38686c3 (diff) | |
| parent | f7173fce49db615a72388bf8415968df64a1aada (diff) | |
Merge branch 'finish-DM_MMC-migration'
- Complete the migration to LIBATA requiring BLK to be enabled.
- Complete the migration to DM_MMC being required for non-SPL/TPL
U-Boot.
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/ata/Kconfig | 6 | ||||
| -rw-r--r-- | drivers/mmc/Kconfig | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig index b5a279862ad..6f0b7723836 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. diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig index f4ad1db45d7..89014569670 100644 --- a/drivers/mmc/Kconfig +++ b/drivers/mmc/Kconfig @@ -4,6 +4,7 @@ config MMC bool "MMC/SD/SDIO card support" default ARM || PPC || SANDBOX select HAVE_BLOCK_DEVICE + select DM_MMC if DM help This selects MultiMediaCard, Secure Digital and Secure Digital I/O support. @@ -33,6 +34,7 @@ config MMC_BROKEN_CD config DM_MMC bool "Enable MMC controllers using Driver Model" depends on DM + select BLK help This enables the MultiMediaCard (MMC) uclass which supports MMC and Secure Digital I/O (SDIO) cards. Both removable (SD, micro-SD, etc.) |