OvmfPkg/EmuVariableFvbRuntimeDxe: stop using PcdVariableStoreSize

[mirror_edk2.git] / OvmfPkg / OvmfPkgX64.fdf

diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
index 5e2e1dfaf5a99d5be082805e0df32054c7d81b36..1a46104fc63d7f898deab144be573c9002b7fd89 100644 (file)
--- a/OvmfPkg/OvmfPkgX64.fdf
+++ b/OvmfPkg/OvmfPkgX64.fdf
@@ -1,7 +1,7 @@
 ## @file\r
 #  Open Virtual Machine Firmware: FDF\r
 #\r
-#  Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
 #  (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
 #\r
 #  This program and the accompanying materials\r
@@ -82,7 +82,7 @@ gUefiOvmfPkgTokenSpaceGuid.PcdOvmfLockBoxStorageBase|gUefiOvmfPkgTokenSpaceGuid.
 0x007000|0x001000\r
 gEfiMdePkgTokenSpaceGuid.PcdGuidedExtractHandlerTableAddress|gUefiOvmfPkgTokenSpaceGuid.PcdGuidedExtractHandlerTableSize\r
 \r
-0x010000|0x008000\r
+0x010000|0x010000\r
 gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPeiTempRamBase|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPeiTempRamSize\r
 \r
 0x020000|0x0E0000\r
@@ -165,9 +165,15 @@ INF  OvmfPkg/SmmAccess/SmmAccessPei.inf
 !endif\r
 INF  UefiCpuPkg/CpuMpPei/CpuMpPei.inf\r
 \r
+!if $(TPM2_ENABLE) == TRUE\r
+INF  OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf\r
+INF  SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf\r
+!endif\r
+\r
 ################################################################################\r
 \r
 [FV.DXEFV]\r
+FvForceRebase      = FALSE\r
 FvNameGuid         = 7CB8BDC9-F8EB-4F34-AAEA-3EE4AF6516A1\r
 BlockSize          = 0x10000\r
 FvAlignment        = 16\r
@@ -190,6 +196,7 @@ READ_LOCK_STATUS   = TRUE
 APRIORI DXE {\r
   INF  MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf\r
   INF  MdeModulePkg/Universal/PCD/Dxe/Pcd.inf\r
+  INF  OvmfPkg/AmdSevDxe/AmdSevDxe.inf\r
 !if $(SMM_REQUIRE) == FALSE\r
   INF  OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf\r
 !endif\r
@@ -281,8 +288,10 @@ INF  MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf
 INF  MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf\r
 \r
 INF  FatPkg/EnhancedFatDxe/Fat.inf\r
+INF  MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf\r
 \r
 !ifndef $(USE_OLD_SHELL)\r
+INF  ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf\r
 INF  ShellPkg/Application/Shell/Shell.inf\r
 !else\r
 INF  RuleOverride = BINARY EdkShellBinPkg/FullShell/FullShell.inf\r
@@ -295,7 +304,7 @@ INF MdeModulePkg/Logo/LogoDxe.inf
 #\r
 !if $(E1000_ENABLE)\r
   FILE DRIVER = 5D695E11-9B3F-4b83-B25F-4A8D5D69BE07 {\r
-    SECTION PE32 = Intel3.5/EFIX64/E3507X2.EFI\r
+    SECTION PE32 = Intel3.5/EFIX64/E3522X2.EFI\r
   }\r
 !endif\r
   INF  MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf\r
@@ -314,11 +323,7 @@ INF MdeModulePkg/Logo/LogoDxe.inf
   INF  NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf\r
   INF  NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf\r
   INF  NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf\r
-!if $(SECURE_BOOT_ENABLE) == TRUE\r
   INF  NetworkPkg/IScsiDxe/IScsiDxe.inf\r
-!else\r
-  INF  MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf\r
-!endif\r
 !else\r
   INF  MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf\r
   INF  MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf\r
@@ -329,6 +334,10 @@ INF MdeModulePkg/Logo/LogoDxe.inf
   INF  NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf\r
   INF  NetworkPkg/HttpDxe/HttpDxe.inf\r
   INF  NetworkPkg/HttpBootDxe/HttpBootDxe.inf\r
+!endif\r
+!if $(TLS_ENABLE) == TRUE\r
+  INF  NetworkPkg/TlsDxe/TlsDxe.inf\r
+  INF  NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf\r
 !endif\r
   INF  OvmfPkg/VirtioNetDxe/VirtioNet.inf\r
 \r
@@ -351,6 +360,8 @@ INF  RuleOverride=CSM OvmfPkg/Csm/Csm16/Csm16.inf
 INF  OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf\r
 INF  OvmfPkg/VirtioGpuDxe/VirtioGpu.inf\r
 INF  OvmfPkg/PlatformDxe/Platform.inf\r
+INF  OvmfPkg/AmdSevDxe/AmdSevDxe.inf\r
+INF  OvmfPkg/IoMmuDxe/IoMmuDxe.inf\r
 \r
 !if $(SMM_REQUIRE) == TRUE\r
 INF  OvmfPkg/SmmAccess/SmmAccess2Dxe.inf\r
@@ -381,6 +392,10 @@ INF  MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf
 INF  MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf\r
 !endif\r
 \r
+!if $(TPM2_ENABLE) == TRUE\r
+INF  SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf\r
+!endif\r
+\r
 ################################################################################\r
 \r
 [FV.FVMAIN_COMPACT]\r