From patchwork Mon Jun 16 11:45:03 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 31950 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f198.google.com (mail-ob0-f198.google.com [209.85.214.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 4CFB2206A0 for ; Mon, 16 Jun 2014 11:46:38 +0000 (UTC) Received: by mail-ob0-f198.google.com with SMTP id uy5sf30429356obc.5 for ; Mon, 16 Jun 2014 04:46: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:delivered-to:from:to:date:message-id:in-reply-to :references:mime-version:cc:subject:precedence:list-id :list-unsubscribe:list-post:list-help:list-subscribe:sender :errors-to:x-original-sender:x-original-authentication-results :mailing-list:list-archive:content-type:content-transfer-encoding; bh=9zIJaOrfGOp8PFd+j7B1Ip6PcMhhO4PweIOvLBKKkvI=; b=UUTnieM1zyx2snXAt3dT4OCXWn95NLEKgryfSXXfanCzFHk3djuQhtmlgozE6UxLp3 bI+sB0WfM35KvbozCWkFreVaaN2jMa5N6RwXtHR/D6uDdnpjj5camy156179R6KmfcLm K8+wCzNsbiRmHAgTPJaCMO469saQQbSdAO/Haf+V+343KCys3S+tS4c9Exu8ycKCXOMD b7QlJxjJEijYYcTfO1YN5IC1dd6cD1WDSxQ0PWALUGtl0XpyL6Oe0whvkWk0gjdDq20t F4WatU/3cHTAZRsj02DIMfgGGzNPJH8WytaJXr3TSTo6lwzw9xSkQ6Fm8SiI4253Ohon K+sA== X-Gm-Message-State: ALoCoQlZ1h37u0kOmC79d/EBs9ktDVYztDNrBsiTl4BBA1oRZJRZPtNC3+qXGgPajm1+Tofz2PuJ X-Received: by 10.42.194.207 with SMTP id dz15mr2722598icb.10.1402919197959; Mon, 16 Jun 2014 04:46:37 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.87.148 with SMTP id r20ls1547552qgd.12.gmail; Mon, 16 Jun 2014 04:46:37 -0700 (PDT) X-Received: by 10.58.152.234 with SMTP id vb10mr15914094veb.21.1402919197842; Mon, 16 Jun 2014 04:46:37 -0700 (PDT) Received: from mail-ve0-f177.google.com (mail-ve0-f177.google.com [209.85.128.177]) by mx.google.com with ESMTPS id xn7si3999437vcb.105.2014.06.16.04.46.37 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 16 Jun 2014 04:46:37 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.177 as permitted sender) client-ip=209.85.128.177; Received: by mail-ve0-f177.google.com with SMTP id i13so2237625veh.36 for ; Mon, 16 Jun 2014 04:46:37 -0700 (PDT) X-Received: by 10.52.52.168 with SMTP id u8mr13204911vdo.25.1402919197737; Mon, 16 Jun 2014 04:46:37 -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.54.6 with SMTP id vs6csp128494vcb; Mon, 16 Jun 2014 04:46:37 -0700 (PDT) X-Received: by 10.140.31.131 with SMTP id f3mr11221939qgf.59.1402919197360; Mon, 16 Jun 2014 04:46:37 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id m3si11182293qaz.59.2014.06.16.04.46.36 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 16 Jun 2014 04:46:37 -0700 (PDT) Received-SPF: none (google.com: xen-devel-bounces@lists.xen.org does not designate permitted sender hosts) client-ip=50.57.142.19; Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WwVLc-0003O1-IN; Mon, 16 Jun 2014 11:45:12 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WwVLZ-0003M5-Vj for xen-devel@lists.xen.org; Mon, 16 Jun 2014 11:45:10 +0000 Received: from [193.109.254.147:37591] by server-16.bemta-14.messagelabs.com id 6A/8A-16986-5C8DE935; Mon, 16 Jun 2014 11:45:09 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1402919107!11436650!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16442 invoked from network); 16 Jun 2014 11:45:08 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-3.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 16 Jun 2014 11:45:08 -0000 X-IronPort-AV: E=Sophos;i="5.01,486,1400025600"; d="scan'208";a="143697246" Received: from accessns.citrite.net (HELO FTLPEX01CL02.citrite.net) ([10.9.154.239]) by FTLPIPO02.CITRIX.COM with ESMTP; 16 Jun 2014 11:45:04 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.79) with Microsoft SMTP Server id 14.3.181.6; Mon, 16 Jun 2014 07:45:04 -0400 Received: from marilith-n13-p0.uk.xensource.com ([10.80.229.115] helo=marilith-n13.uk.xensource.com.) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1WwVLU-000152-45; Mon, 16 Jun 2014 12:45:04 +0100 From: Ian Campbell To: Date: Mon, 16 Jun 2014 12:45:03 +0100 Message-ID: <1402919103-29642-10-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1402919079.14907.22.camel@kazak.uk.xensource.com> References: <1402919079.14907.22.camel@kazak.uk.xensource.com> MIME-Version: 1.0 X-DLP: MIA1 Cc: Ian Campbell , stefano.stabellini@eu.citrix.com, Naresh Bhat , julien.grall@linaro.org, tim@xen.org, Roy Franz , Fu Wei Subject: [Xen-devel] [PATCH 10/10] xen: arm: update multiboot device tree bindings. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Post: , List-Help: , List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ian.campbell@citrix.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.177 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 List-Archive: Signed-off-by: Ian Campbell --- docs/misc/arm/device-tree/booting.txt | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/docs/misc/arm/device-tree/booting.txt b/docs/misc/arm/device-tree/booting.txt index bfb8d01..92af119 100644 --- a/docs/misc/arm/device-tree/booting.txt +++ b/docs/misc/arm/device-tree/booting.txt @@ -8,15 +8,27 @@ Each node contains the following properties: - compatible - Must be: + Must always include at least: - "xen,", "xen,multiboot-module" + "multiboot,module" - where must be one of: + Optionally a more specific compatible string may be used in + addition to the above. One of: - - "linux-zimage" -- the dom0 kernel - - "linux-initrd" -- the dom0 ramdisk - - "xsm-policy" -- XSM policy blob + - "multiboot,kernel" -- the dom0 kernel + - "multiboot,ramdisk" -- the dom0 ramdisk + - "xen,xsm-policy" -- XSM policy blob + + For compatibility with Xen 4.4 the following are also + supported: + + "xen,multiboot-module" equivalent to "multiboot,module" + "xen,linux-zimage" equivalent to "multiboot,kernel" + "xen,linux-initrd" equivalent to "multiboot,ramdisk" + + Xen 4.4 does not know the "multiboot,*" compatibility + strings. Also when using Xen 4.4 the more specific + "xen,linux-*" names are non-optional. - reg