X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=board%2Fnetphone%2Fu-boot.lds;h=d64274b683cde9079d19bd2d698b36b7ac8cbf58;hb=e8fac25e83426fdf461c66aa8a2530ec28ec536e;hp=9584c3358a3625cd338a5b0b623e0e388a258efe;hpb=64134f011254123618798ff77c42ba196b2ec485;p=u-boot

diff --git a/board/netphone/u-boot.lds b/board/netphone/u-boot.lds
index 9584c3358a..d64274b683 100644
--- a/board/netphone/u-boot.lds
+++ b/board/netphone/u-boot.lds
@@ -22,7 +22,6 @@
  */
 
 OUTPUT_ARCH(powerpc)
-SEARCH_DIR(/lib); SEARCH_DIR(/usr/lib); SEARCH_DIR(/usr/local/lib); SEARCH_DIR(/usr/local/powerpc-any-elf/lib);
 /* Do we need any of these for elf?
    __DYNAMIC = 0;    */
 SECTIONS
@@ -34,10 +33,10 @@ SECTIONS
   .dynsym       : { *(.dynsym)		}
   .dynstr       : { *(.dynstr)		}
   .rel.text     : { *(.rel.text)	}
-  .rela.text    : { *(.rela.text) 	}
+  .rela.text    : { *(.rela.text)	}
   .rel.data     : { *(.rel.data)	}
-  .rela.data    : { *(.rela.data) 	}
-  .rel.rodata   : { *(.rel.rodata) 	}
+  .rela.data    : { *(.rela.data)	}
+  .rel.rodata   : { *(.rel.rodata)	}
   .rela.rodata  : { *(.rela.rodata)	}
   .rel.got      : { *(.rel.got)		}
   .rela.got     : { *(.rela.got)	}
@@ -50,8 +49,8 @@ SECTIONS
   .rel.plt      : { *(.rel.plt)		}
   .rela.plt     : { *(.rela.plt)	}
   .init         : { *(.init)		}
-  .plt			: { *(.plt) 		}
-  .text      	:
+  .plt		: { *(.plt)		}
+  .text	:
   {
     cpu/mpc8xx/start.o		(.text)
     cpu/mpc8xx/traps.o		(.text)
@@ -64,20 +63,17 @@ SECTIONS
     lib_ppc/time.o		(.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
-    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)   }
@@ -135,6 +131,7 @@ SECTIONS
    *(.dynbss)
    *(.bss)
    *(COMMON)
+   . = ALIGN(4);
   }
   _end = . ;
   PROVIDE (end = .);