This enables the evaluation of config.h which will simplify switching between GICv2 and v3 for the vexpress config. For that, we need to switch the provider of types.h from Linux to Jailhouse.
Note that this change will require adjustment/recreation of local config source files. Signed-off-by: Jan Kiszka <[email protected]> --- configs/Makefile | 8 +++++++- configs/apic-demo.c | 2 +- configs/bananapi-gic-demo.c | 2 +- configs/bananapi-uart-demo.c | 2 +- configs/bananapi.c | 2 +- configs/e1000-demo.c | 2 +- configs/f2a88xm-hd3.c | 2 +- configs/h87i.c | 2 +- configs/imb-a180.c | 2 +- configs/ioapic-demo.c | 2 +- configs/ivshmem-demo.c | 2 +- configs/jetson-tk1-demo.c | 2 +- configs/jetson-tk1.c | 2 +- configs/linux-x86-demo.c | 2 +- configs/pci-demo.c | 2 +- configs/qemu-vm.c | 2 +- configs/smp-demo.c | 2 +- configs/tiny-demo.c | 2 +- configs/vexpress-gic-demo.c | 2 +- configs/vexpress-linux-demo.c | 2 +- configs/vexpress-uart-demo.c | 2 +- configs/vexpress.c | 2 +- tools/root-cell-config.c.tmpl | 2 +- 23 files changed, 29 insertions(+), 23 deletions(-) diff --git a/configs/Makefile b/configs/Makefile index 785e14e..3e94199 100644 --- a/configs/Makefile +++ b/configs/Makefile @@ -10,7 +10,13 @@ # the COPYING file in the top-level directory. # -ccflags-y := -I$(src)/../hypervisor/include -Wextra +LINUXINCLUDE := -I$(src)/../hypervisor/arch/$(SRCARCH)/include \ + -I$(src)/../hypervisor/include +KBUILD_CFLAGS := -Wextra + +ifneq ($(wildcard $(obj)/../hypervisor/include/jailhouse/config.h),) +KBUILD_CFLAGS += -include $(obj)/../hypervisor/include/jailhouse/config.h +endif OBJCOPYFLAGS := -O binary diff --git a/configs/apic-demo.c b/configs/apic-demo.c index af338c6..3972109 100644 --- a/configs/apic-demo.c +++ b/configs/apic-demo.c @@ -12,7 +12,7 @@ * the COPYING file in the top-level directory. */ -#include <linux/types.h> +#include <jailhouse/types.h> #include <jailhouse/cell-config.h> #define ARRAY_SIZE(a) sizeof(a) / sizeof(a[0]) diff --git a/configs/bananapi-gic-demo.c b/configs/bananapi-gic-demo.c index 472e543..f7c9ee6 100644 --- a/configs/bananapi-gic-demo.c +++ b/configs/bananapi-gic-demo.c @@ -13,7 +13,7 @@ * the COPYING file in the top-level directory. */ -#include <linux/types.h> +#include <jailhouse/types.h> #include <jailhouse/cell-config.h> #define ARRAY_SIZE(a) sizeof(a) / sizeof(a[0]) diff --git a/configs/bananapi-uart-demo.c b/configs/bananapi-uart-demo.c index b65155f..89eb736 100644 --- a/configs/bananapi-uart-demo.c +++ b/configs/bananapi-uart-demo.c @@ -13,7 +13,7 @@ * the COPYING file in the top-level directory. */ -#include <linux/types.h> +#include <jailhouse/types.h> #include <jailhouse/cell-config.h> #define ARRAY_SIZE(a) sizeof(a) / sizeof(a[0]) diff --git a/configs/bananapi.c b/configs/bananapi.c index 6e72743..b45604b 100644 --- a/configs/bananapi.c +++ b/configs/bananapi.c @@ -12,7 +12,7 @@ * the COPYING file in the top-level directory. */ -#include <linux/types.h> +#include <jailhouse/types.h> #include <jailhouse/cell-config.h> #define ARRAY_SIZE(a) sizeof(a) / sizeof(a[0]) diff --git a/configs/e1000-demo.c b/configs/e1000-demo.c index b935f07..50edb17 100644 --- a/configs/e1000-demo.c +++ b/configs/e1000-demo.c @@ -13,7 +13,7 @@ * the COPYING file in the top-level directory. */ -#include <linux/types.h> +#include <jailhouse/types.h> #include <jailhouse/cell-config.h> #define ARRAY_SIZE(a) sizeof(a) / sizeof(a[0]) diff --git a/configs/f2a88xm-hd3.c b/configs/f2a88xm-hd3.c index 321d148..b7926bc 100644 --- a/configs/f2a88xm-hd3.c +++ b/configs/f2a88xm-hd3.c @@ -17,7 +17,7 @@ * "memmap=0x4200000$0x3b000000" */ -#include <linux/types.h> +#include <jailhouse/types.h> #include <jailhouse/cell-config.h> #define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0])) diff --git a/configs/h87i.c b/configs/h87i.c index f281a34..7f0407c 100644 --- a/configs/h87i.c +++ b/configs/h87i.c @@ -12,7 +12,7 @@ * the COPYING file in the top-level directory. */ -#include <linux/types.h> +#include <jailhouse/types.h> #include <jailhouse/cell-config.h> #define ARRAY_SIZE(a) sizeof(a) / sizeof(a[0]) diff --git a/configs/imb-a180.c b/configs/imb-a180.c index 5d25f5c..0b23dae 100644 --- a/configs/imb-a180.c +++ b/configs/imb-a180.c @@ -16,7 +16,7 @@ * "memmap=0x4200000$0x3b000000" */ -#include <linux/types.h> +#include <jailhouse/types.h> #include <jailhouse/cell-config.h> #define ARRAY_SIZE(a) sizeof(a) / sizeof(a[0]) diff --git a/configs/ioapic-demo.c b/configs/ioapic-demo.c index 64f3e74..97e2fdd 100644 --- a/configs/ioapic-demo.c +++ b/configs/ioapic-demo.c @@ -13,7 +13,7 @@ * the COPYING file in the top-level directory. */ -#include <linux/types.h> +#include <jailhouse/types.h> #include <jailhouse/cell-config.h> #define ARRAY_SIZE(a) sizeof(a) / sizeof(a[0]) diff --git a/configs/ivshmem-demo.c b/configs/ivshmem-demo.c index 5f97ca1..1b90857 100644 --- a/configs/ivshmem-demo.c +++ b/configs/ivshmem-demo.c @@ -10,7 +10,7 @@ * the COPYING file in the top-level directory. */ -#include <linux/types.h> +#include <jailhouse/types.h> #include <jailhouse/cell-config.h> #define ARRAY_SIZE(a) sizeof(a) / sizeof(a[0]) diff --git a/configs/jetson-tk1-demo.c b/configs/jetson-tk1-demo.c index 5bf465a..90fcac6 100644 --- a/configs/jetson-tk1-demo.c +++ b/configs/jetson-tk1-demo.c @@ -13,7 +13,7 @@ * the COPYING file in the top-level directory. */ -#include <linux/types.h> +#include <jailhouse/types.h> #include <jailhouse/cell-config.h> #define ARRAY_SIZE(a) sizeof(a) / sizeof(a[0]) diff --git a/configs/jetson-tk1.c b/configs/jetson-tk1.c index 8137ca5..5691223 100644 --- a/configs/jetson-tk1.c +++ b/configs/jetson-tk1.c @@ -15,7 +15,7 @@ * NOTE: Add "mem=1984M vmalloc=512M" to the kernel command line. */ -#include <linux/types.h> +#include <jailhouse/types.h> #include <jailhouse/cell-config.h> #define ARRAY_SIZE(a) sizeof(a) / sizeof(a[0]) diff --git a/configs/linux-x86-demo.c b/configs/linux-x86-demo.c index c0c8de7..0980f41 100644 --- a/configs/linux-x86-demo.c +++ b/configs/linux-x86-demo.c @@ -12,7 +12,7 @@ * the COPYING file in the top-level directory. */ -#include <linux/types.h> +#include <jailhouse/types.h> #include <jailhouse/cell-config.h> #define ARRAY_SIZE(a) sizeof(a) / sizeof(a[0]) diff --git a/configs/pci-demo.c b/configs/pci-demo.c index 85fd5b2..ecb4ea2 100644 --- a/configs/pci-demo.c +++ b/configs/pci-demo.c @@ -13,7 +13,7 @@ * the COPYING file in the top-level directory. */ -#include <linux/types.h> +#include <jailhouse/types.h> #include <jailhouse/cell-config.h> #define ARRAY_SIZE(a) sizeof(a) / sizeof(a[0]) diff --git a/configs/qemu-vm.c b/configs/qemu-vm.c index 4d397ee..0e7aac2 100644 --- a/configs/qemu-vm.c +++ b/configs/qemu-vm.c @@ -26,7 +26,7 @@ * Guest kernel command line appendix: memmap=66M$0x3b000000 */ -#include <linux/types.h> +#include <jailhouse/types.h> #include <jailhouse/cell-config.h> #define ARRAY_SIZE(a) sizeof(a) / sizeof(a[0]) diff --git a/configs/smp-demo.c b/configs/smp-demo.c index 1bbf659..d91790d 100644 --- a/configs/smp-demo.c +++ b/configs/smp-demo.c @@ -12,7 +12,7 @@ * the COPYING file in the top-level directory. */ -#include <linux/types.h> +#include <jailhouse/types.h> #include <jailhouse/cell-config.h> #define ARRAY_SIZE(a) sizeof(a) / sizeof(a[0]) diff --git a/configs/tiny-demo.c b/configs/tiny-demo.c index 71515a4..5006c6f 100644 --- a/configs/tiny-demo.c +++ b/configs/tiny-demo.c @@ -12,7 +12,7 @@ * the COPYING file in the top-level directory. */ -#include <linux/types.h> +#include <jailhouse/types.h> #include <jailhouse/cell-config.h> #define ARRAY_SIZE(a) sizeof(a) / sizeof(a[0]) diff --git a/configs/vexpress-gic-demo.c b/configs/vexpress-gic-demo.c index cac296a..2984c61 100644 --- a/configs/vexpress-gic-demo.c +++ b/configs/vexpress-gic-demo.c @@ -10,7 +10,7 @@ * the COPYING file in the top-level directory. */ -#include <linux/types.h> +#include <jailhouse/types.h> #include <jailhouse/cell-config.h> #define ARRAY_SIZE(a) sizeof(a) / sizeof(a[0]) diff --git a/configs/vexpress-linux-demo.c b/configs/vexpress-linux-demo.c index 250a3a8..d192b66 100644 --- a/configs/vexpress-linux-demo.c +++ b/configs/vexpress-linux-demo.c @@ -10,7 +10,7 @@ * the COPYING file in the top-level directory. */ -#include <linux/types.h> +#include <jailhouse/types.h> #include <jailhouse/cell-config.h> #define ARRAY_SIZE(a) sizeof(a) / sizeof(a[0]) diff --git a/configs/vexpress-uart-demo.c b/configs/vexpress-uart-demo.c index 0054c62..ab02a7c 100644 --- a/configs/vexpress-uart-demo.c +++ b/configs/vexpress-uart-demo.c @@ -10,7 +10,7 @@ * the COPYING file in the top-level directory. */ -#include <linux/types.h> +#include <jailhouse/types.h> #include <jailhouse/cell-config.h> #define ARRAY_SIZE(a) sizeof(a) / sizeof(a[0]) diff --git a/configs/vexpress.c b/configs/vexpress.c index 7d239d2..663f84a 100644 --- a/configs/vexpress.c +++ b/configs/vexpress.c @@ -10,7 +10,7 @@ * the COPYING file in the top-level directory. */ -#include <linux/types.h> +#include <jailhouse/types.h> #include <jailhouse/cell-config.h> #define ARRAY_SIZE(a) sizeof(a) / sizeof(a[0]) diff --git a/tools/root-cell-config.c.tmpl b/tools/root-cell-config.c.tmpl index f07b546..b4522ef 100644 --- a/tools/root-cell-config.c.tmpl +++ b/tools/root-cell-config.c.tmpl @@ -39,7 +39,7 @@ * "memmap=${hex(ourmem[1])}$${hex(ourmem[0])}" */ -#include <linux/types.h> +#include <jailhouse/types.h> #include <jailhouse/cell-config.h> #define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0])) -- 2.1.4 -- 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.
