From 7d773ef40e7e98fd45d31ce1842460045d0ca3f9 Mon Sep 17 00:00:00 2001 From: Philipp Tomsich Date: Thu, 9 Feb 2017 13:45:01 +0100 Subject: 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 --- 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 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 -- cgit v1.2.3