diff options
| author | Ard Biesheuvel | 2014-09-12 15:06:50 +0200 |
|---|---|---|
| committer | Peter Maydell | 2014-09-12 15:06:50 +0200 |
| commit | 69e7f76f6a1ed8fe13602c8b5f51cdb6ce3a3981 (patch) | |
| tree | 95b2d43d1a12e532dfcc45f7aa75348276d5146a /hw/arm/boot.c | |
| parent | hw/arm/boot: pass an address limit to and return size from load_dtb() (diff) | |
| download | qemu-69e7f76f6a1ed8fe13602c8b5f51cdb6ce3a3981.tar.gz qemu-69e7f76f6a1ed8fe13602c8b5f51cdb6ce3a3981.tar.xz qemu-69e7f76f6a1ed8fe13602c8b5f51cdb6ce3a3981.zip | |
hw/arm/boot: load device tree to base of DRAM if no -kernel option was passed
If we are running the 'virt' machine, we may have a device tree blob but no
kernel to supply it to if no -kernel option was passed. In that case, copy it
to the base of RAM where it can be picked up by a bootloader.
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Message-id: 1410453915-9344-4-git-send-email-ard.biesheuvel@linaro.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/arm/boot.c')
| -rw-r--r-- | hw/arm/boot.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/hw/arm/boot.c b/hw/arm/boot.c index 2083aeb95d..1bed02db6f 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -490,6 +490,16 @@ void arm_load_kernel(ARMCPU *cpu, struct arm_boot_info *info) /* Load the kernel. */ if (!info->kernel_filename) { + + if (have_dtb(info)) { + /* If we have a device tree blob, but no kernel to supply it to, + * copy it to the base of RAM for a bootloader to pick up. + */ + if (load_dtb(info->loader_start, info, 0) < 0) { + exit(1); + } + } + /* If no kernel specified, do nothing; we will start from address 0 * (typically a boot ROM image) in the same way as hardware. */ |