From: Peter Crosthwaite <crosthwaitepe...@gmail.com>
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 <crosthwaite.pe...@gmail.com>
---
hw/microblaze/boot.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/hw/microblaze/boot.c b/hw/microblaze/boot.c
index d7eaa1f..dc6fa59 100644
--- a/hw/microblaze/boot.c
+++ b/hw/microblaze/boot.c
@@ -117,7 +117,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
