diff options
Diffstat (limited to 'hw/integratorcp.c')
| -rw-r--r-- | hw/integratorcp.c | 42 |
1 files changed, 29 insertions, 13 deletions
diff --git a/hw/integratorcp.c b/hw/integratorcp.c index 83c6208cf..549cc25df 100644 --- a/hw/integratorcp.c +++ b/hw/integratorcp.c @@ -7,8 +7,13 @@ * This code is licenced under the GPL */ -#include "vl.h" -#include "arm_pic.h" +#include "hw.h" +#include "primecell.h" +#include "devices.h" +#include "sysemu.h" +#include "boards.h" +#include "arm-misc.h" +#include "net.h" void DMA_run (void) { @@ -99,7 +104,7 @@ static uint32_t integratorcm_read(void *opaque, target_phys_addr_t offset) return 0; default: cpu_abort (cpu_single_env, - "integratorcm_read: Unimplemented offset 0x%x\n", offset); + "integratorcm_read: Unimplemented offset 0x%x\n", (int)offset); return 0; } } @@ -207,7 +212,7 @@ static void integratorcm_write(void *opaque, target_phys_addr_t offset, break; default: cpu_abort (cpu_single_env, - "integratorcm_write: Unimplemented offset 0x%x\n", offset); + "integratorcm_write: Unimplemented offset 0x%x\n", (int)offset); break; } } @@ -414,7 +419,8 @@ static uint32_t icp_control_read(void *opaque, target_phys_addr_t offset) case 3: /* CP_DECODE */ return 0x11; default: - cpu_abort (cpu_single_env, "icp_control_read: Bad offset %x\n", offset); + cpu_abort (cpu_single_env, "icp_control_read: Bad offset %x\n", + (int)offset); return 0; } } @@ -431,7 +437,8 @@ static void icp_control_write(void *opaque, target_phys_addr_t offset, /* Nothing interesting implemented yet. */ break; default: - cpu_abort (cpu_single_env, "icp_control_write: Bad offset %x\n", offset); + cpu_abort (cpu_single_env, "icp_control_write: Bad offset %x\n", + (int)offset); } } static CPUReadMemoryFunc *icp_control_readfn[] = { @@ -462,8 +469,8 @@ static void icp_control_init(uint32_t base) /* Board init. */ -static void integratorcp_init(int ram_size, int vga_ram_size, int boot_device, - DisplayState *ds, const char **fd_filename, int snapshot, +static void integratorcp_init(int 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) { @@ -471,11 +478,15 @@ static void integratorcp_init(int ram_size, int vga_ram_size, int boot_device, uint32_t bios_offset; qemu_irq *pic; qemu_irq *cpu_pic; + int sd; - env = cpu_init(); if (!cpu_model) cpu_model = "arm926"; - cpu_arm_set_model(env, cpu_model); + env = cpu_init(cpu_model); + if (!env) { + fprintf(stderr, "Unable to find CPU definition\n"); + exit(1); + } bios_offset = ram_size + vga_ram_size; /* ??? On a real system the first 1Mb is mapped as SSRAM or boot flash. */ /* ??? RAM shoud repeat to fill physical memory space. */ @@ -491,12 +502,17 @@ static void integratorcp_init(int ram_size, int vga_ram_size, int boot_device, icp_pic_init(0xca000000, pic[26], NULL); icp_pit_init(0x13000000, pic, 5); pl031_init(0x15000000, pic[8]); - pl011_init(0x16000000, pic[1], serial_hds[0]); - pl011_init(0x17000000, pic[2], serial_hds[1]); + pl011_init(0x16000000, pic[1], serial_hds[0], PL011_ARM); + pl011_init(0x17000000, pic[2], serial_hds[1], PL011_ARM); icp_control_init(0xcb000000); pl050_init(0x18000000, pic[3], 0); pl050_init(0x19000000, pic[4], 1); - pl181_init(0x1c000000, sd_bdrv, pic[23], pic[24]); + sd = drive_get_index(IF_SD, 0, 0); + if (sd == -1) { + fprintf(stderr, "qemu: missing SecureDigital card\n"); + exit(1); + } + pl181_init(0x1c000000, drives_table[sd].bdrv, pic[23], pic[24]); if (nd_table[0].vlan) { if (nd_table[0].model == NULL || strcmp(nd_table[0].model, "smc91c111") == 0) { |