瀏覽代碼

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>
Joakim Tjernlund 14 年之前
父節點
當前提交
c1fa1b7d00
共有 2 個文件被更改,包括 5 次插入4 次删除
  1. 1 1
      board/matrix_vision/mvsmr/u-boot.lds
  2. 4 3
      board/rsdproto/u-boot.lds

+ 1 - 1
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    :

+ 4 - 3
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;