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]
/
arch
/
powerpc
/
cpu
/
mpc86xx
/
u-boot.lds
diff --git
a/arch/powerpc/cpu/mpc86xx/u-boot.lds
b/arch/powerpc/cpu/mpc86xx/u-boot.lds
index 49a4c782d5bfc4cd44cb623af885e265cb22ac06..7e357baf9531527ad222865ce864f00d7a036854 100644
(file)
--- a/
arch/powerpc/cpu/mpc86xx/u-boot.lds
+++ b/
arch/powerpc/cpu/mpc86xx/u-boot.lds
@@
-45,13
+45,14
@@
SECTIONS
PROVIDE (erotext = .);
.reloc :
{
PROVIDE (erotext = .);
.reloc :
{
- KEEP(*(.got))
_GOT2_TABLE_ = .;
KEEP(*(.got2))
_GOT2_TABLE_ = .;
KEEP(*(.got2))
+ KEEP(*(.got))
+ PROVIDE(_GLOBAL_OFFSET_TABLE_ = . + 4);
_FIXUP_TABLE_ = .;
KEEP(*(.fixup))
}
_FIXUP_TABLE_ = .;
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 :
@@
-63,9
+64,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*)));
+ }
. = .;
__start___ex_table = .;
. = .;
__start___ex_table = .;
@@
-87,6
+90,6
@@
SECTIONS
*(COMMON)
. = ALIGN(4);
}
*(COMMON)
. = ALIGN(4);
}
- _end = . ;
+ _
_bss_
end = . ;
PROVIDE (end = .);
}
PROVIDE (end = .);
}