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

[oweals/u-boot.git] / board / purple / u-boot.lds

diff --git a/board/purple/u-boot.lds b/board/purple/u-boot.lds
index bf1394b2a432788a1db8fd06a768c38de987e3ea..542601af15ab8f3d7236635d3d6e2f5d74f71a1d 100644 (file)
--- a/board/purple/u-boot.lds
+++ b/board/purple/u-boot.lds
@@ -24,7 +24,7 @@
 /*
 OUTPUT_FORMAT("elf32-bigmips", "elf32-bigmips", "elf32-bigmips")
 */
-OUTPUT_FORMAT("elf32-tradbigmips", "elf32-tradbigmips", "elf32-tradbigmips")
+OUTPUT_FORMAT("elf32-tradbigmips", "elf32-tradbigmips", "elf32-tradlittlemips")
 OUTPUT_ARCH(mips)
 ENTRY(_start)
 SECTIONS
@@ -34,13 +34,13 @@ SECTIONS
        . = ALIGN(4);
        .text       :
        {
-         cpu/mips/start.o              (.text)
+         arch/mips/cpu/start.o         (.text)
          board/purple/lowlevel_init.o  (.text)
-         cpu/mips/cache.o              (.text)
+         arch/mips/cpu/cache.o         (.text)
          common/main.o                 (.text)
          common/dlmalloc.o             (.text)
          common/cmd_boot.o             (.text)
-         lib_generic/zlib.o            (.text)
+         lib/zlib.o            (.text)
          . = DEFINED(env_offset) ? env_offset : .;
          common/env_embedded.o (.ppcenv)
 
@@ -48,7 +48,7 @@ SECTIONS
        }
 
        . = ALIGN(4);
-       .rodata  : { *(.rodata) }
+       .rodata  : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) }
 
        . = ALIGN(4);
        .data  : { *(.data) }