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

[mirror_edk2.git] / UnixPkg / UnixPkg.fdf

diff --git a/UnixPkg/UnixPkg.fdf b/UnixPkg/UnixPkg.fdf
index 46e1a14d11786cae86f8fb2b57e7b78aee4ad725..bdc9494d7712a643ef6beb1e6ec65f206634d3c1 100644 (file)
--- a/UnixPkg/UnixPkg.fdf
+++ b/UnixPkg/UnixPkg.fdf
@@ -299,10 +299,10 @@ FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
 #  \r
 #[Rule.Common.DXE_DRIVER]\r
 #  FILE DRIVER = $(NAMED_GUID) {\r
-#    DXE_DEPEX    DXE_DEPEX Optional      |.depex\r
+#    DXE_DEPEX    DXE_DEPEX Optional      $(MODULE_NAME).depex\r
 #    COMPRESS PI_STD {\r
 #      GUIDED {\r
-#        PE32     PE32                    |.efi\r
+#        PE32     PE32                    $(MODULE_NAME).efi\r
 #        UI       STRING="$(MODULE_NAME)" Optional\r
 #        VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
 #      }\r
@@ -313,24 +313,24 @@ FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
 \r
 [Rule.Common.PEI_CORE]\r
   FILE PEI_CORE = $(NAMED_GUID) {\r
-    PE32     PE32    Align=32       |.efi\r
+    PE32     PE32    Align=32       $(MODULE_NAME).efi\r
     UI       STRING ="$(MODULE_NAME)" Optional         \r
     VERSION  STRING ="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)    \r
   }\r
 \r
 [Rule.Common.PEIM]\r
   FILE PEIM = $(NAMED_GUID) {\r
-     PEI_DEPEX PEI_DEPEX Optional        |.depex\r
-     PE32      PE32   Align=32       |.efi\r
+     PEI_DEPEX PEI_DEPEX Optional        $(MODULE_NAME).depex\r
+     PE32      PE32   Align=32       $(MODULE_NAME).efi\r
      UI       STRING="$(MODULE_NAME)" Optional         \r
      VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)   \r
   }\r
 \r
 [Rule.Common.PEIM.TIANOCOMPRESSED]\r
   FILE PEIM = $(NAMED_GUID) {\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                     $(MODULE_NAME).efi\r
       UI        STRING="$(MODULE_NAME)" Optional\r
       VERSION   STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
     }\r
@@ -339,7 +339,7 @@ FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
 [Rule.Common.DXE_CORE]\r
   FILE DXE_CORE = $(NAMED_GUID) {\r
     COMPRESS PI_STD {\r
-      PE32     PE32           |.efi\r
+      PE32     PE32           $(MODULE_NAME).efi\r
       UI       STRING="$(MODULE_NAME)" Optional\r
       VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
     }\r
@@ -347,10 +347,10 @@ FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
 \r
 [Rule.Common.UEFI_DRIVER]\r
   FILE DRIVER = $(NAMED_GUID) {\r
-    DXE_DEPEX    DXE_DEPEX Optional      |.depex\r
+    DXE_DEPEX    DXE_DEPEX Optional      $(MODULE_NAME).depex\r
     COMPRESS PI_STD {\r
       GUIDED {\r
-        PE32     PE32                    |.efi\r
+        PE32     PE32                    $(MODULE_NAME).efi\r
         UI       STRING="$(MODULE_NAME)" Optional\r
         VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
       }\r
@@ -359,10 +359,10 @@ FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
 \r
 [Rule.Common.DXE_DRIVER]\r
   FILE DRIVER = $(NAMED_GUID) {\r
-    DXE_DEPEX    DXE_DEPEX Optional      |.depex\r
+    DXE_DEPEX    DXE_DEPEX Optional      $(MODULE_NAME).depex\r
     COMPRESS PI_STD {\r
       GUIDED {\r
-        PE32     PE32                    |.efi\r
+        PE32     PE32                    $(MODULE_NAME).efi\r
         UI       STRING="$(MODULE_NAME)" Optional\r
         VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
       }\r
@@ -371,10 +371,10 @@ FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
 \r
 [Rule.Common.DXE_RUNTIME_DRIVER]\r
   FILE DRIVER = $(NAMED_GUID) {\r
-    DXE_DEPEX    DXE_DEPEX Optional      |.depex\r
+    DXE_DEPEX    DXE_DEPEX Optional      $(MODULE_NAME).depex\r
     COMPRESS PI_STD {\r
       GUIDED {\r
-        PE32     PE32                    |.efi\r
+        PE32     PE32                    $(MODULE_NAME).efi\r
         UI       STRING="$(MODULE_NAME)" Optional\r
         VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
       }\r
@@ -385,7 +385,7 @@ FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
   FILE APPLICATION = $(NAMED_GUID) {\r
     COMPRESS PI_STD {\r
       GUIDED {\r
-        PE32     PE32                    |.efi\r
+        PE32     PE32                    $(MODULE_NAME).efi\r
         UI       STRING="$(MODULE_NAME)" Optional\r
         VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
       }\r