Commit 3929fb0a authored by Simon Glass's avatar Simon Glass Committed by Tom Rini
Browse files

Replace __bss_end__ with __bss_end



Note this is a tree-wide change affecting multiple architectures.

At present we use __bss_start, but mostly __bss_end__. This seems
inconsistent and in a number of places __bss_end is used instead.

Change to use __bss_end for the BSS end symbol throughout U-Boot. This
makes it possible to use the asm-generic/sections.h file on all
archs.
Signed-off-by: default avatarSimon Glass <sjg@chromium.org>
parent 69d59b47
......@@ -106,7 +106,7 @@ _image_copy_end_ofs:
.globl _bss_end_ofs
_bss_end_ofs:
.word __bss_end__ - _start
.word __bss_end - _start
.globl _end_ofs
_end_ofs:
......
......@@ -57,6 +57,6 @@ SECTIONS
__bss_start = .;
*(.bss*)
. = ALIGN(4);
__bss_end__ = .;
__bss_end = .;
} >.sdram
}
......@@ -121,7 +121,7 @@ _bss_start_ofs:
.globl _bss_end_ofs
_bss_end_ofs:
.word __bss_end__ - _start
.word __bss_end - _start
.globl _end_ofs
_end_ofs:
......
......@@ -103,7 +103,7 @@ _bss_start_ofs:
.globl _bss_end_ofs
_bss_end_ofs:
.word __bss_end__ - _start
.word __bss_end - _start
.globl _end_ofs
_end_ofs:
......
......@@ -57,7 +57,7 @@ SECTIONS
. = ALIGN(4);
__bss_start = .;
.bss : { *(.bss) }
__bss_end__ = .;
__bss_end = .;
_end = .;
}
......@@ -87,7 +87,7 @@ _bss_start_ofs:
.globl _bss_end_ofs
_bss_end_ofs:
.word __bss_end__ - _start
.word __bss_end - _start
.globl _end_ofs
_end_ofs:
......
......@@ -93,7 +93,7 @@ _bss_start_ofs:
.globl _bss_end_ofs
_bss_end_ofs:
.word __bss_end__ - _start
.word __bss_end - _start
.globl _end_ofs
_end_ofs:
......
......@@ -64,7 +64,7 @@ void board_init_f(ulong dummy)
#endif
/* Third, we clear the BSS. */
memset(__bss_start, 0, __bss_end__ - __bss_start);
memset(__bss_start, 0, __bss_end - __bss_start);
/* Finally, setup gd and move to the next step. */
gd = &gdata;
......
......@@ -133,7 +133,7 @@ _bss_start_ofs:
.globl _bss_end_ofs
_bss_end_ofs:
.word __bss_end__ - _start
.word __bss_end - _start
.globl _end_ofs
_end_ofs:
......
......@@ -73,7 +73,7 @@ SECTIONS
__bss_start = .;
*(.bss*)
. = ALIGN(4);
__bss_end__ = .;
__bss_end = .;
}
_end = .;
......
......@@ -73,7 +73,7 @@ SECTIONS
__bss_start = .;
*(.bss*)
. = ALIGN(4);
__bss_end__ = .;
__bss_end = .;
}
_end = .;
......
......@@ -142,7 +142,7 @@ _bss_start_ofs:
.globl _bss_end_ofs
_bss_end_ofs:
.word __bss_end__ - _start
.word __bss_end - _start
.globl _end_ofs
_end_ofs:
......@@ -151,7 +151,7 @@ _end_ofs:
#ifdef CONFIG_NAND_U_BOOT
.globl _end
_end:
.word __bss_end__
.word __bss_end
#endif
#ifdef CONFIG_USE_IRQ
......
......@@ -103,7 +103,7 @@ _bss_start_ofs:
.globl _bss_end_ofs
_bss_end_ofs:
.word __bss_end__ - _start
.word __bss_end - _start
.globl _end_ofs
_end_ofs:
......
......@@ -99,7 +99,7 @@ _bss_start_ofs:
.globl _bss_end_ofs
_bss_end_ofs:
.word __bss_end__ - _start
.word __bss_end - _start
.globl _end_ofs
_end_ofs:
......
......@@ -62,6 +62,6 @@ SECTIONS
__bss_start = .;
*(.bss*)
. = ALIGN(4);
__bss_end__ = .;
__bss_end = .;
} >.sdram
}
......@@ -46,7 +46,7 @@ SECTIONS
__bss_start = .;
*(.bss*)
. = ALIGN(4);
__bss_end__ = .;
__bss_end = .;
} >.sdram
. = ALIGN(8);
......
......@@ -96,7 +96,7 @@ _image_copy_end_ofs:
.globl _bss_end_ofs
_bss_end_ofs:
.word __bss_end__ - _start
.word __bss_end - _start
.globl _end_ofs
_end_ofs:
......
......@@ -112,7 +112,7 @@ _bss_start_ofs:
.globl _bss_end_ofs
_bss_end_ofs:
.word __bss_end__ - _start
.word __bss_end - _start
.globl _end_ofs
_end_ofs:
......
......@@ -71,7 +71,7 @@ SECTIONS
__bss_start = .;
*(.bss*)
. = ALIGN(4);
__bss_end__ = .;
__bss_end = .;
}
/DISCARD/ : { *(.dynstr*) }
......
......@@ -120,7 +120,7 @@ _bss_start_ofs:
.globl _bss_end_ofs
_bss_end_ofs:
.word __bss_end__ - _start
.word __bss_end - _start
.globl _end_ofs
_end_ofs:
......
......@@ -78,7 +78,7 @@ _bss_start_ofs:
.globl _bss_end_ofs
_bss_end_ofs:
.word __bss_end__ - _start
.word __bss_end - _start
.globl _end_ofs
_end_ofs:
......
......@@ -88,7 +88,7 @@ _bss_start_ofs:
.globl _bss_end_ofs
_bss_end_ofs:
.word __bss_end__ - _start
.word __bss_end - _start
.globl _end_ofs
_end_ofs:
......
......@@ -85,7 +85,7 @@ SECTIONS
__bss_start = .;
*(.bss*)
. = ALIGN(4);
__bss_end__ = .;
__bss_end = .;
}
/DISCARD/ : { *(.dynstr*) }
......@@ -96,5 +96,5 @@ SECTIONS
}
#if defined(CONFIG_SPL_TEXT_BASE) && defined(CONFIG_SPL_MAX_SIZE)
ASSERT(__bss_end__ < (CONFIG_SPL_TEXT_BASE + CONFIG_SPL_MAX_SIZE), "SPL image too big");
ASSERT(__bss_end < (CONFIG_SPL_TEXT_BASE + CONFIG_SPL_MAX_SIZE), "SPL image too big");
#endif
......@@ -27,7 +27,7 @@
#include <asm/arch/spl.h>
/* Linker symbols. */
extern char __bss_start[], __bss_end__[];
extern char __bss_start[], __bss_end[];
extern gd_t gdata;
......
......@@ -85,7 +85,7 @@
*/
.globl __bss_start
.globl __bss_end__
.globl __bss_end
/*
* entry point of crt0 sequence
......@@ -141,7 +141,7 @@ here:
bl c_runtime_cpu_setup /* we still call old routine here */
ldr r0, =__bss_start /* this is auto-relocated! */
ldr r1, =__bss_end__ /* this is auto-relocated! */
ldr r1, =__bss_end /* this is auto-relocated! */
mov r2, #0x00000000 /* prepare zero to clear BSS */
......
......@@ -45,7 +45,7 @@ void __weak board_init_f(ulong dummy)
asm volatile("mov sp, %0\n" : : "r"(CONFIG_SPL_STACK));
/* Clear the BSS. */
memset(__bss_start, 0, __bss_end__ - __bss_start);
memset(__bss_start, 0, __bss_end - __bss_start);
/* Set global data pointer. */
gd = &gdata;
......
......@@ -244,7 +244,7 @@ relocate_code:
/* zero out .bss */
mov r0, 0
mov r1, 0
lda.w r9, __bss_end__
lda.w r9, __bss_end
sub r9, r8
1: st.d r10++, r0
sub r9, 8
......
......@@ -68,5 +68,5 @@ SECTIONS
*(.bss.*)
}
. = ALIGN(8);
__bss_end__ = .;
__bss_end = .;
}
......@@ -27,6 +27,6 @@
extern char _text[], _etext[];
extern char _data[], __data_lma[], _edata[], __edata_lma[];
extern char __got_start[], __got_lma[], __got_end[];
extern char __bss_end__[];
extern char __bss_end[];
#endif /* __ASM_AVR32_SECTIONS_H */
......@@ -116,7 +116,7 @@ static int display_banner (void)
printf ("\n\n%s\n\n", version_string);
printf ("U-Boot code: %08lx -> %08lx data: %08lx -> %08lx\n",
(unsigned long)_text, (unsigned long)_etext,
(unsigned long)_data, (unsigned long)__bss_end__);
(unsigned long)_data, (unsigned long)__bss_end);
return 0;
}
......@@ -188,7 +188,7 @@ void board_init_f(ulong board_type)
* - stack
*/
addr = CONFIG_SYS_SDRAM_BASE + sdram_size;
monitor_len = __bss_end__ - _text;
monitor_len = __bss_end - _text;
/*
* Reserve memory for u-boot code, data and bss.
......
......@@ -77,7 +77,7 @@ static char *failed = "*** failed ***\n";
#include <environment.h>
extern ulong __init_end;
extern ulong __bss_end__;
extern ulong __bss_end;
#if defined(CONFIG_WATCHDOG)
# define INIT_FUNC_WATCHDOG_INIT watchdog_init,
......@@ -244,7 +244,7 @@ board_init_f (ulong bootflag)
* - monitor code
* - board info struct
*/
len = (ulong)&__bss_end__ - CONFIG_SYS_MONITOR_BASE;
len = (ulong)&__bss_end - CONFIG_SYS_MONITOR_BASE;
addr = CONFIG_SYS_SDRAM_BASE + gd->ram_size;
......
......@@ -240,7 +240,7 @@ fix_got_loop:
clear_bss:
la $r0, __bss_start /* r0 <- rel __bss_start in FLASH */
add $r0, $r0, $r9 /* r0 <- rel __bss_start in FLASH */
la $r1, __bss_end__ /* r1 <- rel __bss_end in RAM */
la $r1, __bss_end /* r1 <- rel __bss_end in RAM */
add $r1, $r1, $r9 /* r0 <- rel __bss_end in RAM */
li $r2, 0x00000000 /* clear */
......
......@@ -66,7 +66,7 @@ SECTIONS
__bss_start = .;
*(.bss)
. = ALIGN(4);
__bss_end__ = .;
__bss_end = .;
}
}
......@@ -31,7 +31,7 @@
/* for the following variables, see start.S */
extern ulong __bss_start; /* BSS start relative to _start */
extern ulong __bss_end__; /* BSS end relative to _start */
extern ulong __bss_end; /* BSS end relative to _start */
extern ulong _end; /* end of image relative to _start */
extern ulong _start; /* start of image relative to _start */
extern ulong _TEXT_BASE; /* code start */
......
......@@ -192,7 +192,7 @@ void board_init_f(ulong bootflag)
memset((void *)gd, 0, GENERATED_GBL_DATA_SIZE);
gd->mon_len = (unsigned int)(&__bss_end__) - (unsigned int)(&_start);
gd->mon_len = (unsigned int)(&__bss_end) - (unsigned int)(&_start);
for (init_fnc_ptr = init_sequence; *init_fnc_ptr; ++init_fnc_ptr) {
if ((*init_fnc_ptr)() != 0)
......
......@@ -99,12 +99,12 @@ _cur: movhi r5, %hi(_cur - _start)
3:
/* ZERO BSS/SBSS -- bss and sbss are assumed to be adjacent
* and between __bss_start and __bss_end__.
* and between __bss_start and __bss_end.
*/
movhi r5, %hi(__bss_start)
ori r5, r5, %lo(__bss_start)
movhi r6, %hi(__bss_end__)
ori r6, r6, %lo(__bss_end__)
movhi r6, %hi(__bss_end)
ori r6, r6, %lo(__bss_end)
beq r5, r6, 5f
4: stwio r0, 0(r5)
......
......@@ -101,7 +101,7 @@ SECTIONS
*(.scommon)
}
. = ALIGN(4);
__bss_end__ = .;
__bss_end = .;
PROVIDE (end = .);
/* DEBUG -- symbol table, string table, etc. etc.
......
......@@ -72,7 +72,7 @@
GOT_ENTRY(transfer_to_handler)
GOT_ENTRY(__init_end)
GOT_ENTRY(__bss_end__)
GOT_ENTRY(__bss_end)
GOT_ENTRY(__bss_start)
END_GOT
......@@ -715,7 +715,7 @@ in_ram:
* Now clear BSS segment
*/
lwz r3,GOT(__bss_start)
lwz r4,GOT(__bss_end__)
lwz r4,GOT(__bss_end)
cmplw 0, r3, r4
beq 6f
......
......@@ -89,6 +89,6 @@ SECTIONS
*(COMMON)
. = ALIGN(4);
}
__bss_end__ = . ;
__bss_end = . ;
PROVIDE (end = .);
}
......@@ -77,7 +77,7 @@
GOT_ENTRY(transfer_to_handler)
GOT_ENTRY(__init_end)
GOT_ENTRY(__bss_end__)
GOT_ENTRY(__bss_end)
GOT_ENTRY(__bss_start)
END_GOT
......@@ -622,7 +622,7 @@ clear_bss:
* Now clear BSS segment
*/
lwz r3,GOT(__bss_start)
lwz r4,GOT(__bss_end__)
lwz r4,GOT(__bss_end)
cmplw 0, r3, r4
beq 6f
......
......@@ -84,7 +84,7 @@ SECTIONS
*(COMMON)
. = ALIGN(4);
}
__bss_end__ = . ;
__bss_end = . ;
PROVIDE (end = .);
}
ENTRY(_start)
......@@ -65,7 +65,7 @@
GOT_ENTRY(transfer_to_handler)
GOT_ENTRY(__init_end)
GOT_ENTRY(__bss_end__)
GOT_ENTRY(__bss_end)
GOT_ENTRY(__bss_start)
END_GOT
......@@ -459,7 +459,7 @@ clear_bss:
* Now clear BSS segment
*/
lwz r3,GOT(__bss_start)
lwz r4,GOT(__bss_end__)
lwz r4,GOT(__bss_end)
cmplw 0, r3, r4
beq 6f
......
......@@ -93,7 +93,7 @@ SECTIONS
. = ALIGN(4);
}
__bss_end__ = . ;
__bss_end = . ;
PROVIDE (end = .);
. = env_start;
.ppcenv :
......
......@@ -76,7 +76,7 @@ void board_init_f(ulong bootflag)
initdram(0);
/* Clear bss */
memset(__bss_start, '\0', __bss_end__ - __bss_start);
memset(__bss_start, '\0', __bss_end - __bss_start);
/*
* Call board_init_r() (SPL framework version) to load and boot
......
......@@ -66,7 +66,7 @@
GOT_ENTRY(transfer_to_handler)
GOT_ENTRY(__init_end)
GOT_ENTRY(__bss_end__)
GOT_ENTRY(__bss_end)
GOT_ENTRY(__bss_start)
END_GOT
#endif
......@@ -694,7 +694,7 @@ clear_bss:
* Now clear BSS segment
*/
lwz r3,GOT(__bss_start)
lwz r4,GOT(__bss_end__)
lwz r4,GOT(__bss_end)
cmplw 0, r3, r4
beq 6f
......
......@@ -91,6 +91,6 @@ SECTIONS
*(COMMON)
. = ALIGN(4);
}
__bss_end__ = . ;
__bss_end = . ;
PROVIDE (end = .);
}
......@@ -52,6 +52,6 @@ SECTIONS
__bss_start = .;
*(.bss*)
. = ALIGN(4);
__bss_end__ = .;
__bss_end = .;
} > sdram
}
......@@ -87,6 +87,6 @@ SECTIONS
*(.sbss*)
. = ALIGN(4);
}
__bss_end__ = . ;
__bss_end = . ;
PROVIDE (end = .);
}
......@@ -64,7 +64,7 @@
GOT_ENTRY(transfer_to_handler)
GOT_ENTRY(__init_end)
GOT_ENTRY(__bss_end__)
GOT_ENTRY(__bss_end)
GOT_ENTRY(__bss_start)
END_GOT
......@@ -647,7 +647,7 @@ clear_bss:
* Now clear BSS segment
*/
lwz r3,GOT(__bss_start)
lwz r4,GOT(__bss_end__)
lwz r4,GOT(__bss_end)
cmplw 0, r3, r4
beq 6f
......
......@@ -86,6 +86,6 @@ SECTIONS
*(COMMON)
. = ALIGN(4);
}
__bss_end__ = . ;
__bss_end = . ;
PROVIDE (end = .);
}
......@@ -72,7 +72,7 @@
GOT_ENTRY(transfer_to_handler)
GOT_ENTRY(__init_end)
GOT_ENTRY(__bss_end__)
GOT_ENTRY(__bss_end)
GOT_ENTRY(__bss_start)
#if defined(CONFIG_FADS)
GOT_ENTRY(environment)
......@@ -584,7 +584,7 @@ clear_bss:
* Now clear BSS segment
*/
lwz r3,GOT(__bss_start)
lwz r4,GOT(__bss_end__)
lwz r4,GOT(__bss_end)
cmplw 0, r3, r4
beq 6f
......
......@@ -87,6 +87,6 @@ SECTIONS
*(COMMON)
. = ALIGN(4);
}
__bss_end__ = . ;
__bss_end = . ;
PROVIDE (end = .);
}