diff options
| author | Jon Loeliger <jdl@freescale.com> | 2007-11-02 15:22:01 -0500 |
|---|---|---|
| committer | Jon Loeliger <jdl@freescale.com> | 2007-11-02 15:22:01 -0500 |
| commit | 3cac27c1d40b151f295dcfdb514fa928732e4ecf (patch) | |
| tree | 5dbc1813bfa548e8d31879c39c075bfdcbbf8f86 /cpu/pxa/start.S | |
| parent | 3c89d75409eb26639d36dfa11d4ee3d8b962dc3c (diff) | |
| parent | e60adeac2d8fa30258e1706bb342a3363526e8d7 (diff) | |
| download | u-boot-imx-3cac27c1d40b151f295dcfdb514fa928732e4ecf.zip u-boot-imx-3cac27c1d40b151f295dcfdb514fa928732e4ecf.tar.gz u-boot-imx-3cac27c1d40b151f295dcfdb514fa928732e4ecf.tar.bz2 | |
Merge commit 'remotes/wd/master'
Diffstat (limited to 'cpu/pxa/start.S')
| -rw-r--r-- | cpu/pxa/start.S | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/cpu/pxa/start.S b/cpu/pxa/start.S index ffaa30f..b922485 100644 --- a/cpu/pxa/start.S +++ b/cpu/pxa/start.S @@ -166,13 +166,17 @@ _start_armboot: .word start_armboot /* */ /****************************************************************************/ /* mk@tbd: Fix this! */ -#ifdef CONFIG_CPU_MONAHANS +#if defined(CONFIG_PXA250) || defined(CONFIG_CPU_MONAHANS) #undef ICMR #undef OSMR3 #undef OSCR #undef OWER #undef OIER #endif +#ifdef CONFIG_PXA250 +#undef RCSR +#undef CCCR +#endif /* Interrupt-Controller base address */ IC_BASE: .word 0x40d00000 |