Cleanup MCC200 board configuration; omit non-existent stuff.

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

diff --git a/board/trab/u-boot.lds b/board/trab/u-boot.lds
index 92a369f01a68237ba941e2a8083202df553fed1d..e56cdd3cad4ab7851e3a3031c7a786b1df9b3ed1 100644 (file)
--- a/board/trab/u-boot.lds
+++ b/board/trab/u-boot.lds
@@ -27,9 +27,9 @@ OUTPUT_ARCH(arm)
 ENTRY(_start)
 SECTIONS
 {
-        . = 0x00000000;
+       . = 0x00000000;
 
-        . = ALIGN(4);
+       . = ALIGN(4);
        .text      :
        {
          cpu/arm920t/start.o   (.text)
@@ -38,25 +38,28 @@ SECTIONS
          lib_generic/crc32.o   (.text)
          lib_generic/string.o  (.text)
 
-       . = env_offset;
-       common/environment.o    (.ppcenv)
+       . = DEFINED(env_offset) ? env_offset : .;
+         common/environment.o  (.ppcenv)
 
          *(.text)
        }
 
-        . = ALIGN(4);
-        .rodata : { *(.rodata) }
+       . = ALIGN(4);
+       .rodata : { *(.rodata) }
 
-        . = ALIGN(4);
-        .data : { *(.data) }
+       . = ALIGN(4);
+       .data : { *(.data) }
 
-        . = ALIGN(4);
-        .got : { *(.got) }
+       . = ALIGN(4);
+       .got : { *(.got) }
 
-       armboot_end_data = .;
+       . = .;
+       __u_boot_cmd_start = .;
+       .u_boot_cmd : { *(.u_boot_cmd) }
+       __u_boot_cmd_end = .;
 
-        . = ALIGN(4);
-        .bss : { *(.bss) }
-
-       armboot_end = .;
+       . = ALIGN(4);
+       __bss_start = .;
+       .bss : { *(.bss) }
+       _end = .;
 }