X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=board%2Fuc100%2Fu-boot.lds;h=0d8f60594643e4854013fc0b37641995e7131153;hb=a47a12becf66f02a56da91c161e2edb625e9f20c;hp=db2934249168d020c0583d4bab200d869cf2cbfa;hpb=10a3367955bc2033b288915f8f10d0e507fe2fa1;p=u-boot

diff --git a/board/uc100/u-boot.lds b/board/uc100/u-boot.lds
index db29342491..0d8f605946 100644
--- a/board/uc100/u-boot.lds
+++ b/board/uc100/u-boot.lds
@@ -55,30 +55,27 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mpc8xx/start.o		(.text)
-    cpu/mpc8xx/traps.o		(.text)
+    arch/powerpc/cpu/mpc8xx/start.o		(.text)
+    arch/powerpc/cpu/mpc8xx/traps.o		(.text)
     common/dlmalloc.o		(.text)
-    lib_ppc/ppcstring.o		(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
-    lib_generic/zlib.o		(.text)
-    lib_ppc/cache.o		(.text)
-    lib_ppc/time.o		(.text)
+    arch/powerpc/lib/ppcstring.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
+    lib/zlib.o		(.text)
+    arch/powerpc/lib/cache.o		(.text)
+    arch/powerpc/lib/time.o		(.text)
 
-    common/environment.o	(.text)
+    common/env_embedded.o	(.text)
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;
   PROVIDE (etext = .);
   .rodata    :
   {
-    *(.rodata)
-    *(.rodata1)
-    *(.rodata.str1.4)
     *(.eh_frame)
+    *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*)))
   }
   .fini      : { *(.fini)    } =0
   .ctors     : { *(.ctors)   }
@@ -136,6 +133,7 @@ SECTIONS
    *(.dynbss)
    *(.bss)
    *(COMMON)
+   . = ALIGN(4);
   }
   _end = . ;
   PROVIDE (end = .);