Rename TEXT_BASE: fix merge conflicts

[people/ms/u-boot.git] / board / nc650 / u-boot.lds

diff --git a/board/nc650/u-boot.lds b/board/nc650/u-boot.lds
index 09a442aeeb595176813d4330be1e4b1ba5e419dd..e89a9bc9cd7f48c6aa59be934ec13d702ed7b1fc 100644 (file)
--- a/board/nc650/u-boot.lds
+++ b/board/nc650/u-boot.lds
@@ -52,19 +52,16 @@ 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)   }
@@ -122,6 +119,7 @@ SECTIONS
    *(.dynbss)
    *(.bss)
    *(COMMON)
+   . = ALIGN(4);
   }
   _end = . ;
   PROVIDE (end = .);