projects
/
oweals
/
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 git://git.denx.de/u-boot-ubi
[oweals/u-boot.git]
/
board
/
mpc8540eval
/
u-boot.lds
diff --git
a/board/mpc8540eval/u-boot.lds
b/board/mpc8540eval/u-boot.lds
index 0755d0166b8defaa6cde6887bfd9e9505d5d509e..074791376a923515ad0457780453d032ed60f5ac 100644
(file)
--- a/
board/mpc8540eval/u-boot.lds
+++ b/
board/mpc8540eval/u-boot.lds
@@
-25,7
+25,6
@@
* Boot page and reset vector is put at that end of the 512K block. */
OUTPUT_ARCH(powerpc)
* Boot page and reset vector is put at that end of the 512K block. */
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
@@
-36,11
+35,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) }
@@
-56,7
+55,6
@@
SECTIONS
.text :
{
cpu/mpc85xx/start.o (.text)
.text :
{
cpu/mpc85xx/start.o (.text)
- board/mpc8540eval/init.o (.text)
cpu/mpc85xx/traps.o (.text)
cpu/mpc85xx/interrupts.o (.text)
cpu/mpc85xx/cpu_init.o (.text)
cpu/mpc85xx/traps.o (.text)
cpu/mpc85xx/interrupts.o (.text)
cpu/mpc85xx/cpu_init.o (.text)
@@
-75,10
+73,8
@@
SECTIONS
PROVIDE (etext = .);
.rodata :
{
PROVIDE (etext = .);
.rodata :
{
- *(.rodata)
- *(.rodata1)
- *(.rodata.str1.4)
*(.eh_frame)
*(.eh_frame)
+ *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*)))
}
.fini : { *(.fini) } =0
.ctors : { *(.ctors) }
}
.fini : { *(.fini) } =0
.ctors : { *(.ctors) }
@@
-129,12
+125,13
@@
SECTIONS
__init_end = .;
__bss_start = .;
__init_end = .;
__bss_start = .;
- .bss :
+ .bss
(NOLOAD)
:
{
*(.sbss) *(.scommon)
*(.dynbss)
*(.bss)
*(COMMON)
{
*(.sbss) *(.scommon)
*(.dynbss)
*(.bss)
*(COMMON)
+ . = ALIGN(4);
}
_end = . ;
PROVIDE (end = .);
}
_end = . ;
PROVIDE (end = .);
@@
-143,7
+140,6
@@
SECTIONS
.bootpg :
{
cpu/mpc85xx/start.o (.bootpg)
.bootpg :
{
cpu/mpc85xx/start.o (.bootpg)
- board/mpc8540eval/init.o (.bootpg)
} = 0xffff
. = (. & 0xFFF80000) + 0x0007FFFC;
} = 0xffff
. = (. & 0xFFF80000) + 0x0007FFFC;