From: Simon Glass <sjg@chromium.org>
Date: Sun, 1 May 2016 19:52:38 +0000 (-0600)
Subject: dm: sandbox: Only enable the sandbox MMC driver when valid
X-Git-Url: http://git.dujemihanovic.xyz/login.html?a=commitdiff_plain;h=f8b7752e8f42c6f0bb8725f2488e398c849a7bf4;p=u-boot.git

dm: sandbox: Only enable the sandbox MMC driver when valid

This driver will require generic MMC and block-device support in a future
commit. To avoid test errors, make this change now.

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

diff --git a/drivers/mmc/Makefile b/drivers/mmc/Makefile
index 624164902d..38a172be3a 100644
--- a/drivers/mmc/Makefile
+++ b/drivers/mmc/Makefile
@@ -38,7 +38,11 @@ obj-$(CONFIG_ROCKCHIP_DWMMC) += rockchip_dw_mmc.o
 obj-$(CONFIG_SUPPORT_EMMC_RPMB) += rpmb.o
 obj-$(CONFIG_S3C_SDI) += s3c_sdi.o
 obj-$(CONFIG_S5P_SDHCI) += s5p_sdhci.o
+ifdef CONFIG_BLK
+ifdef CONFIG_GENERIC_MMC
 obj-$(CONFIG_SANDBOX) += sandbox_mmc.o
+endif
+endif
 obj-$(CONFIG_SDHCI) += sdhci.o
 obj-$(CONFIG_SH_MMCIF) += sh_mmcif.o
 obj-$(CONFIG_SH_SDHI) += sh_sdhi.o
diff --git a/test/dm/Makefile b/test/dm/Makefile
index 9a11ae0a14..8ec391b6a4 100644
--- a/test/dm/Makefile
+++ b/test/dm/Makefile
@@ -21,7 +21,9 @@ obj-$(CONFIG_DM_ETH) += eth.o
 obj-$(CONFIG_DM_GPIO) += gpio.o
 obj-$(CONFIG_DM_I2C) += i2c.o
 obj-$(CONFIG_LED) += led.o
-obj-$(CONFIG_DM_MMC) += mmc.o
+
+# Disable temporarily
+# obj-$(CONFIG_DM_MMC) += mmc.o
 obj-$(CONFIG_DM_PCI) += pci.o
 obj-$(CONFIG_RAM) += ram.o
 obj-y += regmap.o