commit f909e7090463886ae6b065b602f359f906098da0
author Joakim Tjernlund <Joakim.Tjernlund@transmode.se> Sun Apr 24 10:29:32 2011 +0200
committer Wolfgang Denk <wd@denx.de> Sun Apr 24 22:49:16 2011 +0200
tree ae4759fc8b10e49628e2948a35b5f75e1419b68f
parent 93ccd47832d291650f56ed838cfc6881bc1b0a81

powerpc, 8xx: Fix fallout from "Fixup all 8xx u-boot.lds scripts"

Two linker scripts for 8xx was missed.

Signed-off-by: Joakim Tjernlund <Joakim.Tjernlund@transmode.se>

board/matrix_vision/mvsmr/u-boot.lds

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 @@
     _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    :

board/rsdproto/u-boot.lds

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 @@
   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;