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

[karo-tx-uboot.git] / board / quantum / u-boot.lds

diff --git a/board/quantum/u-boot.lds b/board/quantum/u-boot.lds
index faa1c6ccad9b800cc5f0b6156ffb362a86c3f492..3f92a9dc438ea241e4920f2a31f0e15ddd044583 100644 (file)
--- a/board/quantum/u-boot.lds
+++ b/board/quantum/u-boot.lds
@@ -55,19 +55,18 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within */
     /* the sector layout of our flash chips!   XXX FIXME XXX   */
 
-    cpu/mpc8xx/start.o (.text)
+    arch/powerpc/cpu/mpc8xx/start.o    (.text)
     common/dlmalloc.o  (.text)
-    lib_ppc/ppcstring.o        (.text)
-    lib_generic/vsprintf.o     (.text)
-    lib_generic/crc32.o                (.text)
-    lib_generic/zlib.o         (.text)
+    arch/powerpc/lib/ppcstring.o       (.text)
+    lib/vsprintf.o     (.text)
+    lib/crc32.o                (.text)
+    lib/zlib.o         (.text)
 /* XXX ?
     . = env_offset;
 */
     common/env_embedded.o(.text)
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;