From patchwork Wed Jul 6 17:53:57 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: fu.wei@linaro.org X-Patchwork-Id: 9216801 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9DBC160467 for ; Wed, 6 Jul 2016 17:57:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 93C68281D2 for ; Wed, 6 Jul 2016 17:57:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 883EB281DB; Wed, 6 Jul 2016 17:57:00 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 34163281B7 for ; Wed, 6 Jul 2016 17:57:00 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bKr20-00070X-Se; Wed, 06 Jul 2016 17:54:40 +0000 Received: from mail6.bemta6.messagelabs.com ([85.158.143.247]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bKr1z-0006zr-TU for xen-devel@lists.xensource.com; Wed, 06 Jul 2016 17:54:40 +0000 Received: from [85.158.143.35] by server-2.bemta-6.messagelabs.com id 4B/D0-11548-FD54D775; Wed, 06 Jul 2016 17:54:39 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrPLMWRWlGSWpSXmKPExsVysWW7jO4919p wg+7n5hb3prxnd2D02N63iz2AMYo1My8pvyKBNWPhgQ7mgufCFauPP2RrYHzF38XIxSEksJtJ 4tS176wQzhlGiXmz+pm7GDk52ATEJc50fmUFsUUE7CTuHtrJAlLELPCEUeLLxG9MIAlhgViJ/ S1n2boYOThYBFQl1jxIAAnzCjhK7Jj7FqyXU8BJYtXZc2AzhYDiq5vegdkSAtoSzy9MZgeZKS HQxyjxt20+2wRGngWMDKsY1YtTi8pSi3SN9JKKMtMzSnITM3N0DQ3M9HJTi4sT01NzEpOK9ZL zczcxAj3PAAQ7GJf9dTrEKMnBpCTKy/KtOlyILyk/pTIjsTgjvqg0J7X4EKMMB4eSBG+tS224 kGBRanpqRVpmDjAEYdISHDxKIrwtIGne4oLE3OLMdIjUKUZdji0LbqxlEmLJy89LlRLntQQpE gApyijNgxsBi4dLjLJSwryMQEcJ8RSkFuVmlqDKv2IU52BUEubNB5nCk5lXArfpFdARTEBH/H SpBjmiJBEhJdXAmNdTfOdqxrnXvpe4Gh6rLlnwLuHuCZ+XbJtt9haHprTNfXo/etbfNPUPEf9 ObTNTVD518eB/tUihy0mlinNLzCfe9+6tqxORuZ675z/v0x87GL8bvZNjFJX5sFJ9wquWZ0fY nOXOp/8I597r8yA0WlHh3O2kk04h/XNf3j309lRWVHxZlGXHIyWW4oxEQy3mouJEAG/W45mCA gAA X-Env-Sender: fu.wei@linaro.org X-Msg-Ref: server-14.tower-21.messagelabs.com!1467827677!22575252!1 X-Originating-IP: [209.132.183.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMjA5LjEzMi4xODMuMjggPT4gNTQwNjQ=\n X-StarScan-Received: X-StarScan-Version: 8.77; banners=-,-,- X-VirusChecked: Checked Received: (qmail 46429 invoked from network); 6 Jul 2016 17:54:38 -0000 Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by server-14.tower-21.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 6 Jul 2016 17:54:38 -0000 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 24EF680E4A; Wed, 6 Jul 2016 17:54:37 +0000 (UTC) Received: from rei-ayanami.redhat.com (vpn1-4-195.pek2.redhat.com [10.72.4.195]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u66HsGhc009158; Wed, 6 Jul 2016 13:54:33 -0400 From: fu.wei@linaro.org To: grub-devel@gnu.org, arvidjaar@gmail.com, phcoder@gmail.com Date: Thu, 7 Jul 2016 01:53:57 +0800 Message-Id: <1467827637-14508-5-git-send-email-fu.wei@linaro.org> In-Reply-To: <1467827637-14508-1-git-send-email-fu.wei@linaro.org> References: <1467827637-14508-1-git-send-email-fu.wei@linaro.org> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Wed, 06 Jul 2016 17:54:37 +0000 (UTC) Cc: xen-devel@lists.xensource.com, Ian.Campbell@citrix.com, jcm@redhat.com, leif.lindholm@linaro.org, julien.grall@arm.com, sstabellini@kernel.org, linaro-uefi@lists.linaro.org, Fu Wei Subject: [Xen-devel] [PATCH v5 4/4] arm64: update the introduction of xen boot commands in docs/grub.texi X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Fu Wei delete: xen_linux, xen_initrd, xen_xsm add: xen_module This update bases on commit 0edd750e50698854068358ea53528100a9192902 Author: Vladimir Serbinenko Date: Fri Jan 22 10:18:47 2016 +0100 xen_boot: Remove obsolete module type distinctions. Also bases on the module loading mechanism of Xen code: 488c2a8 docs/arm64: clarify the documention for loading XSM support 67831c4 docs/arm64: update the documentation for loading XSM support ca32012 xen/arm64: check XSM Magic from the second unknown module. Signed-off-by: Fu Wei Reviewed-by: Julien Grall --- docs/grub.texi | 32 +++++++++----------------------- 1 file changed, 9 insertions(+), 23 deletions(-) diff --git a/docs/grub.texi b/docs/grub.texi index 82f6fa4..85c913e 100644 --- a/docs/grub.texi +++ b/docs/grub.texi @@ -3861,9 +3861,7 @@ you forget a command, you can run the command @command{help} * videoinfo:: List available video modes @comment * xen_*:: Xen boot commands * xen_hypervisor:: Load xen hypervisor binary -* xen_linux:: Load dom0 kernel for xen hypervisor -* xen_initrd:: Load dom0 initrd for dom0 kernel -* xen_xsm:: Load xen security module for xen hypervisor +* xen_module:: Load xen modules for xen hypervisor @end menu @@ -5141,30 +5139,18 @@ verbatim as the @dfn{kernel command-line}. Any other binaries must be reloaded after using this command. @end deffn -@node xen_linux -@subsection xen_linux +@node xen_module +@subsection xen_module -@deffn Command xen_linux file [arguments] -Load a dom0 kernel image for xen hypervisor at the booting process of xen. +@deffn Command xen_module [--nounzip] file [arguments] +Load a module for xen hypervisor at the booting process of xen. The rest of the line is passed verbatim as the module command line. +Modules should be loaded in the following order: + - dom0 kernel image + - dom0 ramdisk if present + - XSM policy if present @end deffn -@node xen_initrd -@subsection xen_initrd - -@deffn Command xen_initrd file -Load a initrd image for dom0 kernel at the booting process of xen. -@end deffn - -@node xen_xsm -@subsection xen_xsm - -@deffn Command xen_xsm file -Load a xen security module for xen hypervisor at the booting process of xen. -See @uref{http://wiki.xen.org/wiki/XSM} for more detail. -@end deffn - - @node Networking commands @section The list of networking commands