From patchwork Wed Jul 6 15:20:19 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 71475 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp920389qgy; Wed, 6 Jul 2016 08:20:45 -0700 (PDT) X-Received: by 10.107.27.80 with SMTP id b77mr19441586iob.163.1467818445685; Wed, 06 Jul 2016 08:20:45 -0700 (PDT) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id 193si4200461itg.65.2016.07.06.08.20.40; Wed, 06 Jul 2016 08:20:45 -0700 (PDT) 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 7AAFE68450; Wed, 6 Jul 2016 15:20:40 +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=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW, 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 4ACF1680BD; Wed, 6 Jul 2016 15:20:37 +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 150E46844D; Wed, 6 Jul 2016 15:20: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 37D30680BD for ; Wed, 6 Jul 2016 15:20:29 +0000 (UTC) Received: by mail-wm0-f48.google.com with SMTP id f126so177899963wma.1 for ; Wed, 06 Jul 2016 08:20:29 -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; bh=JyN//zYRQhVDM4SOnJZY9hlb6nyO11T0Et+FyCqXjQw=; b=VAeUmqI7VftpkzNN/r4q0Vqew3O4IZtY/9TNyJ7Oh5LsLw+4IpMGspzG89LwU2sNs3 8qUdOQPvDvADhzAZCQ0pi3ZOLomAiQg7t7hOcAa8cx6DuguNIiEQp2xSJiLQ5SR0YA0a b+TVZAvz4uVxqlP6x8RMHQ04DwPL0rHxF/RfmnokYn18NJAJxPEoCvL5Bx6312IuO28r GUbb0OJVEqS0W3feE9thXW1lcYDaUbFjbGRferyW47SpzNei2L1d7HQn1whmkt8mUVoS Tin++rAxhS9wEhGHMFesbyqGPqPnGHTVh5rTYTJbv12tSGn5CLv8Ark41RQv/TtD5r9F 6UXQ== X-Gm-Message-State: ALyK8tKlga2aAHMY7HxBG3lFRwydyDnm/4BLPMthT5i+ratAC91CdRyVYW/HJsDGhlKAljkmI2s= X-Received: by 10.28.225.196 with SMTP id y187mr20793134wmg.72.1467818427464; Wed, 06 Jul 2016 08:20:27 -0700 (PDT) Received: from localhost.localdomain (ip16-2-212-87.adsl2.static.versatel.nl. [87.212.2.16]) by smtp.gmail.com with ESMTPSA id b84sm4201503wmb.6.2016.07.06.08.20.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 06 Jul 2016 08:20:26 -0700 (PDT) From: Ard Biesheuvel To: linaro-uefi@lists.linaro.org Date: Wed, 6 Jul 2016 17:20:19 +0200 Message-Id: <1467818419-12455-1-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 1.9.1 Subject: [Linaro-uefi] [PATCH] Platforms/FVP: drop GICv2 support 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" Now that ARM Trusted Firmware has dropped support for the legacy VE memory map (which means it can only support the FVP Foundation model in GICv3 mode), and runs the GICv3 in native mode by default on the secure side (which prevents a GICv2 compatible GICv3 from being driven in v2 mode on the non-secure side), there is little point in keeping the GICv2 legacy ifdefs in the FVP dsc. So remove them. Note that we will still be able to support FVP Base in GICv2 mode after applying this patch, but running it will require a special build of ATF with FVP_GICV2 defined. Signed-off-by: Ard Biesheuvel Reviewed-by: Ryan Harkin Reviewed-by: Leif Lindholm --- Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.dsc | 9 --------- 1 file changed, 9 deletions(-) diff --git a/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.dsc b/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.dsc index 1e871b541c6e..3d67823cf5db 100644 --- a/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.dsc +++ b/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.dsc @@ -82,10 +82,6 @@ # It could be set FALSE to save size. gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport|TRUE -!ifdef ARM_FVP_GICV3_WITH_V2_LEGACY - gArmTokenSpaceGuid.PcdArmGicV3WithV2Legacy|TRUE -!endif - [PcdsFixedAtBuild.common] gArmPlatformTokenSpaceGuid.PcdFirmwareVendor|"ARM Fixed Virtual Platform" gEmbeddedTokenSpaceGuid.PcdEmbeddedPrompt|"ARM-FVP" @@ -154,14 +150,9 @@ # # ARM General Interrupt Controller # -!ifdef ARM_FVP_LEGACY_GICV2_LOCATION - gArmTokenSpaceGuid.PcdGicDistributorBase|0x2C001000 - gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase|0x2C002000 -!else gArmTokenSpaceGuid.PcdGicDistributorBase|0x2f000000 gArmTokenSpaceGuid.PcdGicRedistributorsBase|0x2f100000 gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase|0x2C000000 -!endif # # ARM OS Loader