Merge branch 'master' of /home/wd/git/u-boot/custodians

[karo-tx-uboot.git] / board / genietv / u-boot.lds

diff --git a/board/genietv/u-boot.lds b/board/genietv/u-boot.lds
index 5eb8076abec41c78eb748e1f28505745324eccbf..99d743b5a1259ad9f323b7822b761febb8f341ea 100644 (file)
--- a/board/genietv/u-boot.lds
+++ b/board/genietv/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)     }
@@ -64,7 +63,7 @@ SECTIONS
     lib_generic/zlib.o         (.text)
 
     . = env_offset;
-    common/environment.o(.text)
+    common/env_embedded.o(.text)
     *(.text)
     *(.fixup)
     *(.got1)
@@ -138,7 +137,7 @@ SECTIONS
   . = ALIGN(256 * 1024);
   .ppcenv      :
   {
-    common/environment.o (.ppcenv)
+    common/env_embedded.o (.ppcenv)
   }
   _end = . ;
   PROVIDE (end = .);