Revert BaseTools: PYTHON3 migration

This reverts commit 6693f359b3c213513c5096a06c6f67244a44dc52..
678f85131238622e576705117e299d81cff755c9.

Python3 migration is the fundamental change. It requires every developer
to install Python3. Before this migration, the well communication and wide
verification must be done. But now, most people is not aware of this change,
and not try it. So, Python3 migration is reverted and be moved to edk2-staging
Python3 branch for the edk2 user evaluation.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Liming Gao <liming.gao@intel.com>

1 files changed, 8 insertions, 9 deletions

diff --git a/BaseTools/Source/Python/GenFds/FvImageSection.py b/BaseTools/Source/Python/GenFds/FvImageSection.py
index f15df23514..04556fc870 100644
--- a/BaseTools/Source/Python/GenFds/FvImageSection.py
+++ b/BaseTools/Source/Python/GenFds/FvImageSection.py
@@ -15,6 +15,7 @@
 ##

 # Import Modules

 #

+from __future__ import absolute_import

 from . import Section

 from io import BytesIO

 from .Ffs import Ffs

@@ -70,7 +71,7 @@ class FvImageSection(FvImageSectionClassObject):
                     # PI FvHeader is 0x48 byte

                     FvHeaderBuffer = FvFileObj.read(0x48)

                     # FV alignment position.

-                    FvAlignmentValue = 1 << (FvHeaderBuffer[0x2E] & 0x1F)

+                    FvAlignmentValue = 1 << (ord (FvHeaderBuffer[0x2E]) & 0x1F)

                     FvFileObj.close()

                 if FvAlignmentValue > MaxFvAlignment:

                     MaxFvAlignment = FvAlignmentValue

@@ -86,9 +87,9 @@ class FvImageSection(FvImageSectionClassObject):
                     if MaxFvAlignment >= 0x1000000:

                         self.Alignment = "16M"

                     else:

-                        self.Alignment = str(MaxFvAlignment // 0x100000) + "M"

+                        self.Alignment = str(MaxFvAlignment / 0x100000) + "M"

                 else:

-                    self.Alignment = str (MaxFvAlignment // 0x400) + "K"

+                    self.Alignment = str (MaxFvAlignment / 0x400) + "K"

             else:

                 # MaxFvAlignment is less than 1K

                 self.Alignment = str (MaxFvAlignment)

@@ -98,12 +99,10 @@ class FvImageSection(FvImageSectionClassObject):
         # Generate Fv

         #

         if self.FvName is not None:

-            Buffer = BytesIO()

+            Buffer = BytesIO('')

             Fv = GenFdsGlobalVariable.FdfParser.Profile.FvDict.get(self.FvName)

             if Fv is not None:

                 self.Fv = Fv

-                if not self.FvAddr and self.Fv.BaseAddress:

-                    self.FvAddr = self.Fv.BaseAddress

                 FvFileName = Fv.AddToBuffer(Buffer, self.FvAddr, MacroDict = Dict, Flag=IsMakefile)

                 if Fv.FvAlignment is not None:

                     if self.Alignment is None:

@@ -120,7 +119,7 @@ class FvImageSection(FvImageSectionClassObject):
                         # PI FvHeader is 0x48 byte

                         FvHeaderBuffer = FvFileObj.read(0x48)

                         # FV alignment position.

-                        FvAlignmentValue = 1 << (FvHeaderBuffer[0x2E] & 0x1F)

+                        FvAlignmentValue = 1 << (ord (FvHeaderBuffer[0x2E]) & 0x1F)

                         # FvAlignmentValue is larger than or equal to 1K

                         if FvAlignmentValue >= 0x400:

                             if FvAlignmentValue >= 0x100000:

@@ -128,9 +127,9 @@ class FvImageSection(FvImageSectionClassObject):
                                 if FvAlignmentValue >= 0x1000000:

                                     self.Alignment = "16M"

                                 else:

-                                    self.Alignment = str(FvAlignmentValue // 0x100000) + "M"

+                                    self.Alignment = str(FvAlignmentValue / 0x100000) + "M"

                             else:

-                                self.Alignment = str (FvAlignmentValue // 0x400) + "K"

+                                self.Alignment = str (FvAlignmentValue / 0x400) + "K"

                         else:

                             # FvAlignmentValue is less than 1K

                             self.Alignment = str (FvAlignmentValue)