X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=board%2Factux1%2Fu-boot.lds;h=5c1ece79c8e149ce980dbdc46426deda1c406804;hb=39ddd10b046fb791f47281ffb2100be01909ad72;hp=0de78d32a91ee72776b3a20218b58b6a04e00601;hpb=40dcd6aa75ef95b490f342695f970910b82e392e;p=u-boot

diff --git a/board/actux1/u-boot.lds b/board/actux1/u-boot.lds
index 0de78d32a9..5c1ece79c8 100644
--- a/board/actux1/u-boot.lds
+++ b/board/actux1/u-boot.lds
@@ -30,20 +30,20 @@ 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/environment.o(.ppcenv)
+		common/env_embedded.o(.ppcenv)
 		* (.text)
 	}
 
 	. = 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 =.;
 }