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

[u-boot] / board / amcc / canyonlands / u-boot-nand.lds

diff --git a/board/amcc/canyonlands/u-boot-nand.lds b/board/amcc/canyonlands/u-boot-nand.lds
index d18c536158f59803ac45cba720fe9cd627e4d7aa..c71f0b7c0afa1bc4db3dbec2a69325bb14457eff 100644 (file)
--- a/board/amcc/canyonlands/u-boot-nand.lds
+++ b/board/amcc/canyonlands/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(0x20000);
@@ -62,7 +62,6 @@ SECTIONS
     . = ALIGN(0x80000);
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;