Merge branch 'master' of git://git.denx.de/u-boot-net

[oweals/u-boot.git] / board / freescale / mpc8610hpcd / u-boot.lds

diff --git a/board/freescale/mpc8610hpcd/u-boot.lds b/board/freescale/mpc8610hpcd/u-boot.lds
index ae9c6c4a033eb5f4398abbdb0708d20a1b17f9f4..b573807fe92352dbc32bd85b4b35e9f1695d38d3 100644 (file)
--- a/board/freescale/mpc8610hpcd/u-boot.lds
+++ b/board/freescale/mpc8610hpcd/u-boot.lds
@@ -51,7 +51,6 @@ SECTIONS
   .text :
   {
     cpu/mpc86xx/start.o        (.text)
-    board/freescale/mpc8610hpcd/init.o (.bootpg)
     cpu/mpc86xx/traps.o (.text)
     cpu/mpc86xx/interrupts.o (.text)
     cpu/mpc86xx/cpu_init.o (.text)
@@ -62,17 +61,14 @@ SECTIONS
     lib_ppc/extable.o (.text)
     lib_generic/zlib.o (.text)
     *(.text)
-    *(.fixup)
     *(.got1)
    }
     _etext = .;
     PROVIDE (etext = .);
     .rodata    :
    {
-    *(.rodata)
-    *(.rodata1)
-    *(.rodata.str1.4)
     *(.eh_frame)
+    *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*)))
   }
   .fini             : { *(.fini)    } =0
   .ctors     : { *(.ctors)   }
@@ -123,12 +119,13 @@ SECTIONS
   __init_end = .;
 
   __bss_start = .;
-  .bss      :
+  .bss (NOLOAD)             :
   {
    *(.sbss) *(.scommon)
    *(.dynbss)
    *(.bss)
    *(COMMON)
+   . = ALIGN(4);
   }
   _end = . ;
   PROVIDE (end = .);