diff options
| author | Nick Hudson | 2019-01-07 09:31:50 +0100 |
|---|---|---|
| committer | Peter Maydell | 2019-01-07 16:46:20 +0100 |
| commit | f831f955d420966471f5f8b316ba50d2523b1ff0 (patch) | |
| tree | 3466e96de4c3694e9957667258caf577db844b27 /hw/nios2 | |
| parent | hw/misc/tz-mpc: Fix value of BLK_MAX register (diff) | |
| download | qemu-f831f955d420966471f5f8b316ba50d2523b1ff0.tar.gz qemu-f831f955d420966471f5f8b316ba50d2523b1ff0.tar.xz qemu-f831f955d420966471f5f8b316ba50d2523b1ff0.zip | |
Support u-boot noload images for arm as used by, NetBSD/evbarm GENERIC kernel.
noload kernels are loaded with the u-boot image header and as a result
the header size needs adding to the entry point. Fake up a hdr so the
kernel image is loaded at the right address and the entry point is
adjusted appropriately.
The default location for the uboot file is 32MiB above bottom of DRAM.
This matches the recommendation in Documentation/arm/Booting.
Clarify the load_uimage API to state the passing of a load address when an
image doesn't specify one, or when loading a ramdisk is expected.
Adjust callers of load_uimage, etc.
Signed-off-by: Nick Hudson <skrll@netbsd.org>
Message-id: 11488a08-1fe0-a278-2210-deb64731107f@gmx.co.uk
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/nios2')
| -rw-r--r-- | hw/nios2/boot.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/nios2/boot.c b/hw/nios2/boot.c index 4bb5b601d3..ed5cb28e94 100644 --- a/hw/nios2/boot.c +++ b/hw/nios2/boot.c @@ -161,7 +161,7 @@ void nios2_load_kernel(Nios2CPU *cpu, hwaddr ddr_base, /* If it wasn't an ELF image, try an u-boot image. */ if (kernel_size < 0) { - hwaddr uentry, loadaddr; + hwaddr uentry, loadaddr = LOAD_UIMAGE_LOADADDR_INVALID; kernel_size = load_uimage(kernel_filename, &uentry, &loadaddr, 0, NULL, NULL); |