microblaze: u-boot.lds: replace __end symbol with _end

board_fdt_blob_setup() uses the _end symbol to find the dtb in the non-spl
case. In order to allow microblaze builds to compile successfully with
CONFIG_OF_SEPARATE, the _end symbol must be defined. Align microblaze with
the other architectures and use _end symbol rather than __end to mark the
end of the u-boot binary.

Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
Link: https://lore.kernel.org/r/20211130163358.2531677-2-ovidiu.panait@windriver.com
Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/arch/microblaze/cpu/start.S b/arch/microblaze/cpu/start.S
index 9479737aa296e2b746916e7719b0d8204c154e00..463e0feba47e87f2d02acf7ee3f15cfcd0db3d34 100644 (file)
--- a/arch/microblaze/cpu/start.S
+++ b/arch/microblaze/cpu/start.S
@@ -15,7 +15,7 @@
 _start:
        mts     rmsr, r0        /* disable cache */
 
-       addi    r8, r0, __end
+       addi    r8, r0, _end
        mts     rslr, r8
 
 #if defined(CONFIG_SPL_BUILD)
@@ -270,7 +270,7 @@ relocate_code:
        add     r23, r0, r7 /* Move reloc addr to r23 */
        /* Relocate text and data - r12 temp value */
        addi    r21, r0, _start
-       addi    r22, r0, __end - 4 /* Include BSS too */
+       addi    r22, r0, _end - 4 /* Include BSS too */
 
        rsub    r6, r21, r22
        or      r5, r0, r0

diff --git a/arch/microblaze/cpu/u-boot-spl.lds b/arch/microblaze/cpu/u-boot-spl.lds
index 3387eb7189dfeca8002a94731b818f8e4807f4f3..7883a64b158d9504334eea43ae32710dca64eb22 100644 (file)
--- a/arch/microblaze/cpu/u-boot-spl.lds
+++ b/arch/microblaze/cpu/u-boot-spl.lds
@@ -53,10 +53,10 @@ SECTIONS
                . = ALIGN(4);
                __bss_end = .;
        }
-       __end = . ;
+       _end = . ;
 }
 
 #if defined(CONFIG_SPL_MAX_FOOTPRINT)
-ASSERT(__end - _start <= (CONFIG_SPL_MAX_FOOTPRINT), \
+ASSERT(_end - _start <= (CONFIG_SPL_MAX_FOOTPRINT), \
         "SPL image plus BSS too big");
 #endif

diff --git a/arch/microblaze/cpu/u-boot.lds b/arch/microblaze/cpu/u-boot.lds
index 5dc09dbad2df519498046ccaca55f4b10c8593c4..2b316cc7f5a57f3cfc41fd9b59ac45c64911d5e2 100644 (file)
--- a/arch/microblaze/cpu/u-boot.lds
+++ b/arch/microblaze/cpu/u-boot.lds
@@ -56,5 +56,5 @@ SECTIONS
                . = ALIGN(4);
                __bss_end = .;
        }
-       __end = . ;
+       _end = . ;
 }

diff --git a/arch/microblaze/include/asm/processor.h b/arch/microblaze/include/asm/processor.h
index 16e0d0ef0a958534b461cf2711d26c6b345ba5b4..958018c1909e010b5505784c32c656dec17f1b2e 100644 (file)
--- a/arch/microblaze/include/asm/processor.h
+++ b/arch/microblaze/include/asm/processor.h
@@ -8,7 +8,7 @@
 
 /* References to section boundaries */
 
-extern char __end[];
+extern char _end[];
 extern char __text_start[];
 
 /* Microblaze board initialization function */