BaseTools: Replace StringIO.StringIO with io.BytesIO

[mirror_edk2.git] / BaseTools / Source / Python / GenFds / FvImageSection.py

diff --git a/BaseTools/Source/Python/GenFds/FvImageSection.py b/BaseTools/Source/Python/GenFds/FvImageSection.py
index 748d02f7000304bd03b49651f4305b3d994d5b75..b4f1f3340e99c9f61ff29d4a1602fb817f05e476 100644 (file)
--- a/BaseTools/Source/Python/GenFds/FvImageSection.py
+++ b/BaseTools/Source/Python/GenFds/FvImageSection.py
@@ -1,7 +1,7 @@
 ## @file\r
 # process FV image section generation\r
 #\r
-#  Copyright (c) 2007 - 2016, 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,7 +16,7 @@
 # Import Modules\r
 #\r
 import Section\r
-import StringIO\r
+from io import BytesIO\r
 from Ffs import Ffs\r
 import subprocess\r
 from GenFdsGlobalVariable import GenFdsGlobalVariable\r
@@ -24,6 +24,7 @@ import Common.LongFilePathOs as os
 from CommonDataClass.FdfClass import FvImageSectionClassObject\r
 from Common import EdkLogger\r
 from Common.BuildToolError import *\r
+from Common.DataType import *\r
 \r
 ## generate FV image section\r
 #\r
@@ -50,10 +51,10 @@ class FvImageSection(FvImageSectionClassObject):
     #   @param  Dict        dictionary contains macro and its value\r
     #   @retval tuple       (Generated file name, section alignment)\r
     #\r
-    def GenSection(self, OutputPath, ModuleName, SecNum, KeyStringList, FfsInf = None, Dict = {}):\r
+    def GenSection(self, OutputPath, ModuleName, SecNum, KeyStringList, FfsInf = None, Dict = {}, IsMakefile = False):\r
 \r
         OutputFileList = []\r
-        if self.FvFileType != None:\r
+        if self.FvFileType is not None:\r
             FileList, IsSect = Section.Section.GetFileList(FfsInf, self.FvFileType, self.FvFileExtension)\r
             if IsSect :\r
                 return FileList, self.Alignment\r
@@ -64,7 +65,7 @@ class FvImageSection(FvImageSectionClassObject):
             for FvFileName in FileList:\r
                 FvAlignmentValue = 0\r
                 if os.path.isfile(FvFileName):\r
-                    FvFileObj = open (FvFileName,'r+b')\r
+                    FvFileObj = open (FvFileName, 'rb')\r
                     FvFileObj.seek(0)\r
                     # PI FvHeader is 0x48 byte\r
                     FvHeaderBuffer = FvFileObj.read(0x48)\r
@@ -74,15 +75,18 @@ class FvImageSection(FvImageSectionClassObject):
                 if FvAlignmentValue > MaxFvAlignment:\r
                     MaxFvAlignment = FvAlignmentValue\r
 \r
-                OutputFile = os.path.join(OutputPath, ModuleName + 'SEC' + Num + Ffs.SectionSuffix.get("FV_IMAGE"))\r
-                GenFdsGlobalVariable.GenerateSection(OutputFile, [FvFileName], 'EFI_SECTION_FIRMWARE_VOLUME_IMAGE')\r
+                OutputFile = os.path.join(OutputPath, ModuleName + SUP_MODULE_SEC + Num + Ffs.SectionSuffix.get("FV_IMAGE"))\r
+                GenFdsGlobalVariable.GenerateSection(OutputFile, [FvFileName], 'EFI_SECTION_FIRMWARE_VOLUME_IMAGE', IsMakefile=IsMakefile)\r
                 OutputFileList.append(OutputFile)\r
 \r
             # MaxFvAlignment is larger than or equal to 1K\r
             if MaxFvAlignment >= 0x400:\r
-                if MaxFvAlignment >= 0x10000:\r
-                    #The max alignment supported by FFS is 64K.\r
-                    self.Alignment = "64K"\r
+                if MaxFvAlignment >= 0x100000:\r
+                    #The max alignment supported by FFS is 16M.\r
+                    if MaxFvAlignment >= 0x1000000:\r
+                        self.Alignment = "16M"\r
+                    else:\r
+                        self.Alignment = str(MaxFvAlignment / 0x100000) + "M"\r
                 else:\r
                     self.Alignment = str (MaxFvAlignment / 0x400) + "K"\r
             else:\r
