From patchwork Tue Jun 21 10:30:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 70542 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp1941693qgy; Tue, 21 Jun 2016 03:30:46 -0700 (PDT) X-Received: by 10.36.25.83 with SMTP id b80mr4124431itb.29.1466505046314; Tue, 21 Jun 2016 03:30:46 -0700 (PDT) Return-Path: Received: from ml01.01.org (ml01.01.org. [2001:19d0:306:5::1]) by mx.google.com with ESMTPS id i1si39514272pfk.138.2016.06.21.03.30.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Jun 2016 03:30:46 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) client-ip=2001:19d0:306:5::1; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 376591A1E2D; Tue, 21 Jun 2016 03:31:15 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received: from mail-lf0-x22f.google.com (mail-lf0-x22f.google.com [IPv6:2a00:1450:4010:c07::22f]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 05C2D1A1E2D for ; Tue, 21 Jun 2016 03:31:13 -0700 (PDT) Received: by mail-lf0-x22f.google.com with SMTP id h129so16780182lfh.1 for ; Tue, 21 Jun 2016 03:30:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=lsFJ5u9syGJODw78LjDE5y1mNfiWtl2HloUXDz4Zv+Y=; b=kNQRU0UAMwHWzViks609aCXEkPa/GlxRRX7AjWarPEOgH0KPGkOS9lAmgwQGFheNul +ISY2G7TSGu1qFA3SzjbxO9om1w1y7+FV8jQ/nIdSNTB7zx0PEa00gGwvpv0pC65LNIh WZc9u10c0w+edc0j91PTUAWhz+aS/HNf5v1Fg= 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:in-reply-to :references; bh=lsFJ5u9syGJODw78LjDE5y1mNfiWtl2HloUXDz4Zv+Y=; b=VMKBqZHJRaUTZKOXjQZNS/nUv98L8RaTeXI+pCAHiNm2D+TC6VdgGgMLoiDXUGIEfy ZtmbY1jXlKE9jEgwKasTGjpoUJYQ1SpaCSkAYATAN+MU16VrpDiBj1tvfkf3p+L2gDRB VHi1uo0ZNwlkQRyRQmOkJZ+FNfAi9lH0LKXTdU1W8W3MqqyDzHivL9k7QecKojvYhA6n 8ZCe5E1b4sYrLtd546355QhHZvraqBDdmZE4Di55Uo2U0N2r/HamyeoJDlsEdoI71DNI f2j4dMXqzfraVV5ghQanic/C17V453PpneqeX7yLmKl84OlZpQ6esayFWpReOGfrz89Q 3B6A== X-Gm-Message-State: ALyK8tJ6fuNx+0ztjWpz108OssD17rRz9wXNqhqsY5JqGyZhDO9MLI+kyOEr92/xYr8UxkEs X-Received: by 10.28.222.136 with SMTP id v130mr2494323wmg.90.1466505041787; Tue, 21 Jun 2016 03:30:41 -0700 (PDT) Received: from localhost.localdomain ([188.203.148.129]) by smtp.gmail.com with ESMTPSA id d137sm2314154wmd.12.2016.06.21.03.30.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 21 Jun 2016 03:30:41 -0700 (PDT) From: Ard Biesheuvel To: edk2-devel@lists.01.org, leif.lindholm@linaro.org, lersek@redhat.com Date: Tue, 21 Jun 2016 12:30:32 +0200 Message-Id: <1466505034-10267-3-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1466505034-10267-1-git-send-email-ard.biesheuvel@linaro.org> References: <1466505034-10267-1-git-send-email-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH 2/4] ArmVirtPkg/ArmVirtQemu: switch secure boot build to NorFlashDxe X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Ard Biesheuvel MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" There is no longer a reason to use a different implementation of NorFlashDxe for secure boot builds now that the varstore FV header can carry either gEfiVariableGuid or gEfiAuthenticatedVariableGuid, and the dependent code has been updated to deal with that. So move the secure boot capable builds to the common NorFlashDxe. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel --- ArmVirtPkg/ArmVirtQemu.dsc | 4 ---- ArmVirtPkg/ArmVirtQemu.fdf | 4 ---- ArmVirtPkg/ArmVirtQemuKernel.dsc | 4 ---- ArmVirtPkg/ArmVirtQemuKernel.fdf | 4 ---- 4 files changed, 16 deletions(-) -- 2.7.4 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel Reviewed-by: Laszlo Ersek diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc index d07593b45e27..4958b577ea06 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc @@ -314,11 +314,7 @@ [Components.common] NULL|ArmVirtPkg/Library/ArmVirtTimerFdtClientLib/ArmVirtTimerFdtClientLib.inf } -!if $(SECURE_BOOT_ENABLE) == TRUE - ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashAuthenticatedDxe.inf -!else ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf -!endif MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf # diff --git a/ArmVirtPkg/ArmVirtQemu.fdf b/ArmVirtPkg/ArmVirtQemu.fdf index 012f65e99038..422a2bf1f9a1 100644 --- a/ArmVirtPkg/ArmVirtQemu.fdf +++ b/ArmVirtPkg/ArmVirtQemu.fdf @@ -136,11 +136,7 @@ [FV.FvMain] 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 INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf # diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc index 65e6c875204f..f652689054dc 100644 --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc @@ -292,11 +292,7 @@ [Components.common] NULL|ArmVirtPkg/Library/ArmVirtTimerFdtClientLib/ArmVirtTimerFdtClientLib.inf } -!if $(SECURE_BOOT_ENABLE) == TRUE - ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashAuthenticatedDxe.inf -!else ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf -!endif MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf # diff --git a/ArmVirtPkg/ArmVirtQemuKernel.fdf b/ArmVirtPkg/ArmVirtQemuKernel.fdf index 1a2652fd5068..6db0668a882d 100644 --- a/ArmVirtPkg/ArmVirtQemuKernel.fdf +++ b/ArmVirtPkg/ArmVirtQemuKernel.fdf @@ -157,11 +157,7 @@ [FV.FvMain] 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 INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf #