Merge branch 'elf_reloc'

[oweals/u-boot.git] / board / emk / top860 / u-boot.lds

diff --git a/board/emk/top860/u-boot.lds b/board/emk/top860/u-boot.lds
index da23fff142895214737b8034e001e2f1eb2e4133..4f986f72c1dfce7f3c9302104a07b067a7fafd3d 100644 (file)
--- a/board/emk/top860/u-boot.lds
+++ b/board/emk/top860/u-boot.lds
@@ -52,20 +52,17 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
-    cpu/mpc8xx/start.o (.text)
+    arch/powerpc/cpu/mpc8xx/start.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)   }