MpInitLib: Move the Above1Mb vector allocation to MpInitLibInitialize

[mirror_edk2.git] / OvmfPkg / OvmfXen.fdf

diff --git a/OvmfPkg/OvmfXen.fdf b/OvmfPkg/OvmfXen.fdf
index 2ceff7baa2c78f383bb246087a13a1d655281a81..029b7dadcb2576ef8dca6ca45a477e4d3a861ca0 100644 (file)
--- a/OvmfPkg/OvmfXen.fdf
+++ b/OvmfPkg/OvmfXen.fdf
@@ -12,11 +12,11 @@
 ################################################################################\r
 \r
 [Defines]\r
-!include OvmfPkg.fdf.inc\r
+!include OvmfPkgDefines.fdf.inc\r
 \r
 #\r
-# Build the variable store and the firmware code as one unified flash device\r
-# image.\r
+# This will allow the flash device image to be recognize as an ELF, with first\r
+# an ELF headers, then the firmware code.\r
 #\r
 [FD.OVMF]\r
 BaseAddress   = $(FW_BASE_ADDRESS)\r
@@ -25,7 +25,49 @@ ErasePolarity = 1
 BlockSize     = $(BLOCK_SIZE)\r
 NumBlocks     = $(FW_BLOCKS)\r
 \r
-!include VarStore.fdf.inc\r
+!if ($(FD_SIZE_IN_KB) == 1024) || ($(FD_SIZE_IN_KB) == 2048)\r
+0x00000000|0x0000e000\r
+!endif\r
+!if $(FD_SIZE_IN_KB) == 4096\r
+0x00000000|0x00040000\r
+!endif\r
+\r
+!include XenElfHeader.fdf.inc\r
+\r
+!if ($(FD_SIZE_IN_KB) == 1024) || ($(FD_SIZE_IN_KB) == 2048)\r
+0x0000e000|0x00001000\r
+!endif\r
+!if $(FD_SIZE_IN_KB) == 4096\r
+0x00040000|0x00001000\r
+!endif\r
+#NV_EVENT_LOG\r
+\r
+!if ($(FD_SIZE_IN_KB) == 1024) || ($(FD_SIZE_IN_KB) == 2048)\r
+0x0000f000|0x00001000\r
+!endif\r
+!if $(FD_SIZE_IN_KB) == 4096\r
+0x00041000|0x00001000\r
+!endif\r
+#NV_FTW_WORKING\r
+DATA = {\r
+  # EFI_FAULT_TOLERANT_WORKING_BLOCK_HEADER->Signature = gEdkiiWorkingBlockSignatureGuid         =\r
+  #  { 0x9e58292b, 0x7c68, 0x497d, { 0xa0, 0xce, 0x65,  0x0, 0xfd, 0x9f, 0x1b, 0x95 }}\r
+  0x2b, 0x29, 0x58, 0x9e, 0x68, 0x7c, 0x7d, 0x49,\r
+  0xa0, 0xce, 0x65,  0x0, 0xfd, 0x9f, 0x1b, 0x95,\r
+  # Crc:UINT32            #WorkingBlockValid:1, WorkingBlockInvalid:1, Reserved\r
+  0x2c, 0xaf, 0x2c, 0x64, 0xFE, 0xFF, 0xFF, 0xFF,\r
+  # WriteQueueSize: UINT64\r
+  0xE0, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00\r
+}\r
+\r
+!if ($(FD_SIZE_IN_KB) == 1024) || ($(FD_SIZE_IN_KB) == 2048)\r
+0x00010000|0x00010000\r
+!endif\r
+!if $(FD_SIZE_IN_KB) == 4096\r
+0x00042000|0x00042000\r
+!endif\r
+#NV_FTW_SPARE\r
+\r
 \r
 $(VARS_SIZE)|$(FVMAIN_SIZE)\r
 FV = FVMAIN_COMPACT\r
@@ -77,6 +119,10 @@ gUefiOvmfPkgTokenSpaceGuid.PcdOvmfLockBoxStorageBase|gUefiOvmfPkgTokenSpaceGuid.
 0x007000|0x001000\r
 gEfiMdePkgTokenSpaceGuid.PcdGuidedExtractHandlerTableAddress|gUefiOvmfPkgTokenSpaceGuid.PcdGuidedExtractHandlerTableSize\r
 \r
+0x008000|0x001000\r
+# Used by XenResetVector to communicate with XenPlatformPei\r
+gUefiOvmfPkgTokenSpaceGuid.PcdXenPvhStartOfDayStructPtr|gUefiOvmfPkgTokenSpaceGuid.PcdXenPvhStartOfDayStructPtrSize\r
+\r
 0x010000|0x010000\r
 gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPeiTempRamBase|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPeiTempRamSize\r
 \r
@@ -199,21 +245,21 @@ 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/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  MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf\r
 INF  MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf\r
 INF  MdeModulePkg/Universal/Metronome/Metronome.inf\r
-INF  PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntimeDxe.inf\r
+INF  EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf\r
 \r
+INF  OvmfPkg/XenIoPvhDxe/XenIoPvhDxe.inf\r
 INF  OvmfPkg/XenIoPciDxe/XenIoPciDxe.inf\r
 INF  OvmfPkg/XenBusDxe/XenBusDxe.inf\r
 INF  OvmfPkg/XenPvBlkDxe/XenPvBlkDxe.inf\r
+INF  MdeModulePkg/Universal/SerialDxe/SerialDxe.inf\r
 \r
 INF  MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf\r
 INF  MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf\r
@@ -225,8 +271,8 @@ INF  MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf
 INF  MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.inf\r
 INF  MdeModulePkg/Universal/BdsDxe/BdsDxe.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
@@ -243,17 +289,16 @@ 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
 \r
 INF  MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf\r
-INF  OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf\r
+INF  OvmfPkg/SmbiosPlatformDxe/XenSmbiosPlatformDxe.inf\r
 \r
 INF  MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf\r
-INF  OvmfPkg/AcpiPlatformDxe/AcpiPlatformDxe.inf\r
-INF  RuleOverride=ACPITABLE OvmfPkg/AcpiTables/AcpiTables.inf\r
+INF  OvmfPkg/XenAcpiPlatformDxe/XenAcpiPlatformDxe.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
@@ -263,6 +308,8 @@ INF  MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf
 \r
 !if $(TOOL_CHAIN_TAG) != "XCODE5"\r
 INF  ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf\r
+INF  ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf\r
+INF  OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf\r
 !endif\r
 INF  ShellPkg/Application/Shell/Shell.inf\r
 \r
@@ -341,7 +388,7 @@ FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 {
    }\r
  }\r
 \r
-!include DecomprScratchEnd.fdf.inc\r
+!include FvmainCompactScratchEnd.fdf.inc\r
 \r
 ################################################################################\r
 \r
@@ -422,12 +469,6 @@ FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 {
     VERSION   STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
   }\r
 \r
-[Rule.Common.USER_DEFINED.ACPITABLE]\r
-  FILE FREEFORM = $(NAMED_GUID) {\r
-    RAW ACPI               |.acpi\r
-    RAW ASL                |.aml\r
-  }\r
-\r
 [Rule.Common.USER_DEFINED.CSM]\r
   FILE FREEFORM = $(NAMED_GUID) {\r
     RAW BIN                |.bin\r