Update Nt32Pkg.fdf by using new rule and Pcd format

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

diff --git a/Nt32Pkg/Nt32Pkg.fdf b/Nt32Pkg/Nt32Pkg.fdf
index d4c1a2c1f49bad6e772d5b638375b8217ed83f07..98217147e962573425a2f12d9fb5bdb40497fb0b 100644 (file)
--- a/Nt32Pkg/Nt32Pkg.fdf
+++ b/Nt32Pkg/Nt32Pkg.fdf
@@ -25,8 +25,8 @@
 #\r
 ################################################################################\r
 [FD.Fv_Recovery]\r
-BaseAddress   = 0x0|PcdWinNtFdBaseAddress  #The base address of the FLASH Device.\r
-Size          = 0x002a0000            #The size in bytes of the FLASH Device\r
+BaseAddress   = 0x0|gEfiNt32PkgTokenSpaceGuid.PcdWinNtFdBaseAddress  #The base address of the FLASH Device.\r
+Size          = 0x002a0000                                           #The size in bytes of the FLASH Device\r
 ErasePolarity = 1\r
 BlockSize     = 0x10000\r
 NumBlocks     = 0x2a\r
@@ -47,11 +47,11 @@ NumBlocks     = 0x2a
 #\r
 ################################################################################\r
 0x00000000|0x00280000\r
-PcdWinNtFlashFvRecoveryBase|PcdWinNtFlashFvRecoverySize\r
+gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashFvRecoveryBase|gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashFvRecoverySize\r
 FV = FvRecovery\r
 \r
 0x00280000|0x0000c000\r
