[U-Boot] [PATCH v1 01/11] spl: dm: Undefine DM_MMC, DM_MMC_OPS and BLK, if SPL_DM is not defined

Philipp Tomsich philipp.tomsich at theobroma-systems.com
Fri Feb 17 17:52:38 UTC 2017


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 at theobroma-systems.com>
---
 include/config_uncmd_spl.h | 4 ++++
 scripts/Makefile.uncmd_spl | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/include/config_uncmd_spl.h b/include/config_uncmd_spl.h
index 3c1499c..06498a4 100644
--- a/include/config_uncmd_spl.h
+++ b/include/config_uncmd_spl.h
@@ -1,25 +1,29 @@
 /*
  * (C) Copyright 2012
  * Ilya Yanok, ilya.yanok at gmail.com
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #ifndef __CONFIG_UNCMD_SPL_H__
 #define __CONFIG_UNCMD_SPL_H__
 
 #ifdef CONFIG_SPL_BUILD
 /* SPL needs only BOOTP + TFTP so undefine other stuff to save space */
 
 #ifndef CONFIG_SPL_DM
 #undef CONFIG_DM_SERIAL
 #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
 #undef CONFIG_DM_STDIO
 
 #endif /* CONFIG_SPL_BUILD */
 #endif /* __CONFIG_UNCMD_SPL_H__ */
diff --git a/scripts/Makefile.uncmd_spl b/scripts/Makefile.uncmd_spl
index 15d0836..99b9dee 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
-- 
1.9.1



More information about the U-Boot mailing list