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

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10127 6f19259b-4bc3-4df7-8a09-765794883524

5 files changed, 70 insertions, 70 deletions

diff --git a/DuetPkg/DuetPkg.fdf b/DuetPkg/DuetPkg.fdf
index 83e8df32af..d6c38446e9 100644
--- a/DuetPkg/DuetPkg.fdf
+++ b/DuetPkg/DuetPkg.fdf
@@ -129,29 +129,29 @@ FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
 

 [Rule.Common.DXE_CORE]

   FILE DXE_CORE = $(NAMED_GUID) {

-      PE32     PE32           |.efi

+      PE32     PE32           $(MODULE_NAME).efi

   }

 

 [Rule.Common.UEFI_DRIVER]

   FILE DRIVER = $(NAMED_GUID) {

-    DXE_DEPEX    DXE_DEPEX Optional      |.depex

-        PE32     PE32                    |.efi

+    DXE_DEPEX    DXE_DEPEX Optional      $(MODULE_NAME).depex

+        PE32     PE32                    $(MODULE_NAME).efi

   }

 

 [Rule.Common.DXE_DRIVER]

   FILE DRIVER = $(NAMED_GUID) {

-    DXE_DEPEX    DXE_DEPEX Optional      |.depex

-        PE32     PE32                    |.efi

+    DXE_DEPEX    DXE_DEPEX Optional      $(MODULE_NAME).depex

+        PE32     PE32                    $(MODULE_NAME).efi

   }

 

 [Rule.Common.DXE_RUNTIME_DRIVER]

   FILE DRIVER = $(NAMED_GUID) {

-    DXE_DEPEX    DXE_DEPEX Optional      |.depex

-        PE32     PE32                    |.efi

+    DXE_DEPEX    DXE_DEPEX Optional      $(MODULE_NAME).depex

+        PE32     PE32                    $(MODULE_NAME).efi

   }

 

 [Rule.Common.UEFI_APPLICATION]

   FILE APPLICATION = $(NAMED_GUID) {

-        PE32     PE32                    |.efi

+        PE32     PE32                    $(MODULE_NAME).efi

   }

 

diff --git a/Nt32Pkg/Nt32Pkg.fdf b/Nt32Pkg/Nt32Pkg.fdf
index 49d20e6cad..d34b76097d 100644
--- a/Nt32Pkg/Nt32Pkg.fdf
+++ b/Nt32Pkg/Nt32Pkg.fdf
@@ -279,10 +279,10 @@ FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
 #

 #[Rule.Common.DXE_DRIVER]

 #  FILE DRIVER = $(NAMED_GUID) {

-#    DXE_DEPEX    DXE_DEPEX Optional      |.depex

+#    DXE_DEPEX    DXE_DEPEX Optional      $(MODULE_NAME).depex

 #    COMPRESS PI_STD {

 #      GUIDED {

-#        PE32     PE32                    |.efi

+#        PE32     PE32                    $(MODULE_NAME).efi

 #        UI       STRING="$(MODULE_NAME)" Optional

 #        VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)

 #      }

@@ -293,15 +293,15 @@ FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
 

 [Rule.Common.PEI_CORE]

   FILE PEI_CORE = $(NAMED_GUID) {

-    PE32     PE32    Align=4K     |.efi

+    PE32     PE32    Align=4K     $(MODULE_NAME).efi

     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    Align=4K          |.efi

+     PEI_DEPEX PEI_DEPEX Optional        $(MODULE_NAME).depex

+     PE32      PE32    Align=4K          $(MODULE_NAME).efi

      UI       STRING="$(MODULE_NAME)" Optional         

      VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)   

   }

@@ -309,7 +309,7 @@ FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
 [Rule.Common.DXE_CORE]

   FILE DXE_CORE = $(NAMED_GUID) {

     COMPRESS PI_STD {

-      PE32     PE32      |.efi

+      PE32     PE32      $(MODULE_NAME).efi

       UI       STRING="$(MODULE_NAME)" Optional

       VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)

     }

