OvmfPkg: implement QEMU loader library for X86 with legacy fallback

[mirror_edk2.git] / OvmfPkg / OvmfPkgIa32.fdf

diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf
index 14100356b4f6df68962ecb3fc8da43bd80f0cff3..56e3ab3df25a3f7afce8085b68ac27fcac1eeed5 100644 (file)
--- a/OvmfPkg/OvmfPkgIa32.fdf
+++ b/OvmfPkg/OvmfPkgIa32.fdf
@@ -159,8 +159,9 @@ INF  OvmfPkg/SmmAccess/SmmAccessPei.inf
 !endif\r
 INF  UefiCpuPkg/CpuMpPei/CpuMpPei.inf\r
 \r
-!if $(TPM2_ENABLE) == TRUE\r
+!if $(TPM_ENABLE) == TRUE\r
 INF  OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf\r
+INF  SecurityPkg/Tcg/TcgPei/TcgPei.inf\r
 INF  SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf\r
 !endif\r
 \r
@@ -260,7 +261,7 @@ INF  MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf
 INF  MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf\r
 \r
 INF  OvmfPkg/SioBusDxe/SioBusDxe.inf\r
-!ifndef $(SOURCE_DEBUG_ENABLE)\r
+!if $(SOURCE_DEBUG_ENABLE) == FALSE\r
 INF  MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxe.inf\r
 !endif\r
 INF  MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf\r
@@ -281,6 +282,7 @@ INF  MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf
 !if $(TOOL_CHAIN_TAG) != "XCODE5"\r
 INF  ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf\r
 !endif\r
+INF  OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf\r
 INF  ShellPkg/Application/Shell/Shell.inf\r
 \r
 INF MdeModulePkg/Logo/LogoDxe.inf\r
@@ -305,9 +307,10 @@ INF  MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
 INF  OvmfPkg/Csm/BiosThunk/VideoDxe/VideoDxe.inf\r
 INF  OvmfPkg/Csm/LegacyBiosDxe/LegacyBiosDxe.inf\r
 INF  RuleOverride=CSM OvmfPkg/Csm/Csm16/Csm16.inf\r
+!else\r
+INF  OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf\r
 !endif\r
 \r
-INF  OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf\r
 INF  OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf\r
 INF  OvmfPkg/VirtioGpuDxe/VirtioGpu.inf\r
 INF  OvmfPkg/PlatformDxe/Platform.inf\r
@@ -316,9 +319,10 @@ INF  OvmfPkg/IoMmuDxe/IoMmuDxe.inf
 !if $(SMM_REQUIRE) == TRUE\r
 INF  OvmfPkg/SmmAccess/SmmAccess2Dxe.inf\r
 INF  OvmfPkg/SmmControl2Dxe/SmmControl2Dxe.inf\r
-INF  UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxe.inf\r
+INF  OvmfPkg/CpuS3DataDxe/CpuS3DataDxe.inf\r
 INF  MdeModulePkg/Core/PiSmmCore/PiSmmIpl.inf\r
 INF  MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf\r
+INF  OvmfPkg/CpuHotplugSmm/CpuHotplugSmm.inf\r
 INF  UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.inf\r
 INF  MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.inf\r
 INF  UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf\r
@@ -342,13 +346,21 @@ INF  MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf
 INF  MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf\r
 !endif\r
 \r
-!if $(TPM2_ENABLE) == TRUE\r
+#\r
+# TPM support\r
+#\r
+!if $(TPM_ENABLE) == TRUE\r
+INF  SecurityPkg/Tcg/TcgDxe/TcgDxe.inf\r
 INF  SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf\r
-!if $(TPM2_CONFIG_ENABLE) == TRUE\r
+!if $(TPM_CONFIG_ENABLE) == TRUE\r
 INF  SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf\r
 !endif\r
 !endif\r
 \r
+!if $(LOAD_X64_ON_IA32_ENABLE) == TRUE\r
+INF  OvmfPkg/CompatImageLoaderDxe/CompatImageLoaderDxe.inf\r
+!endif\r
+\r
 ################################################################################\r
 \r
 [FV.FVMAIN_COMPACT]\r