summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Tomsich <philipp.tomsich@theobroma-systems.com>2017-02-09 13:45:01 +0100
committerPhilipp Tomsich <philipp.tomsich@theobroma-systems.com>2017-03-09 01:40:20 +0100
commit7d773ef40e7e98fd45d31ce1842460045d0ca3f9 (patch)
tree9cd564dc522b59e19132af8240b07ac8a9f1ebbf
parent96e3a8826f45b200972e92184413963370dffc08 (diff)
spl: dm: Undefine DM_MMC, DM_MMC_OPS and BLK, if SPL_DM is not defined
CONFIG_DM_MMC, CONFIG_DM_MMC_OPS and CONFIG_BLK depend on CONFIG_DM (CONFIG_SPL_DM); if either is enabled, but CONFIG_SPL_DM is disabled, we also need to undef them. Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
-rw-r--r--include/config_uncmd_spl.h4
-rw-r--r--scripts/Makefile.uncmd_spl4
2 files changed, 8 insertions, 0 deletions
diff --git a/include/config_uncmd_spl.h b/include/config_uncmd_spl.h
index 3c1499c6fb..06498a4cf6 100644
--- a/include/config_uncmd_spl.h
+++ b/include/config_uncmd_spl.h
@@ -16,6 +16,10 @@
#undef CONFIG_DM_GPIO
#undef CONFIG_DM_I2C
#undef CONFIG_DM_SPI
+#undef CONFIG_DM_MMC
+#undef CONFIG_DM_MMC_OPS
+/* CONFIG_BLK also depends on DM */
+#undef CONFIG_BLK
#endif
#undef CONFIG_DM_WARN
diff --git a/scripts/Makefile.uncmd_spl b/scripts/Makefile.uncmd_spl
index 15d0836b49..99b9deefcd 100644
--- a/scripts/Makefile.uncmd_spl
+++ b/scripts/Makefile.uncmd_spl
@@ -12,6 +12,10 @@ CONFIG_DM_GPIO=
CONIFG_DM_I2C=
CONFIG_DM_SPI=
CONFIG_DM_SPI_FLASH=
+CONFIG_DM_MMC=
+CONFIG_DM_MMC_OPS=
+# CONFIG_BLK also depends on CONFIG_DM
+CONFIG_BLK=
endif
endif