Revision 2c9b15ca hw/arm/integratorcp.c
| b/hw/arm/integratorcp.c | ||
|---|---|---|
| 249 | 249 |
} |
| 250 | 250 |
memcpy(integrator_spd + 73, "QEMU-MEMORY", 11); |
| 251 | 251 |
s->cm_init = 0x00000112; |
| 252 |
memory_region_init_ram(&s->flash, "integrator.flash", 0x100000); |
|
| 252 |
memory_region_init_ram(&s->flash, NULL, "integrator.flash", 0x100000);
|
|
| 253 | 253 |
vmstate_register_ram_global(&s->flash); |
| 254 | 254 |
|
| 255 |
memory_region_init_io(&s->iomem, &integratorcm_ops, s, |
|
| 255 |
memory_region_init_io(&s->iomem, NULL, &integratorcm_ops, s,
|
|
| 256 | 256 |
"integratorcm", 0x00800000); |
| 257 | 257 |
sysbus_init_mmio(dev, &s->iomem); |
| 258 | 258 |
|
| ... | ... | |
| 374 | 374 |
qdev_init_gpio_in(&dev->qdev, icp_pic_set_irq, 32); |
| 375 | 375 |
sysbus_init_irq(dev, &s->parent_irq); |
| 376 | 376 |
sysbus_init_irq(dev, &s->parent_fiq); |
| 377 |
memory_region_init_io(&s->iomem, &icp_pic_ops, s, "icp-pic", 0x00800000); |
|
| 377 |
memory_region_init_io(&s->iomem, NULL, &icp_pic_ops, s, "icp-pic", 0x00800000);
|
|
| 378 | 378 |
sysbus_init_mmio(dev, &s->iomem); |
| 379 | 379 |
return 0; |
| 380 | 380 |
} |
| ... | ... | |
| 424 | 424 |
MemoryRegion *io; |
| 425 | 425 |
|
| 426 | 426 |
io = (MemoryRegion *)g_malloc0(sizeof(MemoryRegion)); |
| 427 |
memory_region_init_io(io, &icp_control_ops, NULL, |
|
| 427 |
memory_region_init_io(io, NULL, &icp_control_ops, NULL,
|
|
| 428 | 428 |
"control", 0x00800000); |
| 429 | 429 |
memory_region_add_subregion(get_system_memory(), base, io); |
| 430 | 430 |
/* ??? Save/restore. */ |
| ... | ... | |
| 463 | 463 |
exit(1); |
| 464 | 464 |
} |
| 465 | 465 |
|
| 466 |
memory_region_init_ram(ram, "integrator.ram", ram_size); |
|
| 466 |
memory_region_init_ram(ram, NULL, "integrator.ram", ram_size);
|
|
| 467 | 467 |
vmstate_register_ram_global(ram); |
| 468 | 468 |
/* ??? On a real system the first 1Mb is mapped as SSRAM or boot flash. */ |
| 469 | 469 |
/* ??? RAM should repeat to fill physical memory space. */ |
| 470 | 470 |
/* SDRAM at address zero*/ |
| 471 | 471 |
memory_region_add_subregion(address_space_mem, 0, ram); |
| 472 | 472 |
/* And again at address 0x80000000 */ |
| 473 |
memory_region_init_alias(ram_alias, "ram.alias", ram, 0, ram_size); |
|
| 473 |
memory_region_init_alias(ram_alias, NULL, "ram.alias", ram, 0, ram_size);
|
|
| 474 | 474 |
memory_region_add_subregion(address_space_mem, 0x80000000, ram_alias); |
| 475 | 475 |
|
| 476 | 476 |
dev = qdev_create(NULL, "integrator_core"); |
Also available in: Unified diff