source: mainline/contrib/qemu/integratorcm_init_memsz.patch@ 7f766f4

lfn serial ticket/834-toolchain-update topic/msim-upgrade topic/simplify-dev-export
Last change on this file since 7f766f4 was 38097a43, checked in by Jakub Jermar <jakub@…>, 9 years ago

Upgrade to QEMU 2.7.0

  • Add patch that fixes Integrator/CP regression
  • Property mode set to 100644
File size: 1.1 KB

  • hw/arm/integratorcp.c 

    diff --git a/hw/arm/integratorcp.c b/hw/arm/integratorcp.c
index 96dc150..3d88369 100644
    a b static void integratorcm_init(Object *obj)  
    247247{
    248248    IntegratorCMState *s = INTEGRATOR_CM(obj);
    249249    SysBusDevice *dev = SYS_BUS_DEVICE(obj);
     250    MachineState *machine = MACHINE(qdev_get_machine());
    250251
     252    s->memsz = machine->ram_size >> 20;
    251253    s->cm_osc = 0x01000048;
    252254    /* ??? What should the high bits of this value be?  */
    253255    s->cm_auxosc = 0x0007feff;
    … … static void integratorcp_init(MachineState *machine)  
    574576    memory_region_add_subregion(address_space_mem, 0x80000000, ram_alias);
    575577
    576578    dev = qdev_create(NULL, TYPE_INTEGRATOR_CM);
    577     qdev_prop_set_uint32(dev, "memsz", ram_size >> 20);
    578579    qdev_init_nofail(dev);
    579580    sysbus_mmio_map((SysBusDevice *)dev, 0, 0x10000000);
    580581
    … … static void integratorcp_machine_init(MachineClass *mc)  
    624625DEFINE_MACHINE("integratorcp", integratorcp_machine_init)
    625626
    626627static Property core_properties[] = {
    627     DEFINE_PROP_UINT32("memsz", IntegratorCMState, memsz, 0),
    628628    DEFINE_PROP_END_OF_LIST(),
    629629};
    630630
Note: See TracBrowser for help on using the repository browser.