From: fu.wei@linaro.org
To: grub-devel@gnu.org, arvidjaar@gmail.com, phcoder@gmail.com
Cc: xen-devel@lists.xensource.com, Ian.Campbell@citrix.com,
stefano.stabellini@eu.citrix.com, jcm@redhat.com,
leif.lindholm@linaro.org, ryan.harkin@linaro.org,
linaro-uefi@lists.linaro.org, Fu Wei <fu.wei@linaro.org>
Subject: [PATCH v3 3/4] * util/grub.d/20_linux_xen.in: Add support of the XEN boot on aarch64
Date: Thu, 23 Jul 2015 13:16:22 +0800 [thread overview]
Message-ID: <1437628583-23667-4-git-send-email-fu.wei@linaro.org> (raw)
In-Reply-To: <1437628583-23667-1-git-send-email-fu.wei@linaro.org>
From: Fu Wei <fu.wei@linaro.org>
This patch adds the support of boot command on aarch64 for XEN:
xen_hypervisor
xen_linux
xen_initrd
Signed-off-by: Fu Wei <fu.wei@linaro.org>
---
util/grub.d/20_linux_xen.in | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
index f532fb9..49aa709 100644
--- a/util/grub.d/20_linux_xen.in
+++ b/util/grub.d/20_linux_xen.in
@@ -120,16 +120,16 @@ linux_entry ()
else
xen_rm_opts="no-real-mode edd=off"
fi
- multiboot ${rel_xen_dirname}/${xen_basename} placeholder ${xen_args} \${xen_rm_opts}
+ ${multiboot_cmd} ${rel_xen_dirname}/${xen_basename} placeholder ${xen_args} \${xen_rm_opts}
echo '$(echo "$lmessage" | grub_quote)'
- module ${rel_dirname}/${basename} placeholder root=${linux_root_device_thisversion} ro ${args}
+ ${module_linux_cmd} ${rel_dirname}/${basename} placeholder root=${linux_root_device_thisversion} ro ${args}
EOF
if test -n "${initrd}" ; then
# TRANSLATORS: ramdisk isn't identifier. Should be translated.
message="$(gettext_printf "Loading initial ramdisk ...")"
sed "s/^/$submenu_indentation/" << EOF
echo '$(echo "$message" | grub_quote)'
- module --nounzip ${rel_dirname}/${initrd}
+ ${module_initrd_cmd} ${rel_dirname}/${initrd}
EOF
fi
sed "s/^/$submenu_indentation/" << EOF
@@ -185,6 +185,16 @@ case "$machine" in
*) GENKERNEL_ARCH="$machine" ;;
esac
+if [ "x$machine" != xaarch64 ]; then
+ multiboot_cmd="multiboot"
+ module_linux_cmd="module"
+ module_initrd_cmd="module --nounzip"
+else
+ multiboot_cmd="xen_hypervisor"
+ module_linux_cmd="xen_linux"
+ module_initrd_cmd="xen_initrd"
+fi
+
# Extra indentation to add to menu entries in a submenu. We're not in a submenu
# yet, so it's empty. In a submenu it will be equal to '\t' (one tab).
submenu_indentation=""
--
1.8.3.1
next prev parent reply other threads:[~2015-07-23 5:17 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <=fu.wei@linaro.org>
2015-07-13 8:53 ` [PATCH v2 0/3] arm64: Add multiboot support (via fdt) for Xen boot fu.wei
2015-07-13 8:53 ` [PATCH v2 1/3] arm64: Add Xen boot support file fu.wei
2015-07-15 16:18 ` Vladimir 'φ-coder/phcoder' Serbinenko
2015-07-16 16:46 ` Ian Campbell
2015-07-23 10:16 ` Fu Wei
2015-07-13 8:53 ` [PATCH v2 2/3] util/grub.d/20_linux_xen.in: Add arm64 support fu.wei
2015-07-14 3:53 ` Andrei Borzenkov
2015-07-14 9:41 ` Ian Campbell
2015-07-14 15:23 ` [Xen-devel] " Konrad Rzeszutek Wilk
2015-07-14 13:09 ` Fu Wei
2015-07-15 16:24 ` Vladimir 'φ-coder/phcoder' Serbinenko
2015-07-13 8:54 ` [PATCH v2 3/3] arm64: Add the introduction of Xen boot command fu.wei
2015-07-14 9:29 ` [Xen-devel] [PATCH v2 0/3] arm64: Add multiboot support (via fdt) for Xen boot Ian Campbell
2015-07-14 11:56 ` Fu Wei
2015-07-15 15:56 ` Vladimir 'φ-coder/phcoder' Serbinenko
2015-07-23 5:16 ` [PATCH v3 0/4] arm64: Add Xen boot support (via fdt) fu.wei
2015-07-23 5:16 ` [PATCH v3 1/4] arm64: Add and export some accessor functions for xen boot fu.wei
2015-10-29 12:03 ` Vladimir 'φ-coder/phcoder' Serbinenko
2015-10-30 7:11 ` Fu Wei
2015-07-23 5:16 ` [PATCH v3 2/4] arm64: Add xen_boot module file fu.wei
2015-10-29 14:27 ` Vladimir 'φ-coder/phcoder' Serbinenko
2015-10-30 8:08 ` Fu Wei
2015-11-03 14:57 ` Fu Wei
2015-11-03 15:22 ` Ian Campbell
2015-11-05 9:46 ` Fu Wei
2015-07-23 5:16 ` fu.wei [this message]
2015-10-29 15:25 ` [PATCH v3 3/4] * util/grub.d/20_linux_xen.in: Add support of the XEN boot on aarch64 Vladimir 'φ-coder/phcoder' Serbinenko
2015-10-29 19:53 ` Andrei Borzenkov
2015-10-30 8:44 ` Fu Wei
2015-10-30 9:50 ` Vladimir 'φ-coder/phcoder' Serbinenko
2015-10-30 10:07 ` Andrei Borzenkov
[not found] ` <CAEaD8JOHR9QXa=ySc36a-ECF-7MUBgvaSVFw_BZxrXrvZA5u_A@mail.gmail.com>
[not found] ` <CAA91j0XKvpgVVWuv79AEv6bguxrQrV4q+eG5Xtw+UBvMSmDF-w@mail.gmail.com>
2015-11-12 10:43 ` Vladimir 'φ-coder/phcoder' Serbinenko
2015-07-23 5:16 ` [PATCH v3 4/4] arm64: Add the introduction of xen boot commands in docs/grub.texi fu.wei
2015-08-04 8:34 ` [PATCH v3 0/4] arm64: Add Xen boot support (via fdt) Fu Wei
2015-09-08 3:38 ` Fu Wei
2015-09-30 16:00 ` Stefano Stabellini
2015-10-01 16:19 ` Stefano Stabellini
2015-10-29 2:43 ` Fu Wei
2015-10-29 6:06 ` Fu Wei
2015-10-29 11:00 ` Stefano Stabellini
2016-02-25 6:50 ` [PATCH v2 0/4] arm64,xen: add xen_boot support into grup-mkconfig fu.wei
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1437628583-23667-4-git-send-email-fu.wei@linaro.org \
--to=fu.wei@linaro.org \
--cc=Ian.Campbell@citrix.com \
--cc=arvidjaar@gmail.com \
--cc=grub-devel@gnu.org \
--cc=jcm@redhat.com \
--cc=leif.lindholm@linaro.org \
--cc=linaro-uefi@lists.linaro.org \
--cc=phcoder@gmail.com \
--cc=ryan.harkin@linaro.org \
--cc=stefano.stabellini@eu.citrix.com \
--cc=xen-devel@lists.xensource.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).