ArmVirtPkg: unshare TpmMeasurementLib resolution between platforms

[mirror_edk2.git] / ArmVirtPkg / ArmVirt.dsc.inc

diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc
index a4ae25d982a21cc3b7c97af3e39d5563a61b0eb8..0a28d3a610d654162f715cab84f2d85bb46316a6 100644 (file)
--- a/ArmVirtPkg/ArmVirt.dsc.inc
+++ b/ArmVirtPkg/ArmVirt.dsc.inc
@@ -10,6 +10,21 @@
 [Defines]\r
   DEFINE DEBUG_PRINT_ERROR_LEVEL = 0x8000004F\r
 \r
+!if $(TARGET) != NOOPT\r
+  DEFINE FD_SIZE_IN_MB    = 2\r
+!else\r
+  DEFINE FD_SIZE_IN_MB    = 3\r
+!endif\r
+\r
+!if $(FD_SIZE_IN_MB) == 2\r
+  DEFINE FD_SIZE          = 0x200000\r
+  DEFINE FD_NUM_BLOCKS    = 0x200\r
+!endif\r
+!if $(FD_SIZE_IN_MB) == 3\r
+  DEFINE FD_SIZE          = 0x300000\r
+  DEFINE FD_NUM_BLOCKS    = 0x300\r
+!endif\r
+\r
 [BuildOptions.common.EDKII.DXE_CORE,BuildOptions.common.EDKII.DXE_DRIVER,BuildOptions.common.EDKII.UEFI_DRIVER,BuildOptions.common.EDKII.UEFI_APPLICATION]\r
   GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000\r
 \r
@@ -150,13 +165,11 @@
   # Secure Boot dependencies\r
   #\r
 !if $(SECURE_BOOT_ENABLE) == TRUE\r
-  TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf\r
   AuthVariableLib|SecurityPkg/Library/AuthVariableLib/AuthVariableLib.inf\r
 \r
   # re-use the UserPhysicalPresent() dummy implementation from the ovmf tree\r
   PlatformSecureLib|OvmfPkg/Library/PlatformSecureLib/PlatformSecureLib.inf\r
 !else\r
-  TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf\r
   AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf\r
 !endif\r
   VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf\r