* 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 "sysbus.h"
+#include "boards.h"
+#include "sysemu.h"
#include "net.h"
#include "flash.h"
-#include "sysemu.h"
-#include "devices.h"
-#include "boards.h"
-
#include "etraxfs.h"
#define FLASH_SIZE 0x2000000
CPUState *env = opaque;
cpu_reset(env);
- env->pregs[PR_CCS] &= ~I_FLAG;
env->pc = bootstrap_pc;
}
static
-void bareetraxfs_init (ram_addr_t ram_size, int vga_ram_size,
- const char *boot_device, DisplayState *ds,
+void bareetraxfs_init (ram_addr_t ram_size,
+ const char *boot_device,
const char *kernel_filename, const char *kernel_cmdline,
const char *initrd_filename, const char *cpu_model)
{
+ DeviceState *dev;
CPUState *env;
- struct etraxfs_pic *pic;
+ qemu_irq irq[30], nmi[2], *cpu_irq;
void *etraxfs_dmac;
struct etraxfs_dma_client *eth[2] = {NULL, NULL};
int kernel_size;
cpu_model = "crisv32";
}
env = cpu_init(cpu_model);
- qemu_register_reset(main_cpu_reset, env);
+ qemu_register_reset(main_cpu_reset, 0, env);
/* allocate RAM */
phys_ram = qemu_ram_alloc(ram_size);
phys_flash = qemu_ram_alloc(FLASH_SIZE);
i = drive_get_index(IF_PFLASH, 0, 0);
pflash_cfi02_register(0x0, phys_flash,
- drives_table[i].bdrv, (64 * 1024),
+ i != -1 ? drives_table[i].bdrv : NULL, (64 * 1024),
FLASH_SIZE >> 16,
1, 2, 0x0000, 0x0000, 0x0000, 0x0000,
0x555, 0x2aa);
- pic = etraxfs_pic_init(env, 0x3001c000);
+ cpu_irq = cris_pic_init_cpu(env);
+ dev = sysbus_create_varargs("etraxfs,pic", 0x3001c000,
+ cpu_irq[0], cpu_irq[1], NULL);
+ /* FIXME: Is there a proper way to signal vectors to the CPU core? */
+ qdev_set_prop_ptr(dev, "interrupt_vector", &env->interrupt_vector);
+ for (i = 0; i < 30; i++) {
+ irq[i] = qdev_get_gpio_in(dev, i);
+ }
+ nmi[0] = qdev_get_gpio_in(dev, 30);
+ nmi[1] = qdev_get_gpio_in(dev, 31);
+
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);
+ etraxfs_dmac_connect(etraxfs_dmac, i, irq + 7 + i, i & 1);
}
/* Add the two ethernet blocks. */
- eth[0] = etraxfs_eth_init(&nd_table[0], env, pic->irq + 25, 0x30034000);
+ eth[0] = etraxfs_eth_init(&nd_table[0], env, 0x30034000, 1);
if (nb_nics > 1)
- eth[1] = etraxfs_eth_init(&nd_table[1], env, pic->irq + 26, 0x30036000);
+ eth[1] = etraxfs_eth_init(&nd_table[1], env, 0x30036000, 2);
/* The DMA Connector block is missing, hardwire things for now. */
etraxfs_dmac_connect_client(etraxfs_dmac, 0, eth[0]);
}
/* 2 timers. */
- etraxfs_timer_init(env, pic->irq + 0x1b, pic->nmi + 1, 0x3001e000);
- etraxfs_timer_init(env, pic->irq + 0x1b, pic->nmi + 1, 0x3005e000);
+ sysbus_create_varargs("etraxfs,timer", 0x3001e000, irq[0x1b], nmi[1], NULL);
+ sysbus_create_varargs("etraxfs,timer", 0x3005e000, irq[0x1b], nmi[1], NULL);
for (i = 0; i < 4; i++) {
- if (serial_hds[i]) {
- etraxfs_ser_init(env, pic->irq + 0x14 + i,
- serial_hds[i], 0x30026000 + i * 0x2000);
- }
+ sysbus_create_simple("etraxfs,serial", 0x30026000 + i * 0x2000,
+ irq[0x14 + i]);
}
if (kernel_filename) {
- uint64_t entry;
+ 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, 0,
- &entry, NULL, NULL);
+ 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);
+ kernel_size = load_image_targphys(kernel_filename, 0x40004000,
+ ram_size);
bootstrap_pc = 0x40004000;
- /* magic for boot. */
- env->regs[8] = 0x56902387;
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);
+ }
+ /* Let the kernel know we are modifying the cmdline. */
+ env->regs[10] = 0x87109563;
+ env->regs[11] = 0x40000000;
+ pstrcpy_targphys(env->regs[11], 256, kernel_cmdline);
+ }
}
env->pc = bootstrap_pc;
printf ("ram size =%ld\n", ram_size);
}
-QEMUMachine bareetraxfs_machine = {
- "bareetraxfs",
- "Bare ETRAX FS board",
- bareetraxfs_init,
- 0x8000000,
+static QEMUMachine bareetraxfs_machine = {
+ .name = "bareetraxfs",
+ .desc = "Bare ETRAX FS board",
+ .init = bareetraxfs_init,
+ .is_default = 1,
};
+
+static void bareetraxfs_machine_init(void)
+{
+ qemu_register_machine(&bareetraxfs_machine);
+}
+
+machine_init(bareetraxfs_machine_init);
projects / qemu / blobdiff