From 43638c674a1bc57eef41439e87c281269a08cb16 Mon Sep 17 00:00:00 2001
From: Markus Klotzbücher <Markus Klotzbümk@pollux.denx.de>
Date: Mon, 6 Mar 2006 15:04:25 +0100
Subject: Cleanup of NAND support of delta board using the Monahans Data Flash
 Controller.

---
 cpu/pxa/start.S | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'cpu/pxa')

diff --git a/cpu/pxa/start.S b/cpu/pxa/start.S
index 0eb811f20e..7e5a1ee495 100644
--- a/cpu/pxa/start.S
+++ b/cpu/pxa/start.S
@@ -165,7 +165,15 @@ _start_armboot: .word start_armboot
 /* - 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
-- 
cgit