diff --git a/package/xvisor/Config.in b/package/xvisor/Config.in
index eb7475b86d..71628e633e 100644
--- a/package/xvisor/Config.in
+++ b/package/xvisor/Config.in
@@ -1,9 +1,9 @@
 config BR2_PACKAGE_XVISOR_ARCH_SUPPORTS
 	bool
-	default y
+	default y if BR2_aarch64
+	default y if BR2_cortex_a7 || BR2_cortex_a12 || BR2_cortex_a15 || BR2_cortex_a17
+	default y if BR2_x86_64
 	depends on BR2_USE_MMU
-	depends on BR2_arm || BR2_aarch64 || BR2_x86_64
-	depends on !BR2_ARM_CPU_ARMV4 && !BR2_ARM_CPU_ARMV7M
 
 menuconfig BR2_PACKAGE_XVISOR
 	bool "xvisor"
@@ -32,9 +32,7 @@ endchoice
 
 config BR2_PACKAGE_XVISOR_DEFCONFIG
 	string "Defconfig name"
-	default "generic-v5" if BR2_ARM_CPU_ARMV5
-	default "generic-v6" if BR2_ARM_CPU_ARMV6
-	default "generic-v7" if BR2_ARM_CPU_ARMV7A
+	default "generic-v7-ve" if BR2_ARM_CPU_ARMV7A
 	default "generic-v8" if BR2_aarch64
 	default "x86_64_generic" if BR2_x86_64
 	depends on BR2_PACKAGE_XVISOR_USE_DEFCONFIG