[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 34/35] HACK: mb: boot: Assume using -firmware for
From: |
Peter Crosthwaite |
Subject: |
[Qemu-devel] [PATCH v3 34/35] HACK: mb: boot: Assume using -firmware for mb software |
Date: |
Sat, 18 Jul 2015 02:40:44 -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 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
- [Qemu-devel] [PATCH v3 26/35] arm: enable multi-arch, (continued)
- [Qemu-devel] [PATCH v3 26/35] arm: enable multi-arch, Peter Crosthwaite, 2015/07/18
- [Qemu-devel] [PATCH v3 28/35] arm: Remove ELF_MACHINE from cpu.h, Peter Crosthwaite, 2015/07/18
- [Qemu-devel] [PATCH v3 29/35] hw: mb: Explicitly include cpu.h for consumers, Peter Crosthwaite, 2015/07/18
- [Qemu-devel] [PATCH v3 30/35] mb: Remove ELF_MACHINE from cpu.h, Peter Crosthwaite, 2015/07/18
- [Qemu-devel] [PATCH v3 31/35] microblaze: enable multi-arch, Peter Crosthwaite, 2015/07/18
- [Qemu-devel] [PATCH v3 32/35] arm: boot: Don't assume all CPUs are ARM, Peter Crosthwaite, 2015/07/18
- [Qemu-devel] [PATCH v3 34/35] HACK: mb: boot: Assume using -firmware for mb software,
Peter Crosthwaite <=
- [Qemu-devel] [PATCH v3 35/35] HACK: mb: boot: Disable dtb load in multi-arch, Peter Crosthwaite, 2015/07/18
- Re: [Qemu-devel] [PATCH v3 00/35] Multi Architecture System Emulation, Paolo Bonzini, 2015/07/18