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

[u-boot] / board / actux1 / u-boot.lds

diff --git a/board/actux1/u-boot.lds b/board/actux1/u-boot.lds
index 9dbaa6faf60fb5f9f22c6eb40675e110e29fb4f0..c76728a7fbd3ff9cf06787bf205be4cb32f3fa78 100644 (file)
--- a/board/actux1/u-boot.lds
+++ b/board/actux1/u-boot.lds
@@ -34,31 +34,31 @@ SECTIONS
                net/libnet.o(.text*)
                board/actux1/libactux1.o(.text*)
                arch/arm/cpu/ixp/libixp.o(.text*)
-               drivers/serial/libserial.o(.text*)
+               drivers/input/libinput.o(.text*)
 
                . = env_offset;
                common/env_embedded.o(.ppcenv)
                *(.text*)
        }
 
-       . = ALIGN (4);
+       . = ALIGN(4);
        .rodata : {
                *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*)))
        }
-       . = ALIGN (4);
+       . = ALIGN(4);
        .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);
        .rel.dyn : {
@@ -72,13 +72,21 @@ SECTIONS
                *(.dynsym)
        }
 
-       .bss __rel_dyn_start (OVERLAY) : {
-               __bss_start = .;
+       _end = .;
+
+       .bss_start __rel_dyn_start (OVERLAY) : {
+               KEEP(*(.__bss_start));
+       }
+
+       .bss __bss_start (OVERLAY) : {
                *(.bss*)
                 . = ALIGN(4);
-               _end = .;
+                __bss_end = .;
        }
-       __bss_end__ =.;
+       .bss_end __bss_end (OVERLAY) : {
+               KEEP(*(__bss_end));
+       }
+
        /DISCARD/ : { *(.dynstr*) }
        /DISCARD/ : { *(.dynamic*) }
        /DISCARD/ : { *(.plt*) }