[U-Boot] [PATCH 4/7] da850/omap-l138: Make MMC and NOR support mutually exclusive

[Prabhakar Lad]

From: Rajashekhara, Sudhakar <sudhakar.raj at ti.com>

On Logic PD Rev.3 DA850/OMAP-L138 EVM, NOR and MMC/SD cannot
work together. This patch enables the MMC/SD support only
when NOR support is disabled. NOR Flash identification works
even without this patch, but erase and write will have issues.

Signed-off-by: Rajashekhara, Sudhakar <sudhakar.raj at ti.com>
Signed-off-by: Lad, Prabhakar <prabhakar.lad at ti.com>
Signed-off-by: Hadli, Manjunath <manjunath.hadli at ti.com>
---
 include/configs/da850evm.h |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h
index 4da6d24..08f8d9b 100644
--- a/include/configs/da850evm.h
+++ b/include/configs/da850evm.h
@@ -314,11 +314,13 @@
 #endif
 
 /* SD/MMC */
+#ifndef CONFIG_USE_NOR
 #define CONFIG_MMC
 #define CONFIG_DAVINCI_MMC_SD1
 #define CONFIG_MMC_MBLOCK
 #define CONFIG_GENERIC_MMC
 #define CONFIG_DAVINCI_MMC
+#endif
 
 /* Load U-Boot Image From MMC */
 #ifdef CONFIG_SPL_MMC_LOAD
-- 
1.7.4.1