Module Name:    src
Committed By:   thorpej
Date:           Wed Feb 12 18:11:30 UTC 2020

Modified Files:
        src/sys/arch/evbarm/stand/gzboot/NSLU2_dram_0x01d00000: ldscript

Log Message:
Because everything goes into the same memory region at run-time in this
configuration *and* image data concatenated onto the end, the BSS segment
needs to be allocated in the file.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
    src/sys/arch/evbarm/stand/gzboot/NSLU2_dram_0x01d00000/ldscript

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/evbarm/stand/gzboot/NSLU2_dram_0x01d00000/ldscript
diff -u src/sys/arch/evbarm/stand/gzboot/NSLU2_dram_0x01d00000/ldscript:1.1 src/sys/arch/evbarm/stand/gzboot/NSLU2_dram_0x01d00000/ldscript:1.2
--- src/sys/arch/evbarm/stand/gzboot/NSLU2_dram_0x01d00000/ldscript:1.1	Wed Feb 12 06:57:35 2020
+++ src/sys/arch/evbarm/stand/gzboot/NSLU2_dram_0x01d00000/ldscript	Wed Feb 12 18:11:30 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: ldscript,v 1.1 2020/02/12 06:57:35 thorpej Exp $	*/
+/*	$NetBSD: ldscript,v 1.2 2020/02/12 18:11:30 thorpej Exp $	*/
 
 OUTPUT_FORMAT("elf32-bigarm", "elf32-bigarm",
 	      "elf32-littlearm")
@@ -55,7 +55,7 @@ SECTIONS
   __bss_start = .;
   __bss_start__ = .;
   .sbss      :
-  AT (ADDR(.sbss))
+  AT (LOADADDR(.sdata) + SIZEOF(.sdata))
   {
     PROVIDE (__sbss_start = .);
     PROVIDE (___sbss_start = .);
@@ -67,7 +67,7 @@ SECTIONS
     PROVIDE (___sbss_end = .);
   } > sdram
   .bss       :
-  AT (ADDR(.bss))
+  AT (LOADADDR(.sbss) + SIZEOF(.sbss))
   {
    *(.dynbss)
    *(.bss)
@@ -82,9 +82,9 @@ SECTIONS
   _end = .;
   _bss_end__ = . ; __bss_end__ = . ; __end__ = . ;
   PROVIDE (end = .);
-  .image   (SDRAM + SIZEOF(.text) + SIZEOF(.data) + SIZEOF(.sdata)) :
-  AT (LOADADDR(.sdata) + SIZEOF(.sdata))
+  .image     :
+  AT (LOADADDR(.bss) + SIZEOF(.bss))
   {
     *(.image)
-  }
+  } > sdram
 }

Reply via email to