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
/
ppmc7xx
/
u-boot.lds
diff --git
a/board/ppmc7xx/u-boot.lds
b/board/ppmc7xx/u-boot.lds
index
0dfa8c0
..
bfa4975
100644
(file)
--- a/
board/ppmc7xx/u-boot.lds
+++ b/
board/ppmc7xx/u-boot.lds
@@
-26,7
+26,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);
/* Do we need any of these for elf?
__DYNAMIC = 0; */
SECTIONS
/* Do we need any of these for elf?
__DYNAMIC = 0; */
SECTIONS
@@
-38,11
+37,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) }
@@
-61,7
+60,7
@@
SECTIONS
/* store the environment in a seperate sector in the boot flash */
/* . = env_offset; */
/* store the environment in a seperate sector in the boot flash */
/* . = env_offset; */
-/* common/env
ironment
.o(.text) */
+/* common/env
_embedded
.o(.text) */
*(.text)
*(.fixup)
*(.text)
*(.fixup)
@@
-123,7
+122,7
@@
SECTIONS
__init_end = .;
__bss_start = .;
__init_end = .;
__bss_start = .;
- .bss :
+ .bss
(NOLOAD)
:
{
*(.sbss) *(.scommon)
*(.dynbss)
{
*(.sbss) *(.scommon)
*(.dynbss)