From a0b379ce4017b95558b097f32dd365d3d4853020 Mon Sep 17 00:00:00 2001 From: Jan Kiszka Date: Sun, 28 Sep 2014 21:43:54 +0200 Subject: [PATCH] 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 --- configs/vexpress-gic-demo.c | 4 ++-- configs/vexpress-uart-demo.c | 4 ++-- configs/vexpress.c | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/configs/vexpress-gic-demo.c b/configs/vexpress-gic-demo.c index 115f001..f45f0d6 100644 --- 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 b396eb5..6f29787 100644 --- 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 0d7d4a2..f1b989a 100644 --- 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, }, -- 2.39.2