From patchwork Mon Dec 19 18:14:30 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leif Lindholm X-Patchwork-Id: 88508 Delivered-To: patch@linaro.org Received: by 10.140.20.101 with SMTP id 92csp1304297qgi; Mon, 19 Dec 2016 10:14:40 -0800 (PST) X-Received: by 10.200.57.55 with SMTP id s52mr16841469qtb.191.1482171280635; Mon, 19 Dec 2016 10:14:40 -0800 (PST) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id v128si474544qkh.194.2016.12.19.10.14.40; Mon, 19 Dec 2016 10:14:40 -0800 (PST) Received-SPF: pass (google.com: domain of linaro-uefi-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linaro-uefi-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=linaro-uefi-bounces@lists.linaro.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id E746C608FA; Mon, 19 Dec 2016 18:14:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id CD94F60877; Mon, 19 Dec 2016 18:14:36 +0000 (UTC) X-Original-To: linaro-uefi@lists.linaro.org Delivered-To: linaro-uefi@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id C50A76087C; Mon, 19 Dec 2016 18:14:34 +0000 (UTC) Received: from mail-wm0-f48.google.com (mail-wm0-f48.google.com [74.125.82.48]) by lists.linaro.org (Postfix) with ESMTPS id 436DE60856 for ; Mon, 19 Dec 2016 18:14:33 +0000 (UTC) Received: by mail-wm0-f48.google.com with SMTP id a197so100456420wmd.0 for ; Mon, 19 Dec 2016 10:14:33 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=QyOyQKHWEDvVBBxoyp87OPVd5kthxaMNwYRLcM0B+XU=; b=aPFFzUw8SvabBL2OfG/60pwkTdiilxsNm3FYTRqI5cPO/gDnwizpiu8vX+ILy1YZK8 Xqktn/izoIILIM/XP+/HXnfwrDfzJk8OwiXWaRQk6s9yax7SSvjn8k3yhEtmXg0hD9H1 w6aXNOlSchzlHrJ27yprAvUtYK4dUlwv/1zF9dPOfLMItrOVhhO1d20QSvKTV7qnQ8Qa t+FWgwlqfRO+qi1tQiLdxObeEJgyiRWevTAmc0Iwfzz9N9RKABBFYKgklYl/kmyQ7l7x pKHjvCHo/quln3CPCnbyYBqEqUspin8yBtF0djAAJc1c3DgWbiiETHIxtdcTHTwU/V/C vHXA== X-Gm-Message-State: AIkVDXKyWAg8Smj4jEmEpf0TD0xtS5iQFf30ImwruzQH4cY+ASZ/mXeSemToW/0LZYhTP1D7LE4= X-Received: by 10.28.236.205 with SMTP id h74mr14383557wmi.104.1482171272285; Mon, 19 Dec 2016 10:14:32 -0800 (PST) Received: from mohikan.hemma.eciton.net ([2a01:348:6:8735:e23f:49ff:fe6d:9d26]) by smtp.gmail.com with ESMTPSA id e188sm18351932wma.21.2016.12.19.10.14.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 19 Dec 2016 10:14:31 -0800 (PST) From: Leif Lindholm To: devel@acpica.org Date: Mon, 19 Dec 2016 18:14:30 +0000 Message-Id: <20161219181430.28668-1-leif.lindholm@linaro.org> X-Mailer: git-send-email 2.10.2 Cc: linaro-uefi@lists.linaro.org, Lv Zheng , linaro-acpi@lists.linaro.org Subject: [Linaro-uefi] [PATCH] EFI: fix build for AARCH64 X-BeenThere: linaro-uefi@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: linaro-uefi-bounces@lists.linaro.org Sender: "Linaro-uefi" AARCH64 build was left out of initial version, so add to .dsc and set ACPI_MACHINE_WIDTH correctly. Also, acpidump.inf specified explicit per-architecture (but identical) CFLAGS. Rather than duplicating this further, use the same setting for all architectures until there is actually a need to diverge. Also update README to make it obvious AArch64 is supported. Signed-off-by: Leif Lindholm --- generate/efi/AcpiPkg.dsc | 2 +- generate/efi/README | 1 + generate/efi/acpidump/acpidump.inf | 6 ++---- source/include/platform/acefi.h | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/generate/efi/AcpiPkg.dsc b/generate/efi/AcpiPkg.dsc index 323d39c..9302555 100644 --- a/generate/efi/AcpiPkg.dsc +++ b/generate/efi/AcpiPkg.dsc @@ -18,7 +18,7 @@ PLATFORM_VERSION = 1.0 DSC_SPECIFICATION = 0x00010005 OUTPUT_DIRECTORY = Build/Acpi - SUPPORTED_ARCHITECTURES = IA32|X64 + SUPPORTED_ARCHITECTURES = AARCH64|IA32|X64 BUILD_TARGETS = DEBUG|RELEASE SKUID_IDENTIFIER = DEFAULT diff --git a/generate/efi/README b/generate/efi/README index 7550e9d..b3ec3ff 100644 --- a/generate/efi/README +++ b/generate/efi/README @@ -20,6 +20,7 @@ But the porting has only been tested in a Linux environment. You can find built EFI binaries (e.x., acpidump.efi) in the following folders: + Build/Acpi/DEBUG_GCC47/AARCH64: aarch64 targets Build/Acpi/DEBUG_GCC47/IA32: i386 targets Build/Acpi/DEBUG_GCC47/X64: x86_64 targets diff --git a/generate/efi/acpidump/acpidump.inf b/generate/efi/acpidump/acpidump.inf index 8d2c979..e5f21c0 100644 --- a/generate/efi/acpidump/acpidump.inf +++ b/generate/efi/acpidump/acpidump.inf @@ -55,7 +55,5 @@ BaseLib [BuildOptions] - MSFT:*_*_IA32_CC_FLAGS = /Oi- /WX- /D_EDK2_EFI /DACPI_DUMP_APP - MSFT:*_*_X64_CC_FLAGS = /Oi- /WX- /D_EDK2_EFI /DACPI_DUMP_APP - GCC:*_*_IA32_CC_FLAGS = -U__linux__ -U_LINUX -D_EDK2_EFI -DACPI_DUMP_APP -fno-builtin -iwithprefix include - GCC:*_*_X64_CC_FLAGS = -U__linux__ -U_LINUX -D_EDK2_EFI -DACPI_DUMP_APP -fno-builtin -iwithprefix include + MSFT:*_*_*_CC_FLAGS = /Oi- /WX- /D_EDK2_EFI /DACPI_DUMP_APP + GCC:*_*_*_CC_FLAGS = -U__linux__ -U_LINUX -D_EDK2_EFI -DACPI_DUMP_APP -fno-builtin -iwithprefix include diff --git a/source/include/platform/acefi.h b/source/include/platform/acefi.h index dfa4894..30a5429 100644 --- a/source/include/platform/acefi.h +++ b/source/include/platform/acefi.h @@ -140,7 +140,7 @@ #define VOID void -#if defined(__ia64__) || defined(__x86_64__) +#if defined(__aarch64__) || (__ia64__) || defined(__x86_64__) #define ACPI_MACHINE_WIDTH 64