microblaze: Move cpu/microblaze/* to arch/microblaze/cpu/*

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

diff --git a/board/gen860t/u-boot-flashenv.lds b/board/gen860t/u-boot-flashenv.lds
index bb03d3aacd34e61e9327aa2bc5a014ed7a7a0b9f..0e129253e7f9bf395cc6b6a85fd2b939af61f920 100644 (file)
--- a/board/gen860t/u-boot-flashenv.lds
+++ b/board/gen860t/u-boot-flashenv.lds
@@ -55,18 +55,15 @@ SECTIONS
   .plt           : { *(.plt)           }
   .text :
   {
-    cpu/mpc8xx/start.o (.text)
+    arch/ppc/cpu/mpc8xx/start.o        (.text)
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;
   PROVIDE (etext = .);
   .rodata    :
   {
-    *(.rodata)
-    *(.rodata1)
-    *(.rodata.str1.4)
+    *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*)))
   }
   .fini      : { *(.fini)    } =0
   .ctors     : { *(.ctors)   }
@@ -125,6 +122,7 @@ SECTIONS
    *(.dynbss)
    *(.bss)
    *(COMMON)
+   . = ALIGN(4);
   }
 
   _end = . ;
@@ -133,6 +131,6 @@ SECTIONS
   .ppcenv:
   {
     . = env_offset;
-    common/environment.o
+    common/env_embedded.o
   }
 }