Commit 81a07050 authored by Mark Cave-Ayland's avatar Mark Cave-Ayland Committed by David Gibson
Browse files

mac_oldworld: don't use legacy fw_cfg_init_mem() function 



Instead initialise the device via qdev to allow us to set device properties
directly as required.

Signed-off-by: default avatarMark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent 0f080859

hw/ppc/mac_oldworld.c

+11 −1
Original line number Diff line number Diff line
@@ -309,7 +309,17 @@ static void ppc_heathrow_init(MachineState *machine) 


    /* No PCI init: the BIOS will do it */



    fw_cfg = fw_cfg_init_mem(CFG_ADDR, CFG_ADDR + 2);

    dev = qdev_create(NULL, TYPE_FW_CFG_MEM);

    fw_cfg = FW_CFG(dev);

    qdev_prop_set_uint32(dev, "data_width", 1);

    qdev_prop_set_bit(dev, "dma_enabled", false);

    object_property_add_child(OBJECT(qdev_get_machine()), TYPE_FW_CFG,

                              OBJECT(fw_cfg), NULL);

    qdev_init_nofail(dev);

    s = SYS_BUS_DEVICE(dev);

    sysbus_mmio_map(s, 0, CFG_ADDR);

    sysbus_mmio_map(s, 1, CFG_ADDR + 2);



    fw_cfg_add_i16(fw_cfg, FW_CFG_NB_CPUS, (uint16_t)smp_cpus);

    fw_cfg_add_i16(fw_cfg, FW_CFG_MAX_CPUS, (uint16_t)max_cpus);

    fw_cfg_add_i64(fw_cfg, FW_CFG_RAM_SIZE, (uint64_t)ram_size);