← Back to branch summary

~ubuntu-branches/ubuntu/natty/qemu-linaro/natty

« back to all changes in this revision

Viewing changes to hw/mips_malta.c

  • Committer: Package Import Robot
  • Author(s): Steve Langasek, Loïc Minier, Steve Langasek
  • Date: 2011-03-07 22:55:03 UTC
  • Revision ID: package-import@ubuntu.com-20110307225503-3opjapw0ksg7glo6
[ Loïc Minier ]
* Also pass -fno-var-tracking on armhf.

[ Steve Langasek ]
* New upstream release.
* Build with -marm on armel/armhf; Peter Maydell reports that building for
  Thumb-2 gives an emulator that doesn't work.
* Add support for cross-compiling the package.

Show diffs side-by-side

added added

removed removed

Lines of Context:
hw/mips_malta.c
68
68
    SerialState *uart;
69
69
} MaltaFPGAState;
70
70
 
71
 
static PITState *pit;
 
71
static ISADevice *pit;
72
72
 
73
73
static struct _loaderparams {
74
74
    int ram_size;
919
919
    isa_bus_irqs(i8259);
920
920
    pci_piix4_ide_init(pci_bus, hd, piix4_devfn + 1);
921
921
    usb_uhci_piix4_init(pci_bus, piix4_devfn + 2);
922
 
    smbus = piix4_pm_init(pci_bus, piix4_devfn + 3, 0x1100, isa_reserve_irq(9),
 
922
    smbus = piix4_pm_init(pci_bus, piix4_devfn + 3, 0x1100, isa_get_irq(9),
923
923
                          NULL, NULL, 0);
924
924
    eeprom_buf = qemu_mallocz(8 * 256); /* XXX: make this persistent */
925
925
    for (i = 0; i < 8; i++) {
930
930
        qdev_prop_set_ptr(eeprom, "data", eeprom_buf + (i * 256));
931
931
        qdev_init_nofail(eeprom);
932
932
    }
933
 
    pit = pit_init(0x40, isa_reserve_irq(0));
 
933
    pit = pit_init(0x40, 0);
934
934
    cpu_exit_irq = qemu_allocate_irqs(cpu_request_exit, NULL, 1);
935
935
    DMA_init(0, cpu_exit_irq);
936
936
 
957
957
    if (cirrus_vga_enabled) {
958
958
        pci_cirrus_vga_init(pci_bus);
959
959
    } else if (vmsvga_enabled) {
960
 
        pci_vmsvga_init(pci_bus);
 
960
        if (!pci_vmsvga_init(pci_bus)) {
 
961
            fprintf(stderr, "Warning: vmware_vga not available,"
 
962
                    " using standard VGA instead\n");
 
963
            pci_vga_init(pci_bus);
 
964
        }
961
965
    } else if (std_vga_enabled) {
962
966
        pci_vga_init(pci_bus);
963
967
    }