diff options
| author | Simon Glass <sjg@chromium.org> | 2013-03-14 06:54:53 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-03-15 20:13:54 (GMT) |
| commit | 3929fb0a141530551b3fce15ee08629f80d5ef2a (patch) | |
| tree | 8c3e31e338afb232ac5e404225304c7285136bf4 /arch/nds32 | |
| parent | 69d59b47ad408d9961b850f23e59a93fdeb71df8 (diff) | |
| download | u-boot-3929fb0a141530551b3fce15ee08629f80d5ef2a.tar.xz | |
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: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch/nds32')
| -rw-r--r-- | arch/nds32/cpu/n1213/start.S | 2 | ||||
| -rw-r--r-- | arch/nds32/cpu/n1213/u-boot.lds | 2 | ||||
| -rw-r--r-- | arch/nds32/include/asm/u-boot-nds32.h | 2 | ||||
| -rw-r--r-- | arch/nds32/lib/board.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/arch/nds32/cpu/n1213/start.S b/arch/nds32/cpu/n1213/start.S index 889bf8b..558fd0e 100644 --- a/arch/nds32/cpu/n1213/start.S +++ b/arch/nds32/cpu/n1213/start.S @@ -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 */ diff --git a/arch/nds32/cpu/n1213/u-boot.lds b/arch/nds32/cpu/n1213/u-boot.lds index cef19c5..c64d3b7 100644 --- a/arch/nds32/cpu/n1213/u-boot.lds +++ b/arch/nds32/cpu/n1213/u-boot.lds @@ -66,7 +66,7 @@ SECTIONS __bss_start = .; *(.bss) . = ALIGN(4); - __bss_end__ = .; + __bss_end = .; } } diff --git a/arch/nds32/include/asm/u-boot-nds32.h b/arch/nds32/include/asm/u-boot-nds32.h index ae1918d..a6d7beb 100644 --- a/arch/nds32/include/asm/u-boot-nds32.h +++ b/arch/nds32/include/asm/u-boot-nds32.h @@ -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 */ diff --git a/arch/nds32/lib/board.c b/arch/nds32/lib/board.c index c919928..a7d27fc 100644 --- a/arch/nds32/lib/board.c +++ b/arch/nds32/lib/board.c @@ -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) |