Rename lib_generic/ to lib/

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

diff --git a/board/actux1/u-boot.lds b/board/actux1/u-boot.lds
index ae9b36c..40b5ef3 100644 (file)
--- a/board/actux1/u-boot.lds
+++ b/board/actux1/u-boot.lds
@@ -31,9 +31,9 @@ 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;
@@ -43,7 +43,7 @@ SECTIONS
 
        . = ALIGN (4);
        .rodata : {
-               *(.rodata)
+               *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*)))
        }
        . = ALIGN (4);
        .data : {
@@ -64,6 +64,7 @@ SECTIONS
        __bss_start =.;
        .bss (NOLOAD): {
                *(.bss)
+               . = ALIGN(4);
        }
        _end =.;
 }