qemu: Cleanup the run target

Invoke qemu-system-* using arguments based on architecture.

Signed-off-by: David Hendricks <[email protected]>

Author: dhendrix

examples/qemu/Makefile

@@ -48,28 +48,34 @@ PATCHES_DIR := ./patches
 include $(OSF_BUILDER_DIR)/Makefile.inc
 OUT ?= build/$(PLATFORM)/osf-$(PLATFORM).rom
 
-run:
-ifeq ($(ARCH), amd64)
-	sudo qemu-system-$(ARCH) \
-    `# the machine type specified in the coreboot mainboard configuration` \
-    -M q35 \
-    `# use KVM to avail of hardware virtualization extensions` \
-    -enable-kvm \
-    `# the coreboot ROM to run as system firmware` \
-    -bios $(OUT) \
-    `# the amount of RAM in MB` \
-    -m 1024 \
-    `# RNG to avoid DHCP lockups when waiting for entropy` \
-    -object rng-random,filename=/dev/urandom,id=rng0 \
-    `# redirect all the output to the console` \
-    -nographic
+ifeq ($(CROSS_COMPILING), 0)
+QEMU_KVM_OPTS := -enable-kvm
+else
+QEMU_KVM_OPTS :=
 endif
-ifeq ($(ARCH), ppc64)
-	qemu-system-$(ARCH) -M pseries,accel=kvm,kvm-type=HV -nographic -bios $(OUT)
+
+# RNG to avoid DHCP lockups when waiting for entropy
+# redirect all the output to the console
+QEMU_COMMON_OPTS := -bios $(OUT) $(QEMU_KVM_OPTS) \
+	-m 1024 \
+	-object rng-random,filename=/dev/urandom,id=rng0 \
+	-nographic
+
+run:
+ifeq ($(ARCH), aarch64)
+	$(QEMU_SYSTEM) $(QEMU_COMMON_OPTS) \
+	-M virt,secure=on,virtualization=on \
+	-cpu cortex-a53
 endif
 ifeq ($(ARCH), ppc64le)
-	qemu-system-$(ARCH) -M pseries,accel=kvm,kvm-type=HV -nographic -bios $(OUT)
+	$(QEMU_SYSTEM) $(QEMU_COMMON_OPTS) \
+	-M powernv,hb-mode=on \
+	-cpu power9 \
+	-drive file=build/coreboot.rom,if=mtd \
+	-serial stdio \
+	-display none
 endif
-ifeq ($(ARCH), ppc64le)
-	qemu-system-$(ARCH) -M pseries,accel=kvm,kvm-type=HV -nographic -bios $(OUT)
+ifeq ($(ARCH), x86_64)
+	$(QEMU_SYSTEM) $(QEMU_COMMON_OPTS) \
+	-M q35
 endif