################################################################################\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
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
$(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
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
}\r
}\r
\r
-!include OvmfPkg/FvmainCompactScratchEnd.fdf.inc\r
+!include OvmfPkg/Include/Fdf/FvmainCompactScratchEnd.fdf.inc\r
\r
################################################################################\r
\r