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

[u-boot] / arch / arm / cpu / ixp / u-boot.lds

diff --git a/arch/arm/cpu/ixp/u-boot.lds b/arch/arm/cpu/ixp/u-boot.lds
index b8ff2eed5c92f98ec93263e813425d74e4aa9229..388a67f101cf75037efe17519e2c169e883497a3 100644 (file)
--- a/arch/arm/cpu/ixp/u-boot.lds
+++ b/arch/arm/cpu/ixp/u-boot.lds
@@ -31,26 +31,60 @@ SECTIONS
        . = ALIGN(4);
        .text :
        {
-               arch/arm/cpu/ixp/start.o(.text)
-               *(.text)
+               arch/arm/cpu/ixp/start.o(.text*)
+               *(.text*)
        }
 
        . = ALIGN(4);
        .rodata : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) }
 
        . = ALIGN(4);
-       .data : { *(.data) }
+       .data : {
+               *(.data*)
+       }
 
        . = ALIGN(4);
-       .got : { *(.got) }
 
        . = .;
-       __u_boot_cmd_start = .;
-       .u_boot_cmd : { *(.u_boot_cmd) }
-       __u_boot_cmd_end = .;
 
        . = ALIGN(4);
-       __bss_start = .;
-       .bss (NOLOAD) : { *(.bss) . = ALIGN(4); }
+       .u_boot_list : {
+               KEEP(*(SORT(.u_boot_list*)));
+       }
+
+       . = ALIGN(4);
+
+       __image_copy_end = .;
+
+       .rel.dyn : {
+               __rel_dyn_start = .;
+               *(.rel*)
+               __rel_dyn_end = .;
+       }
+
+       .dynsym : {
+               __dynsym_start = .;
+               *(.dynsym)
+       }
+
        _end = .;
+
+       .bss_start __rel_dyn_start (OVERLAY) : {
+               KEEP(*(.__bss_start));
+       }
+
+       .bss __bss_start (OVERLAY) : {
+               *(.bss*)
+                . = ALIGN(4);
+                __bss_end = .;
+       }
+       .bss_end __bss_end (OVERLAY) : {
+               KEEP(*(__bss_end));
+       }
+
+       /DISCARD/ : { *(.dynstr*) }
+       /DISCARD/ : { *(.dynamic*) }
+       /DISCARD/ : { *(.plt*) }
+       /DISCARD/ : { *(.interp*) }
+       /DISCARD/ : { *(.gnu*) }
 }