aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.target2
-rw-r--r--hw/dummy_m68k.c66
-rw-r--r--vl.c1
-rw-r--r--vl.h3
4 files changed, 71 insertions, 1 deletions
diff --git a/Makefile.target b/Makefile.target
index ab925ad096..ee91a57d19 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -508,7 +508,7 @@ VL_OBJS+= sh_timer.o ptimer.o sh_serial.o sh_intc.o
endif
ifeq ($(TARGET_BASE_ARCH), m68k)
VL_OBJS+= an5206.o mcf5206.o ptimer.o mcf_uart.o mcf_intc.o mcf5208.o mcf_fec.o
-VL_OBJS+= m68k-semi.o
+VL_OBJS+= m68k-semi.o dummy_m68k.o
endif
ifdef CONFIG_GDBSTUB
VL_OBJS+=gdbstub.o
diff --git a/hw/dummy_m68k.c b/hw/dummy_m68k.c
new file mode 100644
index 0000000000..6305915087
--- /dev/null
+++ b/hw/dummy_m68k.c
@@ -0,0 +1,66 @@
+/*
+ * Dummy board with just RAM and CPU for use as an ISS.
+ *
+ * Copyright (c) 2007 CodeSourcery.
+ *
+ * This code is licenced under the GPL
+ */
+
+#include "vl.h"
+
+#define KERNEL_LOAD_ADDR 0x10000
+
+/* Board init. */
+
+static void dummy_m68k_init(int ram_size, int vga_ram_size, int boot_device,
+ DisplayState *ds, const char **fd_filename, int snapshot,
+ const char *kernel_filename, const char *kernel_cmdline,
+ const char *initrd_filename, const char *cpu_model)
+{
+ CPUState *env;
+ int kernel_size;
+ uint64_t elf_entry;
+ target_ulong entry;
+
+ env = cpu_init();
+ if (!cpu_model)
+ cpu_model = "cfv4e";
+ if (cpu_m68k_set_model(env, cpu_model)) {
+ cpu_abort(env, "Unable to find m68k CPU definition\n");
+ }
+
+ /* Initialize CPU registers. */
+ env->vbr = 0;
+
+ /* RAM at address zero */
+ cpu_register_physical_memory(0, ram_size,
+ qemu_ram_alloc(ram_size) | IO_MEM_RAM);
+
+ /* Load kernel. */
+ if (kernel_filename) {
+ kernel_size = load_elf(kernel_filename, 0, &elf_entry, NULL, NULL);
+ entry = elf_entry;
+ if (kernel_size < 0) {
+ kernel_size = load_uboot(kernel_filename, &entry, NULL);
+ }
+ if (kernel_size < 0) {
+ kernel_size = load_image(kernel_filename,
+ phys_ram_base + KERNEL_LOAD_ADDR);
+ entry = KERNEL_LOAD_ADDR;
+ }
+ if (kernel_size < 0) {
+ fprintf(stderr, "qemu: could not load kernel '%s'\n",
+ kernel_filename);
+ exit(1);
+ }
+ } else {
+ entry = 0;
+ }
+ env->pc = entry;
+}
+
+QEMUMachine dummy_m68k_machine = {
+ "dummy",
+ "Dummy board",
+ dummy_m68k_init,
+};
diff --git a/vl.c b/vl.c
index 03859a9958..e70ed4c31d 100644
--- a/vl.c
+++ b/vl.c
@@ -7400,6 +7400,7 @@ void register_machines(void)
#elif defined(TARGET_M68K)
qemu_register_machine(&mcf5208evb_machine);
qemu_register_machine(&an5206_machine);
+ qemu_register_machine(&dummy_m68k_machine);
#elif defined(TARGET_CRIS)
qemu_register_machine(&bareetraxfs_machine);
#else
diff --git a/vl.h b/vl.h
index 683b62db27..099bbb7ad4 100644
--- a/vl.h
+++ b/vl.h
@@ -1719,6 +1719,9 @@ extern QEMUMachine an5206_machine;
/* mcf5208.c */
extern QEMUMachine mcf5208evb_machine;
+/* dummy_m68k.c */
+extern QEMUMachine dummy_m68k_machine;
+
#include "gdbstub.h"
#endif /* defined(QEMU_TOOL) */