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/omap_sx1.c | |
| parent | 9546dbabd5f6ff199ffd7741dfd57b8bff723bd1 (diff) | |
| download | qemu-dacecf5485bf02b2dfe49e9d9c852668884a71be.zip | |
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/omap_sx1.c')
| -rw-r--r-- | hw/arm/omap_sx1.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/hw/arm/omap_sx1.c b/hw/arm/omap_sx1.c index b0f8664607..03b381688b 100644 --- a/hw/arm/omap_sx1.c +++ b/hw/arm/omap_sx1.c @@ -194,12 +194,10 @@ static void sx1_init(QEMUMachineInitArgs *args, const int version) } /* Load the kernel. */ - if (args->kernel_filename) { - sx1_binfo.kernel_filename = args->kernel_filename; - sx1_binfo.kernel_cmdline = args->kernel_cmdline; - sx1_binfo.initrd_filename = args->initrd_filename; - arm_load_kernel(mpu->cpu, &sx1_binfo); - } + sx1_binfo.kernel_filename = args->kernel_filename; + sx1_binfo.kernel_cmdline = args->kernel_cmdline; + sx1_binfo.initrd_filename = args->initrd_filename; + arm_load_kernel(mpu->cpu, &sx1_binfo); /* TODO: fix next line */ //~ qemu_console_resize(ds, 640, 480); |