From: Andreas Koelbl <[email protected]> vexpress.c conditionally chooses the GIC version while vexpress-linux-demo.c does not. Use the same differentiation in vexpress-linux-demo.c as well.
Signed-off-by: Andreas Koelbl <[email protected]> --- Hi, found this inconsistency while writing the Documentation for the hypervisor configuration. I'm not able to test this patch. Looks like we could also squash vexpress-gic-demo.c vexpress-uart-demo.c. The only difference is the assigned CPU and UART. configs/vexpress-linux-demo.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/configs/vexpress-linux-demo.c b/configs/vexpress-linux-demo.c index 83c81882..f357a76e 100644 --- a/configs/vexpress-linux-demo.c +++ b/configs/vexpress-linux-demo.c @@ -56,8 +56,12 @@ struct { }, .irqchips = { - /* GIC v3 */ { - .address = 0x2f000000, /* GIC v2: 0x2f001000 */ + /* GIC */ { +#ifdef CONFIG_ARM_GIC_V3 + .address = 0x2f000000, +#else /* GICv2 */ + .address = 0x2f001000, +#endif .pin_base = 32, .pin_bitmap = { 0x00000100, -- 2.11.1 -- You received this message because you are subscribed to the Google Groups "Jailhouse" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
