From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40495) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XMIiL-0001mD-Lh for qemu-devel@nongnu.org; Tue, 26 Aug 2014 11:31:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XMIiF-0003dy-Dh for qemu-devel@nongnu.org; Tue, 26 Aug 2014 11:31:17 -0400 Received: from mail-wi0-f174.google.com ([209.85.212.174]:45513) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XMIiF-0003dk-7a for qemu-devel@nongnu.org; Tue, 26 Aug 2014 11:31:11 -0400 Received: by mail-wi0-f174.google.com with SMTP id d1so4409664wiv.13 for ; Tue, 26 Aug 2014 08:31:10 -0700 (PDT) From: Ard Biesheuvel Date: Tue, 26 Aug 2014 17:31:02 +0200 Message-Id: <1409067062-1729-1-git-send-email-ard.biesheuvel@linaro.org> Subject: [Qemu-devel] [PATCH] hw/arm/boot: load device tree to base of DRAM if no -kernel option was passed List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, peter.maydell@linaro.org Cc: Ard Biesheuvel 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 DRAM where it can be picked up by a bootloader executing from NOR flash. Signed-off-by: Ard Biesheuvel --- hw/arm/boot.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/hw/arm/boot.c b/hw/arm/boot.c index 3d1f4a255b48..ff6a727613aa 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -455,6 +455,14 @@ void arm_load_kernel(ARMCPU *cpu, struct arm_boot_info *info) /* Load the kernel. */ if (!info->kernel_filename) { + /* + * If we have a device tree blob, but no kernel to supply it to, copy it + * to the base of DRAM for a bootloader executing from NOR flash to + * pick up. + */ + if (have_dtb(info)) + load_dtb(info->loader_start, info); + /* If no kernel specified, do nothing; we will start from address 0 * (typically a boot ROM image) in the same way as hardware. */ -- 1.8.3.2