ArmVirtPkg/VirtFdtDxe: remove Xenio handling and rename to VirtioFdtDxe

[mirror_edk2.git] / ArmVirtPkg / ArmVirtQemu.fdf

diff --git a/ArmVirtPkg/ArmVirtQemu.fdf b/ArmVirtPkg/ArmVirtQemu.fdf
index 5b6bda8c5191ac6dfc7163dd74fca17a01b00b2b..071eaef5dd80f320b7c5e5d8126101054d83db63 100644 (file)
--- a/ArmVirtPkg/ArmVirtQemu.fdf
+++ b/ArmVirtPkg/ArmVirtQemu.fdf
@@ -1,7 +1,7 @@
 #\r
 #  Copyright (c) 2011-2015, ARM Limited. All rights reserved.\r
 #  Copyright (c) 2014, Linaro Limited. All rights reserved.\r
-#  Copyright (c) 2015, Intel Corporation. All rights reserved.\r
+#  Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
@@ -101,15 +101,11 @@ READ_STATUS        = TRUE
 READ_LOCK_CAP      = TRUE\r
 READ_LOCK_STATUS   = TRUE\r
 \r
-  APRIORI DXE {\r
-    INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf\r
-    INF ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.inf\r
-    INF ArmVirtPkg/QemuFwCfgToPcdDxe/QemuFwCfgToPcd.inf\r
-  }\r
   INF MdeModulePkg/Core/Dxe/DxeMain.inf\r
   INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf\r
-  INF ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.inf\r
-  INF ArmVirtPkg/QemuFwCfgToPcdDxe/QemuFwCfgToPcd.inf\r
+  INF ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf\r
+  INF ArmVirtPkg/FdtClientDxe/FdtClientDxe.inf\r
+  INF ArmVirtPkg/HighMemDxe/HighMemDxe.inf\r
 \r
   #\r
   # PI DXE Drivers producing Architectural Protocols (EFI Services)\r
@@ -136,7 +132,7 @@ READ_LOCK_STATUS   = TRUE
   INF MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf\r
   INF MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf\r
   INF MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf\r
-  INF EmbeddedPkg/SerialDxe/SerialDxe.inf\r
+  INF MdeModulePkg/Universal/SerialDxe/SerialDxe.inf\r
 \r
   INF ArmPkg/Drivers/ArmGic/ArmGicDxe.inf\r
   INF ArmPkg/Drivers/TimerDxe/TimerDxe.inf\r
@@ -152,7 +148,7 @@ READ_LOCK_STATUS   = TRUE
   #\r
   INF MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf\r
   INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf\r
-  INF FatBinPkg/EnhancedFatDxe/Fat.inf\r
+  INF FatPkg/EnhancedFatDxe/Fat.inf\r
   INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf\r
 \r
   #\r
@@ -161,6 +157,7 @@ READ_LOCK_STATUS   = TRUE
   INF OvmfPkg/VirtioBlkDxe/VirtioBlk.inf\r
   INF OvmfPkg/VirtioNetDxe/VirtioNet.inf\r
   INF OvmfPkg/VirtioScsiDxe/VirtioScsi.inf\r
+  INF OvmfPkg/VirtioRngDxe/VirtioRng.inf\r
 \r
   #\r
   # UEFI application (Shell Embedded Boot Loader)\r
@@ -171,13 +168,9 @@ READ_LOCK_STATUS   = TRUE
   # Bds\r
   #\r
   INF MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf\r
-!if $(INTEL_BDS) == TRUE\r
   INF MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf\r
   INF MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf\r
   INF IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf\r
-!else\r
-  INF ArmPlatformPkg/Bds/Bds.inf\r
-!endif\r
 \r
   #\r
   # Networking stack\r
@@ -200,11 +193,19 @@ READ_LOCK_STATUS   = TRUE
   INF MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf\r
   INF MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf\r
 \r
+  #\r
+  # SMBIOS Support\r
+  #\r
+  INF MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf\r
+  INF OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf\r
+\r
+!if $(ARCH) == AARCH64\r
   #\r
   # ACPI Support\r
   #\r
   INF MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf\r
   INF OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf\r
+!endif\r
 \r
   #\r
   # PCI support\r
@@ -212,6 +213,7 @@ READ_LOCK_STATUS   = TRUE
   INF ArmVirtPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf\r
   INF MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf\r
   INF OvmfPkg/VirtioPciDeviceDxe/VirtioPciDeviceDxe.inf\r
+  INF OvmfPkg/Virtio10Dxe/Virtio10.inf\r
 \r
   #\r
   # Video support\r
@@ -228,14 +230,12 @@ READ_LOCK_STATUS   = TRUE
   INF MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf\r
   INF MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf\r
 \r
-!if $(INTEL_BDS) == TRUE\r
   #\r
   # TianoCore logo (splash screen)\r
   #\r
   FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {\r
     SECTION RAW = MdeModulePkg/Logo/Logo.bmp\r
   }\r
-!endif\r
 \r
 [FV.FVMAIN_COMPACT]\r
 FvAlignment        = 16\r
@@ -255,9 +255,6 @@ READ_STATUS        = TRUE
 READ_LOCK_CAP      = TRUE\r
 READ_LOCK_STATUS   = TRUE\r
 \r
-  APRIORI PEI {\r
-    INF  MdeModulePkg/Universal/PCD/Pei/Pcd.inf\r
-  }\r
   INF ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf\r
   INF MdeModulePkg/Core/Pei/PeiMain.inf\r
   INF ArmPlatformPkg/PlatformPei/PlatformPeim.inf\r
@@ -303,20 +300,20 @@ READ_LOCK_STATUS   = TRUE
 ############################################################################\r
 \r
 [Rule.Common.SEC]\r
-  FILE SEC = $(NAMED_GUID) RELOCS_STRIPPED {\r
-    TE  TE Align = 128                  $(INF_OUTPUT)/$(MODULE_NAME).efi\r
+  FILE SEC = $(NAMED_GUID) RELOCS_STRIPPED FIXED {\r
+    TE  TE Align = Auto                 $(INF_OUTPUT)/$(MODULE_NAME).efi\r
   }\r
 \r
 [Rule.Common.PEI_CORE]\r
-  FILE PEI_CORE = $(NAMED_GUID) {\r
-    TE     TE Align = 8                 $(INF_OUTPUT)/$(MODULE_NAME).efi\r
+  FILE PEI_CORE = $(NAMED_GUID) FIXED {\r
+    TE     TE Align = Auto              $(INF_OUTPUT)/$(MODULE_NAME).efi\r
     UI     STRING ="$(MODULE_NAME)" Optional\r
   }\r
 \r
 [Rule.Common.PEIM]\r
-  FILE PEIM = $(NAMED_GUID) {\r
+  FILE PEIM = $(NAMED_GUID) FIXED {\r
      PEI_DEPEX PEI_DEPEX Optional       $(INF_OUTPUT)/$(MODULE_NAME).depex\r
-     TE       TE Align = 8              $(INF_OUTPUT)/$(MODULE_NAME).efi\r
+     TE       TE Align = Auto           $(INF_OUTPUT)/$(MODULE_NAME).efi\r
      UI       STRING="$(MODULE_NAME)" Optional\r
   }\r
 \r