Commit 78f16256 authored by Philippe Mathieu-Daudé's avatar Philippe Mathieu-Daudé Committed by Paolo Bonzini
Browse files

hw/mips/malta: Code movement 



Move the SouthBridge peripherals first, and keep the Super I/O
peripherals last.

Signed-off-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20180308223946.26784-16-f4bug@amsat.org>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent c16a4e1b

hw/mips/mips_malta.c

+7 −7
Original line number Diff line number Diff line
@@ -1062,10 +1062,6 @@ void mips_malta_init(MachineState *machine) 
        memory_region_add_subregion(system_memory, 512 << 20, ram_low_postio);

    }



    /* generate SPD EEPROM data */

    generate_eeprom_spd(&smbus_eeprom_buf[0 * 256], ram_size);

    generate_eeprom_serial(&smbus_eeprom_buf[6 * 256]);



#ifdef TARGET_WORDS_BIGENDIAN

    be = 1;

#else
@@ -1208,15 +1204,19 @@ void mips_malta_init(MachineState *machine) 
    pci_create_simple(pci_bus, piix4_devfn + 2, "piix4-usb-uhci");

    smbus = piix4_pm_init(pci_bus, piix4_devfn + 3, 0x1100,

                          isa_get_irq(NULL, 9), NULL, 0, NULL);

    smbus_eeprom_init(smbus, 8, smbus_eeprom_buf, smbus_eeprom_size);

    g_free(smbus_eeprom_buf);

    pit = i8254_pit_init(isa_bus, 0x40, 0, NULL);

    i8257_dma_init(isa_bus, 0);

    mc146818_rtc_init(isa_bus, 2000, NULL);



    /* generate SPD EEPROM data */

    generate_eeprom_spd(&smbus_eeprom_buf[0 * 256], ram_size);

    generate_eeprom_serial(&smbus_eeprom_buf[6 * 256]);

    smbus_eeprom_init(smbus, 8, smbus_eeprom_buf, smbus_eeprom_size);

    g_free(smbus_eeprom_buf);



    /* Super I/O */

    isa_create_simple(isa_bus, TYPE_I8042);



    mc146818_rtc_init(isa_bus, 2000, NULL);

    serial_hds_isa_init(isa_bus, 0, 2);

    parallel_hds_isa_init(isa_bus, 1);