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/palm.c | |
parent | 9546dbabd5f6ff199ffd7741dfd57b8bff723bd1 (diff) | |
download | qemu-dacecf5485bf02b2dfe49e9d9c852668884a71be.zip qemu-dacecf5485bf02b2dfe49e9d9c852668884a71be.tar.gz qemu-dacecf5485bf02b2dfe49e9d9c852668884a71be.tar.bz2 |
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/palm.c')
-rw-r--r-- | hw/arm/palm.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/hw/arm/palm.c b/hw/arm/palm.c index 3e39044..0b72bbe 100644 --- a/hw/arm/palm.c +++ b/hw/arm/palm.c @@ -261,12 +261,10 @@ static void palmte_init(QEMUMachineInitArgs *args) } /* Load the kernel. */ - if (kernel_filename) { - palmte_binfo.kernel_filename = kernel_filename; - palmte_binfo.kernel_cmdline = kernel_cmdline; - palmte_binfo.initrd_filename = initrd_filename; - arm_load_kernel(mpu->cpu, &palmte_binfo); - } + palmte_binfo.kernel_filename = kernel_filename; + palmte_binfo.kernel_cmdline = kernel_cmdline; + palmte_binfo.initrd_filename = initrd_filename; + arm_load_kernel(mpu->cpu, &palmte_binfo); } static QEMUMachine palmte_machine = { |