@@ -317,10 +317,10 @@ FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
 

 [Rule.Common.UEFI_DRIVER]

   FILE DRIVER = $(NAMED_GUID) {

-    DXE_DEPEX    DXE_DEPEX Optional      |.depex

+    DXE_DEPEX    DXE_DEPEX Optional      $(MODULE_NAME).depex

     COMPRESS PI_STD {

       GUIDED {

-        PE32     PE32                    |.efi

+        PE32     PE32                    $(MODULE_NAME).efi

         UI       STRING="$(MODULE_NAME)" Optional

         VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)

       }

@@ -329,9 +329,9 @@ FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
 

 [Rule.Common.UEFI_DRIVER.TIANOCOMPRESSED]

   FILE DRIVER = $(NAMED_GUID) {

-    DXE_DEPEX    DXE_DEPEX Optional      |.depex

+    DXE_DEPEX    DXE_DEPEX Optional      $(MODULE_NAME).depex

     GUIDED A31280AD-481E-41B6-95E8-127F4C984779 PROCESSING_REQUIRED = TRUE {

-      PE32     PE32                    |.efi

+      PE32     PE32                    $(MODULE_NAME).efi

       UI       STRING="$(MODULE_NAME)" Optional

       VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)

     }

@@ -339,10 +339,10 @@ FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
 

 [Rule.Common.DXE_DRIVER]

   FILE DRIVER = $(NAMED_GUID) {

-    DXE_DEPEX    DXE_DEPEX Optional      |.depex

+    DXE_DEPEX    DXE_DEPEX Optional      $(MODULE_NAME).depex

     COMPRESS PI_STD {

       GUIDED {

-        PE32     PE32                    |.efi

+        PE32     PE32                    $(MODULE_NAME).efi

         UI       STRING="$(MODULE_NAME)" Optional

         VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)

       }

@@ -351,10 +351,10 @@ FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
 

 [Rule.Common.DXE_RUNTIME_DRIVER]

   FILE DRIVER = $(NAMED_GUID) {

-    DXE_DEPEX    DXE_DEPEX Optional      |.depex

+    DXE_DEPEX    DXE_DEPEX Optional      $(MODULE_NAME).depex

     COMPRESS PI_STD {

       GUIDED {

-        PE32     PE32                    |.efi

+        PE32     PE32                    $(MODULE_NAME).efi

         UI       STRING="$(MODULE_NAME)" Optional

         VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)

       }

@@ -365,7 +365,7 @@ FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
   FILE APPLICATION = $(NAMED_GUID) {

     COMPRESS PI_STD {

       GUIDED {

-        PE32     PE32                    |.efi

+        PE32     PE32                    $(MODULE_NAME).efi

         UI       STRING="$(MODULE_NAME)" Optional

         VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)

       }

diff --git a/OvmfPkg/OvmfPkg.fdf b/OvmfPkg/OvmfPkg.fdf
index c55b6a3b9a..1d7c8a911f 100644
--- a/OvmfPkg/OvmfPkg.fdf
+++ b/OvmfPkg/OvmfPkg.fdf
@@ -252,39 +252,39 @@ FILE FREEFORM = 1BA0062E-C779-4582-8566-336AE8F78F09 {
 

 [Rule.Common.PEI_CORE]

   FILE PEI_CORE = $(NAMED_GUID) {

-    PE32     PE32   Align=32    |.efi

+    PE32     PE32   Align=32    $(MODULE_NAME).efi

     UI       STRING ="$(MODULE_NAME)" Optional

     VERSION  STRING ="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)

   }

 

 [Rule.Common.SEC]

   FILE SEC = $(NAMED_GUID) {

-    PE32     PE32           |.efi

+    PE32     PE32           $(MODULE_NAME).efi

     UI       STRING ="$(MODULE_NAME)" Optional

     VERSION  STRING ="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)

   }

 

 [Rule.Common.PEIM.NORELOC]

   FILE PEIM = $(NAMED_GUID) RELOCS_STRIPPED  {

-     PEI_DEPEX PEI_DEPEX Optional        |.depex

-     TE        TE                        |.efi

+     PEI_DEPEX PEI_DEPEX Optional        $(MODULE_NAME).depex

+     TE        TE                        $(MODULE_NAME).efi

      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   Align=32           |.efi

+     PEI_DEPEX PEI_DEPEX Optional        $(MODULE_NAME).depex

+     PE32      PE32   Align=32           $(MODULE_NAME).efi

      UI       STRING="$(MODULE_NAME)" Optional

      VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)

   }

 

 [Rule.Common.PEIM.TIANOCOMPRESSED]

   FILE PEIM = $(NAMED_GUID) {

-    PEI_DEPEX PEI_DEPEX Optional         |.depex

+    PEI_DEPEX PEI_DEPEX Optional         $(MODULE_NAME).depex

     GUIDED A31280AD-481E-41B6-95E8-127F4C984779 PROCESSING_REQUIRED = TRUE {

-      PE32      PE32                     |.efi

+      PE32      PE32                     $(MODULE_NAME).efi

       UI        STRING="$(MODULE_NAME)" Optional

       VERSION   STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)

     }

@@ -292,38 +292,38 @@ FILE FREEFORM = 1BA0062E-C779-4582-8566-336AE8F78F09 {
 

 [Rule.Common.DXE_CORE]

   FILE DXE_CORE = $(NAMED_GUID) {

-    PE32     PE32           |.efi

+    PE32     PE32           $(MODULE_NAME).efi

     UI       STRING="$(MODULE_NAME)" Optional

     VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)

   }

 

 [Rule.Common.UEFI_DRIVER]

   FILE DRIVER = $(NAMED_GUID) {

-    DXE_DEPEX    DXE_DEPEX Optional      |.depex

-    PE32     PE32                    |.efi

+    DXE_DEPEX    DXE_DEPEX Optional      $(MODULE_NAME).depex

+    PE32     PE32                    $(MODULE_NAME).efi

     UI       STRING="$(MODULE_NAME)" Optional

     VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)

   }

 

 [Rule.Common.DXE_DRIVER]

   FILE DRIVER = $(NAMED_GUID) {

-    DXE_DEPEX    DXE_DEPEX Optional      |.depex

-    PE32     PE32                    |.efi

+    DXE_DEPEX    DXE_DEPEX Optional      $(MODULE_NAME).depex

+    PE32     PE32                    $(MODULE_NAME).efi

     UI       STRING="$(MODULE_NAME)" Optional

     VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)

   }

 

 [Rule.Common.DXE_RUNTIME_DRIVER]

   FILE DRIVER = $(NAMED_GUID) {

-    DXE_DEPEX    DXE_DEPEX Optional      |.depex

-    PE32     PE32                    |.efi

+    DXE_DEPEX    DXE_DEPEX Optional      $(MODULE_NAME).depex

+    PE32     PE32                    $(MODULE_NAME).efi

     UI       STRING="$(MODULE_NAME)" Optional

     VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)

   }

 

 [Rule.Common.UEFI_APPLICATION]

   FILE APPLICATION = $(NAMED_GUID) {

-    PE32     PE32                    |.efi

+    PE32     PE32                    $(MODULE_NAME).efi

     UI       STRING="$(MODULE_NAME)" Optional

     VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)

   }

diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
index 7e5c0d7cef..0d2286c919 100644
--- a/OvmfPkg/OvmfPkgIa32X64.fdf
+++ b/OvmfPkg/OvmfPkgIa32X64.fdf
@@ -258,39 +258,39 @@ FILE FREEFORM = 1BA0062E-C779-4582-8566-336AE8F78F09 {
 

 [Rule.Common.PEI_CORE]

   FILE PEI_CORE = $(NAMED_GUID) {

-    PE32     PE32   Align=32    |.efi

+    PE32     PE32   Align=32    $(MODULE_NAME).efi

     UI       STRING ="$(MODULE_NAME)" Optional

     VERSION  STRING ="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)

   }

 

 [Rule.Common.SEC]

   FILE SEC = $(NAMED_GUID) {

-    PE32     PE32           |.efi

+    PE32     PE32           $(MODULE_NAME).efi

     UI       STRING ="$(MODULE_NAME)" Optional

     VERSION  STRING ="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)

   }

 

 [Rule.Common.PEIM.NORELOC]

   FILE PEIM = $(NAMED_GUID) RELOCS_STRIPPED  {

-     PEI_DEPEX PEI_DEPEX Optional        |.depex

-     TE        TE                        |.efi

+     PEI_DEPEX PEI_DEPEX Optional        $(MODULE_NAME).depex

+     TE        TE                        $(MODULE_NAME).efi

      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   Align=32           |.efi

+     PEI_DEPEX PEI_DEPEX Optional        $(MODULE_NAME).depex

+     PE32      PE32   Align=32           $(MODULE_NAME).efi

      UI       STRING="$(MODULE_NAME)" Optional

      VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)

   }

 

 [Rule.Common.PEIM.TIANOCOMPRESSED]

   FILE PEIM = $(NAMED_GUID) {

-    PEI_DEPEX PEI_DEPEX Optional         |.depex

+    PEI_DEPEX PEI_DEPEX Optional         $(MODULE_NAME).depex

     GUIDED A31280AD-481E-41B6-95E8-127F4C984779 PROCESSING_REQUIRED = TRUE {

-      PE32      PE32                     |.efi

+      PE32      PE32                     $(MODULE_NAME).efi

       UI        STRING="$(MODULE_NAME)" Optional

       VERSION   STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)

     }

