BaseTools: Replace StandardError with Expression

[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 d9f1cdaff0e42d32d294847f72d7d3078ba6280f..df585f3d819b60a9d9e152d651b71acaaca2ecf1 100644 (file)
--- a/BaseTools/Source/Python/GenFds/Ffs.py
+++ b/BaseTools/Source/Python/GenFds/Ffs.py
@@ -1,7 +1,7 @@
 ## @file\r
 # process FFS generation\r
 #\r
-#  Copyright (c) 2007, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2007-2018, Intel Corporation. All rights reserved.<BR>\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
@@ -16,33 +16,18 @@
 # Import Modules\r
 #\r
 from CommonDataClass.FdfClass import FDClassObject\r
+from Common.DataType import *\r
 \r
 ## generate FFS\r
 #\r
 #\r
 class Ffs(FDClassObject):\r
-    \r
-    # mapping between MODULE type in FDF (from INF) and file type for GenFfs\r
-    ModuleTypeToFileType = {\r
-        'SEC'               : 'EFI_FV_FILETYPE_SECURITY_CORE',\r
-        'PEI_CORE'          : 'EFI_FV_FILETYPE_PEI_CORE',\r
-        'PEIM'              : 'EFI_FV_FILETYPE_PEIM',\r
-        'DXE_CORE'          : 'EFI_FV_FILETYPE_DXE_CORE',\r
-        'DXE_DRIVER'        : 'EFI_FV_FILETYPE_DRIVER',\r
-        'DXE_SAL_DRIVER'    : 'EFI_FV_FILETYPE_DRIVER',\r
-        'DXE_SMM_DRIVER'    : 'EFI_FV_FILETYPE_DRIVER',\r
-        'DXE_RUNTIME_DRIVER': 'EFI_FV_FILETYPE_DRIVER',\r
-        'UEFI_DRIVER'       : 'EFI_FV_FILETYPE_DRIVER',\r
-        'UEFI_APPLICATION'  : 'EFI_FV_FILETYPE_APPLICATION',\r
-        'SMM_CORE'          : 'EFI_FV_FILETYPE_SMM_CORE'\r
-    }\r
-    \r
     # mapping between FILE type in FDF and file type for GenFfs\r
     FdfFvFileTypeToFileType = {\r
-        'SEC'               : 'EFI_FV_FILETYPE_SECURITY_CORE',\r
-        'PEI_CORE'          : 'EFI_FV_FILETYPE_PEI_CORE',\r
-        'PEIM'              : 'EFI_FV_FILETYPE_PEIM',\r
-        'DXE_CORE'          : 'EFI_FV_FILETYPE_DXE_CORE',\r
+        SUP_MODULE_SEC               : 'EFI_FV_FILETYPE_SECURITY_CORE',\r
+        SUP_MODULE_PEI_CORE          : 'EFI_FV_FILETYPE_PEI_CORE',\r
+        SUP_MODULE_PEIM              : 'EFI_FV_FILETYPE_PEIM',\r
+        SUP_MODULE_DXE_CORE          : 'EFI_FV_FILETYPE_DXE_CORE',\r
         'FREEFORM'          : 'EFI_FV_FILETYPE_FREEFORM',\r
         'DRIVER'            : 'EFI_FV_FILETYPE_DRIVER',\r
         'APPLICATION'       : 'EFI_FV_FILETYPE_APPLICATION',\r
@@ -50,25 +35,28 @@ class Ffs(FDClassObject):
         'RAW'               : 'EFI_FV_FILETYPE_RAW',\r
         'PEI_DXE_COMBO'     : 'EFI_FV_FILETYPE_COMBINED_PEIM_DRIVER',\r
         'SMM'               : 'EFI_FV_FILETYPE_SMM',\r
-        'SMM_CORE'          : 'EFI_FV_FILETYPE_SMM_CORE'\r
+        SUP_MODULE_SMM_CORE          : 'EFI_FV_FILETYPE_SMM_CORE',\r
+        SUP_MODULE_MM_STANDALONE     : 'EFI_FV_FILETYPE_MM_STANDALONE',\r
+        SUP_MODULE_MM_CORE_STANDALONE : 'EFI_FV_FILETYPE_MM_CORE_STANDALONE'\r
     }\r
     \r
     # mapping between section type in FDF and file suffix\r
     SectionSuffix = {\r
-        'PE32'                 : '.pe32',\r
-        'PIC'                  : '.pic',\r
-        'TE'                   : '.te',\r
-        'DXE_DEPEX'            : '.dpx',\r
+        BINARY_FILE_TYPE_PE32                 : '.pe32',\r
+        BINARY_FILE_TYPE_PIC                  : '.pic',\r
+        BINARY_FILE_TYPE_TE                   : '.te',\r
+        BINARY_FILE_TYPE_DXE_DEPEX            : '.dpx',\r
         'VERSION'              : '.ver',\r
-        'UI'                   : '.ui',\r
+        BINARY_FILE_TYPE_UI                   : '.ui',\r
         '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'            : '.dpx'\r
+        BINARY_FILE_TYPE_PEI_DEPEX            : '.dpx',\r
+        BINARY_FILE_TYPE_SMM_DEPEX            : '.dpx'\r
     }\r
     \r
     ## The constructor\r