[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PULL 12/13] hw/sparc/leon3: Allow load of uImage firmwar
From: |
Laurent Vivier |
Subject: |
[Qemu-trivial] [PULL 12/13] hw/sparc/leon3: Allow load of uImage firmwares |
Date: |
Thu, 2 May 2019 20:58:34 +0200 |
From: Philippe Mathieu-Daudé <address@hidden>
Currently the Leon3 machine doesn't allow to load legacy u-boot images:
$ qemu-system-sparc -M leon3_generic -d in_asm \
-kernel HelenOS-0.6.0-sparc32-leon3.bin
qemu-system-sparc: could not load kernel 'HelenOS-0.6.0-sparc32-leon3.bin'
$ file HelenOS-0.6.0-sparc32-leon3.bin
HelenOS-0.6.0-sparc32-leon3.bin: u-boot legacy uImage, HelenOS-0.6.0,\
Linux/ARM, OS Kernel Image (Not compressed), 2424229 bytes,\
Sun Dec 21 19:18:09 2014,\
Load Address: 0x40000000, Entry Point: 0x40000000,\
Header CRC: 0x8BCFA236, Data CRC: 0x37AD87DF
Since QEMU can load uImages, add the necessary code,
so the Leon3 machine can load these images:
$ qemu-system-sparc -M leon3_generic -d in_asm \
-kernel HelenOS-0.6.0-sparc32-leon3.bin
----------------
IN:
0x40000000: b 0x400007a8
0x40000004: nop
----------------
IN:
0x400007a8: save %sp, -136, %sp
0x400007ac: call 0x40000020
0x400007b0: sethi %hi(0x4000b800), %i1
...
Tested with the following firmware:
http://www.helenos.org/releases/HelenOS-0.6.0-sparc32-leon3.bin
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: KONRAD Frederic <address@hidden>
Tested-by: KONRAD Frederic <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>
---
hw/sparc/leon3.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/hw/sparc/leon3.c b/hw/sparc/leon3.c
index 774639af3393..0383b17c298f 100644
--- a/hw/sparc/leon3.c
+++ b/hw/sparc/leon3.c
@@ -193,6 +193,10 @@ static void leon3_generic_hw_init(MachineState *machine)
kernel_size = load_elf(kernel_filename, NULL, NULL, NULL,
&entry, NULL, NULL,
1 /* big endian */, EM_SPARC, 0, 0);
+ if (kernel_size < 0) {
+ kernel_size = load_uimage(kernel_filename, NULL, &entry,
+ NULL, NULL, NULL);
+ }
if (kernel_size < 0) {
error_report("could not load kernel '%s'", kernel_filename);
exit(1);
--
2.20.1
- [Qemu-trivial] [PULL 08/13] Update configure, (continued)
- [Qemu-trivial] [PULL 08/13] Update configure, Laurent Vivier, 2019/05/02
- [Qemu-trivial] [PULL 09/13] Header cleanups, Laurent Vivier, 2019/05/02
- [Qemu-trivial] [PULL 10/13] net: Print output of "-net nic, model=help" to stdout instead of stderr, Laurent Vivier, 2019/05/02
- [Qemu-trivial] [PULL 07/13] configure: fix pam test warning, Laurent Vivier, 2019/05/02
- [Qemu-trivial] [PULL 04/13] Clean up includes, Laurent Vivier, 2019/05/02
- [Qemu-trivial] [PULL 05/13] doc: fix the configuration path, Laurent Vivier, 2019/05/02
- [Qemu-trivial] [PULL 06/13] qom: use object_new_with_type in object_new_with_propv, Laurent Vivier, 2019/05/02
- [Qemu-trivial] [PULL 11/13] Makefile: Let the 'clean' rule remove qemu-ga.exe on Windows hosts, Laurent Vivier, 2019/05/02
- [Qemu-trivial] [PULL 02/13] CODING_STYLE: specify the indent rule for multiline code, Laurent Vivier, 2019/05/02
- [Qemu-trivial] [PULL 13/13] sockets: avoid string truncation warnings when copying UNIX path, Laurent Vivier, 2019/05/02
- [Qemu-trivial] [PULL 12/13] hw/sparc/leon3: Allow load of uImage firmwares,
Laurent Vivier <=
- [Qemu-trivial] [PULL 03/13] CODING_STYLE: indent example code as all others, Laurent Vivier, 2019/05/02
- Re: [Qemu-trivial] [PULL 00/13] Trivial branch patches, Peter Maydell, 2019/05/03
- Re: [Qemu-trivial] [PULL 00/13] Trivial branch patches, Laurent Vivier, 2019/05/03
- Re: [Qemu-trivial] [PULL 00/13] Trivial branch patches, Alex Bennée, 2019/05/03
- Re: [Qemu-trivial] [Qemu-devel] [PULL 00/13] Trivial branch patches, Markus Armbruster, 2019/05/08
- Re: [Qemu-trivial] [Qemu-devel] [PULL 00/13] Trivial branch patches, Alex Bennée, 2019/05/08
- Re: [Qemu-trivial] [Qemu-devel] [PULL 00/13] Trivial branch patches, Markus Armbruster, 2019/05/09
- Re: [Qemu-trivial] [Qemu-devel] [PULL 00/13] Trivial branch patches, Peter Maydell, 2019/05/09
- Re: [Qemu-trivial] [Qemu-devel] [PULL 00/13] Trivial branch patches, Markus Armbruster, 2019/05/10
- Re: [Qemu-trivial] [Qemu-devel] [PULL 00/13] Trivial branch patches, Peter Maydell, 2019/05/10