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

[people/ms/u-boot.git] / board / freescale / mx31ads / u-boot.lds

diff --git a/board/freescale/mx31ads/u-boot.lds b/board/freescale/mx31ads/u-boot.lds
index e682f307f7efcbb2a5709a6f88ab39d86902ee05..ecd97075b04bab4d64c4e1e30bab5c6b8df1cbf7 100644 (file)
--- a/board/freescale/mx31ads/u-boot.lds
+++ b/board/freescale/mx31ads/u-boot.lds
@@ -3,7 +3,7 @@
  * Copyright (c) 2004 Texas Instruments
  *
  * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
+ * Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
  *
  * See file CREDITS for list of people who contributed to this
  * project.
@@ -37,11 +37,11 @@ SECTIONS
          /* WARNING - the following is hand-optimized to fit within    */
          /* the sector layout of our flash chips!      XXX FIXME XXX   */
 
-         cpu/arm1136/start.o                   (.text)
-         board/freescale/mx31ads/libmx31ads.a  (.text)
-         lib_arm/libarm.a                      (.text)
-         net/libnet.a                          (.text)
-         drivers/mtd/libmtd.a                  (.text)
+         arch/arm/cpu/arm1136/start.o                  (.text)
+         board/freescale/mx31ads/libmx31ads.o  (.text)
+         arch/arm/lib/libarm.o                 (.text)
+         net/libnet.o                          (.text)
+         drivers/mtd/libmtd.o                  (.text)
 
          . = DEFINED(env_offset) ? env_offset : .;
          common/env_embedded.o(.text)
@@ -50,7 +50,7 @@ SECTIONS
        }
 
        . = ALIGN(4);
-       .rodata : { *(.rodata) }
+       .rodata : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) }
 
        . = ALIGN(4);
        .data : { *(.data) }