Merge branch 'master' of ssh://gemini/home/wd/git/u-boot/master

[u-boot] / board / actux1 / u-boot.lds

diff --git a/board/actux1/u-boot.lds b/board/actux1/u-boot.lds
index ccdb78e9c3dce146bbb1e66979aee613ea567444..5c1ece79c8e149ce980dbdc46426deda1c406804 100644 (file)
--- a/board/actux1/u-boot.lds
+++ b/board/actux1/u-boot.lds
@@ -30,12 +30,12 @@ SECTIONS
 
        . = ALIGN (4);
        .text : {
-               cpu/ixp/start.o(.text)
-               lib_generic/string.o(.text)
-               lib_generic/vsprintf.o(.text)
-               lib_arm/board.o(.text)
+               arch/arm/cpu/ixp/start.o(.text)
+               lib/string.o(.text)
+               lib/vsprintf.o(.text)
+               arch/arm/lib/board.o(.text)
                common/dlmalloc.o(.text)
-               cpu/ixp/cpu.o(.text)
+               arch/arm/cpu/ixp/cpu.o(.text)
                . = env_offset;
                common/env_embedded.o(.ppcenv)
                * (.text)
@@ -43,7 +43,7 @@ SECTIONS
 
        . = ALIGN (4);
        .rodata : {
-               *(.rodata)
+               *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*)))
        }
        . = ALIGN (4);
        .data : {