Add the missing OUTPUT directory for the EFI and depex file in Rule section.

[mirror_edk2.git] / DuetPkg / DuetPkg.fdf

diff --git a/DuetPkg/DuetPkg.fdf b/DuetPkg/DuetPkg.fdf
index aa1b6f7689975c9763504c8ad682ca2db7074179..b9079810a429dcb1df017653f585156fd24f94ea 100644 (file)
--- a/DuetPkg/DuetPkg.fdf
+++ b/DuetPkg/DuetPkg.fdf
@@ -1,6 +1,7 @@
-# This is NT32 FDF file with UEFI HII features enabled\r
+## @file\r
+# This is DUET FDF file with UEFI HII features enabled\r
 #\r
-# Copyright (c) 2007, Intel Corporation\r
+# Copyright (c) 2007 - 2010, Intel Corporation\r
 #\r
 #  All rights reserved. This program and the accompanying materials\r
 #    are licensed and made available under the terms and conditions of the BSD License\r
@@ -77,14 +78,17 @@ 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  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  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
 \r
 INF  PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf\r
-INF  PcAtChipsetPkg/KbcResetDxe/Reset.inf\r
+INF  DuetPkg/AcpiResetDxe/Reset.inf\r
 INF  DuetPkg/LegacyMetronome/Metronome.inf\r
 INF  PcAtChipsetPkg/8254TimerDxe/8254Timer.inf\r
 INF  PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntimeDxe.inf\r
@@ -95,10 +99,11 @@ INF  IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClassDxe.inf
 \r
   # IDE Support\r
 INF  IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBusDxe.inf\r
-INF  DuetPkg/IdeControllerDxe/IdeController.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/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
@@ -124,29 +129,29 @@ FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
 \r
 [Rule.Common.DXE_CORE]\r
   FILE DXE_CORE = $(NAMED_GUID) {\r
-      PE32     PE32           |.efi\r
+      PE32     PE32           $(INF_OUTPUT)/$(MODULE_NAME).efi\r
   }\r
 \r
 [Rule.Common.UEFI_DRIVER]\r
   FILE DRIVER = $(NAMED_GUID) {\r
-    DXE_DEPEX    DXE_DEPEX Optional      |.depex\r
-        PE32     PE32                    |.efi\r
+    DXE_DEPEX    DXE_DEPEX Optional      $(INF_OUTPUT)/$(MODULE_NAME).depex\r
+        PE32     PE32                    $(INF_OUTPUT)/$(MODULE_NAME).efi\r
   }\r
 \r
 [Rule.Common.DXE_DRIVER]\r
   FILE DRIVER = $(NAMED_GUID) {\r
-    DXE_DEPEX    DXE_DEPEX Optional      |.depex\r
-        PE32     PE32                    |.efi\r
+    DXE_DEPEX    DXE_DEPEX Optional      $(INF_OUTPUT)/$(MODULE_NAME).depex\r
+        PE32     PE32                    $(INF_OUTPUT)/$(MODULE_NAME).efi\r
   }\r
 \r
 [Rule.Common.DXE_RUNTIME_DRIVER]\r
   FILE DRIVER = $(NAMED_GUID) {\r
-    DXE_DEPEX    DXE_DEPEX Optional      |.depex\r
-        PE32     PE32                    |.efi\r
+    DXE_DEPEX    DXE_DEPEX Optional      $(INF_OUTPUT)/$(MODULE_NAME).depex\r
+        PE32     PE32                    $(INF_OUTPUT)/$(MODULE_NAME).efi\r
   }\r
 \r
 [Rule.Common.UEFI_APPLICATION]\r
   FILE APPLICATION = $(NAMED_GUID) {\r
-        PE32     PE32                    |.efi\r
+        PE32     PE32                    $(INF_OUTPUT)/$(MODULE_NAME).efi\r
   }\r
 \r