From fa1bdde4a3db4b0bc21b7ae1a3c8af5678c31dcc Mon Sep 17 00:00:00 2001
From: edgar_igl <edgar_igl@c046a42c-6fe2-441c-8c8c-71466251a162>
Date: Fri, 6 Jun 2008 10:58:48 +0000
Subject: ETRAX machine updates. * Move DMA_run into the dma controller to
 allow for multiple ETRAX/CRIS machines. * Support both ELF and kimage kernel
 images. * Correct emulation of the DMA RW_DATA register.

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4678 c046a42c-6fe2-441c-8c8c-71466251a162
---
 hw/etraxfs.c | 28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

(limited to 'hw/etraxfs.c')

diff --git a/hw/etraxfs.c b/hw/etraxfs.c
index 942892c01..72482e414 100644
--- a/hw/etraxfs.c
+++ b/hw/etraxfs.c
@@ -44,7 +44,6 @@ void etraxfs_ser_init(CPUState *env, qemu_irq *irq, CharDriverState *chr,
 #define FLASH_SIZE 0x2000000
 #define INTMEM_SIZE (128 * 1024)
 
-static void *etraxfs_dmac;
 static uint32_t bootstrap_pc;
 
 static void main_cpu_reset(void *opaque)
@@ -64,6 +63,7 @@ void bareetraxfs_init (ram_addr_t ram_size, int vga_ram_size,
 {
     CPUState *env;
     qemu_irq *pic;
+    void *etraxfs_dmac;
     struct etraxfs_dma_client *eth[2] = {NULL, NULL};
     int kernel_size;
     int i;
@@ -138,19 +138,20 @@ void bareetraxfs_init (ram_addr_t ram_size, int vga_ram_size,
     }
 
     if (kernel_filename) {
-#if 1
+        uint64_t entry;
         /* Boots a kernel elf binary, os/linux-2.6/vmlinux from the axis 
            devboard SDK.  */
         kernel_size = load_elf(kernel_filename, 0,
-                               &bootstrap_pc, NULL, NULL);
-#else
-        /* Takes a kimage from the axis devboard SDK.  */
-        kernel_size = load_image(kernel_filename, phys_ram_base + 0x4000);
-        bootstrap_pc = 0x40004000;
-        /* magic for boot.  */
-        env->regs[8] = 0x56902387;
-        env->regs[9] = 0x40004000 + kernel_size;
-#endif
+                               &entry, NULL, NULL);
+        bootstrap_pc = entry;
+        if (kernel_size < 0) {
+            /* Takes a kimage from the axis devboard SDK.  */
+            kernel_size = load_image(kernel_filename, phys_ram_base + 0x4000);
+            bootstrap_pc = 0x40004000;
+            /* magic for boot.  */
+            env->regs[8] = 0x56902387;
+            env->regs[9] = 0x40004000 + kernel_size;
+        }
     }
     env->pc = bootstrap_pc;
 
@@ -158,11 +159,6 @@ void bareetraxfs_init (ram_addr_t ram_size, int vga_ram_size,
     printf ("ram size =%ld\n", ram_size);
 }
 
-void DMA_run(void)
-{
-	etraxfs_dmac_run(etraxfs_dmac);
-}
-
 QEMUMachine bareetraxfs_machine = {
     "bareetraxfs",
     "Bare ETRAX FS board",
-- 
cgit v1.2.3