Fix a security hole in shell binaries:

[mirror_edk2.git] / DuetPkg / DuetPkg.fdf

diff --git a/DuetPkg/DuetPkg.fdf b/DuetPkg/DuetPkg.fdf
index 3a8b3594dde3caef90934c7a3020f785ea7a5a61..a807525efcbf859e584aab6d8582f04e3b49746f 100644 (file)
--- a/DuetPkg/DuetPkg.fdf
+++ b/DuetPkg/DuetPkg.fdf
@@ -68,7 +68,6 @@ INF  MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDx
 \r
 INF  DuetPkg/FSVariable/FSVariable.inf\r
 INF  MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf\r
-#INF  MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf\r
 INF  MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf\r
 INF  MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf\r
 INF  MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf\r
@@ -78,32 +77,33 @@ INF  MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
 INF  IntelFrameworkModulePkg/Universal/DataHubDxe/DataHubDxe.inf\r
 INF  MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf\r
 INF  MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf\r
-#INF  MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf\r
-\r
-INF  DuetPkg/DataHubGenDxe/DataHubGen.inf\r
+INF  MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf\r
+INF  DuetPkg/SmbiosGenDxe/SmbiosGen.inf\r
 #INF  DuetPkg/FvbRuntimeService/DUETFwh.inf\r
 INF  IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf\r
-INF  UefiCpuPkg/CpuIoDxe/CpuIo.inf\r
+INF  UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf\r
 INF  DuetPkg/CpuDxe/Cpu.inf\r
 \r
 INF  PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf\r
 INF  PcAtChipsetPkg/KbcResetDxe/Reset.inf\r
 INF  DuetPkg/LegacyMetronome/Metronome.inf\r
 INF  PcAtChipsetPkg/8254TimerDxe/8254Timer.inf\r
-INF  PcAtChipsetPkg/PcRtc/RealTimeClock.inf\r
+INF  PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntimeDxe.inf\r
 INF  DuetPkg/PciRootBridgeNoEnumerationDxe/PciRootBridgeNoEnumeration.inf\r
 INF  DuetPkg/PciBusNoEnumerationDxe/PciBusNoEnumeration.inf\r
 INF  IntelFrameworkModulePkg/Bus/Pci/VgaMiniPortDxe/VgaMiniPortDxe.inf\r
 INF  IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClassDxe.inf\r
 \r
   # IDE Support\r
-#IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBusDxe.inf\r
+INF  IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBusDxe.inf\r
+INF  PcAtChipsetPkg/Bus/Pci/IdeControllerDxe/IdeControllerDxe.inf\r
 \r
   # Usb Support\r
-#INF  MdeModulePkg/Bus/Pci/UhciDxe/UhciDxe.inf\r
-#INF  MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf\r
-#INF  MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf\r
-#INF  MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf\r
+INF  MdeModulePkg/Bus/Pci/UhciDxe/UhciDxe.inf\r
+INF  MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.inf\r
+INF  MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf\r
+INF  MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf\r
+INF  MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf\r
 \r
   # ISA Support\r
 INF  PcAtChipsetPkg/IsaAcpiDxe/IsaAcpi.inf\r
@@ -115,14 +115,14 @@ INF  IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppyDxe.inf
 INF  MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf\r
 INF  MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf\r
 INF  MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf\r
-INF  DuetPkg/BiosVideoThunkDxe/BiosVideo.inf\r
+#INF  DuetPkg/BiosVideoThunkDxe/BiosVideo.inf\r
 \r
   # Binary INF file to support toggle among different CPU architectures.\r
 INF  FatBinPkg/EnhancedFatDxe/Fat.inf\r
 \r
-#FILE FREEFORM = 7BB28B99-61BB-11D5-9A5D-0090273FC14D {\r
-#    SECTION RAW = MdeModulePkg/Logo/Logo.bmp\r
-#  }\r
+FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {\r
+    SECTION RAW = MdeModulePkg/Logo/Logo.bmp\r
+  }\r
 \r
 [Rule.Common.DXE_CORE]\r
   FILE DXE_CORE = $(NAMED_GUID) {\r