[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC v2 33/34] HACK: mb: boot: Assume using -firmware for m
From: |
Peter Crosthwaite |
Subject: |
[Qemu-devel] [RFC v2 33/34] HACK: mb: boot: Assume using -firmware for mb software |
Date: |
Sat, 30 May 2015 23:12:06 -0700 |
From: Peter Crosthwaite <address@hidden>
Assume that when using MULTI arch, the -firmware switch dictates the
software to load on microblaze. A hack until we get generic bootloading
working.
Signed-off-by: Peter Crosthwaite <address@hidden>
---
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
- [Qemu-devel] [RFC v2 21/34] core: virtualise CPU interfaces completely, (continued)
- [Qemu-devel] [RFC v2 21/34] core: virtualise CPU interfaces completely, Peter Crosthwaite, 2015/05/31
- [Qemu-devel] [RFC v2 24/34] target-arm: Split cp helper API to new C file, Peter Crosthwaite, 2015/05/31
- [Qemu-devel] [RFC v2 26/34] core: Introduce multi-arch build, Peter Crosthwaite, 2015/05/31
- [Qemu-devel] [RFC v2 25/34] arm: enable multi-arch, Peter Crosthwaite, 2015/05/31
- [Qemu-devel] [RFC v2 27/34] hw: arm: Explicitly include cpu.h for consumers, Peter Crosthwaite, 2015/05/31
- [Qemu-devel] [RFC v2 28/34] arm: Remove ELF_MACHINE from cpu.h, Peter Crosthwaite, 2015/05/31
- [Qemu-devel] [RFC v2 29/34] hw: mb: Explicitly include cpu.h for consumers, Peter Crosthwaite, 2015/05/31
- [Qemu-devel] [RFC v2 30/34] mb: Remove ELF_MACHINE from cpu.h, Peter Crosthwaite, 2015/05/31
- [Qemu-devel] [RFC v2 31/34] arm: boot: Don't assume all CPUs are ARM, Peter Crosthwaite, 2015/05/31
- [Qemu-devel] [RFC v2 32/34] arm: xilinx_zynq: Add a Microblaze, Peter Crosthwaite, 2015/05/31
- [Qemu-devel] [RFC v2 33/34] HACK: mb: boot: Assume using -firmware for mb software,
Peter Crosthwaite <=
- [Qemu-devel] [RFC v2 34/34] HACK: mb: boot: Disable dtb load in multi-arch, Peter Crosthwaite, 2015/05/31