← Back to branch summary

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

« back to all changes in this revision

Viewing changes to hw/mcf5206.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/mcf5206.c
145
145
/* System Integration Module.  */
146
146
 
147
147
typedef struct {
148
 
    CPUState *env;
 
148
    CPUM68KState *env;
149
149
    MemoryRegion iomem;
150
150
    m5206_timer_state *timer[2];
151
151
    void *uart[2];
525
525
    .endianness = DEVICE_NATIVE_ENDIAN,
526
526
};
527
527
 
528
 
qemu_irq *mcf5206_init(MemoryRegion *sysmem, uint32_t base, CPUState *env)
 
528
qemu_irq *mcf5206_init(MemoryRegion *sysmem, uint32_t base, CPUM68KState *env)
529
529
{
530
530
    m5206_mbar_state *s;
531
531
    qemu_irq *pic;