]> git.proxmox.com Git - mirror_edk2.git/blobdiff - ArmVirtPkg/ArmVirtQemu.dsc
UefiCpuPkg: Move AsmRelocateApLoopStart from Mpfuncs.nasm to AmdSev.nasm
[mirror_edk2.git] / ArmVirtPkg / ArmVirtQemu.dsc
index d6ba3b6ae3971b1e6e884f253961a2bbdd309d30..72a0cacab4a8f4cc3c597d87f2866019da6f5b00 100644 (file)
@@ -1,7 +1,7 @@
 #\r
 #  Copyright (c) 2011-2015, ARM Limited. All rights reserved.\r
 #  Copyright (c) 2014, Linaro Limited. All rights reserved.\r
-#  Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.\r
+#  Copyright (c) 2015 - 2020, Intel Corporation. All rights reserved.\r
 #\r
 #  SPDX-License-Identifier: BSD-2-Clause-Patent\r
 #\r
   #\r
   DEFINE TTY_TERMINAL            = FALSE\r
   DEFINE SECURE_BOOT_ENABLE      = FALSE\r
-  DEFINE NETWORK_IP6_ENABLE      = FALSE\r
-  DEFINE HTTP_BOOT_ENABLE        = FALSE\r
+  DEFINE TPM2_ENABLE             = FALSE\r
+  DEFINE TPM2_CONFIG_ENABLE      = FALSE\r
+  DEFINE CAVIUM_ERRATUM_27456    = FALSE\r
+\r
+  #\r
+  # Network definition\r
+  #\r
+  DEFINE NETWORK_IP6_ENABLE              = FALSE\r
+  DEFINE NETWORK_HTTP_BOOT_ENABLE        = FALSE\r
+  DEFINE NETWORK_SNP_ENABLE              = FALSE\r
+  DEFINE NETWORK_TLS_ENABLE              = FALSE\r
+  DEFINE NETWORK_ALLOW_HTTP_CONNECTIONS  = TRUE\r
+  DEFINE NETWORK_ISCSI_ENABLE            = FALSE\r
+\r
+!if $(NETWORK_SNP_ENABLE) == TRUE\r
+  !error "NETWORK_SNP_ENABLE is IA32/X64/EBC only"\r
+!endif\r
+\r
+!include NetworkPkg/NetworkDefines.dsc.inc\r
 \r
 !include ArmVirtPkg/ArmVirt.dsc.inc\r
 \r
+!include MdePkg/MdeLibs.dsc.inc\r
+\r
 [LibraryClasses.common]\r
   ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf\r
   ArmMmuLib|ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf\r
   # Virtio Support\r
   VirtioLib|OvmfPkg/Library/VirtioLib/VirtioLib.inf\r
   VirtioMmioDeviceLib|OvmfPkg/Library/VirtioMmioDeviceLib/VirtioMmioDeviceLib.inf\r
-  QemuFwCfgLib|ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf\r
+  QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLibMmio.inf\r
   QemuFwCfgS3Lib|OvmfPkg/Library/QemuFwCfgS3Lib/BaseQemuFwCfgS3LibNull.inf\r
-\r
-  ArmPlatformLib|ArmPlatformPkg/Library/ArmPlatformLibNull/ArmPlatformLibNull.inf\r
+  QemuFwCfgSimpleParserLib|OvmfPkg/Library/QemuFwCfgSimpleParserLib/QemuFwCfgSimpleParserLib.inf\r
+  QemuLoadImageLib|OvmfPkg/Library/GenericQemuLoadImageLib/GenericQemuLoadImageLib.inf\r
 \r
   TimerLib|ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf\r
-  NorFlashPlatformLib|ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.inf\r
+  VirtNorFlashPlatformLib|ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.inf\r
 \r
   CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf\r
   BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf\r
   FrameBufferBltLib|MdeModulePkg/Library/FrameBufferBltLib/FrameBufferBltLib.inf\r
   QemuBootOrderLib|OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.inf\r
   FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf\r
-  PciPcdProducerLib|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf\r
+  PciPcdProducerLib|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf\r
   PciSegmentLib|MdePkg/Library/BasePciSegmentLibPci/BasePciSegmentLibPci.inf\r
