Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'

[u-boot] / nand_spl / board / samsung / smdk6400 / u-boot.lds

diff --git a/nand_spl/board/samsung/smdk6400/u-boot.lds b/nand_spl/board/samsung/smdk6400/u-boot.lds
index eb8910c12943a51fb61cb3240d639ce4a8f9d56b..b6c573be5c32acf57648d0f4d63f76d366d7f84a 100644 (file)
--- a/nand_spl/board/samsung/smdk6400/u-boot.lds
+++ b/nand_spl/board/samsung/smdk6400/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>
  *
  * (C) Copyright 2008
  * Guennadi Liakhovetki, DENX Software Engineering, <lg@denx.de>
@@ -42,7 +42,7 @@ SECTIONS
        }
 
        . = ALIGN(4);
-       .rodata : { *(.rodata) }
+       .rodata : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) }
 
        . = ALIGN(4);
        .data : { *(.data) }
@@ -50,12 +50,31 @@ SECTIONS
        . = ALIGN(4);
        .got : { *(.got) }
 
-       __u_boot_cmd_start = .;
-       .u_boot_cmd : { *(.u_boot_cmd) }
-       __u_boot_cmd_end = .;
 
        . = ALIGN(4);
-       __bss_start = .;
-       .bss : { *(.bss) . = ALIGN(4); }
+       .u_boot_list : {
+       *(SORT(.u_boot_list*));
+       }
+
+       . = ALIGN(4);
+
+       .rel.dyn : {
+       __rel_dyn_start = .;
+       *(.rel*)
+       __rel_dyn_end = .;
+       }
+
+       .dynsym : {
+       __dynsym_start = .;
+       *(.dynsym)
+       }
+
        _end = .;
+
+       .bss __rel_dyn_start (OVERLAY) : {
+       __bss_start = .;
+       *(.bss)
+       . = ALIGN(4);
+       __bss_end = .;
+       }
 }