diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2013-10-25 15:44:38 +0100 |
|---|---|---|
| committer | Edgar E. Iglesias <edgar.iglesias@gmail.com> | 2013-10-31 14:00:16 +0100 |
| commit | dacecf5485bf02b2dfe49e9d9c852668884a71be (patch) | |
| tree | b32bde689109863211e29dc0d957eaad07ec71e8 /hw/arm/z2.c | |
| parent | 9546dbabd5f6ff199ffd7741dfd57b8bff723bd1 (diff) | |
| download | qemu-dacecf5485bf02b2dfe49e9d9c852668884a71be.tar.gz | |
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.org
Diffstat (limited to 'hw/arm/z2.c')
| -rw-r--r-- | hw/arm/z2.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/hw/arm/z2.c b/hw/arm/z2.c index 2e0d5d4bcc..a00fcc042d 100644 --- a/hw/arm/z2.c +++ b/hw/arm/z2.c @@ -360,13 +360,11 @@ static void z2_init(QEMUMachineInitArgs *args) qdev_connect_gpio_out(mpu->gpio, Z2_GPIO_LCD_CS, qemu_allocate_irqs(z2_lcd_cs, z2_lcd, 1)[0]); - if (kernel_filename) { - z2_binfo.kernel_filename = kernel_filename; - z2_binfo.kernel_cmdline = kernel_cmdline; - z2_binfo.initrd_filename = initrd_filename; - z2_binfo.board_id = 0x6dd; - arm_load_kernel(mpu->cpu, &z2_binfo); - } + z2_binfo.kernel_filename = kernel_filename; + z2_binfo.kernel_cmdline = kernel_cmdline; + z2_binfo.initrd_filename = initrd_filename; + z2_binfo.board_id = 0x6dd; + arm_load_kernel(mpu->cpu, &z2_binfo); } static QEMUMachine z2_machine = { |