[U-Boot] [PATCH 1/3] powerpc, 8xx: Fix fallout from "Fixup all 8xx u-boot.lds scripts"
Joakim Tjernlund
Joakim.Tjernlund at transmode.se
Sun Apr 24 10:29:32 CEST 2011
Two linker scripts for 8xx was missed.
Signed-off-by: Joakim Tjernlund <Joakim.Tjernlund at transmode.se>
---
board/matrix_vision/mvsmr/u-boot.lds | 2 +-
board/rsdproto/u-boot.lds | 7 ++++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/board/matrix_vision/mvsmr/u-boot.lds b/board/matrix_vision/mvsmr/u-boot.lds
index bf2ed04..57c37de 100644
--- a/board/matrix_vision/mvsmr/u-boot.lds
+++ b/board/matrix_vision/mvsmr/u-boot.lds
@@ -62,7 +62,7 @@ SECTIONS
_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 :
diff --git a/board/rsdproto/u-boot.lds b/board/rsdproto/u-boot.lds
index 81728db..a729c52 100644
--- a/board/rsdproto/u-boot.lds
+++ b/board/rsdproto/u-boot.lds
@@ -74,11 +74,12 @@ SECTIONS
PROVIDE (erotext = .);
.reloc :
{
- *(.got)
_GOT2_TABLE_ = .;
- *(.got2)
+ KEEP(*(.got2))
+ KEEP(*(.got))
+ PROVIDE(_GLOBAL_OFFSET_TABLE_ = . + 4);
_FIXUP_TABLE_ = .;
- *(.fixup)
+ KEEP(*(.fixup))
}
__got2_entries = ((_GLOBAL_OFFSET_TABLE_ - _GOT2_TABLE_) >> 2) - 1;
__fixup_entries = (. - _FIXUP_TABLE_)>>2;
--
1.7.3.4
More information about the U-Boot
mailing list