X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=board%2Factux1%2Fu-boot.lds;h=40b5ef3bd19365b6b600cf344e691f4e1104de6a;hb=78acc472d9719316f22e002a009a998d9ceec29d;hp=ae9b36c64c7f2648041bbaeda29ce3b5f55b8d8f;hpb=225f0eaa745adfae05931848543d99942798756a;p=pandora-u-boot.git

diff --git a/board/actux1/u-boot.lds b/board/actux1/u-boot.lds
index ae9b36c64c..40b5ef3bd1 100644
--- 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 =.;
 }