From patchwork Fri Jul 18 13:08:19 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 33837 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f200.google.com (mail-ie0-f200.google.com [209.85.223.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id D41F4208CF for ; Fri, 18 Jul 2014 13:10:15 +0000 (UTC) Received: by mail-ie0-f200.google.com with SMTP id at20sf33578406iec.11 for ; Fri, 18 Jul 2014 06:10:15 -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=c3nmER0YX6rQoKYLXw0onFHjx1lnSf3sOZ1LtUeX1d8/T6caG2YCo1Gn8bZS1DeQ+x aJeAMHGpfKj9x+DtwaSiSshtZjaCSd0qdqt/vqex1AQTYbeBOGfHFt8V7D/5xVO0Oq3P kJGcAy0XtL0tjVOrwCfl8jE39ri6AL9fo22yI7vgNT3jCF5kgHu+sM4Yya7t7cLP4l1I VBTL+cP85nFLfW+pBjmpI0SAJUWZwGAMkZzl+p4Od7VWUJahdeGIG5d4pQR9Eur+XvPj 60+MfON2FnH/YtxdMm3JETK+/fTbhxf3ZF+A571oogBySWA25xODFr/ZUPw5DAlk5djL HP1Q== X-Gm-Message-State: ALoCoQme4gzIXZwgzVEW/K9JWLNMMTtzSnEoIswF410zWKCMHGbgI0PJ35pTzG8eMQho3eamTjBC X-Received: by 10.42.39.140 with SMTP id h12mr2622292ice.9.1405689015334; Fri, 18 Jul 2014 06:10:15 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.25.144 with SMTP id 16ls1002672qgt.45.gmail; Fri, 18 Jul 2014 06:10:15 -0700 (PDT) X-Received: by 10.220.1.198 with SMTP id 6mr5542250vcg.31.1405689015244; Fri, 18 Jul 2014 06:10:15 -0700 (PDT) Received: from mail-vc0-f181.google.com (mail-vc0-f181.google.com [209.85.220.181]) by mx.google.com with ESMTPS id tj17si1739487vdb.100.2014.07.18.06.10.15 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 18 Jul 2014 06:10:15 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.181 as permitted sender) client-ip=209.85.220.181; Received: by mail-vc0-f181.google.com with SMTP id lf12so7279403vcb.12 for ; Fri, 18 Jul 2014 06:10:15 -0700 (PDT) X-Received: by 10.52.129.200 with SMTP id ny8mr4642035vdb.27.1405689014991; Fri, 18 Jul 2014 06:10:14 -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 tc5csp9771vcb; Fri, 18 Jul 2014 06:10:14 -0700 (PDT) X-Received: by 10.50.41.68 with SMTP id d4mr39571348igl.43.1405689012784; Fri, 18 Jul 2014 06:10:12 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id dw5si4895911igb.18.2014.07.18.06.10.11 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 18 Jul 2014 06:10:12 -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 1X87tr-0005bH-K8; Fri, 18 Jul 2014 13:08:35 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X87tp-0005YP-W0 for xen-devel@lists.xen.org; Fri, 18 Jul 2014 13:08:34 +0000 Received: from [193.109.254.147:61762] by server-7.bemta-14.messagelabs.com id EF/8E-13362-15C19C35; Fri, 18 Jul 2014 13:08:33 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1405688911!18275258!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 17311 invoked from network); 18 Jul 2014 13:08:32 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-15.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 18 Jul 2014 13:08:32 -0000 X-IronPort-AV: E=Sophos;i="5.01,685,1400025600"; d="scan'208";a="154077989" Received: from accessns.citrite.net (HELO FTLPEX01CL02.citrite.net) ([10.9.154.239]) by FTLPIPO02.CITRIX.COM with ESMTP; 18 Jul 2014 13:08:31 +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; Fri, 18 Jul 2014 09:08:30 -0400 Received: from marilith-n13-p0.uk.xensource.com ([10.80.229.115] helo=localhost.localdomain) by ukmail1.uk.xensource.com with smtp (Exim 4.69) (envelope-from ) id 1X87tl-0001RU-CB; Fri, 18 Jul 2014 14:08:30 +0100 Received: by localhost.localdomain (sSMTP sendmail emulation); Fri, 18 Jul 2014 14:08:29 +0100 From: Ian Campbell To: Date: Fri, 18 Jul 2014 14:08:19 +0100 Message-ID: <1405688900-11769-9-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1405688876.491.10.camel@kazak.uk.xensource.com> References: <1405688876.491.10.camel@kazak.uk.xensource.com> MIME-Version: 1.0 X-DLP: MIA2 Cc: julien.grall@linaro.org, tim@xen.org, Ian Campbell , stefano.stabellini@eu.citrix.com Subject: [Xen-devel] [PATCH v3 09/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.220.181 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 Acked-by: Julien Grall --- 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 =============