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

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

diff --git a/board/pb1x00/u-boot.lds b/board/pb1x00/u-boot.lds
index 861873272b6196a71a7ab4685cf2d0e83126ed61..07ddd364a09dbab67309d1be0aee1112aff3ea86 100644 (file)
--- a/board/pb1x00/u-boot.lds
+++ b/board/pb1x00/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-tradlittlemips", "elf32-tradbigmips", "elf32-tradlittlemips")
 OUTPUT_ARCH(mips)
 ENTRY(_start)
 SECTIONS
@@ -34,14 +34,14 @@ SECTIONS
        . = ALIGN(4);
        .text       :
        {
-         *(.text)
+         *(.text*)
        }
 
        . = ALIGN(4);
-       .rodata  : { *(.rodata) }
+       .rodata  : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) }
 
        . = ALIGN(4);
-       .data  : { *(.data) }
+       .data  : { *(.data*) }
 
        . = .;
        _gp = ALIGN(16) + 0x7ff0;
@@ -52,19 +52,18 @@ SECTIONS
          __got_end = .;
        }
 
-       .sdata  : { *(.sdata) }
+       .sdata  : { *(.sdata*) }
 
-       .u_boot_cmd : {
-         __u_boot_cmd_start = .;
-         *(.u_boot_cmd)
-         __u_boot_cmd_end = .;
+       . = ALIGN(4);
+       .u_boot_list : {
+               #include <u-boot.lst>
        }
 
        uboot_end_data = .;
        num_got_entries = (__got_end - __got_start) >> 2;
 
        . = ALIGN(4);
-       .sbss  : { *(.sbss) }
-       .bss  : { *(.bss) }
+       .sbss (NOLOAD)  : { *(.sbss*) }
+       .bss (NOLOAD)  : { *(.bss*) . = ALIGN(4); }
        uboot_end = .;
 }