diff options
| author | Philippe Mathieu-Daudé <f4bug@amsat.org> | 2019-04-27 18:29:21 +0200 |
|---|---|---|
| committer | Laurent Vivier <laurent@vivier.eu> | 2019-05-03 13:03:04 +0200 |
| commit | 9176a58018642080ec1910b2be255c2f81f1e8e3 (patch) | |
| tree | 0a01ca5c9bf99225a3e547cd63a8ecf501f80602 /hw/sparc | |
| parent | 59100753886bcdc50e076a6d19647b8f91b1cc02 (diff) | |
| download | qemu-9176a58018642080ec1910b2be255c2f81f1e8e3.zip qemu-9176a58018642080ec1910b2be255c2f81f1e8e3.tar.gz qemu-9176a58018642080ec1910b2be255c2f81f1e8e3.tar.bz2 | |
hw/sparc/leon3: Allow load of uImage firmwares
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é <f4bug@amsat.org>
Reviewed-by: KONRAD Frederic <frederic.konrad@adacore.com>
Tested-by: KONRAD Frederic <frederic.konrad@adacore.com>
Message-Id: <20190427162922.4207-1-f4bug@amsat.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Diffstat (limited to 'hw/sparc')
| -rw-r--r-- | hw/sparc/leon3.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/hw/sparc/leon3.c b/hw/sparc/leon3.c index 774639a..0383b17 100644 --- a/hw/sparc/leon3.c +++ b/hw/sparc/leon3.c @@ -194,6 +194,10 @@ static void leon3_generic_hw_init(MachineState *machine) &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); } |