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

[u-boot] / arch / x86 / cpu / u-boot.lds

diff --git a/arch/x86/cpu/u-boot.lds b/arch/x86/cpu/u-boot.lds
index 54f2fb76f7bb2398f3587e4b9865d8d36b9012d4..2d6911aa4196b58278eedbab54b833ba3e38d976 100644 (file)
--- a/arch/x86/cpu/u-boot.lds
+++ b/arch/x86/cpu/u-boot.lds
@@ -36,7 +36,7 @@ SECTIONS
 
        . = ALIGN(4);
        .u_boot_list : {
-       #include <u-boot.lst>
+               KEEP(*(SORT(.u_boot_list*)));
        }
 
        . = ALIGN(4);
@@ -53,6 +53,7 @@ SECTIONS
 
        . = ALIGN(4);
        __data_end = .;
+       __init_end = .;
 
        . = ALIGN(4);
        .dynsym : { *(.dynsym*) }
@@ -64,9 +65,6 @@ SECTIONS
        . = ALIGN(4);
        _end = .;
 
-       . = ALIGN(4);
-
-       __end = .;
        .bss __rel_dyn_start (OVERLAY) : {
                __bss_start = .;
                *(.bss)