BaseTools: Add a keyword FvNameString in FDF

[mirror_edk2.git] / BaseTools / Source / Python / GenFds / Ffs.py

diff --git a/BaseTools/Source/Python/GenFds/Ffs.py b/BaseTools/Source/Python/GenFds/Ffs.py
index aaa791763baf0b316f989cdaf0d255a919316cf2..c8c5a6e8611f6da1bb2714306c2a9a55e48bb3b1 100644 (file)
--- a/BaseTools/Source/Python/GenFds/Ffs.py
+++ b/BaseTools/Source/Python/GenFds/Ffs.py
@@ -1,9 +1,9 @@
 ## @file\r
 # process FFS generation\r
 #\r
-#  Copyright (c) 2007, Intel Corporation\r
+#  Copyright (c) 2007, Intel Corporation. All rights reserved.<BR>\r
 #\r
-#  All rights reserved. This program and the accompanying materials\r
+#  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r
 #  http://opensource.org/licenses/bsd-license.php\r
@@ -34,7 +34,6 @@ class Ffs(FDClassObject):
         'DXE_RUNTIME_DRIVER': 'EFI_FV_FILETYPE_DRIVER',\r
         'UEFI_DRIVER'       : 'EFI_FV_FILETYPE_DRIVER',\r
         'UEFI_APPLICATION'  : 'EFI_FV_FILETYPE_APPLICATION',\r
-        'SMM_DRIVER'        : 'EFI_FV_FILETYPE_SMM',\r
         'SMM_CORE'          : 'EFI_FV_FILETYPE_SMM_CORE'\r
     }\r
     \r
@@ -50,7 +49,6 @@ class Ffs(FDClassObject):
         'FV_IMAGE'          : 'EFI_FV_FILETYPE_FIRMWARE_VOLUME_IMAGE',\r
         'RAW'               : 'EFI_FV_FILETYPE_RAW',\r
         'PEI_DXE_COMBO'     : 'EFI_FV_FILETYPE_COMBINED_PEIM_DRIVER',\r
-        'SMM_DXE_COMBO'     : 'EFI_FV_FILETYPE_COMBINED_SMM_DXE',\r
         'SMM'               : 'EFI_FV_FILETYPE_SMM',\r
         'SMM_CORE'          : 'EFI_FV_FILETYPE_SMM_CORE'\r
     }\r
@@ -66,11 +64,12 @@ class Ffs(FDClassObject):
         'COMPAT16'             : '.com16',\r
         'RAW'                  : '.raw',\r
         'FREEFORM_SUBTYPE_GUID': '.guid',\r
+        'SUBTYPE_GUID'         : '.guid',        \r
         'FV_IMAGE'             : 'fv.sec',\r
         'COMPRESS'             : '.com',\r
         'GUIDED'               : '.guided',\r
         'PEI_DEPEX'            : '.dpx',\r
-        'SMM_DEPEX'            : '.smm'\r
+        'SMM_DEPEX'            : '.dpx'\r
     }\r
     \r
     ## The constructor\r