summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRajashekhara, Sudhakar <sudhakar.raj@ti.com>2012-06-20 20:34:58 +0530
committerManjunathappa, Prakash <prakash.pm@ti.com>2012-06-26 11:45:12 +0530
commit37788d678909d9fb750fc464bc8c0f569be0aa0c (patch)
tree90b770fe848a18f69a09b60c9b9a72653709b64e
parent3a705878dbbf5e9d4caee9f0b69095dc9ad39000 (diff)
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. 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>
-rw-r--r--include/configs/da850evm.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h
index 8b4fea1c63..4546e0f5b5 100644
--- a/include/configs/da850evm.h
+++ b/include/configs/da850evm.h
@@ -314,10 +314,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