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

[u-boot] / arch / powerpc / cpu / ppc4xx / u-boot.lds

diff --git a/arch/powerpc/cpu/ppc4xx/u-boot.lds b/arch/powerpc/cpu/ppc4xx/u-boot.lds
index 6df673ebf7296a0769a49e4b3d0285b08d54a861..06010d6b149605829abbf5a7f361cfcbc58da99e 100644 (file)
--- a/arch/powerpc/cpu/ppc4xx/u-boot.lds
+++ b/arch/powerpc/cpu/ppc4xx/u-boot.lds
@@ -78,13 +78,10 @@ SECTIONS
   PROVIDE (edata = .);
 
   . = .;
-  __u_boot_cmd_start = .;
-  .u_boot_cmd : { *(.u_boot_cmd) }
-  __u_boot_cmd_end = .;
 
   . = ALIGN(4);
   .u_boot_list : {
-       #include <u-boot.lst>
+       KEEP(*(SORT(.u_boot_list*)));
   }
 
   . = .;
@@ -145,6 +142,6 @@ SECTIONS
   } :bss
 
   . = ALIGN(4);
-  __bss_end__ = . ;
+  __bss_end = . ;
   PROVIDE (end = .);
 }