1 files changed, 6 insertions, 5 deletions
diff --git a/BaseTools/Source/Python/Common/DataType.py b/BaseTools/Source/Python/Common/DataType.py
index 151f7bb1f3..9a2556749a 100644
--- a/BaseTools/Source/Python/Common/DataType.py
+++ b/BaseTools/Source/Python/Common/DataType.py
@@ -14,9 +14,9 @@
 # Common Definitions
 #
 TAB_SPLIT = '.'
-TAB_COMMENT_R8_START = '/*'
-TAB_COMMENT_R8_END = '*/'
-TAB_COMMENT_R8_SPLIT = '//'
+TAB_COMMENT_EDK_START = '/*'
+TAB_COMMENT_EDK_END = '*/'
+TAB_COMMENT_EDK_SPLIT = '//'
 TAB_COMMENT_SPLIT = '#'
 TAB_EQUAL_SPLIT = '='
 TAB_VALUE_SPLIT = '|'
@@ -302,16 +302,17 @@ TAB_INF_DEFINES_BINARY_MODULE = 'BINARY_MODULE'
 TAB_INF_DEFINES_LIBRARY_CLASS = 'LIBRARY_CLASS'
 TAB_INF_DEFINES_COMPONENT_TYPE = 'COMPONENT_TYPE'
 TAB_INF_DEFINES_MAKEFILE_NAME = 'MAKEFILE_NAME'
+TAB_INF_DEFINES_DPX_SOURCE = 'DPX_SOURCE'
 TAB_INF_DEFINES_BUILD_NUMBER = 'BUILD_NUMBER'
 TAB_INF_DEFINES_BUILD_TYPE = 'BUILD_TYPE'
 TAB_INF_DEFINES_FFS_EXT = 'FFS_EXT'
 TAB_INF_DEFINES_FV_EXT = 'FV_EXT'
 TAB_INF_DEFINES_SOURCE_FV = 'SOURCE_FV'
 TAB_INF_DEFINES_VERSION_NUMBER = 'VERSION_NUMBER'
-TAB_INF_DEFINES_VERSION = 'VERSION'          # for R8 inf, the same as VERSION_NUMBER
+TAB_INF_DEFINES_VERSION = 'VERSION'          # for Edk inf, the same as VERSION_NUMBER
 TAB_INF_DEFINES_VERSION_STRING = 'VERSION_STRING'
 TAB_INF_DEFINES_PCD_IS_DRIVER = 'PCD_IS_DRIVER'
-TAB_INF_DEFINES_TIANO_R8_FLASHMAP_H = 'TIANO_R8_FLASHMAP_H'
+TAB_INF_DEFINES_TIANO_EDK_FLASHMAP_H = 'TIANO_EDK_FLASHMAP_H'
 TAB_INF_DEFINES_ENTRY_POINT = 'ENTRY_POINT'
 TAB_INF_DEFINES_UNLOAD_IMAGE = 'UNLOAD_IMAGE'
 TAB_INF_DEFINES_CONSTRUCTOR = 'CONSTRUCTOR'