From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60023) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YrhI6-0008Ex-A7 for qemu-devel@nongnu.org; Mon, 11 May 2015 02:34:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YrhEl-0003S1-BP for qemu-devel@nongnu.org; Mon, 11 May 2015 02:30:48 -0400 Received: from mail-pa0-x22e.google.com ([2607:f8b0:400e:c03::22e]:36250) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YrhEl-0003Rw-4Z for qemu-devel@nongnu.org; Mon, 11 May 2015 02:30:47 -0400 Received: by pabsx10 with SMTP id sx10so102220398pab.3 for ; Sun, 10 May 2015 23:30:46 -0700 (PDT) From: Peter Crosthwaite Date: Sun, 10 May 2015 23:29:36 -0700 Message-Id: In-Reply-To: References: In-Reply-To: References: Subject: [Qemu-devel] [RFC PATCH 33/34] HACK: mb: boot: Assume using -firmware for mb software List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, edgari@xilinx.com, sorenb@xilinx.com, afaerber@suse.de, rth@twiddle.net Assume that when using MULTI arch, the -firmare switch dictates the software to load on microblaze. A hack until we get generic bootloading working. Signed-off-by: Peter Crosthwaite --- hw/microblaze/boot.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hw/microblaze/boot.c b/hw/microblaze/boot.c index b3d7c99..082238b 100644 --- a/hw/microblaze/boot.c +++ b/hw/microblaze/boot.c @@ -116,7 +116,11 @@ void microblaze_load_kernel(MicroBlazeCPU *cpu, hwaddr ddr_base, char *filename = NULL; machine_opts = qemu_get_machine_opts(); +#ifdef TARGET_MULTI + kernel_filename = qemu_opt_get(machine_opts, "firmware"); +#else kernel_filename = qemu_opt_get(machine_opts, "kernel"); +#endif kernel_cmdline = qemu_opt_get(machine_opts, "append"); dtb_arg = qemu_opt_get(machine_opts, "dtb"); /* default to pcbios dtb as passed by machine_init */ -- 1.9.1