ppc4xx: Big cleanup of PPC4xx defines

[u-boot] / board / snmc / qs850 / u-boot.lds

diff --git a/board/snmc/qs850/u-boot.lds b/board/snmc/qs850/u-boot.lds
index 2410d5f2c383bf93c4e715e931c6ae175319da92..7de0de8d9d3f651a78b1271c67d7fbca203d09f9 100644 (file)
--- a/board/snmc/qs850/u-boot.lds
+++ b/board/snmc/qs850/u-boot.lds
@@ -66,7 +66,7 @@ SECTIONS
        lib_ppc/time.o          (.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
-       common/environment.o    (.ppcenv)
+       common/env_embedded.o   (.ppcenv)
 
     *(.text)
     *(.fixup)
@@ -76,10 +76,8 @@ SECTIONS
   PROVIDE (etext = .);
   .rodata    :
   {
-    *(.rodata)
-    *(.rodata1)
-    *(.rodata.str1.4)
     *(.eh_frame)
+    *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*)))
   }
   .fini      : { *(.fini)    } =0
   .ctors     : { *(.ctors)   }
@@ -137,6 +135,7 @@ SECTIONS
    *(.dynbss)
    *(.bss)
    *(COMMON)
+   . = ALIGN(4);
   }
   _end = . ;
   PROVIDE (end = .);