Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging

[u-boot] / board / etx094 / u-boot.lds

diff --git a/board/etx094/u-boot.lds b/board/etx094/u-boot.lds
index 614880be1ff85804842d550bb3cde5cb8797a675..b00d2b3807bb5bba191bffa27b77c4c8345f14c2 100644 (file)
--- a/board/etx094/u-boot.lds
+++ b/board/etx094/u-boot.lds
@@ -36,7 +36,8 @@ SECTIONS
     arch/powerpc/cpu/mpc8xx/traps.o    (.text*)
     net/libnet.o                       (.text*)
     arch/powerpc/cpu/mpc8xx/libmpc8xx.o        (.text*)
-    *(.text.*printf*)
+    *(.text.printf)
+    *(.text.vsprintf)
 
     . = env_offset;
     common/env_embedded.o              (.text*)
@@ -56,13 +57,14 @@ SECTIONS
   PROVIDE (erotext = .);
   .reloc   :
   {
-    KEEP(*(.got))
     _GOT2_TABLE_ = .;
     KEEP(*(.got2))
+    KEEP(*(.got))
+    PROVIDE(_GLOBAL_OFFSET_TABLE_ = . + 4);
     _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    :
@@ -99,6 +101,6 @@ SECTIONS
    *(COMMON)
    . = ALIGN(4);
   }
-  _end = . ;
+  __bss_end__ = . ;
   PROVIDE (end = .);
 }