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 'u-boot-imx/master' into 'u-boot-arm/master'
[oweals/u-boot.git]
/
board
/
rsdproto
/
u-boot.lds
diff --git
a/board/rsdproto/u-boot.lds
b/board/rsdproto/u-boot.lds
index 70fc3a5d2799034dbc00711a89a4fb91fe9c70bc..240b9363c8db14e4b6dad2ce55988d18e2bbc05e 100644
(file)
--- a/
board/rsdproto/u-boot.lds
+++ b/
board/rsdproto/u-boot.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);
/* Do we need any of these for elf?
__DYNAMIC = 0; */
SECTIONS
/* Do we need any of these for elf?
__DYNAMIC = 0; */
SECTIONS
@@
-34,11
+33,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) }
@@
-53,9
+52,8
@@
SECTIONS
.plt : { *(.plt) }
.text :
{
.plt : { *(.plt) }
.text :
{
-
cpu/mpc8260/start.o
(.text)
+
arch/powerpc/cpu/mpc8260/start.o
(.text)
*(.text)
*(.text)
- *(.fixup)
*(.got1)
/*. = env_offset; */
}
*(.got1)
/*. = env_offset; */
}
@@
-63,10
+61,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) }
@@
-78,13
+74,14
@@
SECTIONS
PROVIDE (erotext = .);
.reloc :
{
PROVIDE (erotext = .);
.reloc :
{
- *(.got)
_GOT2_TABLE_ = .;
_GOT2_TABLE_ = .;
- *(.got2)
+ KEEP(*(.got2))
+ KEEP(*(.got))
+ PROVIDE(_GLOBAL_OFFSET_TABLE_ = . + 4);
_FIXUP_TABLE_ = .;
_FIXUP_TABLE_ = .;
-
*(.fixup
)
+
KEEP(*(.fixup)
)
}
}
- __got2_entries = (
_FIXUP_TABLE_ - _GOT2_TABLE_) >>2
;
+ __got2_entries = (
(_GLOBAL_OFFSET_TABLE_ - _GOT2_TABLE_) >> 2) - 1
;
__fixup_entries = (. - _FIXUP_TABLE_)>>2;
.data :
__fixup_entries = (. - _FIXUP_TABLE_)>>2;
.data :
@@
-100,9
+97,11
@@
SECTIONS
PROVIDE (edata = .);
. = .;
PROVIDE (edata = .);
. = .;
- __u_boot_cmd_start = .;
- .u_boot_cmd : { *(.u_boot_cmd) }
- __u_boot_cmd_end = .;
+
+ . = ALIGN(4);
+ .u_boot_list : {
+ KEEP(*(SORT(.u_boot_list*)));
+ }
. = .;
. = .;
@@
-118,13
+117,14
@@
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 = . ;
+ _
_bss_
end = . ;
PROVIDE (end = .);
}
PROVIDE (end = .);
}