From patchwork Thu Jun 26 16:45:51 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 32583 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qc0-f199.google.com (mail-qc0-f199.google.com [209.85.216.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 7D780201EF for ; Thu, 26 Jun 2014 16:48:09 +0000 (UTC) Received: by mail-qc0-f199.google.com with SMTP id l6sf6868953qcy.10 for ; Thu, 26 Jun 2014 09:48:09 -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=0YsVWkJFwPZMytH9o80BZKIpO3Q2c+pJfa/iMhYdNY4=; b=ctNPW0k51scSKc8W+Zab0geiFEVHH1XkbxNCASOUblq92oqzumFs0G1XJehbULne7U urvkvSf1B7lNjK43jkf0mRcFtpb1oZimXVCnAhPHCh77+siwF/LA9YaI3MyRMX5SdQFD zFwhAfTUHCDX41xnZM8GpbQpZ6Lw3dVwK5X7mwahmbh8GAcfnPIc8VEgniOyRPrf9LJC C8pJgVNTHu1OWfUW4o/0CPggYmGV6qfkAUrCO64kewjFxrjoFqt63Pr9WuGDSnVGIKxm QpZo1/ijNr4VXJW8ErxH4xSZUl3is3EoLIgl3QKkPpChkrO4aEymnrJjqWF6Rox7Tpkl lBaw== X-Gm-Message-State: ALoCoQkEzbtslRbs0r7XskF+BV/JW6x1Q7qc1cJKceFo9Qw2LlTQYBguWh/6HdDmSQfqgbqhZPDs X-Received: by 10.58.200.162 with SMTP id jt2mr8437502vec.17.1403801289211; Thu, 26 Jun 2014 09:48:09 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.17.19 with SMTP id 19ls298047qgc.69.gmail; Thu, 26 Jun 2014 09:48:09 -0700 (PDT) X-Received: by 10.52.171.233 with SMTP id ax9mr1665500vdc.76.1403801289082; Thu, 26 Jun 2014 09:48:09 -0700 (PDT) Received: from mail-vc0-f174.google.com (mail-vc0-f174.google.com [209.85.220.174]) by mx.google.com with ESMTPS id s19si4908968vcp.1.2014.06.26.09.48.09 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 26 Jun 2014 09:48:09 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.174 as permitted sender) client-ip=209.85.220.174; Received: by mail-vc0-f174.google.com with SMTP id hy4so3866762vcb.33 for ; Thu, 26 Jun 2014 09:48:09 -0700 (PDT) X-Received: by 10.52.88.44 with SMTP id bd12mr1606482vdb.86.1403801289001; Thu, 26 Jun 2014 09:48:09 -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.37.5 with SMTP id tc5csp44143vcb; Thu, 26 Jun 2014 09:48:08 -0700 (PDT) X-Received: by 10.50.142.97 with SMTP id rv1mr5905074igb.13.1403801288285; Thu, 26 Jun 2014 09:48:08 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id mv4si3483787igb.15.2014.06.26.09.48.07 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 26 Jun 2014 09:48:08 -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 1X0CoC-0004Kr-7X; Thu, 26 Jun 2014 16:46:00 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X0Co9-0004Id-Jx for xen-devel@lists.xen.org; Thu, 26 Jun 2014 16:45:57 +0000 Received: from [193.109.254.147:24054] by server-15.bemta-14.messagelabs.com id 9C/D5-15813-44E4CA35; Thu, 26 Jun 2014 16:45:56 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1403801153!13922171!2 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 800 invoked from network); 26 Jun 2014 16:45:56 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-9.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 26 Jun 2014 16:45:56 -0000 X-IronPort-AV: E=Sophos;i="5.01,554,1400025600"; d="scan'208";a="147655579" Received: from accessns.citrite.net (HELO FTLPEX01CL01.citrite.net) ([10.9.154.239]) by FTLPIPO01.CITRIX.COM with ESMTP; 26 Jun 2014 16:45:52 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.78) with Microsoft SMTP Server id 14.3.181.6; Thu, 26 Jun 2014 12:45:52 -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 1X0Co4-0002AU-1f; Thu, 26 Jun 2014 17:45:52 +0100 From: Ian Campbell To: Date: Thu, 26 Jun 2014 17:45:51 +0100 Message-ID: <1403801151-11007-9-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1403801130.31742.1.camel@kazak.uk.xensource.com> References: <1403801130.31742.1.camel@kazak.uk.xensource.com> MIME-Version: 1.0 X-DLP: MIA1 Cc: julien.grall@linaro.org, tim@xen.org, Ian Campbell , stefano.stabellini@eu.citrix.com Subject: [Xen-devel] [PATCH v2 9/9] 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.220.174 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 --- v2: (Try to) Clarify some wording, add examples to help. --- docs/misc/arm/device-tree/booting.txt | 54 +++++++++++++++++++++++++++++---- 1 file changed, 48 insertions(+), 6 deletions(-) diff --git a/docs/misc/arm/device-tree/booting.txt b/docs/misc/arm/device-tree/booting.txt index bfb8d01..d967061 100644 --- a/docs/misc/arm/device-tree/booting.txt +++ b/docs/misc/arm/device-tree/booting.txt @@ -8,15 +8,31 @@ Each node contains the following properties: - compatible - Must be: + Must always include at least the generic compatiblity string: - "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 + + It is normally recommended to include a more specific + compatible string (if one applies) in addition to the generic + string (which must always be present). + + Xen 4.4 supported a different set of legacy compatible strings + which remain supported such that systems supporting both 4.4 + and later can use a single DTB. + + - "xen,multiboot-module" equivalent to "multiboot,module" + - "xen,linux-zimage" equivalent to "multiboot,kernel" + - "xen,linux-initrd" equivalent to "multiboot,ramdisk" + + For compatibility with Xen 4.4 the more specific "xen,linux-*" + names are non-optional and must be included. - reg @@ -29,6 +45,32 @@ Each node contains the following properties: priority of this field vs. other mechanisms of specifying the bootargs for the kernel. +Examples +======== + +A boot module of unspecified type: + + module@0xc0000000 { + compatible = "multiboot,module"; + reg = <0xc0000000 0x1234>; + bootargs = "..."; + }; + +A boot module containing a ramdisk: + + module@0xd0000000 { + compatible = "multiboot,ramdisk", "multiboot,module"; + reg = <0xd0000000 0x5678>; + }; + +The previous examples are compatible with Xen 4.5+ only. + +To be compatible with Xen 4.4 as well use the legacy names: + + module@0xd0000000 { + compatible = "xen,linux-initrd", "xen,multiboot-module"; + reg = <0xd0000000 0x5678>; + }; Command lines =============