OvmfPkg: Make the VirtIo devices use the new VIRTIO_DEVICE_PROTOCOL

[mirror_edk2.git] / OvmfPkg / OvmfPkgIa32X64.fdf

diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
index 177c880d4b2a1ce7ae33d31cdd6f661f9c7baca4..615451dbec9da5c1f485a57a95dfb12c3f3bedb5 100644 (file)
--- a/OvmfPkg/OvmfPkgIa32X64.fdf
+++ b/OvmfPkg/OvmfPkgIa32X64.fdf
@@ -1,7 +1,7 @@
 ## @file\r
 #  Open Virtual Machine Firmware: FDF\r
 #\r
-#  Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
@@ -14,28 +14,112 @@
 ##\r
 \r
 ################################################################################\r
+\r
+#\r
+# Default flash size for DEBUG build is 2MB. For RELEASE it is 1MB.\r
+#\r
+# Defining FD_SIZE_1MB or FD_SIZE_2MB on the build command line can\r
+# override this.\r
+#\r
+[Defines]\r
+!if $(TARGET) == RELEASE\r
 !ifndef $(FD_SIZE_2MB)\r
+DEFINE FD_SIZE_1MB=\r
+!endif\r
+!endif\r
+\r
+!ifdef $(FD_SIZE_1MB)\r
 [FD.OVMF]\r
-BaseAddress   = 0xFFF00000\r
-Size          = 0x00100000\r
+BaseAddress   = 0xFFF00000|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFdBaseAddress\r
+Size          = 0x00100000|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFirmwareFdSize\r
 ErasePolarity = 1\r
-BlockSize     = 0x1000\r
+BlockSize     = 0x1000|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFirmwareBlockSize\r
 NumBlocks     = 0x100\r
+!else\r
+[FD.OVMF]\r
+BaseAddress   = 0xFFE00000|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFdBaseAddress\r
+Size          = 0x00200000|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFirmwareFdSize\r
+ErasePolarity = 1\r
+BlockSize     = 0x1000|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFirmwareBlockSize\r
+NumBlocks     = 0x200\r
+!endif\r
 \r
-0x00000000|0x000EC000\r
+0x00000000|0x0000e000\r
+gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFlashNvStorageVariableBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize\r
+#NV_VARIABLE_STORE\r
+DATA = {\r
+  ## This is the EFI_FIRMWARE_VOLUME_HEADER\r
+  # ZeroVector []\r
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\r
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\r
+  # FileSystemGuid: gEfiSystemNvDataFvGuid         =\r
+  #   { 0xFFF12B8D, 0x7696, 0x4C8B,\r
+  #     { 0xA9, 0x85, 0x27, 0x47, 0x07, 0x5B, 0x4F, 0x50 }}\r
+  0x8D, 0x2B, 0xF1, 0xFF, 0x96, 0x76, 0x8B, 0x4C,\r
+  0xA9, 0x85, 0x27, 0x47, 0x07, 0x5B, 0x4F, 0x50,\r
+  # FvLength: 0x20000\r
+  0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,\r
+  # Signature "_FVH"       # Attributes\r
+  0x5f, 0x46, 0x56, 0x48, 0xff, 0xfe, 0x04, 0x00,\r
+  # HeaderLength # CheckSum # ExtHeaderOffset #Reserved #Revision\r
+  0x48, 0x00, 0x19, 0xF9, 0x00, 0x00, 0x00, 0x02,\r
+  # Blockmap[0]: 0x20 Blocks * 0x1000 Bytes / Block\r
+  0x20, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00,\r
+  # Blockmap[1]: End\r
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\r
+  ## This is the VARIABLE_STORE_HEADER\r
+!if $(SECURE_BOOT_ENABLE) == TRUE\r
+  # Signature: gEfiAuthenticatedVariableGuid =\r
+  #   { 0xaaf32c78, 0x947b, 0x439a,\r
+  #     { 0xa1, 0x80, 0x2e, 0x14, 0x4e, 0xc3, 0x77, 0x92 }}\r
+  0x78, 0x2c, 0xf3, 0xaa, 0x7b, 0x94, 0x9a, 0x43,\r
+  0xa1, 0x80, 0x2e, 0x14, 0x4e, 0xc3, 0x77, 0x92,\r
+!else\r
+  # Signature: gEfiVariableGuid =\r
+  #   { 0xddcf3616, 0x3275, 0x4164,\r
+  #     { 0x98, 0xb6, 0xfe, 0x85, 0x70, 0x7f, 0xfe, 0x7d }}\r
+  0x16, 0x36, 0xcf, 0xdd, 0x75, 0x32, 0x64, 0x41,\r
+  0x98, 0xb6, 0xfe, 0x85, 0x70, 0x7f, 0xfe, 0x7d,\r
+!endif\r
+  # Size: 0xe000 (gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize) -\r
+  #         0x48 (size of EFI_FIRMWARE_VOLUME_HEADER) = 0xdfb8\r
+  # This can speed up the Variable Dispatch a bit.\r
+  0xB8, 0xDF, 0x00, 0x00,\r
+  # FORMATTED: 0x5A #HEALTHY: 0xFE #Reserved: UINT16 #Reserved1: UINT32\r
+  0x5A, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00\r
+}\r
+\r
+0x0000e000|0x00001000\r
+#NV_EVENT_LOG\r
+gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFlashNvStorageEventLogBase|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFlashNvStorageEventLogSize\r
+\r
+0x0000f000|0x00001000\r
+gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFlashNvStorageFtwWorkingBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize\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
+0x00010000|0x00010000\r
+#NV_FTW_SPARE\r
+gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFlashNvStorageFtwSpareBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize\r
+\r
+!ifdef $(FD_SIZE_1MB)\r
+0x00020000|0x000CC000\r
 FV = FVMAIN_COMPACT\r
 \r
 0x000EC000|0x14000\r
 FV = SECFV\r
