Move lib_$ARCH directories to arch/$ARCH/lib

[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 c379460c9b0eb152f66bdf76ed6b2af361d2edc4..6f5bda4572110d9ac3adabf82afc769e78da76fa 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.
@@ -39,18 +39,18 @@ SECTIONS
 
          cpu/arm1136/start.o                   (.text)
          board/freescale/mx31ads/libmx31ads.a  (.text)
-         lib_arm/libarm.a                      (.text)
+         arch/arm/lib/libarm.a                 (.text)
          net/libnet.a                          (.text)
          drivers/mtd/libmtd.a                  (.text)
 
          . = DEFINED(env_offset) ? env_offset : .;
-         common/environment.o(.text)
+         common/env_embedded.o(.text)
 
          *(.text)
        }
 
        . = ALIGN(4);
-       .rodata : { *(.rodata) }
+       .rodata : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) }
 
        . = ALIGN(4);
        .data : { *(.data) }
@@ -65,6 +65,6 @@ SECTIONS
 
        . = ALIGN(4);
        __bss_start = .;
-       .bss : { *(.bss) }
+       .bss : { *(.bss) . = ALIGN(4); }
        _end = .;
 }