aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.target7
-rw-r--r--hw/axis_dev88.c276
-rw-r--r--hw/boards.h1
-rw-r--r--target-cris/machine.c1
4 files changed, 283 insertions, 2 deletions
diff --git a/Makefile.target b/Makefile.target
index b66b699243..f4f3c703c7 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -676,7 +676,10 @@ OBJS+= pflash_cfi01.o
CPPFLAGS += -DHAS_AUDIO -DHAS_AUDIO_CHOICE
endif
ifeq ($(TARGET_BASE_ARCH), cris)
-OBJS+= etraxfs.o
+# Boards
+OBJS+= etraxfs.o axis_dev88.o
+
+# IO blocks
OBJS+= etraxfs_dma.o
OBJS+= etraxfs_pic.o
OBJS+= etraxfs_eth.o
@@ -684,7 +687,7 @@ OBJS+= etraxfs_timer.o
OBJS+= etraxfs_ser.o
OBJS+= ptimer.o
-OBJS+= pflash_cfi02.o
+OBJS+= pflash_cfi02.o nand.o
endif
ifeq ($(TARGET_BASE_ARCH), sparc)
ifeq ($(TARGET_ARCH), sparc64)
diff --git a/hw/axis_dev88.c b/hw/axis_dev88.c
new file mode 100644
index 0000000000..b16b15d1b9
--- /dev/null
+++ b/hw/axis_dev88.c
@@ -0,0 +1,276 @@
+/*
+ * QEMU model for the AXIS devboard 88.
+ *
+ * Copyright (c) 2009 Edgar E. Iglesias, Axis Communications AB.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#include <time.h>
+#include <sys/time.h>
+#include "hw.h"
+#include "net.h"
+#include "flash.h"
+#include "sysemu.h"
+#include "devices.h"
+#include "boards.h"
+
+#include "etraxfs.h"
+
+#define D(x)
+#define DNAND(x)
+
+struct nand_state_t
+{
+ struct nand_flash_s *nand;
+ unsigned int rdy:1;
+ unsigned int ale:1;
+ unsigned int cle:1;
+ unsigned int ce:1;
+};
+
+static struct nand_state_t nand_state;
+static uint32_t nand_readl (void *opaque, target_phys_addr_t addr)
+{
+ struct nand_state_t *s = opaque;
+ uint32_t r;
+ int rdy;
+
+ r = nand_getio(s->nand);
+ nand_getpins(s->nand, &rdy);
+ s->rdy = rdy;
+
+ DNAND(printf("%s addr=%x r=%x\n", __func__, addr, r));
+ return r;
+}
+
+static void
+nand_writel (void *opaque, target_phys_addr_t addr, uint32_t value)
+{
+ struct nand_state_t *s = opaque;
+ int rdy;
+
+ DNAND(printf("%s addr=%x v=%x\n", __func__, addr, value));
+ nand_setpins(s->nand, s->cle, s->ale, s->ce, 1, 0);
+ nand_setio(s->nand, value);
+ nand_getpins(s->nand, &rdy);
+ s->rdy = rdy;
+}
+
+static CPUReadMemoryFunc *nand_read[] = {
+ &nand_readl,
+ &nand_readl,
+ &nand_readl,
+};
+
+static CPUWriteMemoryFunc *nand_write[] = {
+ &nand_writel,
+ &nand_writel,
+ &nand_writel,
+};
+
+#define RW_PA_DOUT 0
+#define R_PA_DIN 1
+#define RW_PA_OE 2
+struct gpio_state_t
+{
+ struct nand_state_t *nand;
+ uint32_t regs[0x5c / 4];
+} gpio_state;
+
+static uint32_t gpio_readl (void *opaque, target_phys_addr_t addr)
+{
+ struct gpio_state_t *s = opaque;
+ uint32_t r = 0;
+
+ addr >>= 2;
+ switch (addr)
+ {
+ case R_PA_DIN:
+ r = s->regs[RW_PA_DOUT] & s->regs[RW_PA_OE];
+
+ /* Encode pins from the nand. */
+ r |= s->nand->rdy << 7;
+ break;
+ default:
+ r = s->regs[addr];
+ break;
+ }
+ return r;
+ D(printf("%s %x=%x\n", __func__, addr, r));
+}
+
+static void gpio_writel (void *opaque, target_phys_addr_t addr, uint32_t value)
+{
+ struct gpio_state_t *s = opaque;
+ D(printf("%s %x=%x\n", __func__, addr, value));
+
+ addr >>= 2;
+ switch (addr)
+ {
+ case RW_PA_DOUT:
+ /* Decode nand pins. */
+ s->nand->ale = !!(value & (1 << 6));
+ s->nand->cle = !!(value & (1 << 5));
+ s->nand->ce = !!(value & (1 << 4));
+
+ s->regs[addr] = value;
+ break;
+ default:
+ s->regs[addr] = value;
+ break;
+ }
+}
+
+static CPUReadMemoryFunc *gpio_read[] = {
+ NULL, NULL,
+ &gpio_readl,
+};
+
+static CPUWriteMemoryFunc *gpio_write[] = {
+ NULL, NULL,
+ &gpio_writel,
+};
+
+#define INTMEM_SIZE (128 * 1024)
+
+static uint32_t bootstrap_pc;
+static void main_cpu_reset(void *opaque)
+{
+ CPUState *env = opaque;
+ cpu_reset(env);
+
+ env->pc = bootstrap_pc;
+}
+
+static
+void axisdev88_init (ram_addr_t ram_size, int vga_ram_size,
+ const char *boot_device, DisplayState *ds,
+ const char *kernel_filename, const char *kernel_cmdline,
+ const char *initrd_filename, const char *cpu_model)
+{
+ CPUState *env;
+ struct etraxfs_pic *pic;
+ void *etraxfs_dmac;
+ struct etraxfs_dma_client *eth[2] = {NULL, NULL};
+ int kernel_size;
+ int i;
+ int nand_regs;
+ int gpio_regs;
+ ram_addr_t phys_ram;
+ ram_addr_t phys_intmem;
+
+ /* init CPUs */
+ if (cpu_model == NULL) {
+ cpu_model = "crisv32";
+ }
+ env = cpu_init(cpu_model);
+ qemu_register_reset(main_cpu_reset, env);
+
+ /* allocate RAM */
+ phys_ram = qemu_ram_alloc(ram_size);
+ cpu_register_physical_memory(0x40000000, ram_size, phys_ram | IO_MEM_RAM);
+
+ /* The ETRAX-FS has 128Kb on chip ram, the docs refer to it as the
+ internal memory. */
+ phys_intmem = qemu_ram_alloc(INTMEM_SIZE);
+ cpu_register_physical_memory(0x38000000, INTMEM_SIZE,
+ phys_intmem | IO_MEM_RAM);
+
+
+ /* Attach a NAND flash to CS1. */
+ nand_state.nand = nand_init(NAND_MFR_STMICRO, 0xf1);
+ nand_regs = cpu_register_io_memory(0, nand_read, nand_write, &nand_state);
+ cpu_register_physical_memory(0x10000000, 0x05000000, nand_regs);
+
+ gpio_state.nand = &nand_state;
+ gpio_regs = cpu_register_io_memory(0, gpio_read, gpio_write, &gpio_state);
+ cpu_register_physical_memory(0x3001a000, 0x1c, gpio_regs);
+
+
+ pic = etraxfs_pic_init(env, 0x3001c000);
+ etraxfs_dmac = etraxfs_dmac_init(env, 0x30000000, 10);
+ for (i = 0; i < 10; i++) {
+ /* On ETRAX, odd numbered channels are inputs. */
+ etraxfs_dmac_connect(etraxfs_dmac, i, pic->irq + 7 + i, i & 1);
+ }
+
+ /* Add the two ethernet blocks. */
+ eth[0] = etraxfs_eth_init(&nd_table[0], env, pic->irq + 25, 0x30034000);
+ if (nb_nics > 1)
+ eth[1] = etraxfs_eth_init(&nd_table[1], env, pic->irq + 26, 0x30036000);
+
+ /* The DMA Connector block is missing, hardwire things for now. */
+ etraxfs_dmac_connect_client(etraxfs_dmac, 0, eth[0]);
+ etraxfs_dmac_connect_client(etraxfs_dmac, 1, eth[0] + 1);
+ if (eth[1]) {
+ etraxfs_dmac_connect_client(etraxfs_dmac, 6, eth[1]);
+ etraxfs_dmac_connect_client(etraxfs_dmac, 7, eth[1] + 1);
+ }
+
+ /* 2 timers. */
+ etraxfs_timer_init(env, pic->irq + 0x1b, pic->nmi + 1, 0x3001e000);
+ etraxfs_timer_init(env, pic->irq + 0x1b, pic->nmi + 1, 0x3005e000);
+
+ for (i = 0; i < 4; i++) {
+ if (serial_hds[i]) {
+ etraxfs_ser_init(env, pic->irq + 0x14 + i,
+ serial_hds[i], 0x30026000 + i * 0x2000);
+ }
+ }
+
+ if (kernel_filename) {
+ uint64_t entry, high;
+ int kcmdline_len;
+
+ /* Boots a kernel elf binary, os/linux-2.6/vmlinux from the axis
+ devboard SDK. */
+ kernel_size = load_elf(kernel_filename, -0x80000000LL,
+ &entry, NULL, &high);
+ 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;
+ env->regs[9] = 0x40004000 + kernel_size;
+ }
+ env->regs[8] = 0x56902387; /* RAM init magic. */
+
+ if (kernel_cmdline && (kcmdline_len = strlen(kernel_cmdline))) {
+ if (kcmdline_len > 256) {
+ fprintf(stderr, "Too long CRIS kernel cmdline (max 256)\n");
+ exit(1);
+ }
+ pstrcpy_targphys(high, 256, kernel_cmdline);
+ /* Let the kernel know we are modifying the cmdline. */
+ env->regs[10] = 0x87109563;
+ env->regs[11] = high;
+ }
+ }
+ env->pc = bootstrap_pc;
+
+ printf ("pc =%x\n", env->pc);
+ printf ("ram size =%ld\n", ram_size);
+}
+
+QEMUMachine axisdev88_machine = {
+ .name = "axis-dev88",
+ .desc = "AXIS devboard 88",
+ .init = axisdev88_init,
+ .ram_require = 0x8000000,
+};
diff --git a/hw/boards.h b/hw/boards.h
index bff1cf06c6..4f690c9e8a 100644
--- a/hw/boards.h
+++ b/hw/boards.h
@@ -27,6 +27,7 @@ void register_machines(void);
/* Axis ETRAX. */
extern QEMUMachine bareetraxfs_machine;
+extern QEMUMachine axisdev88_machine;
/* pc.c */
extern QEMUMachine pc_machine;
diff --git a/target-cris/machine.c b/target-cris/machine.c
index 3e152e9fbb..b17db23214 100644
--- a/target-cris/machine.c
+++ b/target-cris/machine.c
@@ -4,6 +4,7 @@
void register_machines(void)
{
qemu_register_machine(&bareetraxfs_machine);
+ qemu_register_machine(&axisdev88_machine);
}
void cpu_save(QEMUFile *f, void *opaque)