From patchwork Tue Aug 26 15:31:02 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 383120 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id B4CE51400AA for ; Wed, 27 Aug 2014 01:31:41 +1000 (EST) Received: from localhost ([::1]:54277 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XMIih-00022l-RL for incoming@patchwork.ozlabs.org; Tue, 26 Aug 2014 11:31:39 -0400 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) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=Mzpoz1wgUfrkxytj0XppcV+RkEtD3q6nwG+Txxgs2Ks=; b=HuHQ+LUUXN8EeTwnKrgWnJyBvdB6FldlI05GdSY2Ng+nuVkQlDUG1aYIWBlqZGvNk3 /PFKacwFYenONe4k0WJLoyiEmIaZp8nk+Oc3LfbCmlALdCoEocYbgv6F9lN9Mzk39c2a WBG8tyoB8HFqOOeOgNkkLnRQOwWpqyYIXk8VreH8F+xLOt+aTeqDJDJbAvh+uoCpI/65 MF9gURx6G0Yg+Wt6c6DpfDow1J6vbD2w0PThtm/lh/7UO8yDxLwyhJdHZe8BZNaVzz2M THj4p19uwJGtG9vGyK5xZEFiyT/teLxvcoeeXpUO5/EN0hIOjuy0e0OzHxbZZu7qrEAO 9suw== X-Gm-Message-State: ALoCoQnIqlbOC6VY+b7lWsTbmqwfAfeAIyPzfnwbsSRTXd/UQbJD9j8UcwcHo3Rbcf8JzV85vjSr X-Received: by 10.180.93.104 with SMTP id ct8mr22300504wib.30.1409067069849; Tue, 26 Aug 2014 08:31:09 -0700 (PDT) Received: from ards-macbook-pro.local (BSN-143-76-23.dial-up.dsl.siol.net. [89.143.76.23]) by mx.google.com with ESMTPSA id js2sm9172437wjc.9.2014.08.26.08.31.08 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 26 Aug 2014 08:31:09 -0700 (PDT) From: Ard Biesheuvel To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Tue, 26 Aug 2014 17:31:02 +0200 Message-Id: <1409067062-1729-1-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 1.8.3.2 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.212.174 Cc: Ard Biesheuvel Subject: [Qemu-devel] [PATCH] hw/arm/boot: load device tree to base of DRAM if no -kernel option was passed X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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. */