Merge git://git.denx.de/u-boot into x1

[oweals/u-boot.git] / board / esd / ar405 / u-boot.lds

diff --git a/board/esd/ar405/u-boot.lds b/board/esd/ar405/u-boot.lds
index 64293d21afb80c3569866113f09eab85ae828ade..4a881b6eda8028c633304701a4e216691f87f89f 100644 (file)
--- a/board/esd/ar405/u-boot.lds
+++ b/board/esd/ar405/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
@@ -39,11 +38,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)     }
@@ -80,14 +79,13 @@ SECTIONS
     common/cmd_mem.o           (.text)
     common/cmd_nvedit.o                (.text)
     common/console.o           (.text)
-    common/lists.o             (.text)
     common/main.o              (.text)
 
 /*
     . = DEFINED(env_offset) ? env_offset : .;
-    common/environment.o       (.ppcenv)
+    common/env_embedded.o      (.ppcenv)
 */
-    common/environment.o       (.text)
+    common/env_embedded.o      (.text)
 
     *(.text)
     *(.fixup)
@@ -152,7 +150,7 @@ SECTIONS
   __init_end = .;
 
   __bss_start = .;
-  .bss       :
+  .bss (NOLOAD)       :
   {
    *(.sbss) *(.scommon)
    *(.dynbss)