@@ -93,23 +97,23 @@ class FvImageSection(FvImageSectionClassObject):
         #\r
         # Generate Fv\r
         #\r
-        if self.FvName != None:\r
-            Buffer = StringIO.StringIO('')\r
+        if self.FvName is not None:\r
+            Buffer = BytesIO('')\r
             Fv = GenFdsGlobalVariable.FdfParser.Profile.FvDict.get(self.FvName)\r
-            if Fv != None:\r
+            if Fv is not None:\r
                 self.Fv = Fv\r
-                FvFileName = Fv.AddToBuffer(Buffer, self.FvAddr, MacroDict = Dict)\r
-                if Fv.FvAlignment != None:\r
-                    if self.Alignment == None:\r
+                FvFileName = Fv.AddToBuffer(Buffer, self.FvAddr, MacroDict = Dict, Flag=IsMakefile)\r
+                if Fv.FvAlignment is not None:\r
+                    if self.Alignment is None:\r
                         self.Alignment = Fv.FvAlignment\r
                     else:\r
                         if GenFdsGlobalVariable.GetAlignment (Fv.FvAlignment) > GenFdsGlobalVariable.GetAlignment (self.Alignment):\r
                             self.Alignment = Fv.FvAlignment\r
             else:\r
-                if self.FvFileName != None:\r
+                if self.FvFileName is not None:\r
                     FvFileName = GenFdsGlobalVariable.ReplaceWorkspaceMacro(self.FvFileName)\r
                     if os.path.isfile(FvFileName):\r
-                        FvFileObj = open (FvFileName,'r+b')\r
+                        FvFileObj = open (FvFileName, 'rb')\r
                         FvFileObj.seek(0)\r
                         # PI FvHeader is 0x48 byte\r
                         FvHeaderBuffer = FvFileObj.read(0x48)\r
@@ -117,23 +121,32 @@ class FvImageSection(FvImageSectionClassObject):
                         FvAlignmentValue = 1 << (ord (FvHeaderBuffer[0x2E]) & 0x1F)\r
                         # FvAlignmentValue is larger than or equal to 1K\r
                         if FvAlignmentValue >= 0x400:\r
-                            if FvAlignmentValue >= 0x10000:\r
-                                #The max alignment supported by FFS is 64K.\r
-                                self.Alignment = "64K"\r
+                            if FvAlignmentValue >= 0x100000:\r
+                                #The max alignment supported by FFS is 16M.\r
+                                if FvAlignmentValue >= 0x1000000:\r
+                                    self.Alignment = "16M"\r
+                                else:\r
+                                    self.Alignment = str(FvAlignmentValue / 0x100000) + "M"\r
                             else:\r
                                 self.Alignment = str (FvAlignmentValue / 0x400) + "K"\r
                         else:\r
                             # FvAlignmentValue is less than 1K\r
                             self.Alignment = str (FvAlignmentValue)\r
                         FvFileObj.close()\r
+                    else:\r
+                        if len (mws.getPkgPath()) == 0:\r
+                            EdkLogger.error("GenFds", FILE_NOT_FOUND, "%s is not found in WORKSPACE: %s" % self.FvFileName, GenFdsGlobalVariable.WorkSpaceDir)\r
+                        else:\r
+                            EdkLogger.error("GenFds", FILE_NOT_FOUND, "%s is not found in packages path:\n\t%s" % (self.FvFileName, '\n\t'.join(mws.getPkgPath())))\r
+\r
                 else:\r
                     EdkLogger.error("GenFds", GENFDS_ERROR, "FvImageSection Failed! %s NOT found in FDF" % self.FvName)\r
 \r
             #\r
             # Prepare the parameter of GenSection\r
             #\r
-            OutputFile = os.path.join(OutputPath, ModuleName + 'SEC' + SecNum + Ffs.SectionSuffix.get("FV_IMAGE"))\r
-            GenFdsGlobalVariable.GenerateSection(OutputFile, [FvFileName], 'EFI_SECTION_FIRMWARE_VOLUME_IMAGE')\r
+            OutputFile = os.path.join(OutputPath, ModuleName + SUP_MODULE_SEC + SecNum + Ffs.SectionSuffix.get("FV_IMAGE"))\r
+            GenFdsGlobalVariable.GenerateSection(OutputFile, [FvFileName], 'EFI_SECTION_FIRMWARE_VOLUME_IMAGE', IsMakefile=IsMakefile)\r
             OutputFileList.append(OutputFile)\r
 \r
             return OutputFileList, self.Alignment\r