From patchwork Fri Sep 12 13:23:53 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 37316 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f71.google.com (mail-wg0-f71.google.com [74.125.82.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 00D40203EE for ; Fri, 12 Sep 2014 13:33:46 +0000 (UTC) Received: by mail-wg0-f71.google.com with SMTP id x12sf477805wgg.6 for ; Fri, 12 Sep 2014 06:33:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:date :message-id:in-reply-to:references:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=8Y4FrCQhGS1boC4vndfczxfIPVd7SYrkEiFrku25Gzg=; b=eegXica5453IsQz8gBa9P4k4KkopDCJEOvYg20vJ+e/AHB0MckaEKX+Hh7Wk3uOYP4 vlCgpvXwdq1nG+2pYj7m/cOAt5eVfh2GgIWAjn30v8rwpevQYqNyl0Vh5XCKf9NwLt1R 3iYNQdRGGPKX1U/J5H6Mmn2U6QqRjItJlbvpVqrvTIr2TtSchxuz2EtmJaiSsDev0xvc Ae0ulKwcg2vL3fT8bPB2NUKovOOfyT9ZxJQ1qbqlBofb5dkmoD+A5FmKGyyAbaI8epT7 i1sXzx3K+sujU2nYLvDk3q5b3dQMBc+DxxW2KsQurDHMZTrjJnlD2hTgQ5bqtbZo0I4L LKAg== X-Gm-Message-State: ALoCoQl70Vfxf+K5dJ70MELtCKKQwaEEG4G6foMx/NTRqyPkcjomDPFH+mGTu7VdDyU9leWNTT6f X-Received: by 10.112.182.8 with SMTP id ea8mr2273614lbc.11.1410528824922; Fri, 12 Sep 2014 06:33:44 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.21.170 with SMTP id w10ls144626lae.106.gmail; Fri, 12 Sep 2014 06:33:44 -0700 (PDT) X-Received: by 10.112.141.7 with SMTP id rk7mr8521213lbb.83.1410528824669; Fri, 12 Sep 2014 06:33:44 -0700 (PDT) Received: from mail-lb0-f178.google.com (mail-lb0-f178.google.com [209.85.217.178]) by mx.google.com with ESMTPS id r5si6597230lbe.45.2014.09.12.06.33.44 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 12 Sep 2014 06:33:44 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.178 as permitted sender) client-ip=209.85.217.178; Received: by mail-lb0-f178.google.com with SMTP id c11so900866lbj.37 for ; Fri, 12 Sep 2014 06:33:44 -0700 (PDT) X-Received: by 10.152.5.168 with SMTP id t8mr8816621lat.67.1410528824604; Fri, 12 Sep 2014 06:33:44 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.141.42 with SMTP id rl10csp732363lbb; Fri, 12 Sep 2014 06:33:43 -0700 (PDT) X-Received: by 10.140.81.134 with SMTP id f6mr4098843qgd.60.1410528823144; Fri, 12 Sep 2014 06:33:43 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id w107si1532685qgd.98.2014.09.12.06.33.40 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 12 Sep 2014 06:33:41 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Received: from localhost ([::1]:44996 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XSQyq-0007Ho-DG for patch@linaro.org; Fri, 12 Sep 2014 09:33:40 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57015) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XSQpb-0006q8-GU for qemu-devel@nongnu.org; Fri, 12 Sep 2014 09:24:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XSQpQ-0003xm-4v for qemu-devel@nongnu.org; Fri, 12 Sep 2014 09:24:07 -0400 Received: from mnementh.archaic.org.uk ([81.2.115.146]:46960) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XSQpP-0003xI-V1 for qemu-devel@nongnu.org; Fri, 12 Sep 2014 09:23:56 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1XSQpP-0003Yh-O8 for qemu-devel@nongnu.org; Fri, 12 Sep 2014 14:23:55 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Fri, 12 Sep 2014 14:23:53 +0100 Message-Id: <1410528234-13545-23-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1410528234-13545-1-git-send-email-peter.maydell@linaro.org> References: <1410528234-13545-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 81.2.115.146 Subject: [Qemu-devel] [PULL 22/23] 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: peter.maydell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.178 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 From: 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 Message-id: 1410453915-9344-4-git-send-email-ard.biesheuvel@linaro.org Signed-off-by: Peter Maydell --- hw/arm/boot.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/hw/arm/boot.c b/hw/arm/boot.c index 2083aeb..1bed02d 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. */