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

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

diff --git a/board/cm5200/u-boot.lds b/board/cm5200/u-boot.lds
index 87f37de16440559f681ab8186415a050b45dc07a..30a37d9fb24fd6aa67fcd2503e0a5735d0eb1fe3 100644 (file)
--- a/board/cm5200/u-boot.lds
+++ b/board/cm5200/u-boot.lds
@@ -50,15 +50,12 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
-    cpu/mpc5xxx/start.o        (.text)
+    arch/ppc/cpu/mpc5xxx/start.o       (.text)
     *(.text)
-    *(.fixup)
     *(.got1)
     . = ALIGN(16);
-    *(.rodata)
-    *(.rodata1)
-    *(.rodata.str1.4)
     *(.eh_frame)
+    *(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 = .);