From patchwork Wed Sep 10 10:59:49 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 37197 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qg0-f70.google.com (mail-qg0-f70.google.com [209.85.192.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 28F7320BF9 for ; Wed, 10 Sep 2014 11:08:21 +0000 (UTC) Received: by mail-qg0-f70.google.com with SMTP id i50sf3714883qgf.9 for ; Wed, 10 Sep 2014 04:08:21 -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=QR3jNbpOwTWcypfGkImSApwPDIChXMk2OfqQg/Js0wM=; b=V83J9aDkTxviPoZOt4V+E+9qglmw+VnCVobubLRRJLkzg2DxTKxHwGpbDlT54u6t61 d8dlLATlipBHdeQucKWE6wAq6NiWsnJH01CELjuafhDReE1SnJqeMUsT/8flRWSMvD9/ a+fW6GKwaNbyN+1uXsbg3lsKPbI5x49on41tREDKsgPsH2KSBOdWrUJN7iUCTFHT2eC2 ySSpYgTn0f7Ha4jfKZOKlE+3K5CMnQzmnSo47itWvWq4m+kcRdctNsanD89LTl7S+7ZX k5BpTxxZ27MZpl5o8So5uHdaEYM8CFZMnkFCOTYkow05yrYH/rcuSDQhXYjFfcgiEltY lkAw== X-Gm-Message-State: ALoCoQkHlXg4qPk02PuMMsLlI63wb02pJIOHUNx4YV5TnjGfPZRWHAK6HOC/itxjjAPJt/cEfbSx X-Received: by 10.236.133.230 with SMTP id q66mr25338775yhi.36.1410347301026; Wed, 10 Sep 2014 04:08:21 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.40.180 with SMTP id x49ls2534576qgx.97.gmail; Wed, 10 Sep 2014 04:08:20 -0700 (PDT) X-Received: by 10.221.68.66 with SMTP id xx2mr35937399vcb.1.1410347300936; Wed, 10 Sep 2014 04:08:20 -0700 (PDT) Received: from mail-vc0-f180.google.com (mail-vc0-f180.google.com [209.85.220.180]) by mx.google.com with ESMTPS id yv8si6209421vcb.5.2014.09.10.04.08.20 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 10 Sep 2014 04:08:20 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.180 as permitted sender) client-ip=209.85.220.180; Received: by mail-vc0-f180.google.com with SMTP id hq11so228287vcb.39 for ; Wed, 10 Sep 2014 04:08:20 -0700 (PDT) X-Received: by 10.52.137.2 with SMTP id qe2mr29561455vdb.11.1410347300864; Wed, 10 Sep 2014 04:08:20 -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 uj3csp420007vcb; Wed, 10 Sep 2014 04:08:20 -0700 (PDT) X-Received: by 10.224.11.212 with SMTP id u20mr49915247qau.82.1410347298968; Wed, 10 Sep 2014 04:08:18 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id d5si18375180qcc.2.2014.09.10.04.08.18 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 10 Sep 2014 04:08:18 -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]:55208 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XRfl4-0003wD-Cj for patch@linaro.org; Wed, 10 Sep 2014 07:08:18 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39504) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XRfdF-00077l-PF for qemu-devel@nongnu.org; Wed, 10 Sep 2014 07:00:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XRfd6-0003Bh-S3 for qemu-devel@nongnu.org; Wed, 10 Sep 2014 07:00:13 -0400 Received: from mail-wg0-f41.google.com ([74.125.82.41]:42099) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XRfd6-00039Y-Li for qemu-devel@nongnu.org; Wed, 10 Sep 2014 07:00:04 -0400 Received: by mail-wg0-f41.google.com with SMTP id k14so3558955wgh.12 for ; Wed, 10 Sep 2014 04:00:03 -0700 (PDT) X-Received: by 10.194.9.228 with SMTP id d4mr3003417wjb.99.1410346803890; Wed, 10 Sep 2014 04:00:03 -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 wr10sm18127240wjc.10.2014.09.10.04.00.02 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 10 Sep 2014 04:00:03 -0700 (PDT) From: Ard Biesheuvel To: peter.maydell@linaro.org, qemu-devel@nongnu.org Date: Wed, 10 Sep 2014 12:59:49 +0200 Message-Id: <1410346790-31743-4-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1410346790-31743-1-git-send-email-ard.biesheuvel@linaro.org> References: <1410346790-31743-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: 74.125.82.41 Cc: christoffer.dall@linaro.org, Ard Biesheuvel Subject: [Qemu-devel] [PATCH v2 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.180 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 014fab347b09..1f73614d8843 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -472,6 +472,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. */