Merge branch 'master' of git://www.denx.de/git/u-boot-ppc4xx

[oweals/u-boot.git] / board / hermes / u-boot.lds

diff --git a/board/hermes/u-boot.lds b/board/hermes/u-boot.lds
index a8e05dc0482ff19d3c1d020018d306bc5972aed5..45e812c09da6b3fde05466d2451e83061b37ba49 100644 (file)
--- a/board/hermes/u-boot.lds
+++ b/board/hermes/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
@@ -77,6 +76,7 @@ SECTIONS
     *(.rodata)
     *(.rodata1)
     *(.rodata.str1.4)
+    *(.eh_frame)
   }
   .fini      : { *(.fini)    } =0
   .ctors     : { *(.ctors)   }
@@ -128,7 +128,7 @@ SECTIONS
   __init_end = .;
 
   __bss_start = .;
-  .bss       :
+  .bss (NOLOAD)       :
   {
    *(.sbss) *(.scommon)
    *(.dynbss)