Merge branch 'master' of git://www.denx.de/git/u-boot-mpc86xx

[u-boot] / cpu / pxa / start.S

diff --git a/cpu/pxa/start.S b/cpu/pxa/start.S
index 31f408dfa72f931aa260e52c5597168b5e7b419d..23005e20f97af1884aa55da7a54b20fbc58f23bc 100644 (file)
--- a/cpu/pxa/start.S
+++ b/cpu/pxa/start.S
@@ -128,7 +128,7 @@ relocate:                           /* relocate U-Boot to RAM           */
 copy_loop:
        ldmia   r0!, {r3-r10}           /* copy from source address [r0]    */
        stmia   r1!, {r3-r10}           /* copy to   target address [r1]    */
-       cmp     r0, r2                  /* until source end addreee [r2]    */
+       cmp     r0, r2                  /* until source end address [r2]    */
        ble     copy_loop
 #endif /* !CONFIG_SKIP_RELOCATE_UBOOT */
 
@@ -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