summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRajashekhara, Sudhakar <sudhakar.raj@ti.com>2012-06-24 21:35:17 +0000
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2012-09-01 14:58:09 +0200
commit4a5edda2ed89fadba28579adab42bb7b7c01632b (patch)
tree58fefb703ab7c5d19faae2c1662a368edb9cc358
parent6652c62e0146411ea2b38fb36336915ffdba99de (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. 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>
-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 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