qemu_v8: enable max CPU for Xen
Enable the QEMU max CPU for Xen. With this change simplify the
configuration a little.
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org>
diff --git a/qemu_v8.mk b/qemu_v8.mk
index 6688472..11031f5 100644
--- a/qemu_v8.mk
+++ b/qemu_v8.mk
@@ -489,27 +489,29 @@
ifeq ($(XEN_BOOT),y)
-QEMU_CPU ?= cortex-a57
-QEMU_MEM ?= 3072
-QEMU_SMP ?= 4
QEMU_VIRT = true
-QEMU_XEN ?= -drive if=none,file=$(XEN_EXT4),format=raw,id=hd1 \
- -device virtio-blk-device,drive=hd1
-else
-ifeq ($(SPMC_AT_EL),2)
+else ifeq ($(SPMC_AT_EL),2)
QEMU_VIRT = true
else
QEMU_VIRT = false
endif
+
+ifeq ($(XEN_BOOT),y)
+QEMU_MEM ?= 3072
+QEMU_SMP ?= 4
+QEMU_XEN ?= -drive if=none,file=$(XEN_EXT4),format=raw,id=hd1 \
+ -device virtio-blk-device,drive=hd1
+else
+QEMU_SMP ?= 2
+QEMU_MEM ?= 1057
+endif
+
ifeq ($(SPMC_AT_EL),n)
QEMU_SME = on
else
QEMU_SME = off
endif
QEMU_CPU ?= max,sme=$(QEMU_SME),pauth-impdef=on
-QEMU_SMP ?= 2
-QEMU_MEM ?= 1057
-endif
ifeq ($(MEMTAG),y)
QEMU_MTE = on