diff mbox

Make -kernel command line option optional

Message ID 1382121731-879-1-git-send-email-roy.franz@linaro.org
State New
Headers show

Commit Message

Roy Franz Oct. 18, 2013, 6:42 p.m. UTC 
From: Grant Likely <grant.likely@linaro.org>

The kernel parameter is not used when booting using firmware
such as UEFI.  The firmware image is supplied with the -pflash
parameter, and the -kernel parameter should not be required since
the kernel will be loaded by the firmware.

Signed-off-by: Roy Franz <roy.franz@linaro.org>
Signed-off-by: Grant Likely <grant.likely@linaro.org>
---
 hw/arm/boot.c |   47 ++++++++++++++++++++++-------------------------
 1 file changed, 22 insertions(+), 25 deletions(-)

Comments

Peter Maydell Oct. 19, 2013, 9:45 a.m. UTC | #1 
On 18 October 2013 19:42, Roy Franz <roy.franz@linaro.org> wrote:
> From: Grant Likely <grant.likely@linaro.org>
>
> The kernel parameter is not used when booting using firmware
> such as UEFI.  The firmware image is supplied with the -pflash
> parameter, and the -kernel parameter should not be required since
> the kernel will be loaded by the firmware.

I already have a patch to do this queued, thanks.

-- PMM
diff mbox

Patch

diff --git a/hw/arm/boot.c b/hw/arm/boot.c
index 1e313af..66a057d 100644
--- a/hw/arm/boot.c
+++ b/hw/arm/boot.c
@@ -352,12 +352,6 @@  void arm_load_kernel(ARMCPU *cpu, struct arm_boot_info *info)
     hwaddr entry;
     int big_endian;
 
-    /* Load the kernel.  */
-    if (!info->kernel_filename) {
-        fprintf(stderr, "Kernel image must be specified\n");
-        exit(1);
-    }
-
     info->dtb_filename = qemu_opt_get(qemu_get_machine_opts(), "dtb");
 
     if (!info->secondary_cpu_reset_hook) {
@@ -389,26 +383,29 @@  void arm_load_kernel(ARMCPU *cpu, struct arm_boot_info *info)
     info->initrd_start = info->loader_start +
         MIN(info->ram_size / 2, 128 * 1024 * 1024);
 
-    /* Assume that raw images are linux kernels, and ELF images are not.  */
-    kernel_size = load_elf(info->kernel_filename, NULL, NULL, &elf_entry,
-                           NULL, NULL, big_endian, ELF_MACHINE, 1);
-    entry = elf_entry;
-    if (kernel_size < 0) {
-        kernel_size = load_uimage(info->kernel_filename, &entry, NULL,
-                                  &is_linux);
-    }
-    if (kernel_size < 0) {
-        entry = info->loader_start + KERNEL_LOAD_ADDR;
-        kernel_size = load_image_targphys(info->kernel_filename, entry,
-                                          info->ram_size - KERNEL_LOAD_ADDR);
-        is_linux = 1;
-    }
-    if (kernel_size < 0) {
-        fprintf(stderr, "qemu: could not load kernel '%s'\n",
-                info->kernel_filename);
-        exit(1);
+    if (info->kernel_filename) {
+        /* Assume that raw images are linux kernels, and ELF images are not.  */
+        kernel_size = load_elf(info->kernel_filename, NULL, NULL, &elf_entry,
+                               NULL, NULL, big_endian, ELF_MACHINE, 1);
+        entry = elf_entry;
+        if (kernel_size < 0) {
+            kernel_size = load_uimage(info->kernel_filename, &entry, NULL,
+                                      &is_linux);
+        }
+        if (kernel_size < 0) {
+            entry = info->loader_start + KERNEL_LOAD_ADDR;
+            kernel_size = load_image_targphys(info->kernel_filename, entry,
+                                              info->ram_size - KERNEL_LOAD_ADDR);
+            is_linux = 1;
+        }
+        if (kernel_size < 0) {
+            fprintf(stderr, "qemu: could not load kernel '%s'\n",
+                    info->kernel_filename);
+            exit(1);
+        }
+        info->entry = entry;
     }
-    info->entry = entry;
+
     if (is_linux) {
         if (info->initrd_filename) {
             initrd_size = load_ramdisk(info->initrd_filename,