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

[oweals/u-boot.git] / board / actux2 / u-boot.lds

diff --git a/board/actux2/u-boot.lds b/board/actux2/u-boot.lds
index d1f7a0a40cb8cf982b9223284cd223aa4d3b16a7..707c027ab56f1fbf90b37659bd872676f2fbaa3f 100644 (file)
--- a/board/actux2/u-boot.lds
+++ b/board/actux2/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)
@@ -45,7 +45,7 @@ SECTIONS
 
        . = ALIGN (4);
        .rodata : {
-               *(.rodata)
+               *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*)))
        }
 
        . = ALIGN (4);
@@ -69,6 +69,7 @@ SECTIONS
        __bss_start =.;
        .bss (NOLOAD): {
                *(.bss)
+               . = ALIGN(4);
        }
        _end =.;
 }