bc092b
From 26c2f306fd425d2c0348023b8dcb7eb40a01851a Mon Sep 17 00:00:00 2001
bc092b
From: Fu Wei <fu.wei@linaro.org>
bc092b
Date: Sun, 14 May 2017 15:43:47 +0800
78e1a1
Subject: [PATCH 041/216] arm64: Update the introduction of Xen boot commands
bc092b
 in docs/grub.texi
bc092b
bc092b
delete: xen_linux, xen_initrd, xen_xsm
bc092b
add: xen_module
bc092b
bc092b
This update bases on
bc092b
    commit 0edd750e50698854068358ea53528100a9192902
bc092b
    Author: Vladimir Serbinenko <phcoder@gmail.com>
bc092b
    Date:   Fri Jan 22 10:18:47 2016 +0100
bc092b
bc092b
        xen_boot: Remove obsolete module type distinctions.
bc092b
bc092b
Also bases on the module loading mechanism of Xen code:
bc092b
488c2a8 docs/arm64: clarify the documention for loading XSM support
bc092b
67831c4 docs/arm64: update the documentation for loading XSM support
bc092b
ca32012 xen/arm64: check XSM Magic from the second unknown module.
bc092b
bc092b
Signed-off-by: Fu Wei <fu.wei@linaro.org>
bc092b
Reviewed-by: Julien Grall <julien.grall@arm.com>
bc092b
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
bc092b
---
bc092b
 docs/grub.texi | 38 +++++++++++++-------------------------
bc092b
 1 file changed, 13 insertions(+), 25 deletions(-)
bc092b
bc092b
diff --git a/docs/grub.texi b/docs/grub.texi
ec4acb
index e935af33ea5..a0c4b9e4e8e 100644
bc092b
--- a/docs/grub.texi
bc092b
+++ b/docs/grub.texi
bc092b
@@ -3873,11 +3873,9 @@ you forget a command, you can run the command @command{help}
bc092b
 @comment * vbeinfo::                     List available video modes
bc092b
 * verify_detached::             Verify detached digital signature
bc092b
 * videoinfo::                   List available video modes
bc092b
-@comment * xen_*::              Xen boot commands
bc092b
-* xen_hypervisor::              Load xen hypervisor binary
bc092b
-* xen_linux::                   Load dom0 kernel for xen hypervisor
bc092b
-* xen_initrd::                  Load dom0 initrd for dom0 kernel
bc092b
-* xen_xsm::                     Load xen security module for xen hypervisor
bc092b
+@comment * xen_*::              Xen boot commands for AArch64
bc092b
+* xen_hypervisor::              Load xen hypervisor binary (only on AArch64)
bc092b
+* xen_module::                  Load xen modules for xen hypervisor (only on AArch64)
bc092b
 @end menu
bc092b
 
bc092b
 
bc092b
@@ -5153,32 +5151,22 @@ List available video modes. If resolution is given, show only matching modes.
bc092b
 Load a Xen hypervisor binary from @var{file}. The rest of the line is passed
bc092b
 verbatim as the @dfn{kernel command-line}. Any other binaries must be
bc092b
 reloaded after using this command.
bc092b
+This command is only available on AArch64 systems.
bc092b
 @end deffn
bc092b
 
bc092b
-@node xen_linux
bc092b
-@subsection xen_linux
bc092b
+@node xen_module
bc092b
+@subsection xen_module
bc092b
 
bc092b
-@deffn Command xen_linux file [arguments]
bc092b
-Load a dom0 kernel image for xen hypervisor at the booting process of xen.
bc092b
+@deffn Command xen_module [--nounzip] file [arguments]
bc092b
+Load a module for xen hypervisor at the booting process of xen.
bc092b
 The rest of the line is passed verbatim as the module command line.
bc092b
+Modules should be loaded in the following order:
bc092b
+ - dom0 kernel image
bc092b
+ - dom0 ramdisk if present
bc092b
+ - XSM policy if present
bc092b
+This command is only available on AArch64 systems.
bc092b
 @end deffn
bc092b
 
bc092b
-@node xen_initrd
bc092b
-@subsection xen_initrd
bc092b
-
bc092b
-@deffn Command xen_initrd file
bc092b
-Load a initrd image for dom0 kernel at the booting process of xen.
bc092b
-@end deffn
bc092b
-
bc092b
-@node xen_xsm
bc092b
-@subsection xen_xsm
bc092b
-
bc092b
-@deffn Command xen_xsm file
bc092b
-Load a xen security module for xen hypervisor at the booting process of xen.
bc092b
-See @uref{http://wiki.xen.org/wiki/XSM} for more detail.
bc092b
-@end deffn
bc092b
-
bc092b
-
bc092b
 @node Networking commands
bc092b
 @section The list of networking commands
bc092b
 
bc092b
-- 
ec4acb
2.15.0
bc092b