MdeModulePkg/DxeCore: defer PE/COFF emulator registration to StartImage

[mirror_edk2.git] / OvmfPkg / OvmfPkgIa32.fdf

diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf
index 14100356b4f6df68962ecb3fc8da43bd80f0cff3..6c342823d206baa14f209672809a92abc81fd6b6 100644 (file)
--- a/OvmfPkg/OvmfPkgIa32.fdf
+++ b/OvmfPkg/OvmfPkgIa32.fdf
@@ -260,7 +260,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 +281,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 +306,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
@@ -342,6 +344,9 @@ INF  MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf
 INF  MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf\r
 !endif\r
 \r
+#\r
+# TPM2 support\r
+#\r
 !if $(TPM2_ENABLE) == TRUE\r
 INF  SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf\r
 !if $(TPM2_CONFIG_ENABLE) == TRUE\r