-!else\r
-[FD.OVMF]\r
-BaseAddress   = 0xFFE00000\r
-Size          = 0x00200000\r
-ErasePolarity = 1\r
-BlockSize     = 0x1000\r
-NumBlocks     = 0x200\r
 \r
-0x00000000|0x001CC000\r
+!else\r
+0x00020000|0x001AC000\r
 FV = FVMAIN_COMPACT\r
 \r
 0x001CC000|0x34000\r
@@ -155,7 +239,9 @@ READ_LOCK_CAP      = TRUE
 READ_LOCK_STATUS   = TRUE\r
 \r
 APRIORI DXE {\r
+  INF  MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf\r
   INF  MdeModulePkg/Universal/PCD/Dxe/Pcd.inf\r
+  INF  OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf\r
 }\r
 \r
 #\r
@@ -180,8 +266,10 @@ INF  MdeModulePkg/Universal/Metronome/Metronome.inf
 INF  PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntimeDxe.inf\r
 \r
 INF  OvmfPkg/BlockMmioToBlockIoDxe/BlockIo.inf\r
+INF  OvmfPkg/VirtioPciDeviceDxe/VirtioPciDeviceDxe.inf\r
 INF  OvmfPkg/VirtioBlkDxe/VirtioBlk.inf\r
 INF  OvmfPkg/VirtioScsiDxe/VirtioScsi.inf\r
+INF  OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf\r
 INF  OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.inf\r
 INF  MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf\r
 \r
@@ -211,6 +299,7 @@ INF  IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBusDxe.inf
 INF  PcAtChipsetPkg/Bus/Pci/IdeControllerDxe/IdeControllerDxe.inf\r
 INF  MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf\r
 INF  MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf\r
+INF  MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf\r
 INF  MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf\r
 \r
 INF  PcAtChipsetPkg/IsaAcpiDxe/IsaAcpi.inf\r
@@ -232,15 +321,11 @@ INF  RuleOverride=ACPITABLE OvmfPkg/AcpiTables/AcpiTables.inf
 \r
 INF  RuleOverride = BINARY USE = X64 FatBinPkg/EnhancedFatDxe/Fat.inf\r
 \r
-!if $(BUILD_NEW_SHELL)\r
+!ifndef $(USE_OLD_SHELL)\r
 INF  ShellPkg/Application/Shell/Shell.inf\r
 !else\r
-!if $(USE_NEW_SHELL)\r
-INF  RuleOverride = BINARY USE = X64 ShellBinPkg/UefiShell/UefiShell.inf\r
-!else\r
 INF  RuleOverride = BINARY USE = X64 EdkShellBinPkg/FullShell/FullShell.inf\r
 !endif\r
-!endif\r
 \r
 FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {\r
   SECTION RAW = MdeModulePkg/Logo/Logo.bmp\r
@@ -267,6 +352,7 @@ FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
   INF  MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf\r
   INF  MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf\r
   INF  MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf\r
+  INF  OvmfPkg/VirtioNetDxe/VirtioNet.inf\r
 \r
 #\r
 # Usb Support\r