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

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

diff --git a/board/r360mpi/u-boot.lds b/board/r360mpi/u-boot.lds
index 88c1b306daa405ff6337fc46dd6285207a44f6a1..3cf0ba4bff8b276b15adb5d47b576f988a0bf4ae 100644 (file)
--- a/board/r360mpi/u-boot.lds
+++ b/board/r360mpi/u-boot.lds
@@ -55,26 +55,23 @@ SECTIONS
     /* 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/cpu_init.o      (.text)
-    cpu/mpc8xx/interrupts.o    (.text)
-    cpu/mpc8xx/traps.o         (.text)
+    arch/powerpc/cpu/mpc8xx/start.o            (.text)
+    arch/powerpc/cpu/mpc8xx/cpu_init.o (.text)
+    arch/powerpc/cpu/mpc8xx/interrupts.o       (.text)
+    arch/powerpc/cpu/mpc8xx/traps.o            (.text)
 /***
     . = env_offset;
     common/env_embedded.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)   }
@@ -132,6 +129,7 @@ SECTIONS
    *(.dynbss)
    *(.bss)
    *(COMMON)
+   . = ALIGN(4);
   }
   _end = . ;
   PROVIDE (end = .);