Merge remote-tracking branch 'kiszka/master'

[jailhouse.git] / configs / vexpress.c

diff --git a/configs/vexpress.c b/configs/vexpress.c
index cb8387b81f8c92dffb22b2ed95f6739004866c33..7d239d2f3f40b2930352a52842a7693be2af9659 100644 (file)
--- a/configs/vexpress.c
+++ b/configs/vexpress.c
@@ -22,10 +22,16 @@ struct {
        struct jailhouse_irqchip irqchips[1];
 } __attribute__((packed)) config = {
        .header = {
+               .signature = JAILHOUSE_SYSTEM_SIGNATURE,
                .hypervisor_memory = {
                        .phys_start = 0xfc000000,
                        .size = 0x4000000,
                },
+               .debug_console = {
+                       .phys_start = 0x1c090000,
+                       .size = 0x1000,
+                       .flags = JAILHOUSE_MEM_IO,
+               },
                .root_cell = {
                        .name = "VExpress Linux",
 
@@ -98,9 +104,12 @@ struct {
                },
        },
        .irqchips = {
-               /* GIC */ {
-                       .address = 0x2f000000,
-                       .pin_bitmap = 0xffffffffffffffff,
+               /* GIC v3 */ {
+                       .address = 0x2f000000, /* GIC v2: 0x2f001000 */
+                       .pin_base = 32,
+                       .pin_bitmap = {
+                               0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff
+                       },
                },
        },