powerpc, 8xx: Fixup all 8xx u-boot.lds scripts

[J-u-boot.git] / board / v37 / u-boot.lds

diff --git a/board/v37/u-boot.lds b/board/v37/u-boot.lds
index bf78a3225fc6a29dfb1a3dd1eace4327e115819c..e62d53db54fa048d4c0966f06dde05b6bbfb29f5 100644 (file)
--- a/board/v37/u-boot.lds
+++ b/board/v37/u-boot.lds
@@ -1,5 +1,5 @@
 /*
 /*

- * (C) Copyright 2003
+ * (C) Copyright 2003-2010

  * Wolfgang Denk, DENX Software Engineering, [email protected].
  *
  * See file CREDITS for list of people who contributed to this
  * Wolfgang Denk, DENX Software Engineering, [email protected].
  *
  * See file CREDITS for list of people who contributed to this


@@ -22,70 +22,24 @@
  */
 
 OUTPUT_ARCH(powerpc)
  */
 
 OUTPUT_ARCH(powerpc)

-/* Do we need any of these for elf?
-   __DYNAMIC = 0;    */
+

 SECTIONS
 {
   /* Read-only sections, merged into text segment: */
   . = + SIZEOF_HEADERS;
 SECTIONS
 {
   /* Read-only sections, merged into text segment: */
   . = + SIZEOF_HEADERS;

-  .interp : { *(.interp) }
-  .hash          : { *(.hash)          }
-  .dynsym        : { *(.dynsym)                }
-  .dynstr        : { *(.dynstr)                }
-  .rel.text      : { *(.rel.text)      }
-  .rela.text     : { *(.rela.text)     }
-  .rel.data      : { *(.rel.data)      }
-  .rela.data     : { *(.rela.data)     }
-  .rel.rodata    : { *(.rel.rodata)    }
-  .rela.rodata   : { *(.rela.rodata)   }
-  .rel.got       : { *(.rel.got)       }
-  .rela.got      : { *(.rela.got)      }
-  .rel.ctors     : { *(.rel.ctors)     }
-  .rela.ctors    : { *(.rela.ctors)    }
-  .rel.dtors     : { *(.rel.dtors)     }
-  .rela.dtors    : { *(.rela.dtors)    }
-  .rel.bss       : { *(.rel.bss)       }
-  .rela.bss      : { *(.rela.bss)      }
-  .rel.plt       : { *(.rel.plt)       }
-  .rela.plt      : { *(.rela.plt)      }
-  .init          : { *(.init)          }
-  .plt : { *(.plt) }

   .text      :
   {
   .text      :
   {

-    /* WARNING - the following is hand-optimized to fit within */
-    /* the sector layout of our flash chips!   XXX FIXME XXX   */
-
-    cpu/mpc8xx/start.o         (.text)
-    cpu/mpc8xx/traps.o         (.text)
-    common/dlmalloc.o          (.text)
-    lib_ppc/ppcstring.o                (.text)
-    lib_generic/vsprintf.o     (.text)
-    lib_generic/crc32.o                (.text)
-    lib_generic/zlib.o         (.text)
-    lib_ppc/cache.o            (.text)
-    lib_ppc/time.o             (.text)
-
-/*
-    . = env_offset;
-*/
-    common/env_embedded.o      (.ppcenv)
+    arch/powerpc/cpu/mpc8xx/start.o    (.text*)
+    arch/powerpc/cpu/mpc8xx/traps.o    (.text*)

 
 

-    *(.text)
-    *(.fixup)
-    *(.got1)
+    *(.text*)

   }
   _etext = .;
   PROVIDE (etext = .);
   .rodata    :
   {
   }
   _etext = .;
   PROVIDE (etext = .);
   .rodata    :
   {

-    *(.rodata)
-    *(.rodata1)
-    *(.rodata.str1.4)
-    *(.eh_frame)
+    *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*)))

   }
   }

-  .fini      : { *(.fini)    } =0
-  .ctors     : { *(.ctors)   }
-  .dtors     : { *(.dtors)   }

 
   /* Read-write section, merged into data segment: */
   . = (. + 0x00FF) & 0xFFFFFF00;
 
   /* Read-write section, merged into data segment: */
   . = (. + 0x00FF) & 0xFFFFFF00;


@@ -93,23 +47,20 @@ SECTIONS
   PROVIDE (erotext = .);
   .reloc   :
   {
   PROVIDE (erotext = .);
   .reloc   :
   {

-    *(.got)

     _GOT2_TABLE_ = .;
     _GOT2_TABLE_ = .;

-    *(.got2)
+    KEEP(*(.got2))
+    KEEP(*(.got))
+    PROVIDE(_GLOBAL_OFFSET_TABLE_ = . + 4);

     _FIXUP_TABLE_ = .;
     _FIXUP_TABLE_ = .;

-    *(.fixup)
+    KEEP(*(.fixup))

   }
   }

-  __got2_entries = (_FIXUP_TABLE_ - _GOT2_TABLE_) >>2;
+  __got2_entries = ((_GLOBAL_OFFSET_TABLE_ - _GOT2_TABLE_) >> 2) - 1;

   __fixup_entries = (. - _FIXUP_TABLE_)>>2;
 
   .data    :
   {
   __fixup_entries = (. - _FIXUP_TABLE_)>>2;
 
   .data    :
   {

-    *(.data)
-    *(.data1)
-    *(.sdata)
-    *(.sdata2)
-    *(.dynamic)
-    CONSTRUCTORS
+    *(.data*)
+    *(.sdata*)

   }
   _edata  =  .;
   PROVIDE (edata = .);
   }
   _edata  =  .;
   PROVIDE (edata = .);


@@ -135,12 +86,11 @@ SECTIONS
   __bss_start = .;
   .bss (NOLOAD)       :
   {
   __bss_start = .;
   .bss (NOLOAD)       :
   {

-   *(.sbss) *(.scommon)
-   *(.dynbss)
-   *(.bss)
+   *(.bss*)
+   *(.sbss*)

    *(COMMON)
    . = ALIGN(4);
   }
    *(COMMON)
    . = ALIGN(4);
   }

-  _end = . ;
+  __bss_end__ = . ;

   PROVIDE (end = .);
 }
   PROVIDE (end = .);
 }