-  PciHostBridgeLib|ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf\r
+  PciHostBridgeLib|OvmfPkg/Fdt/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf\r
+  PciHostBridgeUtilityLib|OvmfPkg/Library/PciHostBridgeUtilityLib/PciHostBridgeUtilityLib.inf\r
+  PeiHardwareInfoLib|OvmfPkg/Library/HardwareInfoLib/PeiHardwareInfoLib.inf\r
+\r
+!if $(TPM2_ENABLE) == TRUE\r
+  Tpm2CommandLib|SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.inf\r
+  Tcg2PhysicalPresenceLib|OvmfPkg/Library/Tcg2PhysicalPresenceLibQemu/DxeTcg2PhysicalPresenceLib.inf\r
+  TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf\r
+  TpmPlatformHierarchyLib|SecurityPkg/Library/PeiDxeTpmPlatformHierarchyLib/PeiDxeTpmPlatformHierarchyLib.inf\r
+!else\r
+  TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf\r
+  TpmPlatformHierarchyLib|SecurityPkg/Library/PeiDxeTpmPlatformHierarchyLibNull/PeiDxeTpmPlatformHierarchyLib.inf\r
+!endif\r
+\r
+[LibraryClasses.AARCH64]\r
+  ArmPlatformLib|ArmVirtPkg/Library/ArmPlatformLibQemu/ArmPlatformLibQemu.inf\r
+\r
+[LibraryClasses.ARM]\r
+  ArmPlatformLib|ArmPlatformPkg/Library/ArmPlatformLibNull/ArmPlatformLibNull.inf\r
 \r
 [LibraryClasses.common.PEIM]\r
   ArmVirtMemInfoLib|ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoPeiLib.inf\r
 \r
+!if $(TPM2_ENABLE) == TRUE\r
+  BaseCryptLib|CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf\r
+  ResetSystemLib|MdeModulePkg/Library/PeiResetSystemLib/PeiResetSystemLib.inf\r
+  Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2DeviceLibDTpm.inf\r
+!endif\r
+\r
 [LibraryClasses.common.DXE_DRIVER]\r
   ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf\r
 \r
+!if $(TPM2_ENABLE) == TRUE\r
+  Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.inf\r
+!endif\r
+\r
 [LibraryClasses.common.UEFI_DRIVER]\r
   UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf\r
 \r
+[BuildOptions]\r
+!if $(CAVIUM_ERRATUM_27456) == TRUE\r
+  GCC:*_*_AARCH64_PP_FLAGS = -DCAVIUM_ERRATUM_27456\r
+!else\r
+  GCC:*_*_AARCH64_CC_XIPFLAGS ==\r
+!endif\r
+\r
+!include NetworkPkg/NetworkBuildOptions.dsc.inc\r
+\r
 ################################################################################\r
 #\r
 # Pcd Section - list of all EDK II PCD Entries defined by this Platform\r
 \r
   gEfiMdeModulePkgTokenSpaceGuid.PcdTurnOffUsbLegacySupport|TRUE\r
 \r
+  gArmVirtTokenSpaceGuid.PcdTpm2SupportEnabled|$(TPM2_ENABLE)\r
+\r
 [PcdsFixedAtBuild.common]\r
 !if $(ARCH) == AARCH64\r
   gArmTokenSpaceGuid.PcdVFPEnabled|1\r
   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
   #\r
   gArmTokenSpaceGuid.PcdArmArchTimerFreqInHz|0\r
 \r
-!if $(HTTP_BOOT_ENABLE) == TRUE\r
-  gEfiNetworkPkgTokenSpaceGuid.PcdAllowHttpConnections|TRUE\r
-!endif\r
+  #\r
+  # Network Pcds\r
+  #\r
+!include NetworkPkg/NetworkPcds.dsc.inc\r
 \r
   # System Memory Base -- fixed at 0x4000_0000\r
   gArmTokenSpaceGuid.PcdSystemMemoryBase|0x40000000\r
 !endif\r
 \r
   gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|3\r
