diff options
| author | Stefan Roese <sr@denx.de> | 2007-10-27 13:43:40 +0200 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2007-10-27 13:43:40 +0200 |
| commit | 49801028715cd8bc22863cdfc0ee7919b7a6af4b (patch) | |
| tree | b7344561054c6da1886e0622716ad6da9bb2325b /cpu/pxa/start.S | |
| parent | 20d500d531a6b971ce6cc1bf191cb0092cdc0afc (diff) | |
| parent | d78791ae914d4e7c5edca1cdad73b3dc81a4eb82 (diff) | |
| download | u-boot-imx-49801028715cd8bc22863cdfc0ee7919b7a6af4b.zip u-boot-imx-49801028715cd8bc22863cdfc0ee7919b7a6af4b.tar.gz u-boot-imx-49801028715cd8bc22863cdfc0ee7919b7a6af4b.tar.bz2 | |
Merge git://www.denx.de/git/u-boot
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 |