projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pxa: fix previous definition on cpu init
[platform/kernel/u-boot.git]
/
cpu
/
pxa
/
start.S
diff --git
a/cpu/pxa/start.S
b/cpu/pxa/start.S
index
31f408d
..
1cdb709
100644
(file)
--- a/
cpu/pxa/start.S
+++ b/
cpu/pxa/start.S
@@
-166,17
+166,13
@@
_start_armboot: .word start_armboot
/* */
/****************************************************************************/
/* mk@tbd: Fix this! */
/* */
/****************************************************************************/
/* mk@tbd: Fix this! */
-#
if defined(CONFIG_PXA250) || defined(CONFIG_CPU_MONAHANS)
+#
undef RCSR
#undef ICMR
#undef OSMR3
#undef OSCR
#undef OWER
#undef OIER
#undef ICMR
#undef OSMR3
#undef OSCR
#undef OWER
#undef OIER
-#endif /* CONFIG_PXA250 || CONFIG_CPU_MONAHANS */
-#ifdef CONFIG_PXA250
-#undef RCSR
#undef CCCR
#undef CCCR
-#endif /* CONFIG_PXA250 */
/* Interrupt-Controller base address */
IC_BASE: .word 0x40d00000
/* Interrupt-Controller base address */
IC_BASE: .word 0x40d00000