michaelh/zephyr
1
0
Fork 0
Code Releases Activity

qemu: cleanup qemu configurations

Browse source 
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 <anas.nashif@intel.com>
This commit is contained in:
Anas Nashif 2017-09-22 20:41:06 -04:00 • committed by Andrew Boie
commit 66f1f89da9
10 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -786,8 +786,6 @@ ifdef MAKEFILE_TOOLCHAIN_DO_PASS2
include $(srctree)/scripts/Makefile.toolchain.$(ZEPHYR_GCC_VARIANT) include $(srctree)/scripts/Makefile.toolchain.$(ZEPHYR_GCC_VARIANT)
endif endif
QEMU = $(addsuffix /,$(QEMU_BIN_PATH))$(QEMU_$(ARCH))
# The all: target is the default when no target is given on the # The all: target is the default when no target is given on the
# command line. # command line.
# This allow a user to issue only 'make' to build a kernel including modules # This allow a user to issue only 'make' to build a kernel including modules

7
arch/xtensa/Makefile
View file

@ -19,10 +19,3 @@ cflags-$(CONFIG_LTO) += $(call cc-option,-flto,)
KBUILD_CFLAGS += $(cflags-y) KBUILD_CFLAGS += $(cflags-y)
KBUILD_CXXFLAGS += $(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

2
arch/xtensa/soc/D_233L/Makefile
View file

@ -1,3 +1 @@
obj- = soc.o obj- = soc.o
QEMU_CPU_TYPE_xtensa = dc233c

1
arch/xtensa/soc/sample_controller/Makefile
View file

@ -1,3 +1,2 @@
obj- = soc.o obj- = soc.o
QEMU_CPU_TYPE_xtensa = sample_controller

2
boards/arm/qemu_cortex_m3/Makefile.board
View file

@ -9,6 +9,6 @@ QEMU_arm = qemu-system-arm
DEBUG_SCRIPT = qemu.sh DEBUG_SCRIPT = qemu.sh
debugserver: QEMU_EXTRA_FLAGS += -s -S debugserver: QEMU_EXTRA_FLAGS += -s -S
debugserver: qemu debugserver: run
export QEMU_FLAGS_arm QEMU_arm export QEMU_FLAGS_arm QEMU_arm

2
boards/nios2/qemu_nios2/Makefile.board
View file

@ -8,4 +8,4 @@ QEMU_nios2 = qemu-system-nios2
DEBUG_SCRIPT = qemu.sh DEBUG_SCRIPT = qemu.sh
debugserver: QEMU_EXTRA_FLAGS += -s -S debugserver: QEMU_EXTRA_FLAGS += -s -S
debugserver: qemu debugserver: run

2
boards/riscv32/qemu_riscv32/Makefile.board
View file

@ -8,4 +8,4 @@ QEMU_riscv32 = qemu-system-riscv32
DEBUG_SCRIPT = qemu.sh DEBUG_SCRIPT = qemu.sh
debugserver: QEMU_EXTRA_FLAGS += -s -S debugserver: QEMU_EXTRA_FLAGS += -s -S
debugserver: qemu debugserver: run

2
boards/x86/qemu_x86/Makefile.board
View file

@ -17,6 +17,6 @@ QEMU_x86 = qemu-system-i386
DEBUG_SCRIPT = qemu.sh DEBUG_SCRIPT = qemu.sh
debugserver: QEMU_EXTRA_FLAGS += -s -S debugserver: QEMU_EXTRA_FLAGS += -s -S
debugserver: qemu debugserver: run
export QEMU_FLAGS_x86 QEMU_x86 QEMU_CPU_TYPE_x86 export QEMU_FLAGS_x86 QEMU_x86 QEMU_CPU_TYPE_x86

11
boards/xtensa/qemu_xtensa/Makefile.board
View file

@ -1,2 +1,13 @@
EMU_PLATFORM ?= qemu 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

1
scripts/Makefile.qemu
View file

@ -9,6 +9,7 @@
# QEMU_INSTANCE is a command line argument to make. By appending the instance # 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. # 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_FLAGS = $(QEMU_FLAGS_$(ARCH)) -pidfile qemu$(QEMU_INSTANCE).pid
QEMU = $(addsuffix /,$(QEMU_BIN_PATH))$(QEMU_$(ARCH))
ifneq ($(QEMU_PTY),) ifneq ($(QEMU_PTY),)
QEMU_FLAGS += -serial pty QEMU_FLAGS += -serial pty