@@ -298,38 +298,38 @@ FILE FREEFORM = 1BA0062E-C779-4582-8566-336AE8F78F09 {
 

 [Rule.Common.DXE_CORE]

   FILE DXE_CORE = $(NAMED_GUID) {

-    PE32     PE32           |.efi

+    PE32     PE32           $(MODULE_NAME).efi

     UI       STRING="$(MODULE_NAME)" Optional

     VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)

   }

 

 [Rule.Common.UEFI_DRIVER]

   FILE DRIVER = $(NAMED_GUID) {

-    DXE_DEPEX    DXE_DEPEX Optional      |.depex

-    PE32     PE32                    |.efi

+    DXE_DEPEX    DXE_DEPEX Optional      $(MODULE_NAME).depex

+    PE32     PE32                    $(MODULE_NAME).efi

     UI       STRING="$(MODULE_NAME)" Optional

     VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)

   }

 

 [Rule.Common.DXE_DRIVER]

   FILE DRIVER = $(NAMED_GUID) {

-    DXE_DEPEX    DXE_DEPEX Optional      |.depex

-    PE32     PE32                    |.efi

+    DXE_DEPEX    DXE_DEPEX Optional      $(MODULE_NAME).depex

+    PE32     PE32                    $(MODULE_NAME).efi

     UI       STRING="$(MODULE_NAME)" Optional

     VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)

   }

 

 [Rule.Common.DXE_RUNTIME_DRIVER]

   FILE DRIVER = $(NAMED_GUID) {

-    DXE_DEPEX    DXE_DEPEX Optional      |.depex

-    PE32     PE32                    |.efi

+    DXE_DEPEX    DXE_DEPEX Optional      $(MODULE_NAME).depex

+    PE32     PE32                    $(MODULE_NAME).efi

     UI       STRING="$(MODULE_NAME)" Optional

     VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)

   }

 

 [Rule.Common.UEFI_APPLICATION]

   FILE APPLICATION = $(NAMED_GUID) {

-    PE32     PE32                    |.efi

+    PE32     PE32                    $(MODULE_NAME).efi

     UI       STRING="$(MODULE_NAME)" Optional

     VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)

   }

diff --git a/UnixPkg/UnixPkg.fdf b/UnixPkg/UnixPkg.fdf
index 46e1a14d11..bdc9494d77 100644
--- a/UnixPkg/UnixPkg.fdf
+++ b/UnixPkg/UnixPkg.fdf
@@ -299,10 +299,10 @@ FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
 #  

 #[Rule.Common.DXE_DRIVER]

 #  FILE DRIVER = $(NAMED_GUID) {