+  gEfiShellPkgTokenSpaceGuid.PcdShellFileOperationSize|0x20000\r
+\r
+  # Shadowing PEI modules is absolutely pointless when the NOR flash is emulated\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdShadowPeimOnBoot|FALSE\r
+\r
+  # System Memory Size -- 128 MB initially, actual size will be fetched from DT\r
+  gArmTokenSpaceGuid.PcdSystemMemorySize|0x8000000\r
 \r
 [PcdsFixedAtBuild.AARCH64]\r
   # Clearing BIT0 in this PCD prevents installing a 32-bit SMBIOS entry point,\r
   # point only, for entry point versions >= 3.0.\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdSmbiosEntryPointProvideMethod|0x2\r
 \r
-  # ACPI predates the AARCH64 architecture by 5 versions, so\r
-  # we only target OSes that support ACPI v5.0 or later\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiExposedTableVersions|0x20\r
-\r
 [PcdsDynamicDefault.common]\r
   gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|3\r
 \r
   #  enumeration to complete before installing ACPI tables.\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdPciDisableBusEnumeration|TRUE\r
 \r
-  # System Memory Size -- 1 MB initially, actual size will be fetched from DT\r
-  gArmTokenSpaceGuid.PcdSystemMemorySize|0x00100000\r
-\r
   gArmTokenSpaceGuid.PcdArmArchTimerSecIntrNum|0x0\r
   gArmTokenSpaceGuid.PcdArmArchTimerIntrNum|0x0\r
   gArmTokenSpaceGuid.PcdArmArchTimerVirtIntrNum|0x0\r
   # PCD and PcdPciDisableBusEnumeration above have not been assigned yet\r
   gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0xFFFFFFFFFFFFFFFF\r
 \r
-  gArmTokenSpaceGuid.PcdPciIoTranslation|0x0\r
+  gEfiMdePkgTokenSpaceGuid.PcdPciIoTranslation|0x0\r
 \r
   #\r
   # Set video resolution for boot options and for text setup.\r
   # PlatformDxe can set the former at runtime.\r
   #\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdVideoHorizontalResolution|800\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdVideoVerticalResolution|600\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdVideoHorizontalResolution|1280\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdVideoVerticalResolution|800\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdSetupVideoHorizontalResolution|640\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdSetupVideoVerticalResolution|480\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow|0\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn|0\r
 \r
   #\r
   # SMBIOS entry point version\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdSmbiosDocRev|0x0\r
   gUefiOvmfPkgTokenSpaceGuid.PcdQemuSmbiosValidated|FALSE\r
 \r
