################################################################################\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 MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf\r
INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf\r
INF MdeModulePkg/Universal/EbcDxe/EbcDxe.inf\r
-INF OvmfPkg/8259InterruptControllerDxe/8259.inf\r
+INF OvmfPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf\r
INF UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf\r
INF UefiCpuPkg/CpuDxe/CpuDxe.inf\r
-INF OvmfPkg/8254TimerDxe/8254Timer.inf\r
INF OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.inf\r
INF OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.inf\r
INF MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf\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
INF MdeModulePkg/Application/UiApp/UiApp.inf\r
INF OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.inf\r
INF MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf\r
-INF MdeModulePkg/Universal/PrintDxe/PrintDxe.inf\r
INF MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf\r
INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf\r
INF MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf\r
INF MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf\r
INF MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf\r
\r
-INF OvmfPkg/SioBusDxe/SioBusDxe.inf\r
!if $(SOURCE_DEBUG_ENABLE) == FALSE\r
-INF MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxe.inf\r
+INF MdeModulePkg/Universal/SerialDxe/SerialDxe.inf\r
!endif\r
-INF MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf\r
\r
INF MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf\r
INF OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf\r
\r
INF MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf\r
-INF OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf\r
+INF OvmfPkg/AcpiPlatformDxe/AcpiPlatformDxe.inf\r
INF MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxe.inf\r
INF MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf\r
INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf\r
INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf\r
INF OvmfPkg/VirtioFsDxe/VirtioFsDxe.inf\r
\r
+INF EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf\r
+INF OvmfPkg/Fdt/VirtioFdtDxe/VirtioFdtDxe.inf\r
+\r
!if $(TOOL_CHAIN_TAG) != "XCODE5"\r
INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf\r
INF ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf\r
}\r
}\r
\r
-!include OvmfPkg/FvmainCompactScratchEnd.fdf.inc\r
+!include OvmfPkg/Include/Fdf/FvmainCompactScratchEnd.fdf.inc\r
\r
################################################################################\r
\r