From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Subject: Re: [PATCH 10/10] xen: arm: update multiboot device
	tree bindings.
Date: Wed, 18 Jun 2014 15:56:48 +0100
Message-ID: <alpine.DEB.2.02.1406181545410.13771@kaball.uk.xensource.com>
References: <1402919079.14907.22.camel@kazak.uk.xensource.com>
	<1402919103-29642-10-git-send-email-ian.campbell@citrix.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xen.org>
In-Reply-To: <1402919103-29642-10-git-send-email-ian.campbell@citrix.com>
List-Unsubscribe: <http://lists.xen.org/cgi-bin/mailman/options/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xen.org>
List-Help: <mailto:xen-devel-request@lists.xen.org?subject=help>
List-Subscribe: <http://lists.xen.org/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=subscribe>
Sender: xen-devel-bounces@lists.xen.org
Errors-To: xen-devel-bounces@lists.xen.org
To: Ian Campbell <ian.campbell@citrix.com>
Cc: stefano.stabellini@eu.citrix.com, Naresh Bhat <naresh.bhat@linaro.org>, julien.grall@linaro.org, tim@xen.org, xen-devel@lists.xen.org, Roy Franz <roy.franz@linaro.org>, Fu Wei <fu.wei@linaro.org>
List-Id: xen-devel@lists.xenproject.org

On Mon, 16 Jun 2014, Ian Campbell wrote:
> Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
> ---
>  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,<type>", "xen,multiboot-module"
> +		"multiboot,module"

As it stands this conflicts with the statement below that we are
compatible with Xen 4.4: the old multiboot compatible strings didn't
include "multiboot,module".
You might want to reword it.


> -	where <type> must be one of:
> +	Optionally a more specific compatible string may be used in
> +	addition to the above. One of:

We should probably recommend the usage of a more specific string in
addition to "multiboot,module".


> -	- "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.