From patchwork Wed Jun 22 15:01:16 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 70660 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp2593467qgy; Wed, 22 Jun 2016 08:01:36 -0700 (PDT) X-Received: by 10.200.46.235 with SMTP id i40mr38118225qta.13.1466607696633; Wed, 22 Jun 2016 08:01:36 -0700 (PDT) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id x63si246750qke.12.2016.06.22.08.01.33; Wed, 22 Jun 2016 08:01:36 -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 39FC16171F; Wed, 22 Jun 2016 15:01:33 +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 0F0E9616D8; Wed, 22 Jun 2016 15:01:30 +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 E0BB361714; Wed, 22 Jun 2016 15:01:27 +0000 (UTC) Received: from mail-wm0-f42.google.com (mail-wm0-f42.google.com [74.125.82.42]) by lists.linaro.org (Postfix) with ESMTPS id 4A3CE616D8 for ; Wed, 22 Jun 2016 15:01:22 +0000 (UTC) Received: by mail-wm0-f42.google.com with SMTP id a66so10157089wme.0 for ; Wed, 22 Jun 2016 08:01:22 -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=s8AQ/i0NyCGOR5o9KBU38DNnJXl2gM1TI8hsY70VNEI=; b=DicMk4oTQ9XAUKHzXOuaNHzD3p9unikT0iA/5vo95ey6DRsFp30lRuWiLk9PhDMu6t OW9JIp2a05IUgA9oraBKSzg+RbAw9SegTlNii4s9qNEa8wcTXZ+EQ3+JzZi+zIrEzqse ClFj17gWg3AI4vGE2+28mClgfWB+dfTT1BLC+Ad67pJ0q34Xoz2cxfJX124Mn8tZKkm9 SjP+GZ0n9fReUmNwFaX3vq+0FugKDy3hJHVGweM8700gf2WiCwYTeKjplKOZJ1KoheBd gNCSx4zfZnnk8hRoUCu2y7IRz+I5G8vgiEEGGbuk1YFoVDGHmGklTEag/pjhpdMy0U+G PniQ== X-Gm-Message-State: ALyK8tIJYKGLVv/5i8tCINgi6+GA3iVVnkrSnE3ItMtMCchdcG01ojoo9DTJYO9oYFAK9995ZyI= X-Received: by 10.194.55.136 with SMTP id s8mr24539007wjp.134.1466607681443; Wed, 22 Jun 2016 08:01:21 -0700 (PDT) Received: from localhost.localdomain ([188.203.148.129]) by smtp.gmail.com with ESMTPSA id i74sm1019197wmg.21.2016.06.22.08.01.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 22 Jun 2016 08:01:20 -0700 (PDT) From: Ard Biesheuvel To: linaro-uefi@lists.linaro.org Date: Wed, 22 Jun 2016 17:01:16 +0200 Message-Id: <1466607676-28487-1-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.7.4 Subject: [Linaro-uefi] [PATCH] Platforms/ARM/VExpress-FVP: drop reference to NorFlashAuthenticatedDxe 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" The DXE module NorFlashAuthenticatedDxe no longer exists upstream, now that its functionality has been merged into the ordinary NorFlashDxe, which now supports for non-secure boot and secure boot builds. So replace all references to it with NorFlashDxe. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel Reviewed-by: Ryan Harkin --- Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.dsc | 4 ---- Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.fdf | 4 ---- 2 files changed, 8 deletions(-) diff --git a/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.dsc b/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.dsc index 92af088b7759..0f03b479c63e 100644 --- a/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.dsc +++ b/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.dsc @@ -280,11 +280,7 @@ OpenPlatformPkg/Platforms/ARM/VExpress/AcpiTables/rtsm_ve-aemv8a/AcpiTables.inf ArmPkg/Drivers/ArmGic/ArmGicDxe.inf -!if $(SECURE_BOOT_ENABLE) == TRUE - ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashAuthenticatedDxe.inf -!else ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf -!endif ArmPkg/Drivers/TimerDxe/TimerDxe.inf !ifdef EDK2_ENABLE_PL111 ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/PL111LcdGraphicsOutputDxe.inf diff --git a/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.fdf b/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.fdf index b49d452e85e5..41267baae344 100644 --- a/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.fdf +++ b/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.fdf @@ -112,11 +112,7 @@ FvNameGuid = 87940482-fc81-41c3-87e6-399cf85ac8a0 INF ArmPkg/Drivers/ArmGic/ArmGicDxe.inf INF ArmPkg/Drivers/TimerDxe/TimerDxe.inf -!if $(SECURE_BOOT_ENABLE) == TRUE - INF ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashAuthenticatedDxe.inf -!else INF ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf -!endif !ifdef EDK2_ENABLE_PL111 INF ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/PL111LcdGraphicsOutputDxe.inf !endif