+  #\r
+  # IPv4 and IPv6 PXE Boot support.\r
+  #\r
+  gEfiNetworkPkgTokenSpaceGuid.PcdIPv4PXESupport|0x01\r
+  gEfiNetworkPkgTokenSpaceGuid.PcdIPv6PXESupport|0x01\r
+\r
+  #\r
+  # TPM2 support\r
+  #\r
+!if $(TPM2_ENABLE) == TRUE\r
+  gEfiSecurityPkgTokenSpaceGuid.PcdTpmBaseAddress|0x0\r
+  gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid|{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\r
+  gEfiSecurityPkgTokenSpaceGuid.PcdTpm2HashMask|0\r
+!else\r
+[PcdsPatchableInModule]\r
+  # make this PCD patchable instead of dynamic when TPM support is not enabled\r
+  # this permits setting the PCD in unreachable code without pulling in dynamic PCD support\r
+  gEfiSecurityPkgTokenSpaceGuid.PcdTpmBaseAddress|0x0\r
+!endif\r
+\r
 [PcdsDynamicHii]\r
-  gArmVirtTokenSpaceGuid.PcdForceNoAcpi|L"ForceNoAcpi"|gArmVirtVariableGuid|0x0|FALSE|NV,BS\r
+  gUefiOvmfPkgTokenSpaceGuid.PcdForceNoAcpi|L"ForceNoAcpi"|gOvmfVariableGuid|0x0|FALSE|NV,BS\r
+\r
+!if $(TPM2_CONFIG_ENABLE) == TRUE\r
+  gEfiSecurityPkgTokenSpaceGuid.PcdTcgPhysicalPresenceInterfaceVer|L"TCG2_VERSION"|gTcg2ConfigFormSetGuid|0x0|"1.3"|NV,BS\r
+  gEfiSecurityPkgTokenSpaceGuid.PcdTpm2AcpiTableRev|L"TCG2_VERSION"|gTcg2ConfigFormSetGuid|0x8|3|NV,BS\r
+!endif\r
+\r
+  gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|L"Timeout"|gEfiGlobalVariableGuid|0x0|5\r
+\r
+[LibraryClasses.common.PEI_CORE, LibraryClasses.common.PEIM]\r
+!if $(TPM2_ENABLE) == TRUE\r
+  PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf\r
+!else\r
+  PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf\r
+!endif\r
 \r
 ################################################################################\r
 #\r
   #\r
   ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf\r
   MdeModulePkg/Core/Pei/PeiMain.inf\r
-  MdeModulePkg/Universal/PCD/Pei/Pcd.inf {\r
+  ArmPlatformPkg/PlatformPei/PlatformPeim.inf\r
+  ArmVirtPkg/MemoryInitPei/MemoryInitPeim.inf {\r
     <LibraryClasses>\r
-      PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf\r
+!if $(ARCH) == AARCH64\r
+      ArmMmuLib|ArmPkg/Library/ArmMmuLib/ArmMmuPeiLib.inf\r
+!endif\r
   }\r
-  ArmPlatformPkg/PlatformPei/PlatformPeim.inf\r
-  ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.inf\r
   ArmPkg/Drivers/CpuPei/CpuPei.inf\r
 \r
-  MdeModulePkg/Universal/Variable/Pei/VariablePei.inf\r
+!if $(TPM2_ENABLE) == TRUE\r
+  MdeModulePkg/Universal/PCD/Pei/Pcd.inf {\r
+    <LibraryClasses>\r
+      PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf\r
+  }\r
+  MdeModulePkg/Universal/ResetSystemPei/ResetSystemPei.inf {\r
+    <LibraryClasses>\r
+      ResetSystemLib|ArmVirtPkg/Library/ArmVirtPsciResetSystemPeiLib/ArmVirtPsciResetSystemPeiLib.inf\r
+  }\r
+  OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf\r
+  SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf {\r
+    <LibraryClasses>\r
+      HashLib|SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterPei.inf\r
+      NULL|SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.inf\r
+      NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf\r
+      NULL|SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.inf\r
+      NULL|SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf\r
+      NULL|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf\r
+  }\r
+!endif\r
 \r
   MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf {\r
     <LibraryClasses>\r
   MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf {\r
     <LibraryClasses>\r
       NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf\r
+!if $(TPM2_ENABLE) == TRUE\r
+      NULL|SecurityPkg/Library/DxeTpm2MeasureBootLib/DxeTpm2MeasureBootLib.inf\r
+!endif\r
   }\r
   SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf\r
+  OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.inf\r
 !else\r
   MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf\r
 !endif\r
     <LibraryClasses>\r
       NULL|ArmVirtPkg/Library/ArmVirtTimerFdtClientLib/ArmVirtTimerFdtClientLib.inf\r
   }\r
-  ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf\r
+  OvmfPkg/VirtNorFlashDxe/VirtNorFlashDxe.inf {\r
+    <LibraryClasses>\r
+      # don't use unaligned CopyMem () on the UEFI varstore NOR flash region\r
+      BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf\r
+  }\r
   MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf\r
 \r
   #\r
   #\r
   # Platform Driver\r
   #\r
-  ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf\r
-  ArmVirtPkg/FdtClientDxe/FdtClientDxe.inf\r
-  ArmVirtPkg/HighMemDxe/HighMemDxe.inf\r
+  OvmfPkg/Fdt/VirtioFdtDxe/VirtioFdtDxe.inf\r
+  EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf\r
+  OvmfPkg/Fdt/HighMemDxe/HighMemDxe.inf\r
   OvmfPkg/VirtioBlkDxe/VirtioBlk.inf\r
   OvmfPkg/VirtioScsiDxe/VirtioScsi.inf\r
   OvmfPkg/VirtioNetDxe/VirtioNet.inf\r
   OvmfPkg/VirtioRngDxe/VirtioRng.inf\r
 \r
   #\r
-  # FAT filesystem + GPT/MBR partitioning + UDF filesystem\r
+  # FAT filesystem + GPT/MBR partitioning + UDF filesystem + virtio-fs\r
   #\r
   MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf\r
   MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf\r
   MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf\r
   FatPkg/EnhancedFatDxe/Fat.inf\r
   MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf\r
+  OvmfPkg/VirtioFsDxe/VirtioFsDxe.inf\r
 \r
   #\r
   # Bds\r
       NULL|MdeModulePkg/Library/BootManagerUiLib/BootManagerUiLib.inf\r
       NULL|MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerUiLib.inf\r
   }\r
+  OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.inf {\r
+    <LibraryClasses>\r
+      NULL|OvmfPkg/Library/BlobVerifierLibNull/BlobVerifierLibNull.inf\r
+  }\r
 \r
   #\r
   # Networking stack\r
   #\r
-  MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf\r
-  MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf\r
-  MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf\r
-  MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf\r
-  MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf\r
-  MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf\r
-  MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf\r
-  MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf\r
-  NetworkPkg/TcpDxe/TcpDxe.inf\r
-  NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf\r
-  NetworkPkg/IScsiDxe/IScsiDxe.inf\r
-!if $(NETWORK_IP6_ENABLE) == TRUE\r
-  NetworkPkg/Ip6Dxe/Ip6Dxe.inf\r
-  NetworkPkg/Udp6Dxe/Udp6Dxe.inf\r
-  NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf\r
-  NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf\r
-!endif\r
-!if $(HTTP_BOOT_ENABLE) == TRUE\r
-  NetworkPkg/DnsDxe/DnsDxe.inf\r
-  NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf\r
-  NetworkPkg/HttpDxe/HttpDxe.inf\r
-  NetworkPkg/HttpBootDxe/HttpBootDxe.inf\r
+!include NetworkPkg/NetworkComponents.dsc.inc\r
+\r
+  NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf {\r
+    <LibraryClasses>\r
+      NULL|OvmfPkg/Library/PxeBcPcdProducerLib/PxeBcPcdProducerLib.inf\r
+  }\r
+\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
   MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf\r
   MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf\r
 \r
+  #\r
+  # NVME Driver\r
+  #\r
+  MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf\r
+\r
   #\r
   # SMBIOS Support\r
   #\r
   #\r
   ArmPkg/Drivers/ArmPciCpuIo2Dxe/ArmPciCpuIo2Dxe.inf {\r
     <LibraryClasses>\r
-      NULL|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf\r
+      NULL|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf\r
   }\r
   MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf\r
   MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf {\r
     <LibraryClasses>\r
-      NULL|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf\r
+      NULL|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf\r
   }\r
+  OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.inf\r
   OvmfPkg/VirtioPciDeviceDxe/VirtioPciDeviceDxe.inf\r
   OvmfPkg/Virtio10Dxe/Virtio10.inf\r
 \r
   MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf\r
   MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf\r
 \r
+  #\r
+  # TPM2 support\r
+  #\r
+!if $(TPM2_ENABLE) == TRUE\r
+  SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf {\r
+    <LibraryClasses>\r
+      HashLib|SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterDxe.inf\r
+      Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterDxe.inf\r
+      NULL|SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2InstanceLibDTpm.inf\r
+      NULL|SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.inf\r
+      NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf\r
+      NULL|SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.inf\r
+      NULL|SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf\r
+      NULL|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf\r
+  }\r
+!if $(TPM2_CONFIG_ENABLE) == TRUE\r
+  SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf\r
+!endif\r
+!endif\r
+\r
   #\r
   # ACPI Support\r
   #\r
-  ArmVirtPkg/PlatformHasAcpiDtDxe/PlatformHasAcpiDtDxe.inf\r
+  OvmfPkg/PlatformHasAcpiDtDxe/PlatformHasAcpiDtDxe.inf\r
 [Components.AARCH64]\r
   MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf\r
-  OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf {\r
+  OvmfPkg/AcpiPlatformDxe/AcpiPlatformDxe.inf {\r
     <LibraryClasses>\r
-      NULL|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf\r
+      NULL|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf\r
   }\r