Merge branch 'master' of git://git.denx.de/u-boot-mpc5xxx

[karo-tx-uboot.git] / board / actux2 / u-boot.lds

diff --git a/board/actux2/u-boot.lds b/board/actux2/u-boot.lds
index d1f7a0a40cb8cf982b9223284cd223aa4d3b16a7..c276501bd7b6dc057f4936b9f01ca0c175872a2b 100644 (file)
--- a/board/actux2/u-boot.lds
+++ b/board/actux2/u-boot.lds
@@ -30,45 +30,83 @@ SECTIONS
 
        . = ALIGN (4);
        .text : {
-               cpu/ixp/start.o(.text)
-               lib_generic/string.o(.text)
-               lib_generic/vsprintf.o(.text)
-               lib_arm/board.o(.text)
-               common/dlmalloc.o(.text)
-               cpu/ixp/cpu.o(.text)
+               *(.__image_copy_start)
+               arch/arm/cpu/ixp/start.o(.text*)
+               net/libnet.o(.text*)
+               board/actux2/libactux2.o(.text*)
+               arch/arm/cpu/ixp/libixp.o(.text*)
+               drivers/input/libinput.o(.text*)
 
                . = env_offset;
-               common/env_embedded.o (.ppcenv)
-
-               * (.text)
+               common/env_embedded.o(.ppcenv)
+               *(.text*)
        }
 
-       . = ALIGN (4);
+       . = ALIGN(4);
        .rodata : {
-               *(.rodata)
+               *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*)))
        }
-
-       . = ALIGN (4);
+       . = ALIGN(4);
        .data : {
-               *(.data)
+               *(.data*)
        }
-
-       . = ALIGN (4);
+       . = ALIGN(4);
        .got : {
                *(.got)
        }
-
        . =.;
-       __u_boot_cmd_start =.;
-       .u_boot_cmd : {
-               *(.u_boot_cmd)
+
+       . = ALIGN(4);
+       .u_boot_list : {
+               KEEP(*(SORT(.u_boot_list*)));
        }
-       __u_boot_cmd_end =.;
 
        . = ALIGN (4);
-       __bss_start =.;
-       .bss (NOLOAD): {
-               *(.bss)
+
+       .image_copy_end :
+       {
+               *(.__image_copy_end)
+       }
+
+       .rel_dyn_start :
+       {
+               *(.__rel_dyn_start)
+       }
+
+       .rel.dyn : {
+               *(.rel*)
        }
-       _end =.;
+
+       .rel_dyn_end :
+       {
+               *(.__rel_dyn_end)
+       }
+
+       _end = .;
+
+/*
+ * Compiler-generated __bss_start and __bss_end, see arch/arm/lib/bss.c
+ * __bss_base and __bss_limit are for linker only (overlay ordering)
+ */
+
+       .bss_start __rel_dyn_start (OVERLAY) : {
+               KEEP(*(.__bss_start));
+               __bss_base = .;
+       }
+
+       .bss __bss_base (OVERLAY) : {
+               *(.bss*)
+                . = ALIGN(4);
+                __bss_limit = .;
+       }
+       .bss_end __bss_limit (OVERLAY) : {
+               KEEP(*(.__bss_end));
+       }
+
+       /DISCARD/ : { *(.dynsym) }
+       /DISCARD/ : { *(.dynstr*) }
+       /DISCARD/ : { *(.dynamic*) }
+       /DISCARD/ : { *(.plt*) }
+       /DISCARD/ : { *(.interp*) }
+       /DISCARD/ : { *(.gnu*) }
 }