dm: sandbox: mmc: Enable building MMC code for sandbox

Enable building the MMC code for sandbox. This increases build
coverage for sandbox.

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

diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig
index afdf4a3ba7159430cbd7b85391dbb2b0abc09521..aec2e538a19ff0f0ffb4eda211d98519cf9fb366 100644 (file)
--- a/configs/sandbox_defconfig
+++ b/configs/sandbox_defconfig
@@ -1,4 +1,5 @@
 CONFIG_SYS_MALLOC_F_LEN=0x2000
+CONFIG_MMC=y
 CONFIG_PCI=y
 CONFIG_DEFAULT_DEVICE_TREE="sandbox"
 CONFIG_I8042_KEYB=y
@@ -97,6 +98,7 @@ CONFIG_PWRSEQ=y
 CONFIG_SPL_PWRSEQ=y
 CONFIG_RESET=y
 CONFIG_DM_MMC=y
+CONFIG_SANDBOX_MMC=y
 CONFIG_SPI_FLASH_SANDBOX=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_ATMEL=y

diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h
index c51d4cd737b6540dd1c6172ad045a1415f84040f..23a0c40ca528a8377416d4036f6d46ffdeff29e2 100644 (file)
--- a/include/configs/sandbox.h
+++ b/include/configs/sandbox.h
@@ -215,4 +215,6 @@
 #define CONFIG_SYS_SYSTEMACE_WIDTH     16
 #define CONFIG_SYS_SYSTEMACE_BASE      0
 
+#define CONFIG_GENERIC_MMC
+
 #endif

diff --git a/test/dm/blk.c b/test/dm/blk.c
index f4ea32e83e514095d277046bf8a0d249f8235c6a..012bf4cab56ef43fbfa605c7bac9a32eebd4baa1 100644 (file)
--- a/test/dm/blk.c
+++ b/test/dm/blk.c
@@ -83,12 +83,12 @@ static int dm_test_blk_usb(struct unit_test_state *uts)
        ut_asserteq_ptr(usb_dev, dev_get_parent(dev));
 
        /* Check we have one block device for each mass storage device */
-       ut_asserteq(3, count_blk_devices());
+       ut_asserteq(4, count_blk_devices());
 
        /* Now go around again, making sure the old devices were unbound */
        ut_assertok(usb_stop());
        ut_assertok(usb_init());
-       ut_asserteq(3, count_blk_devices());
+       ut_asserteq(4, count_blk_devices());
        ut_assertok(usb_stop());
 
        return 0;