diff options
| author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2008-05-01 02:13:44 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-05-03 20:56:22 +0200 |
| commit | 27c38689d0cfde0e444239345f97b5eecc9f4067 (patch) | |
| tree | b57a69d1b9532b2b81d7d5e38c3dd6d26bec536c /cpu/pxa | |
| parent | 6d12e697de794d700767f22f950e3026ccf4daf6 (diff) | |
| download | u-boot-imx-27c38689d0cfde0e444239345f97b5eecc9f4067.zip u-boot-imx-27c38689d0cfde0e444239345f97b5eecc9f4067.tar.gz u-boot-imx-27c38689d0cfde0e444239345f97b5eecc9f4067.tar.bz2 | |
pxa: fix previous definition on cpu init
start.S:183:1: warning: "ICMR" redefined
In file included from start.S:33:
include/asm/arch/pxa-regs.h:935:1: warning: this is the location of the previous definition
start.S:187:1: warning: "RCSR" redefined
...
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Diffstat (limited to 'cpu/pxa')
| -rw-r--r-- | cpu/pxa/start.S | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/cpu/pxa/start.S b/cpu/pxa/start.S index 31f408d..1cdb709 100644 --- a/cpu/pxa/start.S +++ b/cpu/pxa/start.S @@ -166,17 +166,13 @@ _start_armboot: .word start_armboot /* */ /****************************************************************************/ /* mk@tbd: Fix this! */ -#if defined(CONFIG_PXA250) || defined(CONFIG_CPU_MONAHANS) +#undef RCSR #undef ICMR #undef OSMR3 #undef OSCR #undef OWER #undef OIER -#endif /* CONFIG_PXA250 || CONFIG_CPU_MONAHANS */ -#ifdef CONFIG_PXA250 -#undef RCSR #undef CCCR -#endif /* CONFIG_PXA250 */ /* Interrupt-Controller base address */ IC_BASE: .word 0x40d00000 |