Add VlanConfigDxe to platform DSC/FDF.

[mirror_edk2.git] / DuetPkg / DuetPkg.fdf

diff --git a/DuetPkg/DuetPkg.fdf b/DuetPkg/DuetPkg.fdf
index e6481accedb47c021eca17823f9c6f85f6b438cd..0e5bd9b1b9887c9511d094be74dcca2e404d9ef6 100644 (file)
--- a/DuetPkg/DuetPkg.fdf
+++ b/DuetPkg/DuetPkg.fdf
@@ -1,3 +1,4 @@
+## @file\r
 # This is DUET FDF file with UEFI HII features enabled\r
 #\r
 # Copyright (c) 2007 - 2010, Intel Corporation\r
@@ -82,11 +83,12 @@ INF  DuetPkg/SmbiosGenDxe/SmbiosGen.inf
 #INF  DuetPkg/FvbRuntimeService/DUETFwh.inf\r
 INF  IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.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
@@ -119,7 +121,7 @@ INF  MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
 INF  DuetPkg/BiosVideoThunkDxe/BiosVideo.inf\r
 \r
   # Binary INF file to support toggle among different CPU architectures.\r
-INF  FatBinPkg/EnhancedFatDxe/Fat.inf\r
+INF  RuleOverride=BINARY FatBinPkg/EnhancedFatDxe/Fat.inf\r
 \r
 FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {\r
     SECTION RAW = MdeModulePkg/Logo/Logo.bmp\r
@@ -127,29 +129,35 @@ 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                    $(INF_OUTPUT)/$(MODULE_NAME).efi\r
+  }\r
+\r
+[Rule.Common.UEFI_DRIVER.BINARY]\r
+  FILE DRIVER = $(NAMED_GUID) {\r
+    DXE_DEPEX    DXE_DEPEX Optional      |.depex\r
         PE32     PE32                    |.efi\r
   }\r
 \r