From: Rajashekhara, Sudhakar <sudhakar.raj@ti.com>
Date: Sun, 24 Jun 2012 21:35:17 +0000 (+0000)
Subject: da850/omap-l138: Make MMC and NOR support mutually exclusive
X-Git-Tag: v2012.10-rc1~349
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=4a5edda2ed89fadba28579adab42bb7b7c01632b;p=oweals%2Fu-boot.git

da850/omap-l138: Make MMC and NOR support mutually exclusive

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.

Tested-by: Christian Riesch <christian.riesch@omicron.at>
Signed-off-by: Rajashekhara, Sudhakar <sudhakar.raj@ti.com>
Signed-off-by: Lad, Prabhakar <prabhakar.lad@ti.com>
Signed-off-by: Hadli, Manjunath <manjunath.hadli@ti.com>
---

diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h
index dfbc674064..054d64a8c9 100644
--- a/include/configs/da850evm.h
+++ b/include/configs/da850evm.h
@@ -312,10 +312,12 @@
 #endif
 
 /* SD/MMC configuration */
+#ifndef CONFIG_USE_NOR
 #define CONFIG_MMC
 #define CONFIG_DAVINCI_MMC_SD1
 #define CONFIG_GENERIC_MMC
 #define CONFIG_DAVINCI_MMC
+#endif
 
 /*
  * Enable MMC commands only when