]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
microblaze: Remove CONFIG_TEXT_BASE from code
authorMichal Simek <michal.simek@amd.com>
Fri, 24 Jun 2022 12:14:59 +0000 (14:14 +0200)
committerMichal Simek <michal.simek@amd.com>
Fri, 24 Jun 2022 12:14:59 +0000 (14:14 +0200)
Use symbol instead macro to find where U-Boot starts.

Signed-off-by: Michal Simek <michal.simek@amd.com>
Link: https://lore.kernel.org/r/d5d4c201bee6171e85b47783d916387d84db0456.1655299267.git.michal.simek@amd.com
arch/microblaze/cpu/start.S

index 1acac5faf4287b856c8054bd49d3e5eb9e563489..205d5f384c389693bffd80a4c51a11852b0cb9ae 100644 (file)
@@ -142,7 +142,7 @@ __setup_exceptions:
        swi     r2, r4, 0x0     /* reset address - imm opcode */
        swi     r3, r4, 0x4     /* reset address - brai opcode */
 
-       addik   r6, r0, CONFIG_SYS_TEXT_BASE
+       addik   r6, r0, _start
        sw      r6, r1, r0
        lhu     r7, r1, r10
        rsubi   r8, r10, 0x2
@@ -285,7 +285,7 @@ relocate_code:
 
        /* R23 points to the base address. */
        add     r23, r0, r7 /* Move reloc addr to r23 */
-       addi    r24, r0, CONFIG_SYS_TEXT_BASE /* Get reloc offset */
+       addi    r24, r0, _start /* Get reloc offset */
        rsub    r23, r24, r23 /* keep - this is already here gd->reloc_off */
 
        /* Setup vectors with post-relocation symbols */
@@ -323,7 +323,7 @@ relocate_code:
        nop
 
 2:     addi    r5, r31, 0 /* gd is initialized in board_r.c */
-       addi    r6, r0, CONFIG_SYS_TEXT_BASE
+       addi    r6, r0, _start
        addi    r12, r23, board_init_r
        bra     r12 /* Jump to relocated code */