BaseTools/BinToPcd: Fix Python 2.7.x compatibility issue

[mirror_edk2.git] / DuetPkg / DuetPkg.fdf

diff --git a/DuetPkg/DuetPkg.fdf b/DuetPkg/DuetPkg.fdf
index 4793055fa679e327f149fe1aa921fd6fc4b6b1cd..f51af8a307db68cc7a13d068c8a0ba0c2b7ad023 100644 (file)
--- a/DuetPkg/DuetPkg.fdf
+++ b/DuetPkg/DuetPkg.fdf
@@ -1,9 +1,9 @@
 ## @file\r
 # This is DUET FDF file with UEFI HII features enabled\r
 #\r
-# Copyright (c) 2007 - 2010, Intel Corporation\r
+# Copyright (c) 2007 - 2016, Intel Corporation. All rights reserved.<BR>\r
 #\r
-#  All rights reserved. This program and the accompanying materials\r
+#    This program and the accompanying materials\r
 #    are licensed and made available under the terms and conditions of the BSD License\r
 #    which accompanies this distribution. The full text of the license may be found at\r
 #    http://opensource.org/licenses/bsd-license.php\r
@@ -24,7 +24,6 @@
 ################################################################################\r
 [FV.DuetEfiMainFv]\r
 BlockSize          = 0x10000\r
-NumBlocks          = 0x2a\r
 FvAlignment        = 16         #FV alignment and FV attributes setting.\r
 ERASE_POLARITY     = 1\r
 MEMORY_MAPPED      = TRUE\r
@@ -42,6 +41,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  PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf\r
+}\r
+\r
 INF  MdeModulePkg/Universal/PCD/Dxe/Pcd.inf\r
 INF  MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf\r
 INF  MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf\r
@@ -55,6 +59,7 @@ INF  MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf
 INF  MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf\r
 INF  MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf\r
 INF  MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf\r
+INF  MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf\r
 \r
 INF  MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf\r
 INF  MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf\r
@@ -65,7 +70,7 @@ INF  IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf
 INF  MdeModulePkg/Universal/EbcDxe/EbcDxe.inf\r
 INF  MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf\r
 INF  UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf\r
-INF  DuetPkg/CpuDxe/Cpu.inf\r
+INF  UefiCpuPkg/CpuDxe/CpuDxe.inf\r
 \r
 INF  PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf\r
 INF  DuetPkg/AcpiResetDxe/Reset.inf\r
@@ -77,9 +82,12 @@ INF  DuetPkg/PciBusNoEnumerationDxe/PciBusNoEnumeration.inf
 INF  IntelFrameworkModulePkg/Bus/Pci/VgaMiniPortDxe/VgaMiniPortDxe.inf\r
 INF  IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClassDxe.inf\r
 \r
-  # IDE Support\r
-INF  IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBusDxe.inf\r
-INF  PcAtChipsetPkg/Bus/Pci/IdeControllerDxe/IdeControllerDxe.inf\r
+  # IDE/AHCI Support\r
+INF  DuetPkg/SataControllerDxe/SataControllerDxe.inf\r
+INF  MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf\r
+INF  MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf\r
+INF  MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf\r
+INF  MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf\r
 \r
   # Usb Support\r
 INF  MdeModulePkg/Bus/Pci/UhciDxe/UhciDxe.inf\r
@@ -100,8 +108,7 @@ INF  MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
 INF  MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf\r
 INF  DuetPkg/BiosVideoThunkDxe/BiosVideo.inf\r
 \r
-  # Binary INF file to support toggle among different CPU architectures.\r
-INF  RuleOverride=BINARY FatBinPkg/EnhancedFatDxe/Fat.inf\r
+INF  FatPkg/EnhancedFatDxe/Fat.inf\r
 \r
 FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {\r
     SECTION RAW = MdeModulePkg/Logo/Logo.bmp\r