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

[mirror_edk2.git] / ArmPlatformPkg / ArmRealViewEbPkg / ArmRealViewEb-RTSM-UniCore.fdf

diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-UniCore.fdf b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-UniCore.fdf
index a24a5a25cea83e29402fbddfb4358123fe0792fe..12a6847aa25ca7f8723fc8009319aababb99f721 100644 (file)
--- a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-UniCore.fdf
+++ b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-UniCore.fdf
@@ -222,10 +222,10 @@ READ_LOCK_STATUS   = TRUE
 #\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
@@ -236,60 +236,60 @@ READ_LOCK_STATUS   = TRUE
 \r
 [Rule.Common.SEC]\r
   FILE SEC = $(NAMED_GUID) RELOCS_STRIPPED {\r
-    TE  TE    Align = 32      |.efi\r
+    TE  TE    Align = 32                  $(INF_OUTPUT)/$(MODULE_NAME).efi\r
   }\r
 \r
 [Rule.Common.PEI_CORE]\r
   FILE PEI_CORE = $(NAMED_GUID) {\r
-    TE     TE           |.efi\r
+    TE     TE                             $(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
-     TE       TE                         |.efi\r
+     PEI_DEPEX PEI_DEPEX Optional         $(INF_OUTPUT)/$(MODULE_NAME).depex\r
+     TE       TE                          $(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          $(INF_OUTPUT)/$(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
     UI     STRING ="$(MODULE_NAME)" Optional         \r
-    PE32   PE32                    |.efi\r
+    PE32   PE32                          $(INF_OUTPUT)/$(MODULE_NAME).efi\r
   }\r