MIPS: remove OUTPUT_FORMAT from linker scripts

[u-boot] / board / qemu-mips / u-boot.lds

diff --git a/board/qemu-mips/u-boot.lds b/board/qemu-mips/u-boot.lds
index 03bcb093f1edebbafd69e7eaee3aa97ccfc49caf..33b42f312885edeb404ae1444764289303bfc0ff 100644 (file)
--- a/board/qemu-mips/u-boot.lds
+++ b/board/qemu-mips/u-boot.lds
@@ -21,10 +21,6 @@
  * MA 02111-1307 USA
  */
 
-/*
-OUTPUT_FORMAT("elf32-bigmips", "elf32-bigmips", "elf32-bigmips")
-*/
-OUTPUT_FORMAT("elf32-tradbigmips", "elf32-tradbigmips", "elf32-tradbigmips")
 OUTPUT_ARCH(mips)
 ENTRY(_start)
 SECTIONS
@@ -34,14 +30,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;
@@ -53,20 +49,22 @@ SECTIONS
        }
 
        . = ALIGN(4);
-       .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 = .;
+#if defined(CONFIG_64BIT)
+       num_got_entries = (__got_end - __got_start) >> 3;
+#else
        num_got_entries = (__got_end - __got_start) >> 2;
+#endif
 
        . = ALIGN(4);
-       .sbss  : { *(.sbss) }
-       .bss  : { *(.bss) . = ALIGN(4); }
+       .sbss  : { *(.sbss*) }
+       .bss  : { *(.bss*) . = ALIGN(4); }
        uboot_end = .;
 }