config, core: Improve irqchip configuration

[jailhouse.git] / configs / vexpress.c

diff --git a/configs/vexpress.c b/configs/vexpress.c
index eb273455feaf671c18ced74692546f1468c8f6ef..3caf3093ab13639a33d5e86239bd0338e64c376d 100644 (file)
--- a/configs/vexpress.c
+++ b/configs/vexpress.c
@@ -22,11 +22,12 @@ struct {
        struct jailhouse_irqchip irqchips[1];
 } __attribute__((packed)) config = {
        .header = {
+               .signature = JAILHOUSE_SYSTEM_SIGNATURE,
                .hypervisor_memory = {
                        .phys_start = 0xfc000000,
                        .size = 0x4000000,
                },
-               .debug_uart = {
+               .debug_console = {
                        .phys_start = 0x1c090000,
                        .size = 0x1000,
                        .flags = JAILHOUSE_MEM_IO,
@@ -105,7 +106,10 @@ struct {
        .irqchips = {
                /* GIC */ {
                        .address = 0x2f000000,
-                       .pin_bitmap = 0xffffffffffffffff,
+                       .pin_base = 32,
+                       .pin_bitmap = {
+                               0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff
+                       },
                },
        },