BaseTools: Fix a Eot issue.

[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 7eae4ac6729d01edbac832fe95adb747a5c79cb1..4802aea8b1fb21e803240dc34532631920cdc529 100644 (file)
--- a/BaseTools/Source/Python/Eot/EotMain.py
+++ b/BaseTools/Source/Python/Eot/EotMain.py
@@ -21,7 +21,8 @@ import Eot.EotGlobalData as EotGlobalData
 from optparse import OptionParser\r
 from Common.StringUtils import NormPath\r
 from Common import BuildToolError\r
-from Common.Misc import GuidStructureStringToGuidString, sdict\r
+from Common.Misc import GuidStructureStringToGuidString\r
+from collections import OrderedDict as sdict\r
 from Eot.Parser import *\r
 from Eot.InfParserLite import EdkInfParser\r
 from Common.StringUtils import GetSplitValueList\r
@@ -390,7 +391,7 @@ class FirmwareVolume(Image):
         FfsDxeCoreGuid = None\r
         FfsPeiPrioriGuid = None\r
         FfsDxePrioriGuid = None\r
-        for FfsID in self.UnDispatchedFfsDict.keys():\r
+        for FfsID in list(self.UnDispatchedFfsDict.keys()):\r
             Ffs = self.UnDispatchedFfsDict[FfsID]\r
             if Ffs.Type == 0x03:\r
                 FfsSecCoreGuid = FfsID\r
@@ -496,7 +497,7 @@ class FirmwareVolume(Image):
     def DisPatchDxe(self, Db):\r
         IsInstalled = False\r
         ScheduleList = sdict()\r
-        for FfsID in self.UnDispatchedFfsDict.keys():\r
+        for FfsID in list(self.UnDispatchedFfsDict.keys()):\r
             CouldBeLoaded = False\r
             DepexString = ''\r
             FileDepex = None\r
@@ -561,7 +562,7 @@ class FirmwareVolume(Image):
 \r
     def DisPatchPei(self, Db):\r
         IsInstalled = False\r
-        for FfsID in self.UnDispatchedFfsDict.keys():\r
+        for FfsID in list(self.UnDispatchedFfsDict.keys()):\r
             CouldBeLoaded = True\r
             DepexString = ''\r
             FileDepex = None\r
@@ -929,8 +930,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
@@ -1106,7 +1105,7 @@ class MultipleFv(FirmwareVolume):
             Fv.frombuffer(Buf, 0, len(Buf))\r
 \r
             self.BasicInfo.append([Fv.Name, Fv.FileSystemGuid, Fv.Size])\r
-            self.FfsDict.append(Fv.FfsDict)\r
+            self.FfsDict.update(Fv.FfsDict)\r
 \r
 ## Class Eot\r
 #\r
@@ -1516,7 +1515,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