dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-10-27 00:24:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Ovidiu Panait
2021-11-30 18:33:49 +02:00
committed by Michal Simek
parent 380bd08370
commit edf0f9b15e
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/microblaze/cpu/start.S
View File

@@ -15,7 +15,7 @@
_start: _start:
mts rmsr, r0 /* disable cache */ mts rmsr, r0 /* disable cache */
addi r8, r0, __end addi r8, r0, _end
mts rslr, r8 mts rslr, r8
#if defined(CONFIG_SPL_BUILD) #if defined(CONFIG_SPL_BUILD)
@@ -270,7 +270,7 @@ relocate_code:
add r23, r0, r7 /* Move reloc addr to r23 */ add r23, r0, r7 /* Move reloc addr to r23 */
/* Relocate text and data - r12 temp value */ /* Relocate text and data - r12 temp value */
addi r21, r0, _start addi r21, r0, _start
addi r22, r0, __end - 4 /* Include BSS too */ addi r22, r0, _end - 4 /* Include BSS too */
rsub r6, r21, r22 rsub r6, r21, r22
or r5, r0, r0 or r5, r0, r0

4
arch/microblaze/cpu/u-boot-spl.lds
View File

@@ -53,10 +53,10 @@ SECTIONS
. = ALIGN(4); . = ALIGN(4);
__bss_end = .; __bss_end = .;
} }
__end = . ; _end = . ;
} }
#if defined(CONFIG_SPL_MAX_FOOTPRINT) #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"); "SPL image plus BSS too big");
#endif #endif

2
arch/microblaze/cpu/u-boot.lds
View File

@@ -56,5 +56,5 @@ SECTIONS
. = ALIGN(4); . = ALIGN(4);
__bss_end = .; __bss_end = .;
} }
__end = . ; _end = . ;
} }

2
arch/microblaze/include/asm/processor.h
View File

@@ -8,7 +8,7 @@
/* References to section boundaries */ /* References to section boundaries */
extern char __end[]; extern char _end[];
extern char __text_start[]; extern char __text_start[];
/* Microblaze board initialization function */ /* Microblaze board initialization function */