From 0b8c5cd4e6b5c7148d2d6c018fc359e0146ca3a9 Mon Sep 17 00:00:00 2001 From: Star Zeng Date: Wed, 1 Jul 2015 03:11:45 +0000 Subject: Vlv2TbltDevicePkg: Use the merged Variable driver Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Star Zeng Reviewed-by: David Wei git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17771 6f19259b-4bc3-4df7-8a09-765794883524 --- Vlv2TbltDevicePkg/PlatformPkg.fdf | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'Vlv2TbltDevicePkg/PlatformPkg.fdf') diff --git a/Vlv2TbltDevicePkg/PlatformPkg.fdf b/Vlv2TbltDevicePkg/PlatformPkg.fdf index a0a6af43d..10071e1b5 100644 --- a/Vlv2TbltDevicePkg/PlatformPkg.fdf +++ b/Vlv2TbltDevicePkg/PlatformPkg.fdf @@ -340,11 +340,7 @@ INF IntelFspWrapperPkg/FspInitPei/FspInitPei.inf !endif INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/CpuPeim.inf INF MdeModulePkg/Universal/FaultTolerantWritePei/FaultTolerantWritePei.inf -!if $(SECURE_BOOT_ENABLE) == TRUE -INF SecurityPkg/VariableAuthenticated/Pei/VariablePei.inf -!else INF MdeModulePkg/Universal/Variable/Pei/VariablePei.inf -!endif INF $(PLATFORM_PACKAGE)/PlatformPei/PlatformPei.inf @@ -435,19 +431,13 @@ INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf INF MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf INF IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3SaveDxe.inf -!if $(SECURE_BOOT_ENABLE) -INF SecurityPkg/VariableAuthenticated/RuntimeDxe/VariableSmmRuntimeDxe.inf -INF SecurityPkg/VariableAuthenticated/RuntimeDxe/VariableSmm.inf -INF $(PLATFORM_PACKAGE)/FvbRuntimeDxe/FvbSmm.inf -INF MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmm.inf -INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PchSpiSmm.inf -INF SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf -!else INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.inf INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.inf INF $(PLATFORM_PACKAGE)/FvbRuntimeDxe/FvbSmm.inf INF MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmm.inf INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PchSpiSmm.inf +!if $(SECURE_BOOT_ENABLE) +INF SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf !endif INF MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf -- cgit v1.2.3