Use CONFIG_ variables instead of configuration definitions
diff --git a/libsel4bench/arch_include/arm/armv/armv7-a/sel4bench/armv/sel4bench.h b/libsel4bench/arch_include/arm/armv/armv7-a/sel4bench/armv/sel4bench.h
index c18fd22..8f6cf3f 100644
--- a/libsel4bench/arch_include/arm/armv/armv7-a/sel4bench/armv/sel4bench.h
+++ b/libsel4bench/arch_include/arm/armv/armv7-a/sel4bench/armv/sel4bench.h
@@ -11,6 +11,7 @@
*/
#pragma once
+#include <autoconf.h>
#include <sel4bench/types.h>
#include <sel4bench/armv/private.h>
#include <sel4/sel4.h>
@@ -51,7 +52,7 @@
//Enable counters globally.
MODIFY_PMCR( | , SEL4BENCH_ARMV7A_PMCR_ENABLE);
-#ifdef ARM_HYP
+#ifdef CONFIG_ARM_HYPERVISOR_SUPPORT
// Select instruction count incl. PL2 by default */
sel4bench_private_write_pmnxsel(0x1f);
sel4bench_private_write_evtsel(BIT(27));
diff --git a/libsel4bench/arch_include/arm/armv/armv8-a/sel4bench/armv/sel4bench.h b/libsel4bench/arch_include/arm/armv/armv8-a/sel4bench/armv/sel4bench.h
index cf1c3fe..f1d2ec3 100644
--- a/libsel4bench/arch_include/arm/armv/armv8-a/sel4bench/armv/sel4bench.h
+++ b/libsel4bench/arch_include/arm/armv/armv8-a/sel4bench/armv/sel4bench.h
@@ -17,6 +17,7 @@
); \
} while(0)
+#include <autoconf.h>
#include <sel4bench/types.h>
#include <sel4bench/armv/private.h>
#include <sel4/sel4.h>
@@ -51,7 +52,7 @@
//Enable counters globally.
MODIFY_PMCR( | , SEL4BENCH_ARMV8A_PMCR_ENABLE);
-#ifdef ARM_HYP
+#ifdef CONFIG_ARM_HYPERVISOR_SUPPORT
// Select instruction count incl. PL2 by default */
sel4bench_private_write_pmnxsel(0x1f);
sel4bench_private_write_evtsel(BIT(27));
diff --git a/libsel4platsupport/src/common.c b/libsel4platsupport/src/common.c
index df50ecf..403a704 100644
--- a/libsel4platsupport/src/common.c
+++ b/libsel4platsupport/src/common.c
@@ -222,7 +222,7 @@
simple = &_simple_mem;
vka = &_vka_mem;
simple_make_vka(simple, vka);
-#ifndef ARCH_ARM
+#ifndef CONFIG_ARCH_ARM
sel4platsupport_get_io_port_ops(&io_ops.io_port_ops, simple);
#endif
err = platsupport_serial_setup_io_ops(&io_ops);
@@ -254,7 +254,7 @@
vspace = _vspace;
simple = _simple;
vka = _vka;
-#ifndef ARCH_ARM
+#ifndef CONFIG_ARCH_ARM
sel4platsupport_get_io_port_ops(&io_ops.io_port_ops, simple);
#endif
err = platsupport_serial_setup_io_ops(&io_ops);
diff --git a/libsel4platsupport/src/io.c b/libsel4platsupport/src/io.c
index 7500d92..c7b6646 100644
--- a/libsel4platsupport/src/io.c
+++ b/libsel4platsupport/src/io.c
@@ -11,7 +11,7 @@
#include <autoconf.h>
#include <sel4platsupport/io.h>
-#ifdef ARCH_ARM
+#ifdef CONFIG_ARCH_ARM
#include <platsupport/clock.h>
#include <platsupport/mux.h>
#endif
@@ -274,7 +274,7 @@
if (err) {
return err;
}
-#ifdef ARCH_ARM
+#ifdef CONFIG_ARCH_ARM
clock_sys_init(io_ops, &io_ops->clock_sys);
mux_sys_init(io_ops, &io_ops->mux_sys);
#endif
diff --git a/libsel4utils/sel4_arch_include/aarch32/sel4utils/sel4_arch/util.h b/libsel4utils/sel4_arch_include/aarch32/sel4utils/sel4_arch/util.h
index 82b02a7..25da47e 100644
--- a/libsel4utils/sel4_arch_include/aarch32/sel4utils/sel4_arch/util.h
+++ b/libsel4utils/sel4_arch_include/aarch32/sel4utils/sel4_arch/util.h
@@ -13,6 +13,7 @@
#ifndef _SEL4UTILS_SEL4_ARCH_UTIL_H
#define _SEL4UTILS_SEL4_ARCH_UTIL_H
+#include <autoconf.h>
#include <sel4/sel4.h>
#define ARCH_SYSCALL_INSTRUCTION_SIZE 4
@@ -21,7 +22,7 @@
sel4utils_is_read_fault(void)
{
seL4_Word fsr = seL4_GetMR(seL4_VMFault_FSR);
-#if defined(ARM_HYP)
+#if defined(CONFIG_ARM_HYPERVISOR_SUPPORT)
return (fsr & (1 << 6)) == 0;
#else
return (fsr & (1 << 11)) == 0;
diff --git a/libsel4vka/sel4_arch_include/aarch32/vka/sel4_arch/object.h b/libsel4vka/sel4_arch_include/aarch32/vka/sel4_arch/object.h
index a1fd4b4..6d81bf6 100644
--- a/libsel4vka/sel4_arch_include/aarch32/vka/sel4_arch/object.h
+++ b/libsel4vka/sel4_arch_include/aarch32/vka/sel4_arch/object.h
@@ -13,12 +13,13 @@
#ifndef _VKA_SEL4_ARCH_OBJECT_H__
#define _VKA_SEL4_ARCH_OBJECT_H__
+#include <autoconf.h>
#include <vka/vka.h>
#include <vka/kobject_t.h>
#include <utils/util.h>
/*resource allocation interfaces for virtual machine extensions on ARM */
-#ifdef ARM_HYP
+#ifdef CONFIG_ARM_HYPERVISOR_SUPPORT
static inline int vka_alloc_vcpu(vka_t *vka, vka_object_t *result)
{
return vka_alloc_object(vka, seL4_ARM_VCPUObject, seL4_ARM_VCPUBits, result);
