projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of /home/wd/git/u-boot/custodians
[platform/kernel/u-boot.git]
/
board
/
amcc
/
bamboo
/
u-boot-nand.lds
diff --git
a/board/amcc/bamboo/u-boot-nand.lds
b/board/amcc/bamboo/u-boot-nand.lds
index
a5dae0e
..
bfe2769
100644
(file)
--- a/
board/amcc/bamboo/u-boot-nand.lds
+++ b/
board/amcc/bamboo/u-boot-nand.lds
@@
-22,7
+22,6
@@
*/
OUTPUT_ARCH(powerpc)
*/
OUTPUT_ARCH(powerpc)
-SEARCH_DIR(/lib); SEARCH_DIR(/usr/lib); SEARCH_DIR(/usr/local/lib); SEARCH_DIR(/usr/local/powerpc-any-elf/lib);
SECTIONS
{
/* Read-only sections, merged into text segment: */
SECTIONS
{
/* Read-only sections, merged into text segment: */
@@
-32,11
+31,11
@@
SECTIONS
.dynsym : { *(.dynsym) }
.dynstr : { *(.dynstr) }
.rel.text : { *(.rel.text) }
.dynsym : { *(.dynsym) }
.dynstr : { *(.dynstr) }
.rel.text : { *(.rel.text) }
- .rela.text : { *(.rela.text) }
+ .rela.text : { *(.rela.text) }
.rel.data : { *(.rel.data) }
.rel.data : { *(.rel.data) }
- .rela.data : { *(.rela.data) }
- .rel.rodata : { *(.rel.rodata) }
- .rela.rodata : { *(.rela.rodata) }
+ .rela.data : { *(.rela.data) }
+ .rel.rodata : { *(.rel.rodata) }
+ .rela.rodata : { *(.rela.rodata) }
.rel.got : { *(.rel.got) }
.rela.got : { *(.rela.got) }
.rel.ctors : { *(.rel.ctors) }
.rel.got : { *(.rel.got) }
.rela.got : { *(.rela.got) }
.rel.ctors : { *(.rel.ctors) }
@@
-58,7
+57,7
@@
SECTIONS
/* Align to next NAND block */
. = ALIGN(0x4000);
/* Align to next NAND block */
. = ALIGN(0x4000);
- common/env
ironment
.o (.ppcenv)
+ common/env
_embedded
.o (.ppcenv)
/* Keep some space here for redundant env and potential bad env blocks */
. = ALIGN(0x10000);
/* Keep some space here for redundant env and potential bad env blocks */
. = ALIGN(0x10000);
@@
-124,7
+123,7
@@
SECTIONS
__init_end = .;
__bss_start = .;
__init_end = .;
__bss_start = .;
- .bss :
+ .bss
(NOLOAD)
:
{
*(.sbss) *(.scommon)
*(.dynbss)
{
*(.sbss) *(.scommon)
*(.dynbss)