From patchwork Thu Sep 11 16:45:14 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 37269 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vc0-f199.google.com (mail-vc0-f199.google.com [209.85.220.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id AEAF120454 for ; Thu, 11 Sep 2014 16:47:07 +0000 (UTC) Received: by mail-vc0-f199.google.com with SMTP id hq11sf2666621vcb.10 for ; Thu, 11 Sep 2014 09:47:07 -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:cc: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=Nd7iNxNDEtD3/+4qimjP8zP4M70SaZ8Td1OZWwrFDnc=; b=MqjyZUIGkJrPedPJIt45ifVWuiQWkNBPry9eV+kferiT/iJ5WZCj1nUIfEsrBC9RoF imzgVzFRuKdp5v3qw9hwFBRH5kg93zZfafil7o0sBYjarjVfWmL3syReFVxtuksKgXcu kaeivWkOwWKR53ff+5JyJ5PMg2Wxw89laER+CE+N6V/+0FibN+rQ13b/K5iK7DD81XtX /TwFnGG9leFl0C5dqG8zlLzq01uQ3/dvYFgIRF9mfWeZm36kuZ0vmL0tvEsXNsogHZhu adCONFHEJkntwpuOTs0+4KZq8NWt6ZLScJMODGdpD7iYSUBUeK4tbGXpvpw9YLU3CdH5 Arqg== X-Gm-Message-State: ALoCoQnlSXboVSkaE01wpFK7CT0TZqj9eRqL7fK6SDjlOHwMBFontARlPUOHremnACnAF9bgIuDp X-Received: by 10.236.216.67 with SMTP id f63mr1066418yhp.10.1410454027472; Thu, 11 Sep 2014 09:47:07 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.17.47 with SMTP id 44ls268002qgc.11.gmail; Thu, 11 Sep 2014 09:47:07 -0700 (PDT) X-Received: by 10.221.24.135 with SMTP id re7mr1739051vcb.53.1410454027339; Thu, 11 Sep 2014 09:47:07 -0700 (PDT) Received: from mail-vc0-f173.google.com (mail-vc0-f173.google.com [209.85.220.173]) by mx.google.com with ESMTPS id h6si768156vdc.96.2014.09.11.09.47.07 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 11 Sep 2014 09:47:07 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.173 as permitted sender) client-ip=209.85.220.173; Received: by mail-vc0-f173.google.com with SMTP id le20so6362430vcb.4 for ; Thu, 11 Sep 2014 09:47:07 -0700 (PDT) X-Received: by 10.52.129.165 with SMTP id nx5mr1462397vdb.25.1410454027068; Thu, 11 Sep 2014 09:47:07 -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.221.45.67 with SMTP id uj3csp620845vcb; Thu, 11 Sep 2014 09:47:06 -0700 (PDT) X-Received: by 10.224.51.197 with SMTP id e5mr3313437qag.48.1410454025832; Thu, 11 Sep 2014 09:47:05 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [208.118.235.17]) by mx.google.com with ESMTPS id j16si1871459qgd.15.2014.09.11.09.47.05 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 11 Sep 2014 09:47:05 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; Received: from localhost ([::1]:40067 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XS7WS-0001HL-Tc for patch@linaro.org; Thu, 11 Sep 2014 12:47:04 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36266) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XS7V2-00087A-8V for qemu-devel@nongnu.org; Thu, 11 Sep 2014 12:45:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XS7Uv-0004CN-MV for qemu-devel@nongnu.org; Thu, 11 Sep 2014 12:45:36 -0400 Received: from mail-wi0-f173.google.com ([209.85.212.173]:33311) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XS7Uv-0004C9-CH for qemu-devel@nongnu.org; Thu, 11 Sep 2014 12:45:29 -0400 Received: by mail-wi0-f173.google.com with SMTP id em10so1296331wid.12 for ; Thu, 11 Sep 2014 09:45:24 -0700 (PDT) X-Received: by 10.180.90.6 with SMTP id bs6mr8709735wib.47.1410453923829; Thu, 11 Sep 2014 09:45:23 -0700 (PDT) Received: from ards-macbook-pro.local (cag06-7-83-153-85-71.fbx.proxad.net. [83.153.85.71]) by mx.google.com with ESMTPSA id ll20sm2078442wic.14.2014.09.11.09.45.22 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 11 Sep 2014 09:45:22 -0700 (PDT) From: Ard Biesheuvel To: peter.maydell@linaro.org, qemu-devel@nongnu.org Date: Thu, 11 Sep 2014 18:45:14 +0200 Message-Id: <1410453915-9344-4-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1410453915-9344-1-git-send-email-ard.biesheuvel@linaro.org> References: <1410453915-9344-1-git-send-email-ard.biesheuvel@linaro.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.212.173 Cc: christoffer.dall@linaro.org, Ard Biesheuvel Subject: [Qemu-devel] [PATCH v3 3/4] 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: ard.biesheuvel@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.220.173 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 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 2083aeb95d80..1bed02db6fdd 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. */