Merge remote-tracking branch 'kiszka/master'

[jailhouse.git] / inmates / lib / arm / inmate.lds

diff --git a/inmates/lib/arm/inmate.lds b/inmates/lib/arm/inmate.lds
index c5d82c21a0eafb16ce0e7bf201887d4d5445935d..fe1325320f659f34481294f85173731436b95613 100644 (file)
--- a/inmates/lib/arm/inmate.lds
+++ b/inmates/lib/arm/inmate.lds
@@ -2,9 +2,11 @@
  * Jailhouse, a Linux-based partitioning hypervisor
  *
  * Copyright (c) ARM Limited, 2014
+ * Copyright (c) Siemens AG, 2016
  *
  * Authors:
  *  Jean-Philippe Brucker <jean-philippe.brucker@arm.com>
+ *  Jan Kiszka <jan.kiszka@siemens.com>
  *
  * This work is licensed under the terms of the GNU GPL, version 2.  See
  * the COPYING file in the top-level directory.
@@ -14,13 +16,10 @@ SECTIONS {
        . = 0;
        .boot           : { *(.boot) }
 
-       . = ALIGN(4096);
-       . = . + 0x1000;
-       stack_top = .;
-       bss_start = .;
-       .bss            : {
-               *(.bss)
-               *(COMMON)
+       . = 0x100;
+       .cmdline        : {
+               *(.cmdline)
+               BYTE(0); /* empty string in case no buffer is provided */
        }
 
        . = ALIGN(4);
@@ -35,6 +34,17 @@ SECTIONS {
        .data           : {
                *(.data)
        }
+
+       .bss            : {
+               bss_start = .;
+               *(.bss)
+               . = ALIGN(4);
+       }
+       bss_dwords = SIZEOF(.bss) / 4;
+
+       . = ALIGN(4096);
+       . += 0x1000;
+       stack_top = .;
 }
 
 ENTRY(__reset_entry)