Merge branch 'master' of git://git.denx.de/u-boot-nand-flash

[u-boot] / board / hymod / u-boot.lds

diff --git a/board/hymod/u-boot.lds b/board/hymod/u-boot.lds
index 2c15c3fa10767beb8f0f5fabe981a9f33390a582..fdd584dd80e6724e2acc882ddd77646e3440e2cd 100644 (file)
--- a/board/hymod/u-boot.lds
+++ b/board/hymod/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,11 +33,11 @@ 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.rodata   : { *(.rela.rodata)   }
+  .rela.data     : { *(.rela.data)     }
+  .rel.rodata    : { *(.rel.rodata)    }
+  .rela.rodata   : { *(.rela.rodata)   }
   .rel.got       : { *(.rel.got)               }
   .rela.got      : { *(.rela.got)              }
   .rel.ctors     : { *(.rel.ctors)     }
@@ -66,7 +65,7 @@ SECTIONS
 
     . = env_offset;
 */
-    common/environment.o(.text)
+    common/env_embedded.o(.text)
 
     *(.text)
     *(.fixup)
@@ -141,8 +140,9 @@ SECTIONS
   . = ALIGN(256 * 1024);
   .ppcenv      :
   {
-    common/environment.o (.ppcenv)
+    common/env_embedded.o (.ppcenv)
   }
+  . = ALIGN(4);
   _end = . ;
   PROVIDE (end = .);
 }