ArmVirtPkg/ArmVirtQemu: enable the TPM2 configuration module

[mirror_edk2.git] / ArmVirtPkg / ArmVirtQemuKernel.dsc

diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc
index 596e59739cabc29412276ecfd5463b6c85320ae9..37e19dfbd0db6688e1dd074c589d28fc59a32b90 100644 (file)
--- a/ArmVirtPkg/ArmVirtQemuKernel.dsc
+++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc
@@ -43,10 +43,6 @@
   !error "NETWORK_SNP_ENABLE is IA32/X64/EBC only"\r
 !endif\r
 \r
-!if $(NETWORK_TLS_ENABLE) == TRUE\r
-  !error "NETWORK_TLS_ENABLE is tracked at <https://bugzilla.tianocore.org/show_bug.cgi?id=1009>"\r
-!endif\r
-\r
 !include NetworkPkg/NetworkDefines.dsc.inc\r
 \r
 !include ArmVirtPkg/ArmVirt.dsc.inc\r
@@ -77,6 +73,7 @@
   PciPcdProducerLib|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf\r
   PciSegmentLib|MdePkg/Library/BasePciSegmentLibPci/BasePciSegmentLibPci.inf\r
   PciHostBridgeLib|ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf\r
+  TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf\r
 \r
 [LibraryClasses.common.DXE_DRIVER]\r
   ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf\r
@@ -118,6 +115,14 @@
   gArmPlatformTokenSpaceGuid.PcdCPUCorePrimaryStackSize|0x4000\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x2000\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdMaxAuthVariableSize|0x2800\r
+!if $(NETWORK_TLS_ENABLE) == TRUE\r
+  #\r
+  # The cumulative and individual VOLATILE variable size limits should be set\r
+  # high enough for accommodating several and/or large CA certificates.\r
+  #\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdVariableStoreSize|0x80000\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVolatileVariableSize|0x40000\r
+!endif\r
 \r
   # Size of the region used by UEFI in permanent memory (Reserved 64MB)\r
   gArmPlatformTokenSpaceGuid.PcdSystemMemoryUefiRegionSize|0x04000000\r
@@ -168,6 +173,12 @@
   gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|3\r
 \r
 [PcdsPatchableInModule.common]\r
+  # we need to provide a resolution for this PCD that supports PcdSet64()\r
+  # being called from ArmVirtPkg/Library/PlatformPeiLib/PlatformPeiLib.c,\r
+  # even though that call will be compiled out on this platform as it does\r
+  # not (and cannot) support the TPM2 driver stack\r
+  gEfiSecurityPkgTokenSpaceGuid.PcdTpmBaseAddress|0x0\r
+\r
   #\r
   # This will be overridden in the code\r
   #\r
@@ -356,6 +367,12 @@
   # Networking stack\r
   #\r
 !include NetworkPkg/NetworkComponents.dsc.inc\r
+!if $(NETWORK_TLS_ENABLE) == TRUE\r
+  NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf {\r
+    <LibraryClasses>\r
+      NULL|OvmfPkg/Library/TlsAuthConfigLib/TlsAuthConfigLib.inf\r
+  }\r
+!endif\r
 \r
   #\r
   # SCSI Bus and Disk Driver\r