mii/qemu
1
0
Fork 0
mirror of https://github.com/mii443/qemu.git synced 2025-09-02 07:09:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

versatilepb: Use cpu_arm_init() to obtain ARMCPU

Browse Source 
Needed for arm_load_kernel().

Signed-off-by: Andreas Färber <afaerber@suse.de>
Acked-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Andreas Färber
2012-05-14 02:04:38 +02:00
parent f25608e9dd
commit 20e93374e9
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
hw/versatilepb.c
View File

@ -173,7 +173,7 @@ static void versatile_init(ram_addr_t ram_size,
const char *initrd_filename, const char *cpu_model, const char *initrd_filename, const char *cpu_model,
int board_id) int board_id)
{ {
CPUARMState *env; ARMCPU *cpu;
MemoryRegion *sysmem = get_system_memory(); MemoryRegion *sysmem = get_system_memory();
MemoryRegion *ram = g_new(MemoryRegion, 1); MemoryRegion *ram = g_new(MemoryRegion, 1);
qemu_irq *cpu_pic; qemu_irq *cpu_pic;
@ -189,10 +189,11 @@ static void versatile_init(ram_addr_t ram_size,
int done_smc = 0; int done_smc = 0;
DriveInfo *dinfo; DriveInfo *dinfo;
if (!cpu_model) if (!cpu_model) {
cpu_model = "arm926"; cpu_model = "arm926";
env = cpu_init(cpu_model); }
if (!env) { cpu = cpu_arm_init(cpu_model);
if (!cpu) {
fprintf(stderr, "Unable to find CPU definition\n"); fprintf(stderr, "Unable to find CPU definition\n");
exit(1); exit(1);
} }
@ -208,7 +209,7 @@ static void versatile_init(ram_addr_t ram_size,
qdev_init_nofail(sysctl); qdev_init_nofail(sysctl);
sysbus_mmio_map(sysbus_from_qdev(sysctl), 0, 0x10000000); sysbus_mmio_map(sysbus_from_qdev(sysctl), 0, 0x10000000);
cpu_pic = arm_pic_init_cpu(env); cpu_pic = arm_pic_init_cpu(&cpu->env);
dev = sysbus_create_varargs("pl190", 0x10140000, dev = sysbus_create_varargs("pl190", 0x10140000,
cpu_pic[0], cpu_pic[1], NULL); cpu_pic[0], cpu_pic[1], NULL);
for (n = 0; n < 32; n++) { for (n = 0; n < 32; n++) {
@ -338,7 +339,7 @@ static void versatile_init(ram_addr_t ram_size,
versatile_binfo.kernel_cmdline = kernel_cmdline; versatile_binfo.kernel_cmdline = kernel_cmdline;
versatile_binfo.initrd_filename = initrd_filename; versatile_binfo.initrd_filename = initrd_filename;
versatile_binfo.board_id = board_id; versatile_binfo.board_id = board_id;
arm_load_kernel(env, &versatile_binfo); arm_load_kernel(&cpu->env, &versatile_binfo);
} }
static void vpb_init(ram_addr_t ram_size, static void vpb_init(ram_addr_t ram_size,