From 66f1f89da973eb8607a8e8f4e937d332e3c45adc Mon Sep 17 00:00:00 2001 From: Anas Nashif Date: Fri, 22 Sep 2017 20:41:06 -0400 Subject: [PATCH] qemu: cleanup qemu configurations Move all QEMU related defines to the boards and cleanup xtensa platforms which were marked to be QEMU capable by mistake. Signed-off-by: Anas Nashif --- Makefile | 2 -- arch/xtensa/Makefile | 7 ------- arch/xtensa/soc/D_233L/Makefile | 2 -- arch/xtensa/soc/sample_controller/Makefile | 1 - boards/arm/qemu_cortex_m3/Makefile.board | 2 +- boards/nios2/qemu_nios2/Makefile.board | 2 +- boards/riscv32/qemu_riscv32/Makefile.board | 2 +- boards/x86/qemu_x86/Makefile.board | 2 +- boards/xtensa/qemu_xtensa/Makefile.board | 11 +++++++++++ scripts/Makefile.qemu | 1 + 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Makefile b/Makefile index 29d4067d07e..d70f9469343 100644 --- a/Makefile +++ b/Makefile @@ -786,8 +786,6 @@ ifdef MAKEFILE_TOOLCHAIN_DO_PASS2 include $(srctree)/scripts/Makefile.toolchain.$(ZEPHYR_GCC_VARIANT) endif -QEMU = $(addsuffix /,$(QEMU_BIN_PATH))$(QEMU_$(ARCH)) - # The all: target is the default when no target is given on the # command line. # This allow a user to issue only 'make' to build a kernel including modules diff --git a/arch/xtensa/Makefile b/arch/xtensa/Makefile index 162051456e0..12f71b860c7 100644 --- a/arch/xtensa/Makefile +++ b/arch/xtensa/Makefile @@ -19,10 +19,3 @@ cflags-$(CONFIG_LTO) += $(call cc-option,-flto,) KBUILD_CFLAGS += $(cflags-y) KBUILD_CXXFLAGS += $(cflags-y) - -QEMU_CPU_TYPE_xtensa ?= unsupported -QEMU_FLAGS_xtensa = -cpu $(QEMU_CPU_TYPE_xtensa) \ - -machine sim -semihosting -nographic -QEMU_xtensa = qemu-system-xtensa - -export QEMU_FLAGS_xtensa QEMU_xtensa diff --git a/arch/xtensa/soc/D_233L/Makefile b/arch/xtensa/soc/D_233L/Makefile index a4ebfc7ddc2..5e8827d7df9 100644 --- a/arch/xtensa/soc/D_233L/Makefile +++ b/arch/xtensa/soc/D_233L/Makefile @@ -1,3 +1 @@ obj- = soc.o - -QEMU_CPU_TYPE_xtensa = dc233c diff --git a/arch/xtensa/soc/sample_controller/Makefile b/arch/xtensa/soc/sample_controller/Makefile index 63196eddada..454e136f3d8 100644 --- a/arch/xtensa/soc/sample_controller/Makefile +++ b/arch/xtensa/soc/sample_controller/Makefile @@ -1,3 +1,2 @@ obj- = soc.o -QEMU_CPU_TYPE_xtensa = sample_controller diff --git a/boards/arm/qemu_cortex_m3/Makefile.board b/boards/arm/qemu_cortex_m3/Makefile.board index 133297b7ba2..b593bd23ca1 100644 --- a/boards/arm/qemu_cortex_m3/Makefile.board +++ b/boards/arm/qemu_cortex_m3/Makefile.board @@ -9,6 +9,6 @@ QEMU_arm = qemu-system-arm DEBUG_SCRIPT = qemu.sh debugserver: QEMU_EXTRA_FLAGS += -s -S -debugserver: qemu +debugserver: run export QEMU_FLAGS_arm QEMU_arm diff --git a/boards/nios2/qemu_nios2/Makefile.board b/boards/nios2/qemu_nios2/Makefile.board index bb04cd13db3..e44fa19266c 100644 --- a/boards/nios2/qemu_nios2/Makefile.board +++ b/boards/nios2/qemu_nios2/Makefile.board @@ -8,4 +8,4 @@ QEMU_nios2 = qemu-system-nios2 DEBUG_SCRIPT = qemu.sh debugserver: QEMU_EXTRA_FLAGS += -s -S -debugserver: qemu +debugserver: run diff --git a/boards/riscv32/qemu_riscv32/Makefile.board b/boards/riscv32/qemu_riscv32/Makefile.board index f61be5e7b74..ac66bb4103d 100644 --- a/boards/riscv32/qemu_riscv32/Makefile.board +++ b/boards/riscv32/qemu_riscv32/Makefile.board @@ -8,4 +8,4 @@ QEMU_riscv32 = qemu-system-riscv32 DEBUG_SCRIPT = qemu.sh debugserver: QEMU_EXTRA_FLAGS += -s -S -debugserver: qemu +debugserver: run diff --git a/boards/x86/qemu_x86/Makefile.board b/boards/x86/qemu_x86/Makefile.board index c1efa489c00..e1dfbcdc5e4 100644 --- a/boards/x86/qemu_x86/Makefile.board +++ b/boards/x86/qemu_x86/Makefile.board @@ -17,6 +17,6 @@ QEMU_x86 = qemu-system-i386 DEBUG_SCRIPT = qemu.sh debugserver: QEMU_EXTRA_FLAGS += -s -S -debugserver: qemu +debugserver: run export QEMU_FLAGS_x86 QEMU_x86 QEMU_CPU_TYPE_x86 diff --git a/boards/xtensa/qemu_xtensa/Makefile.board b/boards/xtensa/qemu_xtensa/Makefile.board index adda482465c..22912876492 100644 --- a/boards/xtensa/qemu_xtensa/Makefile.board +++ b/boards/xtensa/qemu_xtensa/Makefile.board @@ -1,2 +1,13 @@ EMU_PLATFORM ?= qemu +QEMU_CPU_TYPE_xtensa = sample_controller +QEMU_FLAGS_xtensa = -cpu $(QEMU_CPU_TYPE_xtensa) \ + -machine sim -semihosting -nographic +QEMU_xtensa = qemu-system-xtensa + +DEBUG_SCRIPT = qemu.sh + +debugserver: QEMU_EXTRA_FLAGS += -s -S +debugserver: run + +export QEMU_FLAGS_xtensa QEMU_xtensa diff --git a/scripts/Makefile.qemu b/scripts/Makefile.qemu index 61503324af4..650ef5eb5bf 100644 --- a/scripts/Makefile.qemu +++ b/scripts/Makefile.qemu @@ -9,6 +9,7 @@ # QEMU_INSTANCE is a command line argument to make. By appending the instance # name to the pid file we can easily run more instances of the same sample. QEMU_FLAGS = $(QEMU_FLAGS_$(ARCH)) -pidfile qemu$(QEMU_INSTANCE).pid +QEMU = $(addsuffix /,$(QEMU_BIN_PATH))$(QEMU_$(ARCH)) ifneq ($(QEMU_PTY),) QEMU_FLAGS += -serial pty