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

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

diff --git a/board/munices/u-boot.lds b/board/munices/u-boot.lds
index e9b3be8ea3b7b30c09038fe241c6d50c02d8af99..4e27bc947d5fee286b60de550aa1f47461e68e23 100644 (file)
--- a/board/munices/u-boot.lds
+++ b/board/munices/u-boot.lds
@@ -52,14 +52,11 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
-    cpu/mpc5xxx/start.o        (.text)
+    arch/powerpc/cpu/mpc5xxx/start.o   (.text)
     *(.text)
-    *(.fixup)
     *(.got1)
     . = ALIGN(16);
-    *(.rodata)
-    *(.rodata1)
-    *(.rodata.str1.4)
+    *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*)))
   }
   .fini      : { *(.fini)    } =0
   .ctors     : { *(.ctors)   }
@@ -116,6 +113,7 @@ SECTIONS
    *(.dynbss)
    *(.bss)
    *(COMMON)
+   . = ALIGN(4);
   }
   _end = . ;
   PROVIDE (end = .);