From 324cd15f65c1ff4be20d83754b6d0bad9837ad79 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 15 Jun 2015 14:10:33 -0500
Subject: add support for m68k q800 emulation (experimental)

---
 target/m68k/Makefile                 |  6 ++++++
 target/m68k/kernel/qemu-m68k         | 20 --------------------
 target/m68k/kernel/qemu-m68k-mcf5208 | 20 ++++++++++++++++++++
 target/m68k/systems/qemu-m68k        |  5 +----
 4 files changed, 27 insertions(+), 24 deletions(-)
 delete mode 100644 target/m68k/kernel/qemu-m68k
 create mode 100644 target/m68k/kernel/qemu-m68k-mcf5208

(limited to 'target/m68k')

diff --git a/target/m68k/Makefile b/target/m68k/Makefile
index 8e64dc764..2d6e08d75 100644
--- a/target/m68k/Makefile
+++ b/target/m68k/Makefile
@@ -8,8 +8,14 @@ include $(ADK_TOPDIR)/mk/kernel-build.mk
 include $(ADK_TOPDIR)/mk/image.mk
 
 KERNEL:=$(LINUX_DIR)/vmlinux
+
 QEMU_ARGS:=${ADK_QEMU_ARGS}
+ifeq ($(ADK_TARGET_QEMU_M68K_Q800),y)
+QEMU_ARGS+=-M q800
+endif
+ifeq ($(ADK_TARGET_QEMU_M68K_MCF5208),y)
 QEMU_ARGS+=-M mcf5208evb -cpu m5208
+endif
 
 # target helper text
 ifeq ($(ADK_TARGET_FS),archive)
diff --git a/target/m68k/kernel/qemu-m68k b/target/m68k/kernel/qemu-m68k
deleted file mode 100644
index 3caa5323b..000000000
--- a/target/m68k/kernel/qemu-m68k
+++ /dev/null
@@ -1,20 +0,0 @@
-CONFIG_M68K=y
-CONFIG_COLDFIRE=y
-CONFIG_M520x=y
-CONFIG_CLOCK_SET=y
-CONFIG_CLOCK_FREQ=66666666
-CONFIG_CLOCK_DIV=1
-CONFIG_M5208EVB=y
-CONFIG_FREESCALE=y
-CONFIG_RAMBASE=0x40000000
-CONFIG_RAMSIZE=0x0
-CONFIG_VECTORBASE=0x40000000
-CONFIG_KERNELBASE=0x40020000
-CONFIG_4KSTACKS=y
-CONFIG_RAMKERNEL=y
-CONFIG_BINFMT_FLAT=y
-CONFIG_SERIAL_MCF=y
-CONFIG_SERIAL_MCF_BAUDRATE=115200
-CONFIG_SERIAL_MCF_CONSOLE=y
-CONFIG_BOOTPARAM=y
-CONFIG_BOOTPARAM_STRING="console=ttyS0,115200"
diff --git a/target/m68k/kernel/qemu-m68k-mcf5208 b/target/m68k/kernel/qemu-m68k-mcf5208
new file mode 100644
index 000000000..3caa5323b
--- /dev/null
+++ b/target/m68k/kernel/qemu-m68k-mcf5208
@@ -0,0 +1,20 @@
+CONFIG_M68K=y
+CONFIG_COLDFIRE=y
+CONFIG_M520x=y
+CONFIG_CLOCK_SET=y
+CONFIG_CLOCK_FREQ=66666666
+CONFIG_CLOCK_DIV=1
+CONFIG_M5208EVB=y
+CONFIG_FREESCALE=y
+CONFIG_RAMBASE=0x40000000
+CONFIG_RAMSIZE=0x0
+CONFIG_VECTORBASE=0x40000000
+CONFIG_KERNELBASE=0x40020000
+CONFIG_4KSTACKS=y
+CONFIG_RAMKERNEL=y
+CONFIG_BINFMT_FLAT=y
+CONFIG_SERIAL_MCF=y
+CONFIG_SERIAL_MCF_BAUDRATE=115200
+CONFIG_SERIAL_MCF_CONSOLE=y
+CONFIG_BOOTPARAM=y
+CONFIG_BOOTPARAM_STRING="console=ttyS0,115200"
diff --git a/target/m68k/systems/qemu-m68k b/target/m68k/systems/qemu-m68k
index a8f35ee3b..66f20b587 100644
--- a/target/m68k/systems/qemu-m68k
+++ b/target/m68k/systems/qemu-m68k
@@ -1,10 +1,7 @@
 config ADK_TARGET_SYSTEM_QEMU_M68K
 	bool "Qemu M68K"
-	select ADK_CPU_CF_5208
-	select ADK_TARGET_UCLINUX
 	select ADK_TARGET_QEMU
-	select ADK_TARGET_BINFMT_FLAT
 	select ADK_TARGET_KERNEL_ZIMAGE
 	help
-	 Support for Qemu Emulator M68K/Coldfire without MMU.
+	 Support for Qemu Emulator M68K/Coldfire. 
 
-- 
cgit v1.2.3