[U-Boot-Users] [PATCH] Fix various redefinition build warnings

Marcel Ziswiler marcel at ziswiler.com
Thu May 1 09:05:14 CEST 2008


- warning: "ICMR" redefined
- warning: "RCSR" redefined
- warning: "OSMR3" redefined
- warning: "OSCR" redefined
- warning: "OWER" redefined
- warning: "OIER" redefined
- warning: "CCCR" redefined

Signed-off-by: Marcel Ziswiler <marcel at ziswiler.com>
---
 cpu/pxa/start.S |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cpu/pxa/start.S b/cpu/pxa/start.S
index 31f408d..a460f30 100644
--- a/cpu/pxa/start.S
+++ b/cpu/pxa/start.S
@@ -166,17 +166,17 @@ _start_armboot: .word start_armboot
 /*									    */
 /****************************************************************************/
 /* mk at tbd: Fix this! */
-#if defined(CONFIG_PXA250) || defined(CONFIG_CPU_MONAHANS)
+#if defined(CONFIG_PXA250) || defined(CONFIG_PXA27X) || defined(CONFIG_CPU_MONAHANS)
 #undef ICMR
 #undef OSMR3
 #undef OSCR
 #undef OWER
 #undef OIER
-#endif /* CONFIG_PXA250 || CONFIG_CPU_MONAHANS */
-#ifdef CONFIG_PXA250
+#endif /* CONFIG_PXA250 || CONFIG_PXA27X || CONFIG_CPU_MONAHANS */
+#if defined(CONFIG_PXA250) || defined(CONFIG_PXA27X)
 #undef RCSR
 #undef CCCR
-#endif /* CONFIG_PXA250 */
+#endif /* CONFIG_PXA250 || CONFIG_PXA27X */
 
 /* Interrupt-Controller base address					    */
 IC_BASE:	   .word	   0x40d00000
-- 
1.5.4.1





More information about the U-Boot mailing list