start.S:183:1: warning: "ICMR" redefined In file included from start.S:33: /home/j/u-boot-at91/include/asm/arch/pxa-regs.h:935:1: warning: this is the location of the previous definition start.S:187:1: warning: "RCSR" redefined /home/j/u-boot-at91/include/asm/arch/pxa-regs.h:1602:1: warning: this is the location of the previous definition start.S:191:1: warning: "OSMR3" redefined /home/j/u-boot-at91/include/asm/arch/pxa-regs.h:869:1: warning: this is the location of the previous definition start.S:192:1: warning: "OSCR" redefined /home/j/u-boot-at91/include/asm/arch/pxa-regs.h:870:1: warning: this is the location of the previous definition start.S:193:1: warning: "OWER" redefined /home/j/u-boot-at91/include/asm/arch/pxa-regs.h:872:1: warning: this is the location of the previous definition start.S:194:1: warning: "OIER" redefined /home/j/u-boot-at91/include/asm/arch/pxa-regs.h:873:1: warning: this is the location of the previous definition start.S:207:1: warning: "CCCR" redefined /home/j/u-boot-at91/include/asm/arch/pxa-regs.h:1770:1: warning: this is the location of the previous definition
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD plagnioj@jcrosoft.com
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