From patchwork Fri Oct 18 18:42:11 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roy Franz X-Patchwork-Id: 284697 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id A50D32C00C3 for ; Sat, 19 Oct 2013 05:42:48 +1100 (EST) Received: from localhost ([::1]:59053 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VXF0Y-0002Jx-Bx for incoming@patchwork.ozlabs.org; Fri, 18 Oct 2013 14:42:46 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50195) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VXF0C-0002Io-F1 for qemu-devel@nongnu.org; Fri, 18 Oct 2013 14:42:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VXF06-0001fv-KO for qemu-devel@nongnu.org; Fri, 18 Oct 2013 14:42:24 -0400 Received: from mail-pa0-f51.google.com ([209.85.220.51]:56061) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VXF06-0001fa-DS for qemu-devel@nongnu.org; Fri, 18 Oct 2013 14:42:18 -0400 Received: by mail-pa0-f51.google.com with SMTP id ld10so2246238pab.10 for ; Fri, 18 Oct 2013 11:42:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=AI6wCU/N3NISk5OxpgUFXsHnRaceUKcGJoySUWR1gFo=; b=nGL/pshyQGieYH57DspRScbU7S4zzCfqsALLDPn8yN0FUg7hDjx0DuCANy6w/11Dz/ ouQs+ejSYqMc2Lcr/lNHluwITJomFxOGHUI9spBv9lI6ES7/qkucu/fmtLHHiYfXKjZv d7cnsevWrN6rjTvFHJQoPDRvvC5Baa3Yw+wE6IIxN92Z4XS7nP8QAMXuMS1g0n003+XX oOi/Gze22aJRRutLM/4mjxNS8own174f4wcBhrDMNeO37p2sRgG51wVutVNwwSTNiqN8 fKG6oda8oW9KSlB20YPIjiMNAt5JfbwmHZsXtQVPwllsDogmZR9i8OwgqX+bl22MWQlC Mndg== X-Gm-Message-State: ALoCoQlGvuEcX0umGBSqsrrxYnTd7yKz4idAQkw/dFm9DWaB2USevBs4R2Q4m4Br/kwV1rfrRg7i X-Received: by 10.68.252.68 with SMTP id zq4mr4421311pbc.154.1382121737274; Fri, 18 Oct 2013 11:42:17 -0700 (PDT) Received: from rfranz-i7.local (c-98-244-40-86.hsd1.ca.comcast.net. [98.244.40.86]) by mx.google.com with ESMTPSA id ta10sm6127739pab.5.2013.10.18.11.42.15 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 18 Oct 2013 11:42:16 -0700 (PDT) From: Roy Franz To: qemu-devel@nongnu.org Date: Fri, 18 Oct 2013 11:42:11 -0700 Message-Id: <1382121731-879-1-git-send-email-roy.franz@linaro.org> X-Mailer: git-send-email 1.7.10.4 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.220.51 Cc: grant.likely@linaro.org, peter.maydell@linaro.org, Roy Franz , patches@linaro.org Subject: [Qemu-devel] [PATCH] Make -kernel command line option optional X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Grant Likely 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 Signed-off-by: Grant Likely --- hw/arm/boot.c | 47 ++++++++++++++++++++++------------------------- 1 file changed, 22 insertions(+), 25 deletions(-) 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,