From patchwork Mon Jul 13 08:53:59 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fu Wei Fu X-Patchwork-Id: 51063 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f70.google.com (mail-wg0-f70.google.com [74.125.82.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id E99C8218E9 for ; Mon, 13 Jul 2015 08:56:43 +0000 (UTC) Received: by wgfk9 with SMTP id k9sf101748277wgf.1 for ; Mon, 13 Jul 2015 01:56:43 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:subject:date:message-id :in-reply-to:references:cc:precedence:reply-to:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :mime-version:content-type:content-transfer-encoding:errors-to :sender:x-original-sender:x-original-authentication-results :mailing-list; bh=TOOgSsP6nP/UHsJl+3r1vFEZHwl45+J//KvQMJsj8QE=; b=hYs8c6tMR2RKu5/r+RXGY2CeNpo/CPW3/ZFZqSVHidbRhKyxeTbpSU0pwytUqdcnmF GFBuW9m3h76EDsAoeSDpB6L1oUXD3wPWrdNMYXC3M+ndMVeLMMUULU5qK2wWE6td3ROh zbVJia/RyBdrOJBJ5th28A1vHFVsvhmINsArqzPuXEWcsMEETXJLyDUVnBIek/zhhgEm BpwQp4u/++CyJUy6LpJQPhDsOkt2CatueTTBAPVBnZT6j+zEmRJOaU5NoUrRwhWcucxg T+kec9B69dpDL9ki3NWepnuGmHSDHJFQk7Uzk4t9dxWmvv1ktwKy0CvHnyoVOgJZzsSl oO0A== X-Gm-Message-State: ALoCoQlTufV1HhXjBC4FVT2ghBN+gMDFz3D9CbPXLY9vRScsi/d7uh2+lN0u2gxGWo+zu1m/sv8J X-Received: by 10.194.179.42 with SMTP id dd10mr18069850wjc.7.1436777803300; Mon, 13 Jul 2015 01:56:43 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.20.201 with SMTP id p9ls1500193lae.42.gmail; Mon, 13 Jul 2015 01:56:43 -0700 (PDT) X-Received: by 10.152.29.97 with SMTP id j1mr25533762lah.104.1436777803132; Mon, 13 Jul 2015 01:56:43 -0700 (PDT) Received: from mail-lb0-f180.google.com (mail-lb0-f180.google.com. [209.85.217.180]) by mx.google.com with ESMTPS id dn11si14370771lac.122.2015.07.13.01.56.43 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 13 Jul 2015 01:56:43 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.180 as permitted sender) client-ip=209.85.217.180; Received: by lblf12 with SMTP id f12so51144121lbl.2 for ; Mon, 13 Jul 2015 01:56:43 -0700 (PDT) X-Received: by 10.152.18.162 with SMTP id x2mr31507436lad.73.1436777803013; Mon, 13 Jul 2015 01:56:43 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.108.230 with SMTP id hn6csp1588097lbb; Mon, 13 Jul 2015 01:56:41 -0700 (PDT) X-Received: by 10.66.97.67 with SMTP id dy3mr67350226pab.130.1436777801286; Mon, 13 Jul 2015 01:56:41 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id e3si27406568pdc.50.2015.07.13.01.56.40 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 13 Jul 2015 01:56:41 -0700 (PDT) Received-SPF: pass (google.com: domain of grub-devel-bounces+patch=linaro.org@gnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Received: from localhost ([::1]:53681 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZEZXT-0006mQ-Fs for patch@linaro.org; Mon, 13 Jul 2015 04:56:39 -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-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: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Errors-To: grub-devel-bounces+patch=linaro.org@gnu.org Sender: grub-devel-bounces+patch=linaro.org@gnu.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: fu.wei@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.180 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 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=""