summaryrefslogtreecommitdiff
path: root/cpu
diff options
context:
space:
mode:
authorMarkus Klotzbücher <Markus Klotzbümk@pollux.denx.de>2006-03-06 15:04:25 +0100
committerMarkus Klotzbücher <mk@pollux.denx.de>2006-03-06 15:04:25 +0100
commit43638c674a1bc57eef41439e87c281269a08cb16 (patch)
treec42d1e3340add6c4b4099ea59b603ecffbe0430d /cpu
parentf9e029184be5ef550d05262e0f150d31fb09d19b (diff)
downloadu-boot-imx-43638c674a1bc57eef41439e87c281269a08cb16.zip
u-boot-imx-43638c674a1bc57eef41439e87c281269a08cb16.tar.gz
u-boot-imx-43638c674a1bc57eef41439e87c281269a08cb16.tar.bz2
Cleanup of NAND support of delta board using the Monahans Data Flash
Controller.
Diffstat (limited to 'cpu')
-rw-r--r--cpu/pxa/start.S10
1 files changed, 9 insertions, 1 deletions
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 @@ _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