6b2dd0f731
Signed-off-by: Peter Jones <pjones@redhat.com>
91 lines
3.3 KiB
Diff
91 lines
3.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Fu Wei <fu.wei@linaro.org>
|
|
Date: Sun, 14 May 2017 15:43:47 +0800
|
|
Subject: [PATCH] arm64: Update the introduction of Xen boot commands in
|
|
docs/grub.texi
|
|
|
|
delete: xen_linux, xen_initrd, xen_xsm
|
|
add: xen_module
|
|
|
|
This update bases on
|
|
commit 0edd750e50698854068358ea53528100a9192902
|
|
Author: Vladimir Serbinenko <phcoder@gmail.com>
|
|
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 <fu.wei@linaro.org>
|
|
Reviewed-by: Julien Grall <julien.grall@arm.com>
|
|
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
|
|
---
|
|
docs/grub.texi | 38 +++++++++++++-------------------------
|
|
1 file changed, 13 insertions(+), 25 deletions(-)
|
|
|
|
diff --git a/docs/grub.texi b/docs/grub.texi
|
|
index e935af33ea5..a0c4b9e4e8e 100644
|
|
--- a/docs/grub.texi
|
|
+++ b/docs/grub.texi
|
|
@@ -3873,11 +3873,9 @@ you forget a command, you can run the command @command{help}
|
|
@comment * vbeinfo:: List available video modes
|
|
* verify_detached:: Verify detached digital signature
|
|
* 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
|
|
+@comment * xen_*:: Xen boot commands for AArch64
|
|
+* xen_hypervisor:: Load xen hypervisor binary (only on AArch64)
|
|
+* xen_module:: Load xen modules for xen hypervisor (only on AArch64)
|
|
@end menu
|
|
|
|
|
|
@@ -5153,32 +5151,22 @@ List available video modes. If resolution is given, show only matching modes.
|
|
Load a Xen hypervisor binary from @var{file}. The rest of the line is passed
|
|
verbatim as the @dfn{kernel command-line}. Any other binaries must be
|
|
reloaded after using this command.
|
|
+This command is only available on AArch64 systems.
|
|
@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
|
|
+This command is only available on AArch64 systems.
|
|
@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
|
|
|