strongarm.c (4482e05cbbb7e50e476f6a9500cf0b38913bd939) | strongarm.c (ba1ba5cca3962a9cc400c713c736b4fb8db1f38e) |
---|---|
1/* 2 * StrongARM SA-1100/SA-1110 emulation 3 * 4 * Copyright (C) 2011 Dmitry Eremin-Solenikov 5 * 6 * Largely based on StrongARM emulation: 7 * Copyright (c) 2006 Openedhand Ltd. 8 * Written by Andrzej Zaborowski <balrog@zabor.org> --- 1567 unchanged lines hidden (view full) --- 1576 .parent = TYPE_SYS_BUS_DEVICE, 1577 .instance_size = sizeof(StrongARMSSPState), 1578 .instance_init = strongarm_ssp_init, 1579 .class_init = strongarm_ssp_class_init, 1580}; 1581 1582/* Main CPU functions */ 1583StrongARMState *sa1110_init(MemoryRegion *sysmem, | 1/* 2 * StrongARM SA-1100/SA-1110 emulation 3 * 4 * Copyright (C) 2011 Dmitry Eremin-Solenikov 5 * 6 * Largely based on StrongARM emulation: 7 * Copyright (c) 2006 Openedhand Ltd. 8 * Written by Andrzej Zaborowski <balrog@zabor.org> --- 1567 unchanged lines hidden (view full) --- 1576 .parent = TYPE_SYS_BUS_DEVICE, 1577 .instance_size = sizeof(StrongARMSSPState), 1578 .instance_init = strongarm_ssp_init, 1579 .class_init = strongarm_ssp_class_init, 1580}; 1581 1582/* Main CPU functions */ 1583StrongARMState *sa1110_init(MemoryRegion *sysmem, |
1584 unsigned int sdram_size, const char *rev) | 1584 unsigned int sdram_size, const char *cpu_type) |
1585{ 1586 StrongARMState *s; 1587 int i; 1588 1589 s = g_new0(StrongARMState, 1); 1590 | 1585{ 1586 StrongARMState *s; 1587 int i; 1588 1589 s = g_new0(StrongARMState, 1); 1590 |
1591 if (!rev) { 1592 rev = "sa1110-b5"; 1593 } 1594 1595 if (strncmp(rev, "sa1110", 6)) { | 1591 if (strncmp(cpu_type, "sa1110", 6)) { |
1596 error_report("Machine requires a SA1110 processor."); 1597 exit(1); 1598 } 1599 | 1592 error_report("Machine requires a SA1110 processor."); 1593 exit(1); 1594 } 1595 |
1600 s->cpu = ARM_CPU(cpu_generic_init(TYPE_ARM_CPU, rev)); | 1596 s->cpu = ARM_CPU(cpu_create(cpu_type)); |
1601 1602 memory_region_allocate_system_memory(&s->sdram, NULL, "strongarm.sdram", 1603 sdram_size); 1604 memory_region_add_subregion(sysmem, SA_SDCS0, &s->sdram); 1605 1606 s->pic = sysbus_create_varargs("strongarm_pic", 0x90050000, 1607 qdev_get_gpio_in(DEVICE(s->cpu), ARM_CPU_IRQ), 1608 qdev_get_gpio_in(DEVICE(s->cpu), ARM_CPU_FIQ), --- 44 unchanged lines hidden --- | 1597 1598 memory_region_allocate_system_memory(&s->sdram, NULL, "strongarm.sdram", 1599 sdram_size); 1600 memory_region_add_subregion(sysmem, SA_SDCS0, &s->sdram); 1601 1602 s->pic = sysbus_create_varargs("strongarm_pic", 0x90050000, 1603 qdev_get_gpio_in(DEVICE(s->cpu), ARM_CPU_IRQ), 1604 qdev_get_gpio_in(DEVICE(s->cpu), ARM_CPU_FIQ), --- 44 unchanged lines hidden --- |