configs: Adjust VExpress configs for smaller reservations

Move the hypervisor at the top of 2G memory. The gic and uart demo cells
are placed below, each given much less space than before - they don't
need more.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>

diff --git a/configs/vexpress-gic-demo.c b/configs/vexpress-gic-demo.c
index 115f001dbed75e5421d3591d0665ad8b4d05b705..f45f0d67c45ee4dad0e2d5d221dcfe224b04dd8f 100644 (file)
--- a/configs/vexpress-gic-demo.c
+++ b/configs/vexpress-gic-demo.c
@@ -44,9 +44,9 @@ struct {
                                JAILHOUSE_MEM_DMA,
                },
                /* RAM */ {
-                       .phys_start = 0xa4000000,
+                       .phys_start = 0xfbfe0000,
                        .virt_start = 0,
-                       .size = 0x01000000,
+                       .size = 0x00010000,
                        .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE |
                                JAILHOUSE_MEM_EXECUTE | JAILHOUSE_MEM_LOADABLE,
                },

diff --git a/configs/vexpress-uart-demo.c b/configs/vexpress-uart-demo.c
index b396eb58136c48278289de749d8deb8aedafc758..6f2978740559f8446651e36d23f7757b210d9dc8 100644 (file)
--- a/configs/vexpress-uart-demo.c
+++ b/configs/vexpress-uart-demo.c
@@ -44,9 +44,9 @@ struct {
                                JAILHOUSE_MEM_DMA,
                },
                /* RAM */ {
-                       .phys_start = 0xa5000000,
+                       .phys_start = 0xfbff0000,
                        .virt_start = 0,
-                       .size = 0x01000000,
+                       .size = 0x00010000,
                        .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE |
                                JAILHOUSE_MEM_EXECUTE | JAILHOUSE_MEM_LOADABLE,
                },

diff --git a/configs/vexpress.c b/configs/vexpress.c
index 0d7d4a251d861a0940a8060fe8c1f72c8a0cbe9e..f1b989af2e5b1e0e3a8d9687bdc1ec6cff02cbbd 100644 (file)
--- a/configs/vexpress.c
+++ b/configs/vexpress.c
@@ -23,8 +23,8 @@ struct {
 } __attribute__((packed)) config = {
        .header = {
                .hypervisor_memory = {
-                       .phys_start = 0xa0000000,
-                       .size = 0x4000000 - 0x2000,
+                       .phys_start = 0xfc000000,
+                       .size = 0x4000000,
                },
                .root_cell = {
                        .name = "VExpress Linux",
@@ -92,7 +92,7 @@ struct {
                /* RAM */ {
                        .phys_start = 0x80000000,
                        .virt_start = 0x80000000,
-                       .size = 0x80000000,
+                       .size = 0x7c000000,
                        .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE |
                                JAILHOUSE_MEM_EXECUTE,
                },