From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1ZEZXJ-0006aK-Dg for mharc-grub-devel@gnu.org; Mon, 13 Jul 2015 04:56:29 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33933) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZEZXF-0006TY-Un for grub-devel@gnu.org; Mon, 13 Jul 2015 04:56:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZEZXA-0001MX-Al for grub-devel@gnu.org; Mon, 13 Jul 2015 04:56:25 -0400 Received: from mail-pd0-f178.google.com ([209.85.192.178]:35369) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZEZXA-0001MB-63 for grub-devel@gnu.org; Mon, 13 Jul 2015 04:56:20 -0400 Received: by pdrg1 with SMTP id g1so88824243pdr.2 for ; Mon, 13 Jul 2015 01:56:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=HLXAlTHbVPzY2DInKbQyLJMBtJayhMRj9mXiJpKBaZw=; b=jhCgR8RYqGCAGj1Z6qyUO+XZD6G4Q4CHO2IQW2kH1FzlEy0GaRFP7P41IUSXedlu7b Q6Gjki8kOD05LmY3LBtQc6rhK1mVeI6A3TcOIH/qTIddTZAmouQKqF4EjC0hE06JQdgr /i0aC/Xv37xy4poyrzXQjznWF7CMAp+Ipfap2PccfmnN2kaLcrZIUFrLoWIWpC0cgdMG +8DEdEENdYVKX2T7/ycZUULbgJYlLitrfEVvXydq/dpr+NAn33OGzave9HM1xh9f/VI1 E4vxXe4m3HpE4CWZKB92Wj2fsTYYOUYQrKpUczRssACthu9WzpKxNfRU6aYMp0VhONHc gNtw== X-Gm-Message-State: ALoCoQnQGdwdifM3AOUd5m2mH0yuf1T6stBzlItLxC13n1pZKs01T82DIbTXS3Yik7NFsI8vOXcb X-Received: by 10.70.89.199 with SMTP id bq7mr66455964pdb.168.1436777779581; Mon, 13 Jul 2015 01:56:19 -0700 (PDT) Received: from localhost.localdomain (li400-65.members.linode.com. [106.187.50.65]) by smtp.googlemail.com with ESMTPSA id g10sm18109895pat.35.2015.07.13.01.55.25 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 13 Jul 2015 01:56:19 -0700 (PDT) From: fu.wei@linaro.org To: grub-devel@gnu.org, arvidjaar@gmail.com, phcoder@gmail.com Subject: [PATCH v2 2/3] util/grub.d/20_linux_xen.in: Add arm64 support Date: Mon, 13 Jul 2015 16:53:59 +0800 Message-Id: <1436777640-31871-3-git-send-email-fu.wei@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1436777640-31871-1-git-send-email-fu.wei@linaro.org> References: <=fu.wei@linaro.org> <1436777640-31871-1-git-send-email-fu.wei@linaro.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.192.178 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 X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Jul 2015 08:56:27 -0000 From: Fu Wei This patch adds the support of boot command on arm64 for XEN: xen_hypervisor xen_module Signed-off-by: Fu Wei --- util/grub.d/20_linux_xen.in | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in index f532fb9..b52c50d 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_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_cmd} --nounzip ${rel_dirname}/${initrd} EOF fi sed "s/^/$submenu_indentation/" << EOF @@ -185,6 +185,14 @@ case "$machine" in *) GENKERNEL_ARCH="$machine" ;; esac +if [ "x$machine" != xaarch64 ]; then + multiboot_cmd="multiboot" + module_cmd="module" +else + multiboot_cmd="xen_hypervisor" + module_cmd="xen_module" +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