X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=DuetPkg%2FDuetPkg.fdf;h=473851a0c386b517515a9c21e493f754d8da2413;hb=ded312f134a0c5125f692531280a5917d28e8026;hp=9072d9823704519cbb484f9cd9361e722203391a;hpb=c5dfb4770b115c57563c07d1f4379f45c2904caf;p=mirror_edk2.git

diff --git a/DuetPkg/DuetPkg.fdf b/DuetPkg/DuetPkg.fdf
index 9072d98237..473851a0c3 100644
--- a/DuetPkg/DuetPkg.fdf
+++ b/DuetPkg/DuetPkg.fdf
@@ -61,19 +61,16 @@ READ_STATUS        = TRUE
 READ_LOCK_CAP      = TRUE
 READ_LOCK_STATUS   = TRUE
 
-APRIORI DXE {
-  INF  IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.inf
-  }
-
+INF  IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.inf
+INF  MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
 INF  MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
 INF  MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf
 INF  MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf
-  
+
 INF  DuetPkg/FSVariable/FSVariable.inf
 INF  MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf
 INF  MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf
 INF  MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf
-INF  IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.inf
 INF  MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf
 INF  MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf
 INF  MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
@@ -86,57 +83,61 @@ INF  MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf
 
 INF  DuetPkg/DataHubGenDxe/DataHubGen.inf
 #INF  DuetPkg/FvbRuntimeService/DUETFwh.inf
-INF  MdeModulePkg/Universal/BdsDxe/BdsDxe.inf
-INF  DuetPkg/CpuIoDxe/CpuIo.inf
+INF  IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf
+INF  UefiCpuPkg/CpuIoDxe/CpuIo.inf
 INF  DuetPkg/CpuDxe/Cpu.inf
-  
-INF  IntelFrameworkModulePkg/Universal/Legacy8259Dxe/8259.inf
-INF  DuetPkg/KbcResetDxe/Reset.inf
+
+INF  PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf
+INF  PcAtChipsetPkg/KbcResetDxe/Reset.inf
 INF  DuetPkg/LegacyMetronome/Metronome.inf
-INF  DuetPkg/8254TimerDxe/8254Timer.inf
-INF  DuetPkg/PcRtc/RealTimeClock.inf
+INF  PcAtChipsetPkg/8254TimerDxe/8254Timer.inf
+INF  PcAtChipsetPkg/PcRtc/RealTimeClock.inf
 INF  DuetPkg/PciRootBridgeNoEnumerationDxe/PciRootBridgeNoEnumeration.inf
 INF  DuetPkg/PciBusNoEnumerationDxe/PciBusNoEnumeration.inf
 INF  IntelFrameworkModulePkg/Bus/Pci/VgaMiniPortDxe/VgaMiniPortDxe.inf
 INF  IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClassDxe.inf
 
   # IDE Support
-  #IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBusDxe.inf
-  
+#IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBusDxe.inf
+
   # Usb Support
 INF  MdeModulePkg/Bus/Pci/UhciDxe/UhciDxe.inf
 INF  MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
 INF  MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf
 INF  MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
-  
+
   # ISA Support
-INF  DuetPkg/IsaAcpiDxe/IsaAcpi.inf
+INF  PcAtChipsetPkg/IsaAcpiDxe/IsaAcpi.inf
 INF  IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.inf
 INF  IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.inf
-#INF  IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2keyboardDxe.inf
+INF  IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2keyboardDxe.inf
 INF  IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppyDxe.inf
 
-#INF  MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf
-#INF  MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
-#INF  MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
+INF  MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf
+INF  MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
+INF  MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
+#INF  DuetPkg/BiosVideoThunkDxe/BiosVideo.inf
 
-#FILE DRIVER = 961578FE-B6B7-44c3-AF35-6BC705CD2B1F {
-#  SECTION PE32 = FatBinPkg/EnhancedFatDxe/Ia32/Fat.efi
-#  }
+  # Binary INF file to support toggle among different CPU architectures.
+#INF  FatBinPkg/EnhancedFatDxe/Fat.inf
+
+FILE FREEFORM = 7BB28B99-61BB-11D5-9A5D-0090273FC14D {
+    SECTION RAW = MdeModulePkg/Logo/Logo.bmp
+  }
 
 [Rule.Common.PEI_CORE]
   FILE PEI_CORE = $(NAMED_GUID) {
     PE32     PE32           |.efi
-    UI       STRING ="$(MODULE_NAME)" Optional         
-    VERSION  STRING ="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)    
+    UI       STRING ="$(MODULE_NAME)" Optional
+    VERSION  STRING ="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
   }
 
 [Rule.Common.PEIM]
   FILE PEIM = $(NAMED_GUID) {
      PEI_DEPEX PEI_DEPEX Optional        |.depex
      PE32      PE32                      |.efi
-     UI       STRING="$(MODULE_NAME)" Optional         
-     VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)   
+     UI       STRING="$(MODULE_NAME)" Optional
+     VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
   }
 
 [Rule.Common.PEIM.TIANOCOMPRESSED]
@@ -204,3 +205,4 @@ INF  IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppyDxe.inf
       }
     }
   }
+