Clean up Rules of Platform FDFs to apply only one EFI image and Depex for each driver

[mirror_edk2.git] / EmbeddedPkg / EmbeddedPkg.fdf

diff --git a/EmbeddedPkg/EmbeddedPkg.fdf b/EmbeddedPkg/EmbeddedPkg.fdf
index 6ad2b668edab7293d66a92d4dc1d187adbc2f57b..b7f17c043b8c8c73412c8d531211e27f647b751e 100644 (file)
--- a/EmbeddedPkg/EmbeddedPkg.fdf
+++ b/EmbeddedPkg/EmbeddedPkg.fdf
@@ -68,10 +68,10 @@ INF  EmbeddedPkg/Ebl/Ebl.inf
 #  \r
 #[Rule.Common.DXE_DRIVER]\r
 #  FILE DRIVER = $(NAMED_GUID) {\r
-#    DXE_DEPEX    DXE_DEPEX Optional      |.depex\r
+#    DXE_DEPEX    DXE_DEPEX               Optional $(INF_OUTPUT)/$(MODULE_NAME).depex\r
 #    COMPRESS PI_STD {\r
 #      GUIDED {\r
-#        PE32     PE32                    |.efi\r
+#        PE32     PE32                    $(INF_OUTPUT)/$(MODULE_NAME).efi\r
 #        UI       STRING="$(MODULE_NAME)" Optional\r
 #        VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
 #      }\r
@@ -82,60 +82,60 @@ INF  EmbeddedPkg/Ebl/Ebl.inf
 \r
 [Rule.Common.SEC]\r
   FILE SEC = $(NAMED_GUID) {\r
-    PE32     PE32           |.efi\r
+    PE32     PE32                     $(INF_OUTPUT)/$(MODULE_NAME).efi\r
   }\r
 \r
 [Rule.Common.PEI_CORE]\r
   FILE PEI_CORE = $(NAMED_GUID) {\r
-    PE32     PE32           |.efi\r
+    PE32     PE32                     $(INF_OUTPUT)/$(MODULE_NAME).efi\r
     UI       STRING ="$(MODULE_NAME)" Optional         \r
   }\r
 \r
 [Rule.Common.PEIM]\r
   FILE PEIM = $(NAMED_GUID) {\r
-   PEI_DEPEX PEI_DEPEX Optional        |.depex\r
-   PE32      PE32                      |.efi\r
+   PEI_DEPEX PEI_DEPEX Optional       $(MODULE_NAME).depex\r
+   PE32      PE32                     $(INF_OUTPUT)/$(MODULE_NAME).efi\r
    UI       STRING="$(MODULE_NAME)" Optional         \r
   }\r
 \r
 [Rule.Common.PEIM.TIANOCOMPRESSED]\r
   FILE PEIM = $(NAMED_GUID) DEBUG_MYTOOLS_IA32 {\r
-    PEI_DEPEX PEI_DEPEX Optional         |.depex\r
+    PEI_DEPEX PEI_DEPEX Optional       $(MODULE_NAME).depex\r
     GUIDED A31280AD-481E-41B6-95E8-127F4C984779 PROCESSING_REQUIRED = TRUE {\r
-      PE32      PE32                     |.efi\r
+      PE32      PE32                  $(INF_OUTPUT)/$(MODULE_NAME).efi\r
       UI        STRING="$(MODULE_NAME)" Optional\r
     }\r
   }\r
 \r
 [Rule.Common.DXE_CORE]\r
   FILE DXE_CORE = $(NAMED_GUID) {\r
-    PE32     PE32           |.efi\r
+    PE32     PE32                     $(INF_OUTPUT)/$(MODULE_NAME).efi\r
     UI       STRING="$(MODULE_NAME)" Optional\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
     UI       STRING="$(MODULE_NAME)" Optional\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
     UI       STRING="$(MODULE_NAME)" Optional\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
     UI       STRING="$(MODULE_NAME)" Optional\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
     UI       STRING="$(MODULE_NAME)" Optional\r
   }\r