Enable building the MMC code for sandbox. This increases build coverage for sandbox.
Signed-off-by: Simon Glass sjg@chromium.org ---
configs/sandbox_defconfig | 10 ++++++---- include/configs/sandbox.h | 2 ++ test/dm/blk.c | 4 ++-- 3 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig index bfc8b61..a760561 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_FIT=y @@ -30,8 +31,8 @@ CONFIG_ADC=y CONFIG_ADC_SANDBOX=y CONFIG_BLK=y CONFIG_CLK=y -CONFIG_SANDBOX_GPIO=y CONFIG_PM8916_GPIO=y +CONFIG_SANDBOX_GPIO=y CONFIG_SYS_I2C_SANDBOX=y CONFIG_CROS_EC_KEYB=y CONFIG_LED=y @@ -41,6 +42,7 @@ CONFIG_CROS_EC=y CONFIG_CROS_EC_SANDBOX=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 @@ -59,10 +61,8 @@ CONFIG_PINCTRL=y CONFIG_PINCONF=y CONFIG_PINCTRL_SANDBOX=y CONFIG_DM_PMIC=y -CONFIG_DM_PMIC_SANDBOX=y CONFIG_PMIC_PM8916=y -CONFIG_SPMI=y -CONFIG_SPMI_SANDBOX=y +CONFIG_DM_PMIC_SANDBOX=y CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_SANDBOX=y CONFIG_RAM=y @@ -72,6 +72,8 @@ CONFIG_SANDBOX_SERIAL=y CONFIG_SOUND=y CONFIG_SOUND_SANDBOX=y CONFIG_SANDBOX_SPI=y +CONFIG_SPMI=y +CONFIG_SPMI_SANDBOX=y CONFIG_TIMER=y CONFIG_TIMER_EARLY=y CONFIG_SANDBOX_TIMER=y diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index f0f7cd4..2d43102 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -233,4 +233,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 f4ea32e..012bf4c 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;