mirror of https://github.com/proxmox/mirror_qemu
hw/arm: Tidy up conditional calls to arm_load_kernel
Now that arm_load_kernel doesn't insist on a kernel filename being present, we can remove some unnecessary conditionals in board models. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Message-id: 1379980897-21277-3-git-send-email-peter.maydell@linaro.orgmaster
parent
9546dbabd5
commit
dacecf5485
|
@ -194,12 +194,10 @@ static void sx1_init(QEMUMachineInitArgs *args, const int version)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Load the kernel. */
|
/* Load the kernel. */
|
||||||
if (args->kernel_filename) {
|
sx1_binfo.kernel_filename = args->kernel_filename;
|
||||||
sx1_binfo.kernel_filename = args->kernel_filename;
|
sx1_binfo.kernel_cmdline = args->kernel_cmdline;
|
||||||
sx1_binfo.kernel_cmdline = args->kernel_cmdline;
|
sx1_binfo.initrd_filename = args->initrd_filename;
|
||||||
sx1_binfo.initrd_filename = args->initrd_filename;
|
arm_load_kernel(mpu->cpu, &sx1_binfo);
|
||||||
arm_load_kernel(mpu->cpu, &sx1_binfo);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* TODO: fix next line */
|
/* TODO: fix next line */
|
||||||
//~ qemu_console_resize(ds, 640, 480);
|
//~ qemu_console_resize(ds, 640, 480);
|
||||||
|
|
|
@ -261,12 +261,10 @@ static void palmte_init(QEMUMachineInitArgs *args)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Load the kernel. */
|
/* Load the kernel. */
|
||||||
if (kernel_filename) {
|
palmte_binfo.kernel_filename = kernel_filename;
|
||||||
palmte_binfo.kernel_filename = kernel_filename;
|
palmte_binfo.kernel_cmdline = kernel_cmdline;
|
||||||
palmte_binfo.kernel_cmdline = kernel_cmdline;
|
palmte_binfo.initrd_filename = initrd_filename;
|
||||||
palmte_binfo.initrd_filename = initrd_filename;
|
arm_load_kernel(mpu->cpu, &palmte_binfo);
|
||||||
arm_load_kernel(mpu->cpu, &palmte_binfo);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static QEMUMachine palmte_machine = {
|
static QEMUMachine palmte_machine = {
|
||||||
|
|
12
hw/arm/z2.c
12
hw/arm/z2.c
|
@ -360,13 +360,11 @@ static void z2_init(QEMUMachineInitArgs *args)
|
||||||
qdev_connect_gpio_out(mpu->gpio, Z2_GPIO_LCD_CS,
|
qdev_connect_gpio_out(mpu->gpio, Z2_GPIO_LCD_CS,
|
||||||
qemu_allocate_irqs(z2_lcd_cs, z2_lcd, 1)[0]);
|
qemu_allocate_irqs(z2_lcd_cs, z2_lcd, 1)[0]);
|
||||||
|
|
||||||
if (kernel_filename) {
|
z2_binfo.kernel_filename = kernel_filename;
|
||||||
z2_binfo.kernel_filename = kernel_filename;
|
z2_binfo.kernel_cmdline = kernel_cmdline;
|
||||||
z2_binfo.kernel_cmdline = kernel_cmdline;
|
z2_binfo.initrd_filename = initrd_filename;
|
||||||
z2_binfo.initrd_filename = initrd_filename;
|
z2_binfo.board_id = 0x6dd;
|
||||||
z2_binfo.board_id = 0x6dd;
|
arm_load_kernel(mpu->cpu, &z2_binfo);
|
||||||
arm_load_kernel(mpu->cpu, &z2_binfo);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static QEMUMachine z2_machine = {
|
static QEMUMachine z2_machine = {
|
||||||
|
|
Loading…
Reference in New Issue