commit d68d2eda0e15e8b71156963f0b28a71721ecea20
author Star Zeng <star.zeng@intel.com> Wed Jul 01 03:11:05 2015 +0000
committer lzeng14 <lzeng14@Edk2> Wed Jul 01 03:11:05 2015 +0000
tree cc2b940d9eab7e68a4e40d1857bcb6f8d0cddac9
parent 5e56fb35e76b8a1230e3be14cd42a0247b7aed85

ArmVirtPkg: Use the merged Variable driver

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Star Zeng <star.zeng@intel.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Tested-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17770 6f19259b-4bc3-4df7-8a09-765794883524

ArmVirtPkg/ArmVirtQemu.dsc

diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
index d8eb796..0671469 100644
--- a/ArmVirtPkg/ArmVirtQemu.dsc
+++ b/ArmVirtPkg/ArmVirtQemu.dsc
@@ -239,11 +239,7 @@
   ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.inf

   ArmPkg/Drivers/CpuPei/CpuPei.inf

 

-!if $(SECURE_BOOT_ENABLE) == TRUE

-  SecurityPkg/VariableAuthenticated/Pei/VariablePei.inf

-!else

   MdeModulePkg/Universal/Variable/Pei/VariablePei.inf

-!endif

 

   MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf {

     <LibraryClasses>

@@ -264,16 +260,15 @@
   #

   ArmPkg/Drivers/CpuDxe/CpuDxe.inf

   MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf

+  MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf

 !if $(SECURE_BOOT_ENABLE) == TRUE

   MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf {

     <LibraryClasses>

       NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf

   }

-  SecurityPkg/VariableAuthenticated/RuntimeDxe/VariableRuntimeDxe.inf

   SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf

 !else

   MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf

-  MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf

 !endif

   MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf

   MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf

ArmVirtPkg/ArmVirtQemu.fdf

diff --git a/ArmVirtPkg/ArmVirtQemu.fdf b/ArmVirtPkg/ArmVirtQemu.fdf
index 73d088a..e822fdf 100644
--- a/ArmVirtPkg/ArmVirtQemu.fdf
+++ b/ArmVirtPkg/ArmVirtQemu.fdf
@@ -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

@@ -116,11 +117,9 @@
   INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf

   INF MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf

   INF MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf

-!if $(SECURE_BOOT_ENABLE) == TRUE

-  INF SecurityPkg/VariableAuthenticated/RuntimeDxe/VariableRuntimeDxe.inf

-  INF SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf

-!else

   INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf

+!if $(SECURE_BOOT_ENABLE) == TRUE

+  INF SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf

 !endif

   INF MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf

   INF EmbeddedPkg/ResetRuntimeDxe/ResetRuntimeDxe.inf

@@ -264,11 +263,7 @@
   INF ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.inf

   INF ArmPkg/Drivers/CpuPei/CpuPei.inf

   INF MdeModulePkg/Universal/PCD/Pei/Pcd.inf

-!if $(SECURE_BOOT_ENABLE) == TRUE

-  INF SecurityPkg/VariableAuthenticated/Pei/VariablePei.inf

-!else

   INF MdeModulePkg/Universal/Variable/Pei/VariablePei.inf

-!endif

   INF MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf

 

   FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 {