[U-Boot] [PATCH 91/93] dm: Enable CONFIG_BLK

Simon Glass
2018-11-19T15:54:11Z

As per the migration plan in MIGRATION.txt all boards should now be
migrated to use CONFIG_BLK.

Enable the CONFIG_BLK option for all boards that use CONFIG_DM. Allow
sandbox_noblk to continue to build until migration is complete.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

drivers/block/Kconfig | 2 +-
drivers/mmc/Kconfig | 2 +-
drivers/usb/Kconfig | 1 +
3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index 33f4aa24185..2e6b87a48a7 100644
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -1,7 +1,7 @@
config BLK
bool "Support block devices"
depends on DM
- default y if DM_MMC
+ default y
help
Enable support for block devices, such as SCSI, MMC and USB
flash sticks. These provide a block-level interface which permits
diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig
index 27246ee4658..1ec23145aa3 100644
--- a/drivers/mmc/Kconfig
+++ b/drivers/mmc/Kconfig
@@ -26,6 +26,7 @@ config MMC_BROKEN_CD
config DM_MMC
bool "Enable MMC controllers using Driver Model"
depends on DM
+ default y && !SANDBOX # Allow sandbox_noblk to work
help
This enables the MultiMediaCard (MMC) uclass which supports MMC and
Secure Digital I/O (SDIO) cards. Both removable (SD, micro-SD, etc.)
@@ -36,7 +37,6 @@ config DM_MMC
config SPL_DM_MMC
bool "Enable MMC controllers using Driver Model in SPL"
depends on SPL_DM && DM_MMC
- default y
help
This enables the MultiMediaCard (MMC) uclass which supports MMC and
Secure Digital I/O (SDIO) cards. Both removable (SD, micro-SD, etc.)
diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
index 4fbe172e05c..38b8e2e5f5d 100644
--- a/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
@@ -36,6 +36,7 @@ if USB
config DM_USB
bool "Enable driver model for USB"
depends on USB && DM
+ default y if !SANDBOX # Allow sandbox_noblk to work
help
Enable driver model for USB. The USB interface is then implemented
by the USB uclass. Multiple USB controllers of different types
--
2.19.1.1215.g8438c0b245-goog