Merge branch 'master' into next

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

diff --git a/board/trab/u-boot.lds b/board/trab/u-boot.lds
index ccffb198ce2acffd2eb6d39d4e1d4893eb74749c..c3d5c49a9b2b1a1e2d5c2de3255acc16db39973b 100644 (file)
--- a/board/trab/u-boot.lds
+++ b/board/trab/u-boot.lds
@@ -1,6 +1,6 @@
 /*
  * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
+ * Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
  *
  * See file CREDITS for list of people who contributed to this
  * project.
@@ -33,19 +33,18 @@ SECTIONS
        .text      :
        {
          cpu/arm920t/start.o   (.text)
-         lib_arm/_umodsi3.o    (.text)
          lib_generic/zlib.o    (.text)
          lib_generic/crc32.o   (.text)
          lib_generic/string.o  (.text)
 
        . = DEFINED(env_offset) ? env_offset : .;
-       common/environment.o    (.ppcenv)
+         common/env_embedded.o (.ppcenv)
 
          *(.text)
        }
 
        . = ALIGN(4);
-       .rodata : { *(.rodata) }
+       .rodata : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) }
 
        . = ALIGN(4);
        .data : { *(.data) }
@@ -53,15 +52,13 @@ SECTIONS
        . = ALIGN(4);
        .got : { *(.got) }
 
-  __u_boot_cmd_start = .;
-  .u_boot_cmd : { *(.u_boot_cmd) }
-  __u_boot_cmd_end = .;
-
-       armboot_end_data = .;
+       . = .;
+       __u_boot_cmd_start = .;
+       .u_boot_cmd : { *(.u_boot_cmd) }
+       __u_boot_cmd_end = .;
 
        . = ALIGN(4);
-       .bss : { *(.bss) }
-
-
-       armboot_end = .;
+       __bss_start = .;
+       .bss (NOLOAD) : { *(.bss) . = ALIGN(4); }
+       _end = .;
 }