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

[u-boot] / board / esd / pmc440 / u-boot-nand.lds

diff --git a/board/esd/pmc440/u-boot-nand.lds b/board/esd/pmc440/u-boot-nand.lds
index b580e0bd10c4da744a3c676061450ff23ec2be79..6a5cef6c8c8ad1f7deef16c11aa270ea12ab09be 100644 (file)
--- a/board/esd/pmc440/u-boot-nand.lds
+++ b/board/esd/pmc440/u-boot-nand.lds
@@ -53,7 +53,7 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within */
     /* the sector layout of our flash chips!   XXX FIXME XXX   */
 
-    cpu/ppc4xx/start.o (.text)
+    arch/powerpc/cpu/ppc4xx/start.o    (.text)
 
     /* Align to next NAND block */
     . = ALIGN(0x4000);
@@ -62,7 +62,6 @@ SECTIONS
     . = ALIGN(0x10000);
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;
@@ -103,10 +102,10 @@ SECTIONS
   PROVIDE (edata = .);
 
   . = .;
-  __u_boot_cmd_start = .;
-  .u_boot_cmd : { *(.u_boot_cmd) }
-  __u_boot_cmd_end = .;
 
+  .u_boot_list : {
+               KEEP(*(SORT(.u_boot_list*)));
+  }
 
   . = .;
   __start___ex_table = .;
@@ -130,6 +129,6 @@ SECTIONS
    . = ALIGN(4);
   }
 
-  _end = . ;
+  __bss_end = . ;
   PROVIDE (end = .);
 }