commit 27eba14fb2bce64ddb1f1723329b0f9cc7bdb09a
author Markus Klotzbücher <Markus Klotzbümk@pollux.denx.de> Mon Mar 06 15:04:25 2006 +0100
committer Markus Klotzbücher <mk@pollux.denx.de> Mon Mar 06 15:04:25 2006 +0100
tree c42d1e3340add6c4b4099ea59b603ecffbe0430d
parent 85678e2fa8c9f8240a1a7c39519518d499dea951

Cleanup of NAND support of delta board using the Monahans Data Flash
Controller.

cpu/pxa/start.S

diff --git a/cpu/pxa/start.S b/cpu/pxa/start.S
index 0eb811f..7e5a1ee 100644
--- a/cpu/pxa/start.S
+++ b/cpu/pxa/start.S
@@ -165,7 +165,15 @@
 /* - setup memory timing						    */
 /*									    */
 /****************************************************************************/
-
+/* mk@tbd: Fix this! */
+#ifdef CONFIG_CPU_MONAHANS
+#undef ICMR
+#undef OSMR3
+#undef OSCR
+#undef OWER
+#undef OIER
+#endif
+	
 /* Interrupt-Controller base address				            */
 IC_BASE:	   .word	   0x40d00000
 #define ICMR	0x04