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

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

diff --git a/board/csb472/u-boot.lds b/board/csb472/u-boot.lds
index 00219180fdd5f111b95a0760906269c8aa59062b..ba37c1b79e87e4a25ac6cd85731ca302b27a5609 100644 (file)
--- a/board/csb472/u-boot.lds
+++ b/board/csb472/u-boot.lds
@@ -38,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)     }
@@ -68,7 +68,7 @@ SECTIONS
     cpu/ppc4xx/4xx_uart.o      (.text)
     cpu/ppc4xx/cpu_init.o      (.text)
     cpu/ppc4xx/speed.o (.text)
-    cpu/ppc4xx/4xx_enet.o      (.text)
+    drivers/net/4xx_enet.o     (.text)
     common/dlmalloc.o  (.text)
     lib_generic/crc32.o                (.text)
 
@@ -76,20 +76,17 @@ SECTIONS
     lib_ppc/board.o    (.text)
     lib_generic/zlib.o (.text)
 /*    . = 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)   }
@@ -147,6 +144,7 @@ SECTIONS
    *(.dynbss)
    *(.bss)
    *(COMMON)
+   . = ALIGN(4);
   }
   _end = . ;
   PROVIDE (end = .);