diff --git a/arch/arm64/src/qemu/Kconfig b/arch/arm64/src/qemu/Kconfig index 484f7bfd750..ce6caa81b21 100644 --- a/arch/arm64/src/qemu/Kconfig +++ b/arch/arm64/src/qemu/Kconfig @@ -31,6 +31,10 @@ config ARCH_CHIP_QEMU_A72 endchoice # Qemu Chip Selection +config ARCH_CHIP_QEMU_WITH_HV + bool "Qemu with hypvervisor (e.g. kvm, hvf)" + default n + endmenu # "Qemu Chip Selection" endif # ARCH_CHIP_QEMU diff --git a/arch/arm64/src/qemu/qemu_boot.c b/arch/arm64/src/qemu/qemu_boot.c index 08fbca8f461..a5f3caae3c0 100644 --- a/arch/arm64/src/qemu/qemu_boot.c +++ b/arch/arm64/src/qemu/qemu_boot.c @@ -154,9 +154,10 @@ void arm64_chip_boot(void) arm64_mmu_init(true); -#if defined(CONFIG_SMP) || defined(CONFIG_ARCH_HAVE_PSCI) +#if defined(CONFIG_ARCH_CHIP_QEMU_WITH_HV) + arm64_psci_init("hvc"); +#elif defined(CONFIG_SMP) || defined(CONFIG_ARCH_HAVE_PSCI) arm64_psci_init("smc"); - #endif /* Perform board-specific device initialization. This would include