ARM DaVinci:Consolidate common u-boot.lds

[u-boot] / board / pb1x00 / u-boot.lds

diff --git a/board/pb1x00/u-boot.lds b/board/pb1x00/u-boot.lds
index 7329e6aaa09b0829c6aea933d012c942466514fd..9a6cd1b8a3eb912be484d1a5a54fa6f28bc97ee9 100644 (file)
--- a/board/pb1x00/u-boot.lds
+++ b/board/pb1x00/u-boot.lds
@@ -38,12 +38,13 @@ SECTIONS
        }
 
        . = ALIGN(4);
-       .rodata  : { *(.rodata) }
+       .rodata  : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) }
 
        . = ALIGN(4);
        .data  : { *(.data) }
 
-       _gp = ALIGN(16);
+       . = .;
+       _gp = ALIGN(16) + 0x7ff0;
 
        .got : {
          __got_start = .;
@@ -53,15 +54,17 @@ SECTIONS
 
        .sdata  : { *(.sdata) }
 
-       __u_boot_cmd_start = .;
-       .u_boot_cmd : { *(.u_boot_cmd) }
-       __u_boot_cmd_end = .;
+       .u_boot_cmd : {
+         __u_boot_cmd_start = .;
+         *(.u_boot_cmd)
+         __u_boot_cmd_end = .;
+       }
 
        uboot_end_data = .;
        num_got_entries = (__got_end - __got_start) >> 2;
 
        . = ALIGN(4);
-       .sbss  : { *(.sbss) }
-       .bss  : { *(.bss) }
+       .sbss (NOLOAD)  : { *(.sbss) }
+       .bss (NOLOAD)  : { *(.bss) . = ALIGN(4); }
        uboot_end = .;
 }