qemu, qemu_v8: update QEMU invoking commands
QEMU has adopted meson as the build system. As a result, the output of QEMU will
be located in the $(ROOT)/qemu/build, so we should reflect this change.
Signed-off-by: Mingyuan Xiang <xiang_my@outlook.com>
Reviewed-by: Jerome Forissier <jerome@forissier.org>
diff --git a/qemu.mk b/qemu.mk
index e8cadf7..179e8e7 100644
--- a/qemu.mk
+++ b/qemu.mk
@@ -23,6 +23,7 @@
BINARIES_PATH ?= $(ROOT)/out/bin
U-BOOT_PATH ?= $(ROOT)/u-boot
QEMU_PATH ?= $(ROOT)/qemu
+QEMU_BUILD ?= $(QEMU_PATH)/build
SOC_TERM_PATH ?= $(ROOT)/soc_term
DEBUG = 1
@@ -81,11 +82,11 @@
################################################################################
# QEMU
################################################################################
-$(QEMU_PATH)/config-host.mak:
+$(QEMU_BUILD)/config-host.mak:
cd $(QEMU_PATH); ./configure --target-list=arm-softmmu\
$(QEMU_CONFIGURE_PARAMS_COMMON)
-qemu: $(QEMU_PATH)/config-host.mak
+qemu: $(QEMU_BUILD)/config-host.mak
$(MAKE) -C $(QEMU_PATH)
qemu-clean:
@@ -173,7 +174,7 @@
$(call launch-terminal,54320,"Normal World")
$(call launch-terminal,54321,"Secure World")
$(call wait-for-ports,54320,54321)
- cd $(BINARIES_PATH) && $(QEMU_PATH)/arm-softmmu/qemu-system-arm \
+ cd $(BINARIES_PATH) && $(QEMU_BUILD)/arm-softmmu/qemu-system-arm \
-nographic \
-serial tcp:localhost:54320 -serial tcp:localhost:54321 \
-smp $(QEMU_SMP) \
@@ -195,7 +196,7 @@
check: $(CHECK_DEPS)
ln -sf $(ROOT)/out-br/images/rootfs.cpio.gz $(BINARIES_PATH)/
cd $(BINARIES_PATH) && \
- export QEMU=$(ROOT)/qemu/arm-softmmu/qemu-system-arm && \
+ export QEMU=$(QEMU_BUILD)/arm-softmmu/qemu-system-arm && \
export QEMU_SMP=$(QEMU_SMP) && \
expect $(ROOT)/build/qemu-check.exp -- $(check-args) || \
(if [ "$(DUMP_LOGS_ON_ERROR)" ]; then \
diff --git a/qemu_v8.mk b/qemu_v8.mk
index dfc52d4..b01a923 100644
--- a/qemu_v8.mk
+++ b/qemu_v8.mk
@@ -38,6 +38,7 @@
endif
EDK2_BIN ?= $(EDK2_PATH)/Build/ArmVirtQemuKernel-$(EDK2_ARCH)/$(EDK2_BUILD)_$(EDK2_TOOLCHAIN)/FV/QEMU_EFI.fd
QEMU_PATH ?= $(ROOT)/qemu
+QEMU_BUILD ?= $(QEMU_PATH)/build
SOC_TERM_PATH ?= $(ROOT)/soc_term
################################################################################
@@ -110,11 +111,11 @@
################################################################################
# QEMU
################################################################################
-$(QEMU_PATH)/config-host.mak:
+$(QEMU_BUILD)/config-host.mak:
cd $(QEMU_PATH); ./configure --target-list=aarch64-softmmu\
$(QEMU_CONFIGURE_PARAMS_COMMON)
-qemu: $(QEMU_PATH)/config-host.mak
+qemu: $(QEMU_BUILD)/config-host.mak
$(MAKE) -C $(QEMU_PATH)
qemu-clean:
@@ -199,7 +200,7 @@
$(call launch-terminal,54320,"Normal World")
$(call launch-terminal,54321,"Secure World")
$(call wait-for-ports,54320,54321)
- cd $(BINARIES_PATH) && $(QEMU_PATH)/aarch64-softmmu/qemu-system-aarch64 \
+ cd $(BINARIES_PATH) && $(QEMU_BUILD)/aarch64-softmmu/qemu-system-aarch64 \
-nographic \
-serial tcp:localhost:54320 -serial tcp:localhost:54321 \
-smp $(QEMU_SMP) \
@@ -223,7 +224,7 @@
check: $(CHECK_DEPS)
ln -sf $(ROOT)/out-br/images/rootfs.cpio.gz $(BINARIES_PATH)/
cd $(BINARIES_PATH) && \
- export QEMU=$(QEMU_PATH)/aarch64-softmmu/qemu-system-aarch64 && \
+ export QEMU=$(QEMU_BUILD)/aarch64-softmmu/qemu-system-aarch64 && \
export QEMU_SMP=$(QEMU_SMP) && \
expect $(ROOT)/build/qemu-check.exp -- $(check-args) || \
(if [ "$(DUMP_LOGS_ON_ERROR)" ]; then \