From a6d856a5be352f323ae485203d7cd25ec1bd02eb Mon Sep 17 00:00:00 2001
From: Alexandre Abadie <alexandre.abadie@inria.fr>
Date: Tue, 5 Jan 2021 21:59:55 +0100
Subject: [PATCH] makefiles/tools/qemu: cleanup makefile

---
 makefiles/tools/qemu.inc.mk | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/makefiles/tools/qemu.inc.mk b/makefiles/tools/qemu.inc.mk
index a1aa6cb598..e72c652baf 100644
--- a/makefiles/tools/qemu.inc.mk
+++ b/makefiles/tools/qemu.inc.mk
@@ -1,14 +1,17 @@
-EMULATOR ?= qemu-system-arm
-EMULATOR_MACHINE ?= $(BOARD)
-EMULATOR_MONITOR_PORT ?= 45454
-EMULATOR_MONITOR_FLAGS ?= telnet::$(EMULATOR_MONITOR_PORT),server,nowait
+QEMU ?= qemu-system-arm
+QEMU_MACHINE ?= $(BOARD)
+QEMU_MONITOR_PORT ?= 45454
+QEMU_MONITOR_FLAGS ?= telnet::$(QEMU_MONITOR_PORT),server,nowait
 FLASHFILE ?= $(ELFFILE)
 
 QEMU_SERIAL_TCP_PORT ?= 5555
-EMULATOR_FLAGS = -machine $(EMULATOR_MACHINE) -device loader,file=$(ELFFILE) \
-                 -serial telnet::$(QEMU_SERIAL_TCP_PORT),server,nowait,nodelay \
-                 -monitor $(EMULATOR_MONITOR_FLAGS) \
-                 -nographic
+
+# Configure emulator variables
+EMULATOR ?= $(QEMU)
+EMULATOR_FLAGS ?= -machine $(QEMU_MACHINE) -device loader,file=$(ELFFILE) \
+                  -serial telnet::$(QEMU_SERIAL_TCP_PORT),server,nowait,nodelay \
+                  -monitor $(QEMU_MONITOR_FLAGS) \
+                  -nographic
 
 # Configure the qemu terminal access
 EMULATOR_SERIAL_PORT ?= /tmp/riot_$(APPLICATION)_$(BOARD)_uart