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

[karo-tx-uboot.git] / board / LEOX / elpt860 / u-boot.lds.debug

diff --git a/board/LEOX/elpt860/u-boot.lds.debug b/board/LEOX/elpt860/u-boot.lds.debug
index 17f99eb840b2f81db964984d71c83b2b64cdf8cf..592d9e3195653eabf931a8794f671e34f3af2797 100644 (file)
--- a/board/LEOX/elpt860/u-boot.lds.debug
+++ b/board/LEOX/elpt860/u-boot.lds.debug
@@ -31,7 +31,6 @@
 */
 
 OUTPUT_ARCH(powerpc)
-SEARCH_DIR(/lib); SEARCH_DIR(/usr/lib); SEARCH_DIR(/usr/local/lib); SEARCH_DIR(/usr/local/powerpc-any-elf/lib);
 /* Do we need any of these for elf?
    __DYNAMIC = 0;    */
 SECTIONS
@@ -65,16 +64,15 @@ 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_generic/vsprintf.o     (.text)
-    lib_generic/crc32.o                (.text)
+    lib/vsprintf.o     (.text)
+    lib/crc32.o                (.text)
 
     . = env_offset;
-    common/environment.o       (.text)
+    common/env_embedded.o      (.text)
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;
@@ -136,6 +134,6 @@ SECTIONS
    *(.bss)
    *(COMMON)
   }
-  _end = . ;
+  __bss_end = . ;
   PROVIDE (end = .);
 }