X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=board%2Factux2%2Fu-boot.lds;h=707c027ab56f1fbf90b37659bd872676f2fbaa3f;hb=d48455ad8cefd25d7b49f68fd16d0e9fd551732a;hp=d1f7a0a40cb8cf982b9223284cd223aa4d3b16a7;hpb=afbc526336447a7357e9c82852df0377d09a8089;p=oweals%2Fu-boot.git

diff --git a/board/actux2/u-boot.lds b/board/actux2/u-boot.lds
index d1f7a0a40c..707c027ab5 100644
--- 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 =.;
 }