Sync BaseTools Branch (version r2321) to EDKII main trunk.

[mirror_edk2.git] / BaseTools / Source / Python / Common / InfClassObject.py

diff --git a/BaseTools/Source/Python/Common/InfClassObject.py b/BaseTools/Source/Python/Common/InfClassObject.py
index e774d80d697b0489f3ce54fda35e0d7487e2003e..0f2b5ca47d726985b0fad145ccf69c5c802af365 100644 (file)
--- a/BaseTools/Source/Python/Common/InfClassObject.py
+++ b/BaseTools/Source/Python/Common/InfClassObject.py
@@ -104,7 +104,7 @@ class InfHeader(ModuleHeaderClass):
         TAB_INF_DEFINES_VERSION_STRING              : "VersionString",\r
         TAB_INF_DEFINES_VERSION                     : "Version",\r
         TAB_INF_DEFINES_PCD_IS_DRIVER               : "PcdIsDriver",\r
-        TAB_INF_DEFINES_TIANO_R8_FLASHMAP_H         : "TianoR8FlashMap_h",\r
+        TAB_INF_DEFINES_TIANO_EDK_FLASHMAP_H         : "TianoEdkFlashMap_h",\r
         TAB_INF_DEFINES_SHADOW                      : "Shadow",\r
 #       TAB_INF_DEFINES_LIBRARY_CLASS               : "LibraryClass",\r
 #        TAB_INF_DEFINES_ENTRY_POINT                 : "ExternImages",\r
@@ -352,11 +352,11 @@ class Inf(InfObject):
             #\r
             # Remove comment block\r
             #\r
-            if Line.find(TAB_COMMENT_R8_START) > -1:\r
-                ReservedLine = GetSplitValueList(Line, TAB_COMMENT_R8_START, 1)[0]\r
+            if Line.find(TAB_COMMENT_EDK_START) > -1:\r
+                ReservedLine = GetSplitValueList(Line, TAB_COMMENT_EDK_START, 1)[0]\r
                 IsFindBlockComment = True\r
-            if Line.find(TAB_COMMENT_R8_END) > -1:\r
-                Line = ReservedLine + GetSplitValueList(Line, TAB_COMMENT_R8_END, 1)[1]\r
+            if Line.find(TAB_COMMENT_EDK_END) > -1:\r
+                Line = ReservedLine + GetSplitValueList(Line, TAB_COMMENT_EDK_END, 1)[1]\r
                 ReservedLine = ''\r
                 IsFindBlockComment = False\r
             if IsFindBlockComment:\r
@@ -465,7 +465,7 @@ class Inf(InfObject):
             print 'FvExt =', M.Header[Arch].FvExt\r
             print 'SourceFv =', M.Header[Arch].SourceFv\r
             print 'PcdIsDriver =', M.Header[Arch].PcdIsDriver\r
-            print 'TianoR8FlashMap_h =', M.Header[Arch].TianoR8FlashMap_h\r
+            print 'TianoEdkFlashMap_h =', M.Header[Arch].TianoEdkFlashMap_h\r
             print 'Shadow =', M.Header[Arch].Shadow\r
             print 'LibraryClass =', M.Header[Arch].LibraryClass\r
             for Item in M.Header[Arch].LibraryClass:\r
@@ -613,7 +613,7 @@ class Inf(InfObject):
             # Get version of INF\r
             #\r
             if ModuleHeader.InfVersion != "":\r
-                # R9 inf\r
+                # EdkII inf\r
                 VersionNumber = ModuleHeader.VersionNumber\r
                 VersionString = ModuleHeader.VersionString\r
                 if len(VersionNumber) > 0 and len(VersionString) == 0:\r
@@ -624,12 +624,12 @@ class Inf(InfObject):
                         EdkLogger.warn(2001, 'INF file %s defines both VERSION_NUMBER and VERSION_STRING, using VERSION_STRING' % self.Identification.FileFullPath)\r
                     ModuleHeader.Version = VersionString\r
             else:\r
-                # R8 inf\r
+                # Edk inf\r
                 ModuleHeader.InfVersion = "0x00010000"\r
                 if ModuleHeader.ComponentType in gComponentType2ModuleType:\r
                     ModuleHeader.ModuleType = gComponentType2ModuleType[ModuleHeader.ComponentType]\r
                 elif ModuleHeader.ComponentType != '':\r
-                    EdkLogger.error("Parser", PARSER_ERROR, "Unsupported R8 component type [%s]" % ModuleHeader.ComponentType, ExtraData=File, RaiseError = EdkLogger.IsRaiseError)\r
+                    EdkLogger.error("Parser", PARSER_ERROR, "Unsupported Edk component type [%s]" % ModuleHeader.ComponentType, ExtraData=File, RaiseError = EdkLogger.IsRaiseError)\r
 \r
             self.Module.Header[Arch] = ModuleHeader\r
 \r
@@ -841,7 +841,7 @@ class Inf(InfObject):
             Nmake.SupArchList = Nmakes[Key]\r
             self.Module.Nmake.append(Nmake)\r
 \r
-            # convert R8 format to R9 format\r
+            # convert Edk format to EdkII format\r
             if Nmake.Name == "IMAGE_ENTRY_POINT":\r
                 Image = ModuleExternImageClass()\r
                 Image.ModuleEntryPoint = Nmake.Value\r