Merge remote-tracking branch 'u-boot-ti/master'

[karo-tx-uboot.git] / board / etx094 / u-boot.lds

diff --git a/board/etx094/u-boot.lds b/board/etx094/u-boot.lds
index 04233d86a1d3d824e22fb83a6a3dc43c552e213c..56c3470bde547a5045009cb2711da55c1a72f2bd 100644 (file)
--- a/board/etx094/u-boot.lds
+++ b/board/etx094/u-boot.lds
@@ -36,7 +36,7 @@ SECTIONS
     arch/powerpc/cpu/mpc8xx/traps.o    (.text*)
     net/libnet.o                       (.text*)
     arch/powerpc/cpu/mpc8xx/libmpc8xx.o        (.text*)
-    *(.text.*printf*)
+    *(.text.vsprintf)
 
     . = env_offset;
     common/env_embedded.o              (.text*)
@@ -56,13 +56,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    :
@@ -74,9 +75,11 @@ SECTIONS
   PROVIDE (edata = .);
 
   . = .;
-  __u_boot_cmd_start = .;
-  .u_boot_cmd : { *(.u_boot_cmd) }
-  __u_boot_cmd_end = .;
+
+  . = ALIGN(4);
+  .u_boot_list : {
+       #include <u-boot.lst>
+  }
 
 
   . = .;