config: Correct / comment GIC irqchip addresses

[jailhouse.git] / configs / vexpress-linux-demo.c

diff --git a/configs/vexpress-linux-demo.c b/configs/vexpress-linux-demo.c
index 22855c20376085e6012c815e6c62b78d569d49a9..250a3a89a059d984c0cee5f4e4581858b516f4d8 100644 (file)
--- a/configs/vexpress-linux-demo.c
+++ b/configs/vexpress-linux-demo.c
@@ -22,6 +22,7 @@ struct {
        struct jailhouse_irqchip irqchips[1];
 } __attribute__((packed)) config = {
        .cell = {
+               .signature = JAILHOUSE_CELL_DESC_SIGNATURE,
                .name = "linux-demo",
                .flags = JAILHOUSE_CELL_PASSIVE_COMMREG,
 
@@ -42,7 +43,7 @@ struct {
                        .virt_start = 0x1c090000,
                        .size = 0x10000,
                        .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE |
-                               JAILHOUSE_MEM_DMA,
+                               JAILHOUSE_MEM_IO,
                },
                /* RAM load */ {
                        .phys_start = 0xa6000000,
@@ -54,9 +55,12 @@ struct {
        },
 
        .irqchips = {
-               /* GIC */ {
-                       .address = 0x2f000000,
-                       .pin_bitmap = 0x0000000000000100,
+               /* GIC v3 */ {
+                       .address = 0x2f000000, /* GIC v2: 0x2f001000 */
+                       .pin_base = 32,
+                       .pin_bitmap = {
+                               0x00000100,
+                       },
                },
        }
 };