-#    DXE_DEPEX    DXE_DEPEX Optional      |.depex

+#    DXE_DEPEX    DXE_DEPEX Optional      $(MODULE_NAME).depex

 #    COMPRESS PI_STD {

 #      GUIDED {

-#        PE32     PE32                    |.efi

+#        PE32     PE32                    $(MODULE_NAME).efi

 #        UI       STRING="$(MODULE_NAME)" Optional

 #        VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)

 #      }

@@ -313,24 +313,24 @@ FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
 

 [Rule.Common.PEI_CORE]

   FILE PEI_CORE = $(NAMED_GUID) {

-    PE32     PE32    Align=32       |.efi

+    PE32     PE32    Align=32       $(MODULE_NAME).efi

     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   Align=32       |.efi

+     PEI_DEPEX PEI_DEPEX Optional        $(MODULE_NAME).depex

+     PE32      PE32   Align=32       $(MODULE_NAME).efi

      UI       STRING="$(MODULE_NAME)" Optional         

      VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)   

   }

 

 [Rule.Common.PEIM.TIANOCOMPRESSED]

   FILE PEIM = $(NAMED_GUID) {

-    PEI_DEPEX PEI_DEPEX Optional         |.depex

+    PEI_DEPEX PEI_DEPEX Optional         $(MODULE_NAME).depex

     GUIDED A31280AD-481E-41B6-95E8-127F4C984779 PROCESSING_REQUIRED = TRUE {

-      PE32      PE32                     |.efi

+      PE32      PE32                     $(MODULE_NAME).efi

       UI        STRING="$(MODULE_NAME)" Optional

       VERSION   STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)

     }

@@ -339,7 +339,7 @@ FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
 [Rule.Common.DXE_CORE]

   FILE DXE_CORE = $(NAMED_GUID) {

     COMPRESS PI_STD {

-      PE32     PE32           |.efi

+      PE32     PE32           $(MODULE_NAME).efi

       UI       STRING="$(MODULE_NAME)" Optional

       VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)

     }

@@ -347,10 +347,10 @@ FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
 

 [Rule.Common.UEFI_DRIVER]

   FILE DRIVER = $(NAMED_GUID) {

-    DXE_DEPEX    DXE_DEPEX Optional      |.depex

+    DXE_DEPEX    DXE_DEPEX Optional      $(MODULE_NAME).depex

     COMPRESS PI_STD {

       GUIDED {

-        PE32     PE32                    |.efi

+        PE32     PE32                    $(MODULE_NAME).efi

         UI       STRING="$(MODULE_NAME)" Optional

         VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)

       }

@@ -359,10 +359,10 @@ FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
 

 [Rule.Common.DXE_DRIVER]

   FILE DRIVER = $(NAMED_GUID) {

-    DXE_DEPEX    DXE_DEPEX Optional      |.depex

+    DXE_DEPEX    DXE_DEPEX Optional      $(MODULE_NAME).depex

     COMPRESS PI_STD {

       GUIDED {

-        PE32     PE32                    |.efi

+        PE32     PE32                    $(MODULE_NAME).efi

         UI       STRING="$(MODULE_NAME)" Optional

         VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)

       }

@@ -371,10 +371,10 @@ FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
 

 [Rule.Common.DXE_RUNTIME_DRIVER]

   FILE DRIVER = $(NAMED_GUID) {

-    DXE_DEPEX    DXE_DEPEX Optional      |.depex

+    DXE_DEPEX    DXE_DEPEX Optional      $(MODULE_NAME).depex

     COMPRESS PI_STD {

       GUIDED {

-        PE32     PE32                    |.efi

+        PE32     PE32                    $(MODULE_NAME).efi

         UI       STRING="$(MODULE_NAME)" Optional

         VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)

       }

@@ -385,7 +385,7 @@ FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
   FILE APPLICATION = $(NAMED_GUID) {

     COMPRESS PI_STD {

       GUIDED {

-        PE32     PE32                    |.efi

+        PE32     PE32                    $(MODULE_NAME).efi

         UI       STRING="$(MODULE_NAME)" Optional

         VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)

       }