BaseTools: Various typo

[mirror_edk2.git] / BaseTools / Source / Python / Eot / EotMain.py

diff --git a/BaseTools/Source/Python/Eot/EotMain.py b/BaseTools/Source/Python/Eot/EotMain.py
index f86ceec9776f18791219f29a6f374e7a5b74e463..e4359c50150cc035a07ceec4765a6448db481a31 100644 (file)
--- a/BaseTools/Source/Python/Eot/EotMain.py
+++ b/BaseTools/Source/Python/Eot/EotMain.py
@@ -17,7 +17,7 @@
 from __future__ import absolute_import\r
 import Common.LongFilePathOs as os, time, glob\r
 import Common.EdkLogger as EdkLogger\r
-from Eot import EotGlobalData\r
+import Eot.EotGlobalData as EotGlobalData\r
 from optparse import OptionParser\r
 from Common.StringUtils import NormPath\r
 from Common import BuildToolError\r
@@ -36,10 +36,9 @@ import struct
 import uuid\r
 import copy\r
 import codecs\r
+from GenFds.AprioriSection import DXE_APRIORI_GUID, PEI_APRIORI_GUID\r
 \r
 gGuidStringFormat = "%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X"\r
-gPeiAprioriFileNameGuid = '1b45cc0a-156a-428a-af62-49864da0e6e6'\r
-gAprioriGuid = 'fc510ee7-ffdc-11d4-bd41-0080c73c8881'\r
 gIndention = -4\r
 \r
 class Image(array):\r
@@ -402,10 +401,10 @@ class FirmwareVolume(Image):
             if Ffs.Type == 0x05:\r
                 FfsDxeCoreGuid = FfsID\r
                 continue\r
-            if Ffs.Guid.lower() == gPeiAprioriFileNameGuid:\r
+            if Ffs.Guid.lower() == PEI_APRIORI_GUID.lower():\r
                 FfsPeiPrioriGuid = FfsID\r
                 continue\r
-            if Ffs.Guid.lower() == gAprioriGuid:\r
+            if Ffs.Guid.lower() == DXE_APRIORI_GUID.lower():\r
                 FfsDxePrioriGuid = FfsID\r
                 continue\r
 \r
@@ -930,8 +929,6 @@ class Ffs(Image):
     _SIZE_      = struct.Struct("20x 3B")\r
     _STATE_     = struct.Struct("23x 1B")\r
 \r
-    VTF_GUID = "1BA0062E-C779-4582-8566-336AE8F78F09"\r
-\r
     FFS_ATTRIB_FIXED              = 0x04\r
     FFS_ATTRIB_DATA_ALIGNMENT     = 0x38\r
     FFS_ATTRIB_CHECKSUM           = 0x40\r
@@ -1517,7 +1514,7 @@ class Eot(object):
                             % (Identifier, '.NotifyPpi', '->NotifyPpi', MODEL_IDENTIFIER_FUNCTION_CALLING)\r
             SearchPpi(SqlCommand, Identifier, SourceFileID, SourceFileFullPath, ItemMode)\r
 \r
-            # Find Procotols\r
+            # Find Protocols\r
             ItemMode = 'Produced'\r
             SqlCommand = """select Value, Name, BelongsToFile, StartLine, EndLine from %s\r
                             where (Name like '%%%s%%' or Name like '%%%s%%' or Name like '%%%s%%' or Name like '%%%s%%') and Model = %s""" \\r