mv OvmfPkg: move fdf include snippets to Include/Fdf

[mirror_edk2.git] / OvmfPkg / Microvm / MicrovmX64.fdf

diff --git a/OvmfPkg/Microvm/MicrovmX64.fdf b/OvmfPkg/Microvm/MicrovmX64.fdf
index 6999ac1a87b9bb2313b29be17e9a00aaf58f804a..b83fd1e6e4fefeee012ddda9c097b94b37e70648 100644 (file)
--- a/OvmfPkg/Microvm/MicrovmX64.fdf
+++ b/OvmfPkg/Microvm/MicrovmX64.fdf
@@ -11,7 +11,7 @@
 ################################################################################\r
 \r
 [Defines]\r
-!include OvmfPkg/OvmfPkgDefines.fdf.inc\r
+!include OvmfPkg/Include/Fdf/OvmfPkgDefines.fdf.inc\r
 \r
 #\r
 # Build the variable store and the firmware code as one unified flash device\r
@@ -24,7 +24,7 @@ ErasePolarity = 1
 BlockSize     = $(BLOCK_SIZE)\r
 NumBlocks     = $(FW_BLOCKS)\r
 \r
-!include OvmfPkg/VarStore.fdf.inc\r
+!include OvmfPkg/Include/Fdf/VarStore.fdf.inc\r
 \r
 $(VARS_SIZE)|$(FVMAIN_SIZE)\r
 FV = FVMAIN_COMPACT\r
@@ -32,32 +32,6 @@ FV = FVMAIN_COMPACT
 $(SECFV_OFFSET)|$(SECFV_SIZE)\r
 FV = SECFV\r
 \r
-#\r
-# Build the variable store and the firmware code as separate flash device\r
-# images.\r
-#\r
-[FD.MICROVM_VARS]\r
-BaseAddress   = $(FW_BASE_ADDRESS)\r
-Size          = $(VARS_SIZE)\r
-ErasePolarity = 1\r
-BlockSize     = $(BLOCK_SIZE)\r
-NumBlocks     = $(VARS_BLOCKS)\r
-\r
-!include OvmfPkg/VarStore.fdf.inc\r
-\r
-[FD.MICROVM_CODE]\r
-BaseAddress   = $(CODE_BASE_ADDRESS)\r
-Size          = $(CODE_SIZE)\r
-ErasePolarity = 1\r
-BlockSize     = $(BLOCK_SIZE)\r
-NumBlocks     = $(CODE_BLOCKS)\r
-\r
-0x00000000|$(FVMAIN_SIZE)\r
-FV = FVMAIN_COMPACT\r
-\r
-$(FVMAIN_SIZE)|$(SECFV_SIZE)\r
-FV = SECFV\r
-\r
 ################################################################################\r
 \r
 [FD.MEMFD]\r
@@ -215,7 +189,7 @@ INF  MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
 INF  MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf\r
 INF  MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf\r
 INF  MdeModulePkg/Universal/EbcDxe/EbcDxe.inf\r
-INF  OvmfPkg/XenTimerDxe/XenTimerDxe.inf\r
+INF  OvmfPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf\r
 INF  UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf\r
 INF  UefiCpuPkg/CpuDxe/CpuDxe.inf\r
 INF  OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.inf\r
@@ -232,6 +206,10 @@ INF  OvmfPkg/VirtioBlkDxe/VirtioBlk.inf
 INF  OvmfPkg/VirtioScsiDxe/VirtioScsi.inf\r
 INF  OvmfPkg/VirtioRngDxe/VirtioRng.inf\r
 \r
+!if $(SECURE_BOOT_ENABLE) == TRUE\r
+  INF  SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf\r
+!endif\r
+\r
 INF  MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf\r
 INF  MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf\r
 INF  MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf\r
@@ -357,7 +335,7 @@ FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 {
    }\r
  }\r
 \r
-!include OvmfPkg/FvmainCompactScratchEnd.fdf.inc\r
+!include OvmfPkg/Include/Fdf/FvmainCompactScratchEnd.fdf.inc\r
 \r
 ################################################################################\r
 \r