qemu_v8: S-EL2 SPMC: increase non-secure memory to 3GB
For SPMC at S-EL2 (Hafnium), increase non-secure memory to 3GB and keep
it in sync with the amount of memory used in a Xen configuration.
Hafnium configures memory based on it's manifest rather than the DTB
generated by QEMU, so update the manifest accordingly.
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
Acked-by: Jerome Forissier <jerome.forissier@linaro.org>
diff --git a/qemu_v8.mk b/qemu_v8.mk
index 04eaa28..8f2b2f0 100644
--- a/qemu_v8.mk
+++ b/qemu_v8.mk
@@ -535,17 +535,17 @@
ifeq ($(XEN_BOOT),y)
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)
QEMU_VIRT = true
else
QEMU_VIRT = false
endif
-ifeq ($(XEN_BOOT),y)
+ifeq ($(QEMU_VIRT),true)
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