From patchwork Fri Sep 5 15:15:23 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 36855 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pd0-f197.google.com (mail-pd0-f197.google.com [209.85.192.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 6AE37202E4 for ; Fri, 5 Sep 2014 15:16:39 +0000 (UTC) Received: by mail-pd0-f197.google.com with SMTP id y10sf70003602pdj.8 for ; Fri, 05 Sep 2014 08:16:37 -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=fhjnvY6bMHhCMHuw0YYDTOhV3whOy45pj+sF1xU3sus=; b=IjYw5SaPwiJvskhvcnv2Hp36W0YZPBF+vhO3DvG+1YtVQnLtuPcGrVPwmq9thjbrVI VGwwzRQBJqT6VC6ZH5iiwFd0MgWvxFmRSDaG25Lv5NfvwChDzEI2kj9OHi7RsZPBbxT7 Ast8ECE0VML1MvxZnLD2ioo6UVOE9kkStcdQ3+zM8GyyrCUIUICuoD4v7OjcJWhpAPp2 cs13XCqr0dU5wr3OTsmyS19kLooDlnCXpEH7BkC3m2ZGJTq3U1PKl7OBQO0Mfq2NbDR7 VmK0XeZmFhAYKwDUsdYSHiJbfjOanXFpSrzGSIrJyeXMh+/smmmIzGVPVXQSG4qL9cN2 PjCw== X-Gm-Message-State: ALoCoQnuMREjpzdJ0bgQ6gXjiDaovQwJ0D0l/IoHC3SMxVys3mO6kViYH3G0zG7leogyXCdTjIND X-Received: by 10.70.37.41 with SMTP id v9mr7169187pdj.0.1409930195140; Fri, 05 Sep 2014 08:16:35 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.83.49 with SMTP id i46ls803976qgd.10.gmail; Fri, 05 Sep 2014 08:16:34 -0700 (PDT) X-Received: by 10.220.113.148 with SMTP id a20mr2533698vcq.30.1409930194951; Fri, 05 Sep 2014 08:16:34 -0700 (PDT) Received: from mail-vc0-f170.google.com (mail-vc0-f170.google.com [209.85.220.170]) by mx.google.com with ESMTPS id 14si903260vcn.84.2014.09.05.08.16.34 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 05 Sep 2014 08:16:34 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.170 as permitted sender) client-ip=209.85.220.170; Received: by mail-vc0-f170.google.com with SMTP id la4so12647984vcb.29 for ; Fri, 05 Sep 2014 08:16:34 -0700 (PDT) X-Received: by 10.52.3.40 with SMTP id 8mr9503794vdz.24.1409930194654; Fri, 05 Sep 2014 08:16:34 -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 uj3csp97547vcb; Fri, 5 Sep 2014 08:16:34 -0700 (PDT) X-Received: by 10.140.108.68 with SMTP id i62mr18567922qgf.56.1409930193935; Fri, 05 Sep 2014 08:16:33 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [208.118.235.17]) by mx.google.com with ESMTPS id r10si2011100qas.34.2014.09.05.08.16.33 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 05 Sep 2014 08:16:33 -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]:58410 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XPvFZ-0004XG-22 for patch@linaro.org; Fri, 05 Sep 2014 11:16:33 -0400 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) X-Received: by 10.180.90.6 with SMTP id bs6mr4612764wib.47.1409930129062; Fri, 05 Sep 2014 08:15:29 -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 wx3sm1734308wjc.19.2014.09.05.08.15.27 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 05 Sep 2014 08:15:28 -0700 (PDT) From: Ard Biesheuvel To: peter.maydell@linaro.org, qemu-devel@nongnu.org Date: Fri, 5 Sep 2014 17:15:23 +0200 Message-Id: <1409930126-28449-4-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1409930126-28449-1-git-send-email-ard.biesheuvel@linaro.org> References: <1409930126-28449-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.46 Cc: fu.wei@linaro.org, christoffer.dall@linaro.org, Ard Biesheuvel Subject: [Qemu-devel] [PATCH 3/6] 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.170 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 Reviewed-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 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. */