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

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

diff --git a/board/esd/canbt/u-boot.lds b/board/esd/canbt/u-boot.lds
index 07e8110531cce530980e726b1ae41beb25fa2424..2247109cb6db63898a7026845814e144a496c49d 100644 (file)
--- a/board/esd/canbt/u-boot.lds
+++ b/board/esd/canbt/u-boot.lds
@@ -38,11 +38,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,47 +57,17 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
-    /* WARNING - the following is hand-optimized to fit within */
-    /* the sector layout of our flash chips!   XXX FIXME XXX   */
-
     cpu/ppc4xx/start.o         (.text)
-    cpu/ppc4xx/traps.o         (.text)
-    cpu/ppc4xx/interrupts.o    (.text)
-    cpu/ppc4xx/4xx_uart.o              (.text)
-    cpu/ppc4xx/cpu_init.o      (.text)
-    cpu/ppc4xx/speed.o         (.text)
-    common/dlmalloc.o          (.text)
-    lib_ppc/extable.o          (.text)
-    lib_ppc/board.o            (.text)
-    lib_generic/zlib.o         (.text)
-    lib_generic/crc32.o                (.text)
-
-    common/cmd_boot.o          (.text)
-    common/cmd_bootm.o         (.text)
-    common/cmd_flash.o         (.text)
-    common/cmd_mem.o           (.text)
-    common/cmd_nvedit.o                (.text)
-    common/console.o           (.text)
-    common/lists.o             (.text)
-    common/main.o              (.text)
-    net/net.o                  (.text)
-
-/*    . = env_offset;
-    common/environment.o       (.text)
-*/
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;
   PROVIDE (etext = .);
   .rodata    :
   {
-    *(.rodata)
-    *(.rodata1)
-    *(.rodata.str1.4)
     *(.eh_frame)
+    *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*)))
   }
   .fini      : { *(.fini)    } =0
   .ctors     : { *(.ctors)   }
@@ -155,6 +125,7 @@ SECTIONS
    *(.dynbss)
    *(.bss)
    *(COMMON)
+   . = ALIGN(4);
   }
   _end = . ;
   PROVIDE (end = .);