From patchwork Thu Oct 2 01:11:39 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roy Franz X-Patchwork-Id: 38261 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 6EE64202E7 for ; Thu, 2 Oct 2014 01:14:19 +0000 (UTC) Received: by mail-wg0-f70.google.com with SMTP id a1sf533551wgh.5 for ; Wed, 01 Oct 2014 18:14:18 -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:date:message-id:in-reply-to :references:cc:subject:precedence:list-id:list-unsubscribe:list-post :list-help:list-subscribe:mime-version:sender:errors-to :x-original-sender:x-original-authentication-results:mailing-list :list-archive:content-type:content-transfer-encoding; bh=60ppwbJ+wOvX+fY5655mB2e4fSnNAvB3vjzxtvBgAxk=; b=lss1Vy29VnPL8mBdywUmcnP8IR8SDyQ/xQA6JE5atC3I3Eq+9NEatLmPW6zSzdxmzu BBQCHtpFuEmi9rGcMpzkQBYFdjzAcusyBT9xLB76NEPOxx05Nim07B53HsiCy2xIbdqf 8RKjTF+KZkLZUDrM7zOOMHvdbQhx9WGp+buVMkPyMfRlediDsNQfo8anD2ZUV8F34kSE q8QuiXU+ouF4B1AVQKbDJX732VLuZh0xEzM4/AW5qPSv2TJy+4VJnwU3r6gyEvIVA+tU G7dCjAxhbF7ZfBMKlfKQMJzNnMhC3fzt80CAXn/h1cFH8625je9GJddRmdLx/JPAioB/ ++Bg== X-Gm-Message-State: ALoCoQl991zQs2oo91m9stJZhYPi/mEBVbPeIZlRCRDjvjvaTCM0t0yhLxb0cIfSWdJJOpUika71 X-Received: by 10.152.2.97 with SMTP id 1mr2501306lat.6.1412212458216; Wed, 01 Oct 2014 18:14:18 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.43.103 with SMTP id v7ls240595lal.32.gmail; Wed, 01 Oct 2014 18:14:18 -0700 (PDT) X-Received: by 10.112.159.169 with SMTP id xd9mr56084055lbb.71.1412212458001; Wed, 01 Oct 2014 18:14:18 -0700 (PDT) Received: from mail-la0-f43.google.com (mail-la0-f43.google.com [209.85.215.43]) by mx.google.com with ESMTPS id li6si4146659lbc.87.2014.10.01.18.14.17 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 01 Oct 2014 18:14:17 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.43 as permitted sender) client-ip=209.85.215.43; Received: by mail-la0-f43.google.com with SMTP id mc6so1466896lab.30 for ; Wed, 01 Oct 2014 18:14:17 -0700 (PDT) X-Received: by 10.153.6.36 with SMTP id cr4mr24906599lad.40.1412212457849; Wed, 01 Oct 2014 18:14:17 -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.130.169 with SMTP id of9csp635656lbb; Wed, 1 Oct 2014 18:14:17 -0700 (PDT) X-Received: by 10.195.13.114 with SMTP id ex18mr40414834wjd.89.1412212457206; Wed, 01 Oct 2014 18:14:17 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id qj3si3493208wjc.78.2014.10.01.18.14.16 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 01 Oct 2014 18:14:17 -0700 (PDT) Received-SPF: none (google.com: xen-devel-bounces@lists.xen.org does not designate permitted sender hosts) client-ip=50.57.142.19; Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XZUvx-00088t-Pi; Thu, 02 Oct 2014 01:11:53 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XZUvw-00088o-7S for xen-devel@lists.xen.org; Thu, 02 Oct 2014 01:11:53 +0000 Received: from [85.158.139.211:39242] by server-2.bemta-5.messagelabs.com id 5B/F1-31832-756AC245; Thu, 02 Oct 2014 01:11:51 +0000 X-Env-Sender: roy.franz@linaro.org X-Msg-Ref: server-16.tower-206.messagelabs.com!1412212309!8610126!1 X-Originating-IP: [209.85.213.178] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17468 invoked from network); 2 Oct 2014 01:11:50 -0000 Received: from mail-ig0-f178.google.com (HELO mail-ig0-f178.google.com) (209.85.213.178) by server-16.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 2 Oct 2014 01:11:50 -0000 Received: by mail-ig0-f178.google.com with SMTP id l13so1507791iga.11 for ; Wed, 01 Oct 2014 18:11:49 -0700 (PDT) X-Received: by 10.50.29.44 with SMTP id g12mr1188631igh.1.1412212309147; Wed, 01 Oct 2014 18:11:49 -0700 (PDT) Received: from rfranz-v430.caveonetworks.com (64.2.3.195.ptr.us.xo.net. [64.2.3.195]) by mx.google.com with ESMTPSA id sd6sm2749256igb.6.2014.10.01.18.11.47 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 01 Oct 2014 18:11:48 -0700 (PDT) From: Roy Franz To: xen-devel@lists.xen.org, ian.campbell@citrix.com, stefano.stabellini@citrix.com, tim@xen.org, jbeulich@suse.com, keir@xen.org Date: Wed, 1 Oct 2014 18:11:39 -0700 Message-Id: <1412212299-13831-3-git-send-email-roy.franz@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1412212299-13831-1-git-send-email-roy.franz@linaro.org> References: <1412212299-13831-1-git-send-email-roy.franz@linaro.org> Cc: Roy Franz , fu.wei@linaro.org Subject: [Xen-devel] [RFC PATCH 2/2] arm64: Create xen.efi binary for arm64 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: roy.franz@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.215.43 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 List-Archive: The 'xen' binary for arm64 is both an Image file and a PE/COFF executable, copy it to xen.efi so that the 'make install' processing is shared with x86. Prior to this 'make install' was broken on arm64. Signed-off-by: Roy Franz --- config/arm64.mk | 2 ++ xen/arch/arm/Makefile | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/config/arm64.mk b/config/arm64.mk index 4e57b3a..6eafda2 100644 --- a/config/arm64.mk +++ b/config/arm64.mk @@ -15,3 +15,5 @@ LDFLAGS_DIRECT += -EL CONFIG_LOAD_ADDRESS ?= 0x80000000 IOEMU_CPU_ARCH ?= aarch64 + +EFI_DIR ?= /usr/lib64/efi diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile index f330302..9a25290 100644 --- a/xen/arch/arm/Makefile +++ b/xen/arch/arm/Makefile @@ -49,6 +49,9 @@ ALL_OBJS := $(TARGET_SUBARCH)/head.o $(ALL_OBJS) $(TARGET): $(TARGET)-syms $(TARGET).axf $(OBJCOPY) -O binary -S $< $@ +ifeq (arm64,$(XEN_TARGET_ARCH)) + ln -sf $(notdir $@) ../../$(notdir $@).efi +endif $(TARGET).axf: $(TARGET)-syms # XXX: VE model loads by VMA so instead of @@ -100,3 +103,4 @@ clean:: rm -f asm-offsets.s xen.lds rm -f $(BASEDIR)/.xen-syms.[0-9]* rm -f $(TARGET).axf + rm -f $(TARGET).efi