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

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

diff --git a/board/etx094/u-boot.lds.debug b/board/etx094/u-boot.lds.debug
index a0121cedb5c6edde2f808000f7f98ece45f241eb..be05d8fdcc62d38b5ed18a15297c66484d968295 100644 (file)
--- a/board/etx094/u-boot.lds.debug
+++ b/board/etx094/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)     }
@@ -55,23 +55,22 @@ 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)
-    cpu/mpc8xx/traps.o (.text)
-    cpu/mpc8xx/interrupts.o    (.text)
-    cpu/mpc8xx/cpu.o   (.text)
-    cpu/mpc8xx/cpu_init.o      (.text)
-    cpu/mpc8xx/speed.o (.text)
-    cpu/mpc8xx/serial.o        (.text)
-    lib_ppc/extable.o  (.text)
-    lib_ppc/ppcstring.o        (.text)
-    lib_generic/string.o       (.text)
-    lib_generic/crc32.o                (.text)
+    arch/powerpc/cpu/mpc8xx/start.o    (.text)
+    arch/powerpc/cpu/mpc8xx/traps.o    (.text)
+    arch/powerpc/cpu/mpc8xx/interrupts.o       (.text)
+    arch/powerpc/cpu/mpc8xx/cpu.o      (.text)
+    arch/powerpc/cpu/mpc8xx/cpu_init.o (.text)
+    arch/powerpc/cpu/mpc8xx/speed.o    (.text)
+    arch/powerpc/cpu/mpc8xx/serial.o   (.text)
+    arch/powerpc/lib/extable.o (.text)
+    arch/powerpc/lib/ppcstring.o       (.text)
+    lib/string.o       (.text)
+    lib/crc32.o                (.text)
     common/dlmalloc.o  (.text)
     . = env_offset;
-    common/environment.o(.text)
+    common/env_embedded.o(.text)
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;