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

[u-boot] / board / w7o / u-boot.lds.debug

diff --git a/board/w7o/u-boot.lds.debug b/board/w7o/u-boot.lds.debug
index 834d68d6cae7f2c07c97da341b8887d41fcb9626..5ff67d13d45dac3682c369782f868fecec86ea30 100644 (file)
--- a/board/w7o/u-boot.lds.debug
+++ b/board/w7o/u-boot.lds.debug
@@ -33,11 +33,11 @@ SECTIONS
   .dynsym        : { *(.dynsym)                }
   .dynstr        : { *(.dynstr)                }
   .rel.text      : { *(.rel.text)              }
-  .rela.text     : { *(.rela.text)     }
+  .rela.text     : { *(.rela.text)     }
   .rel.data      : { *(.rel.data)              }
-  .rela.data     : { *(.rela.data)     }
-  .rel.rodata    : { *(.rel.rodata)    }
-  .rela.rodata   : { *(.rela.rodata)   }
+  .rela.data     : { *(.rela.data)     }
+  .rel.rodata    : { *(.rel.rodata)    }
+  .rela.rodata   : { *(.rela.rodata)   }
   .rel.got       : { *(.rel.got)               }
   .rela.got      : { *(.rela.got)              }
   .rel.ctors     : { *(.rel.ctors)     }
@@ -57,14 +57,13 @@ SECTIONS
 
     mpc8xx/start.o     (.text)
     common/dlmalloc.o  (.text)
-    lib_generic/vsprintf.o     (.text)
-    lib_generic/crc32.o                (.text)
-    lib_ppc/extable.o  (.text)
+    lib/vsprintf.o     (.text)
+    lib/crc32.o                (.text)
+    arch/powerpc/lib/extable.o (.text)
 
-    common/environment.o(.text)
+    common/env_embedded.o(.text)
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;