summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configs/sandbox_defconfig2
-rw-r--r--include/configs/sandbox.h2
-rw-r--r--test/dm/blk.c4
3 files changed, 6 insertions, 2 deletions
diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig
index afdf4a3ba7..aec2e538a1 100644
--- 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 c51d4cd737..23a0c40ca5 100644
--- 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 f4ea32e83e..012bf4cab5 100644
--- 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;