build: move qemu definitions to boards

Change-Id: I4e87dbd6eea8320f23e5691c1762a7353240a5c8 Signed-off-by: Anas Nashif <[email protected]>
sunkaizhu · Jan 10, 2017 · 6bea1be · 6bea1be
1 parent 6d9ed99
commit 6bea1be
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 22 deletions.
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
@@ -57,9 +57,3 @@ KBUILD_CFLAGS += $(soc-cflags)
 KBUILD_CXXFLAGS += $(soc-cxxflags)
 KBUILD_AFLAGS += $(soc-aflags)
 
-QEMU_CPU_TYPE_arm = cortex-m3
-QEMU_FLAGS_arm = -cpu  $(QEMU_CPU_TYPE_arm) \
-		-machine lm3s6965evb -nographic -vga none
-QEMU_arm = qemu-system-arm
-
-export QEMU_FLAGS_arm QEMU_arm
diff --git a/arch/nios2/Makefile b/arch/nios2/Makefile
@@ -56,6 +56,3 @@ KBUILD_AFLAGS += $(soc-aflags)
 zephyr: $(KERNEL_HEX_NAME)
 all: $(KERNEL_HEX_NAME)
 
-QEMU_CPU_TYPE_nios2 = nios2
-QEMU_FLAGS_nios2 = -machine altera_10m50_zephyr -nographic
-QEMU_nios2 = qemu-system-nios2
diff --git a/arch/x86/Makefile b/arch/x86/Makefile
@@ -40,16 +40,3 @@ KBUILD_CFLAGS += $(soc-cflags)
 KBUILD_CXXFLAGS += $(soc-cxxflags)
 KBUILD_AFLAGS += $(soc-aflags)
 
-QEMU_BIOS ?= /usr/share/qemu
-QEMU_CPU_TYPE_x86 = qemu32
-QEMU_X86_NO_REBOOT_y =
-QEMU_X86_NO_REBOOT_  = -no-reboot
-QEMU_FLAGS_x86 = -m 32 -cpu $(QEMU_CPU_TYPE_x86) \
-		$(QEMU_X86_NO_REBOOT_$(CONFIG_REBOOT)) \
-		-nographic -vga none -display none -net none \
-		-clock dynticks -no-acpi -balloon none \
-		-L $(QEMU_BIOS) -bios bios.bin \
-		-machine type=pc-0.14
-QEMU_x86 = qemu-system-i386
-
-export QEMU_FLAGS_x86 QEMU_x86 QEMU_CPU_TYPE_x86
diff --git a/boards/arm/qemu_cortex_m3/Makefile.board b/boards/arm/qemu_cortex_m3/Makefile.board
@@ -1,5 +1,12 @@
 
+QEMU_CPU_TYPE_arm = cortex-m3
+QEMU_FLAGS_arm = -cpu  $(QEMU_CPU_TYPE_arm) \
+		-machine lm3s6965evb -nographic -vga none
+QEMU_arm = qemu-system-arm
+
 DEBUG_SCRIPT = qemu.sh
 
 debugserver: QEMU_EXTRA_FLAGS += -s -S
 debugserver: qemu
+
+export QEMU_FLAGS_arm QEMU_arm
diff --git a/boards/nios2/qemu_nios2/Makefile.board b/boards/nios2/qemu_nios2/Makefile.board
@@ -1,4 +1,8 @@
 
+QEMU_CPU_TYPE_nios2 = nios2
+QEMU_FLAGS_nios2 = -machine altera_10m50_zephyr -nographic
+QEMU_nios2 = qemu-system-nios2
+
 DEBUG_SCRIPT = qemu.sh
 
 debugserver: QEMU_EXTRA_FLAGS += -s -S

diff --git a/boards/x86/qemu_x86/Makefile.board b/boards/x86/qemu_x86/Makefile.board
@@ -1,5 +1,19 @@
 
+QEMU_BIOS ?= /usr/share/qemu
+QEMU_CPU_TYPE_x86 = qemu32
+QEMU_X86_NO_REBOOT_y =
+QEMU_X86_NO_REBOOT_  = -no-reboot
+QEMU_FLAGS_x86 = -m 32 -cpu $(QEMU_CPU_TYPE_x86) \
+		$(QEMU_X86_NO_REBOOT_$(CONFIG_REBOOT)) \
+		-nographic -vga none -display none -net none \
+		-clock dynticks -no-acpi -balloon none \
+		-L $(QEMU_BIOS) -bios bios.bin \
+		-machine type=pc-0.14
+QEMU_x86 = qemu-system-i386
+
 DEBUG_SCRIPT = qemu.sh
 
 debugserver: QEMU_EXTRA_FLAGS += -s -S
 debugserver: qemu
+
+export QEMU_FLAGS_x86 QEMU_x86 QEMU_CPU_TYPE_x86