Drop support for CONFIG_SKIP_RELOCATE_UBOOT

[people/ms/u-boot.git] / arch / arm / cpu / arm1176 / start.S

diff --git a/arch/arm/cpu/arm1176/start.S b/arch/arm/cpu/arm1176/start.S
index 1a2e5aa37e44f16daceaa87c464e5f20e2284081..f04d2688814e238bf460f5a56bef9c11a4a9b24e 100644 (file)
--- a/arch/arm/cpu/arm1176/start.S
+++ b/arch/arm/cpu/arm1176/start.S
@@ -281,7 +281,6 @@ stack_setup:
        cmp     r0, r6
        beq     clear_bss
 
-#ifndef CONFIG_SKIP_RELOCATE_UBOOT
 copy_loop:
        ldmia   r0!, {r9-r10}           /* copy from source address [r0]    */
        stmia   r6!, {r9-r10}           /* copy to   target address [r1]    */
@@ -328,7 +327,6 @@ fixnext:
        cmp     r2, r3
        blo     fixloop
 #endif
-#endif /* #ifndef CONFIG_SKIP_RELOCATE_UBOOT */
 
 #ifdef CONFIG_ENABLE_MMU
 enable_mmu:
@@ -399,9 +397,7 @@ _nand_boot: .word nand_boot
        ldr     r0, _board_init_r_ofs
        adr     r1, _start
        add     lr, r0, r1
-#ifndef CONFIG_SKIP_RELOCATE_UBOOT
        add     lr, lr, r9
-#endif
        /* setup parameters for board_init_r */
        mov     r0, r5          /* gd_t */
        mov     r1, r7          /* dest_addr */