Rename lib_generic/ to lib/

[platform/kernel/u-boot.git] / board / actux3 / u-boot.lds

diff --git a/board/actux3/u-boot.lds b/board/actux3/u-boot.lds
index b9a9eb9..2fc3796 100644 (file)
--- a/board/actux3/u-boot.lds
+++ b/board/actux3/u-boot.lds
@@ -31,21 +31,21 @@ SECTIONS
        . = ALIGN (4);
        .text : {
                cpu/ixp/start.o (.text)
-               lib_generic/string.o (.text)
-               lib_generic/vsprintf.o (.text)
-               lib_arm/board.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)
 
                . = env_offset;
-               common/environment.o (.ppcenv)
+               common/env_embedded.o (.ppcenv)
 
                * (.text)
        }
 
        . = 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 =.;
 }