From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1ZI8st-0003ey-NI for mharc-grub-devel@gnu.org; Thu, 23 Jul 2015 01:17:31 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60668) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZI8sr-0003ZM-6h for grub-devel@gnu.org; Thu, 23 Jul 2015 01:17:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZI8so-0002jf-0g for grub-devel@gnu.org; Thu, 23 Jul 2015 01:17:29 -0400 Received: from mail-pa0-f54.google.com ([209.85.220.54]:34454) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZI8sn-0002jO-Sd for grub-devel@gnu.org; Thu, 23 Jul 2015 01:17:25 -0400 Received: by pacan13 with SMTP id an13so152663520pac.1 for ; Wed, 22 Jul 2015 22:17:25 -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=8IXV4aPXR8R6UdTUj3IlMpd8/q5HizGxTDFUsl9wXMk=; b=hSJP2PsZNrzLXWni5DfMq8Si2Zjji9mVrIQi3I6279LLjjuPwZbjJX/KeQi2AL9aKH P+p3X+BSDlJ6v+oGgkY9FHUU2C2SVDzyyMJhEUNtWcoFtMlxkuJjTbY6Z6UOtxCyWVmC fGgd1ie1oRQ6JB0+TOMxibATnszfmb0+zoJHJV2HeLWVol4viOUiErSIqcXPn3Bb+V8E USrT65G8+gB8tOdrALTPENSWLnR8WhWruwNHJJIJNpEwAyfVm9qneT/uybXRF/ejEP53 MqcXlE8mf4JifUpqPLI2k2Kbju0L9ngOsdx5tbXNz0Qq/H6Mb8HjhmJWg1lLuTHk5MNj 5Xww== X-Gm-Message-State: ALoCoQnH0dPbhpAknURzUkJDhDLncN82quYADo+XWsJKOwEofdYTCxXfq/fFIBGF+p9h1JlRV2Bp X-Received: by 10.70.134.70 with SMTP id pi6mr14405914pdb.100.1437628645340; Wed, 22 Jul 2015 22:17:25 -0700 (PDT) Received: from localhost.localdomain (li400-65.members.linode.com. [106.187.50.65]) by smtp.googlemail.com with ESMTPSA id ti10sm6364677pab.20.2015.07.22.22.17.20 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 22 Jul 2015 22:17:24 -0700 (PDT) From: fu.wei@linaro.org To: grub-devel@gnu.org, arvidjaar@gmail.com, phcoder@gmail.com 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 Message-Id: <1437628583-23667-4-git-send-email-fu.wei@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1437628583-23667-1-git-send-email-fu.wei@linaro.org> References: <=fu.wei@linaro.org> <1437628583-23667-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.220.54 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: Thu, 23 Jul 2015 05:17:30 -0000 From: Fu Wei This patch adds the support of boot command on aarch64 for XEN: xen_hypervisor xen_linux xen_initrd Signed-off-by: Fu Wei --- 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