From patchwork Thu Jul 23 05:16:22 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: 51377 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f200.google.com (mail-lb0-f200.google.com [209.85.217.200]) by patches.linaro.org (Postfix) with ESMTPS id 7ED3222E16 for ; Thu, 23 Jul 2015 05:17:49 +0000 (UTC) Received: by lbbvz8 with SMTP id vz8sf63231142lbb.2 for ; Wed, 22 Jul 2015 22:17:48 -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=vA17NvQVzh9AcpIcqxU+J9t3DJRB0tIBBiQORTuZ4S0=; b=LWkfza8uj2tfjIRvYNSNpw2D+tYGHQSnsEGe9AA2PdcEoDiARGRXunux/UPV4Qow5z g3N5LUduyFRR23yU3fQat8ZZf29TkAofbympFoWetLTZLZv7mw78Keu/8+nv7mcL584y Q1Yh1nFCFUzsheSW7dOM5XGGeTqOCQW7DiwB26WB2Gv6Uc59f7DNg2V0E5Hqnv5xVLQw 55FySMqm/i2VbQaKAqsGKAuktabh3yDU/0cjQ4PXWgVLWp8gbArFERmyCMzG5qpMGKoo RKgOhe4IlhUht6AwzWnxNr+VLuQWXxxlerYPIWIt64s9T/9w0f9oUxy614xLdcsnWPrw 5X3Q== X-Gm-Message-State: ALoCoQnwbXddKXCTAzn2dC9h1b+83jDOPEtK5sOEJobf7jQ8dg3fXTTjzZQmGn4suQ/5jAs9WbUz X-Received: by 10.180.11.226 with SMTP id t2mr3339072wib.0.1437628668201; Wed, 22 Jul 2015 22:17:48 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.153.8.171 with SMTP id dl11ls160024lad.28.gmail; Wed, 22 Jul 2015 22:17:47 -0700 (PDT) X-Received: by 10.112.83.135 with SMTP id q7mr5738875lby.13.1437628667961; Wed, 22 Jul 2015 22:17:47 -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 tw3si3083134lbb.88.2015.07.22.22.17.47 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Jul 2015 22:17:47 -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 f12so149923539lbl.2 for ; Wed, 22 Jul 2015 22:17:47 -0700 (PDT) X-Received: by 10.152.37.228 with SMTP id b4mr5647244lak.117.1437628667846; Wed, 22 Jul 2015 22:17:47 -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.7.198 with SMTP id l6csp324700lba; Wed, 22 Jul 2015 22:17:47 -0700 (PDT) X-Received: by 10.180.75.78 with SMTP id a14mr13594938wiw.68.1437628667227; Wed, 22 Jul 2015 22:17:47 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id il2si6261777wjb.56.2015.07.22.22.17.46 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 22 Jul 2015 22:17:47 -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]:39529 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZI8t7-00040K-Ug for patch@linaro.org; Thu, 23 Jul 2015 01:17:45 -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-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: 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 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=""