← Back to branch summary

~ubuntu-branches/ubuntu/vivid/qemu-linaro/vivid

« back to all changes in this revision

Viewing changes to hw/omap3.c

  • Committer: Ricardo Salveti de Araujo
  • Date: 2012-09-20 18:39:31 UTC
  • mfrom: (12922.1.2 qemu-linaro)
  • Revision ID: ricardo.salveti@linaro.org-20120920183931-sp3cg6kpdl8dmwo9
* New upstream release.
  - support emulated systems with more than 2G of memory. (LP: #1030588)
* Drop powerpc-missing-include.patch - merged upstream.
* Update debian/control:
  - drop perl build dependency.
  - add libfdt-dev build dependency.
* Update debian/qemu-keymaps.install file.
* Update debian/rules:
  - update QEMU_CPU for ARM architecture: armv4l -> armv7l.
  - update conf_audio_drv: default to PulseAudio since PA is the default on
    Ubuntu.
  - enable KVM on ARM architecture.
  - enable flat device tree support (--enable-fdt). (LP: #1030594)

Show diffs side-by-side

added added

removed removed

Lines of Context:
hw/omap3.c
4018
4018
    struct omap_mpu_state_s *s = opaque;
4019
4019
    int i;
4020
4020
 
4021
 
    cpu_reset(s->env);
 
4021
    cpu_reset(CPU(s->cpu));
4022
4022
    omap_dma_reset(s->dma);
4023
4023
    omap3_cm_reset(s->omap3_cm);
4024
4024
    omap3_prm_reset(s->omap3_prm);
4061
4061
    qemu_irq drqs[4];
4062
4062
    int i;
4063
4063
    SysBusDevice *busdev;
 
4064
    /* values reported by beagleboard(-xm) hw */
 
4065
    const unsigned uart_revision = model == omap3430 ? 0x46 : 0x52;
4064
4066
 
4065
4067
    if (model != omap3430 && model != omap3630) {
4066
4068
        hw_error("%s: invalid cpu model (%d)", __FUNCTION__, model);
4067
4069
    }
4068
4070
    s->mpu_model = model;
4069
 
    s->env = cpu_init("cortex-a8-r2");
4070
 
    if (!s->env) {
 
4071
    s->cpu = cpu_arm_init("cortex-a8-r2");
 
4072
    if (!s->cpu) {
4071
4073
        hw_error("%s: Unable to find CPU definition", __FUNCTION__);
4072
4074
    }
4073
4075
    s->sdram_size = sdram_size;
4084
4086
 
4085
4087
    s->l4 = omap_l4_init(sysmem, OMAP3_L4_BASE, L4A_COUNT, L4ID_COUNT);
4086
4088
 
4087
 
    cpu_irq = arm_pic_init_cpu(s->env);
 
4089
    cpu_irq = arm_pic_init_cpu(s->cpu);
4088
4090
    s->ih[0] = qdev_create(NULL, "omap2-intc");
4089
4091
    qdev_prop_set_uint8(s->ih[0], "revision", 0x40);
4090
4092
    qdev_prop_set_ptr(s->ih[0], "fclk", omap_findclk(s, "omap3_mpu_intc_fclk"));
4203
4205
                         omap_clk_getrate(omap_findclk(s, "omap3_uart1_fclk"))
4204
4206
                         / 16);
4205
4207
    qdev_prop_set_chr(s->uart[0], "chardev", chr_uart1);
 
4208
    qdev_prop_set_uint32(s->uart[0], "revision", uart_revision);
4206
4209
    qdev_init_nofail(s->uart[0]);
4207
4210
    busdev = sysbus_from_qdev(s->uart[0]);
4208
4211
    sysbus_connect_irq(busdev, 0,
4219
4222
                         omap_clk_getrate(omap_findclk(s, "omap3_uart2_fclk"))
4220
4223
                         / 16);
4221
4224
    qdev_prop_set_chr(s->uart[1], "chardev", chr_uart2);
 
4225
    qdev_prop_set_uint32(s->uart[1], "revision", uart_revision);
4222
4226
    qdev_init_nofail(s->uart[1]);
4223
4227
    busdev = sysbus_from_qdev(s->uart[1]);
4224
4228
    sysbus_connect_irq(busdev, 0,
4235
4239
                         omap_clk_getrate(omap_findclk(s, "omap3_uart3_fclk"))
4236
4240
                         / 16);
4237
4241
    qdev_prop_set_chr(s->uart[2], "chardev", chr_uart3);
 
4242
    qdev_prop_set_uint32(s->uart[2], "revision", uart_revision);
4238
4243
    qdev_init_nofail(s->uart[2]);
4239
4244
    busdev = sysbus_from_qdev(s->uart[2]);
4240
4245
    sysbus_connect_irq(busdev, 0,
4253
4258
                                                           "omap3_uart4_fclk"))
4254
4259
                             / 16);
4255
4260
        qdev_prop_set_chr(s->uart[3], "chardev", chr_uart4);
 
4261
        qdev_prop_set_uint32(s->uart[3], "revision", uart_revision);
4256
4262
        qdev_init_nofail(s->uart[3]);
4257
4263
        busdev = sysbus_from_qdev(s->uart[3]);
4258
4264
        sysbus_connect_irq(busdev, 0,