-PcdWinNtFlashNvStorageVariableBase|PcdFlashNvStorageVariableSize\r
+gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageVariableBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize\r
 DATA = {\r
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\r
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\r
@@ -67,10 +67,10 @@ DATA = {
 }\r
 \r
 0x0028c000|0x00002000\r
-PcdWinNtFlashNvStorageEventLogBase|PcdWinNtFlashNvStorageEventLogSize\r
+gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageEventLogBase|gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageEventLogSize\r
 \r
 0x0028e000|0x00002000\r
-PcdWinNtFlashNvStorageFtwWorkingBase|PcdFlashNvStorageFtwWorkingSize\r
+gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageFtwWorkingBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize\r
 DATA = {\r
   0x8d, 0x2b, 0xf1, 0xff, 0x96, 0x76, 0x8b, 0x4c,\r
   0xa9, 0x85, 0x27, 0x47, 0x07, 0x5b, 0x4f, 0x50,\r
@@ -79,7 +79,7 @@ DATA = {
 }\r
 \r
 0x00290000|0x00010000\r
-PcdWinNtFlashNvStorageFtwSpareBase|PcdFlashNvStorageFtwSpareSize\r
+gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageFtwSpareBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize\r
 \r
 ################################################################################\r
 #\r
@@ -232,13 +232,13 @@ FILE FREEFORM = 7BB28B99-61BB-11D5-9A5D-0090273FC14D {
 ############################################################################\r
 #\r
 #[Rule.Common.DXE_DRIVER]\r
-#  FILE DRIVER = $(NAMED_GUID) CheckSum {\r
+#  FILE DRIVER = $(NAMED_GUID) {\r
+#    DXE_DEPEX    DXE_DEPEX Optional      |.depex\r
 #    COMPRESS PI_STD {\r
 #      GUIDED {\r
-#        DXE_DEPEX Optional     $(INF_OUTPUT)/$(MODULE_NAME).depex\r
-#        PE32                   $(INF_OUTPUT)/$(MODULE_NAME).efi\r
-#        UI Optional            $(MODULE_NAME)\r
-#        VERSION Optional       BUILD_NUM=$(BUILD_NUMBER) $(INF_VERSION)\r
+#        PE32     PE32                    |.efi\r
+#        UI       STRING="$(MODULE_NAME)" Optional\r
+#        VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
 #      }\r
 #    }\r
 #  }\r
@@ -247,60 +247,60 @@ FILE FREEFORM = 7BB28B99-61BB-11D5-9A5D-0090273FC14D {
 \r
 [Rule.Common.PEI_CORE]\r
   FILE PEI_CORE = $(NAMED_GUID) {\r
-    PE32                $(INF_OUTPUT)/$(MODULE_NAME).efi\r
-    UI Optional         $(MODULE_NAME)\r
-    VERSION Optional    BUILD_NUM=$(BUILD_NUMBER) $(INF_VERSION)\r
+    PE32     PE32           |.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 Optional        $(INF_OUTPUT)/$(MODULE_NAME).Depex\r
-     PE32                      $(INF_OUTPUT)/$(MODULE_NAME).efi\r
-     UI Optional               $(MODULE_NAME)\r
-     VERSION Optional          BUILD_NUM=$(BUILD_NUMBER) $(INF_VERSION)\r
+     PEI_DEPEX PEI_DEPEX Optional        |.depex\r
+     PE32      PE32                      |.efi\r
+     UI       STRING="$(MODULE_NAME)" Optional         \r
+     VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)   \r
   }\r
 \r
 [Rule.Common.DXE_CORE]\r
   FILE DXE_CORE = $(NAMED_GUID) {\r
     COMPRESS PI_STD {\r
-      PE32                      $(INF_OUTPUT)/$(MODULE_NAME).efi\r
-      UI Optional               $(MODULE_NAME)\r
-      VERSION Optional          BUILD_NUM=$(BUILD_NUMBER) $(INF_VERSION)\r
+      PE32     PE32           |.efi\r
+      UI       STRING="$(MODULE_NAME)" Optional\r
+      VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
     }\r
   }\r
 \r
 [Rule.Common.UEFI_DRIVER]\r
   FILE DRIVER = $(NAMED_GUID) {\r
+    DXE_DEPEX    DXE_DEPEX Optional      |.depex\r
     COMPRESS PI_STD {\r
       GUIDED {\r
-        DXE_DEPEX Optional     $(INF_OUTPUT)/$(MODULE_NAME).depex\r
-        PE32                   $(INF_OUTPUT)/$(MODULE_NAME).efi\r
-        UI Optional            $(MODULE_NAME)\r
-        VERSION Optional       BUILD_NUM=$(BUILD_NUMBER) $(INF_VERSION)\r
+        PE32     PE32                    |.efi\r
+        UI       STRING="$(MODULE_NAME)" Optional\r
+        VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
       }\r
     }\r
   }\r
 \r
 [Rule.Common.DXE_DRIVER]\r
   FILE DRIVER = $(NAMED_GUID) {\r
+    DXE_DEPEX    DXE_DEPEX Optional      |.depex\r
     COMPRESS PI_STD {\r
       GUIDED {\r
-        DXE_DEPEX Optional     $(INF_OUTPUT)/$(MODULE_NAME).depex\r
-        PE32                   $(INF_OUTPUT)/$(MODULE_NAME).efi\r
-        UI Optional            $(MODULE_NAME)\r
-        VERSION Optional       BUILD_NUM=$(BUILD_NUMBER) $(INF_VERSION)\r
+        PE32     PE32                    |.efi\r
+        UI       STRING="$(MODULE_NAME)" Optional\r
+        VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
       }\r
     }\r
   }\r
 \r
 [Rule.Common.DXE_RUNTIME_DRIVER]\r
   FILE DRIVER = $(NAMED_GUID) {\r
+    DXE_DEPEX    DXE_DEPEX Optional      |.depex\r
     COMPRESS PI_STD {\r
       GUIDED {\r
-        DXE_DEPEX Optional     $(INF_OUTPUT)/$(MODULE_NAME).depex\r
-        PE32                   $(INF_OUTPUT)/$(MODULE_NAME).efi\r
-        UI Optional            $(MODULE_NAME)\r
-        VERSION Optional       BUILD_NUM=$(BUILD_NUMBER) $(INF_VERSION)\r
+        PE32     PE32                    |.efi\r
+        UI       STRING="$(MODULE_NAME)" Optional\r
+        VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
       }\r
     }\r
   }\r
@@ -309,9 +309,9 @@ FILE FREEFORM = 7BB28B99-61BB-11D5-9A5D-0090273FC14D {
   FILE APPLICATION = $(NAMED_GUID) {\r
     COMPRESS PI_STD {\r
       GUIDED {\r
-        PE32                   $(INF_OUTPUT)/$(MODULE_NAME).efi\r
-        UI Optional            $(MODULE_NAME)\r
-        VERSION Optional       BUILD_NUM=$(BUILD_NUMBER) $(INF_VERSION)\r
+        PE32     PE32                    |.efi\r
+        UI       STRING="$(MODULE_NAME)" Optional\r
+        VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
       }\r
     }\r
   }\r