From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60052) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XPvEf-0003mc-4J for qemu-devel@nongnu.org; Fri, 05 Sep 2014 11:15:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XPvEY-0002jc-SF for qemu-devel@nongnu.org; Fri, 05 Sep 2014 11:15:36 -0400 Received: from mail-wg0-f46.google.com ([74.125.82.46]:60163) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XPvEY-0002jX-ME for qemu-devel@nongnu.org; Fri, 05 Sep 2014 11:15:30 -0400 Received: by mail-wg0-f46.google.com with SMTP id n12so976532wgh.29 for ; Fri, 05 Sep 2014 08:15:29 -0700 (PDT) From: Ard Biesheuvel Date: Fri, 5 Sep 2014 17:15:23 +0200 Message-Id: <1409930126-28449-4-git-send-email-ard.biesheuvel@linaro.org> In-Reply-To: <1409930126-28449-1-git-send-email-ard.biesheuvel@linaro.org> References: <1409930126-28449-1-git-send-email-ard.biesheuvel@linaro.org> Subject: [Qemu-devel] [PATCH 3/6] 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: peter.maydell@linaro.org, qemu-devel@nongnu.org Cc: fu.wei@linaro.org, christoffer.dall@linaro.org, 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 RAM where it can be picked up by a bootloader. Signed-off-by: Ard Biesheuvel --- hw/arm/boot.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/hw/arm/boot.c b/hw/arm/boot.c index c103a8fdc941..8f5649a250fd 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -463,6 +463,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, NULL)) { + 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. */ -- 1.8.3.2