From 5e56fb35e76b8a1230e3be14cd42a0247b7aed85 Mon Sep 17 00:00:00 2001 From: Star Zeng Date: Wed, 1 Jul 2015 03:10:27 +0000 Subject: [PATCH] ArmVirtPkg: Cleanup redundant library class resolution of Variable modules SecurityPkg/VariableAuthenticated/Pei/VariablePei.inf doesn't consume BaseCryptLib directly or indirectly, cleanup it. SecurityPkg/VariableAuthenticated/Pei/VariablePei.inf { BaseCryptLib|CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf } BaseCryptLib has been declared at [LibraryClasses.common.DXE_RUNTIME_DRIVER] section in ArmVirt.dsc.inc. OpensslLib has been declared at [LibraryClasses.common] section in ArmVirt.dsc.inc. So cleanup them. SecurityPkg/VariableAuthenticated/RuntimeDxe/VariableRuntimeDxe.inf { BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf } Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Star Zeng Reviewed-by: Laszlo Ersek Reviewed-by: Ard Biesheuvel Tested-by: Ard Biesheuvel git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17769 6f19259b-4bc3-4df7-8a09-765794883524 --- ArmVirtPkg/ArmVirtQemu.dsc | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc index 374cf7a9ee..d8eb796782 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc @@ -1,6 +1,7 @@ # # Copyright (c) 2011-2015, ARM Limited. All rights reserved. # Copyright (c) 2014, Linaro Limited. All rights reserved. +# Copyright (c) 2015, Intel Corporation. All rights reserved. # # This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License @@ -239,10 +240,7 @@ ArmPkg/Drivers/CpuPei/CpuPei.inf !if $(SECURE_BOOT_ENABLE) == TRUE - SecurityPkg/VariableAuthenticated/Pei/VariablePei.inf { - - BaseCryptLib|CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf - } + SecurityPkg/VariableAuthenticated/Pei/VariablePei.inf !else MdeModulePkg/Universal/Variable/Pei/VariablePei.inf !endif @@ -271,11 +269,7 @@ NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf } - SecurityPkg/VariableAuthenticated/RuntimeDxe/VariableRuntimeDxe.inf { - - BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf - OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf - } + SecurityPkg/VariableAuthenticated/RuntimeDxe/VariableRuntimeDxe.inf SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf !else MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf -- 2.39.2