[PATCH] * IntelFsp2Pkg: Improve FSP Python scripts to support 3.x.

[ching.jenx.cheng@intel.com]

[-- Attachment #1: Type: text/plain, Size: 2371 bytes --]

BZ:https://bugzilla.tianocore.org/show_bug.cgi?id=2041

Improve Python3.x support with IntelFsp2Pkg/Tools/GenCfgOpt.py,
Base on <<, print('%x' % ) is only support for int, not float.

Cc: Amy Chan <amy.chan@intel.com>
Cc: Chasel Chiu <chasel.chiu@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Star Zeng <star.zeng@intel.com>
Signed-off-by: Ching JenX Cheng <ching.jenx.cheng@intel.com>
---
 IntelFsp2Pkg/Tools/GenCfgOpt.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/IntelFsp2Pkg/Tools/GenCfgOpt.py b/IntelFsp2Pkg/Tools/GenCfgOpt.py
index a42717caae..2fa7582d85 100644
--- a/IntelFsp2Pkg/Tools/GenCfgOpt.py
+++ b/IntelFsp2Pkg/Tools/GenCfgOpt.py
@@ -715,7 +715,7 @@ EndList
                         if (ConfigDict['embed'].find(':END') != -1):
                             Remainder = Offset % (MaxAlign/8)   # MaxAlign is either 32 or 64
                             if Remainder:
-                                Diff = (MaxAlign/8) - Remainder
+                                Diff = int((MaxAlign/8) - Remainder)
                                 Offset = Offset + Diff
                                 ItemOffset = ItemOffset + Diff
                             MaxAlign = 32                       # Reset to default 32 align when struct end
@@ -727,7 +727,7 @@ EndList
                             Remainder = Offset % max(ItemLength/8, 4, SizeAlign)
                             Offset = Offset + ItemLength
                             if Remainder:
-                                Diff = max(ItemLength/8, 4, SizeAlign) - Remainder
+                                Diff = int(max(ItemLength/8, 4, SizeAlign) - Remainder)
                                 ItemOffset = ItemOffset + Diff
                         ConfigDict['offset'] = ItemOffset
 
@@ -1416,7 +1416,7 @@ EndList
                         if BitsRemain:
                             BsfFd.write("        Skip %d bits\n" % BitsRemain)
                             BitsGap -= BitsRemain
-                        BytesRemain = BitsGap / 8
+                        BytesRemain = int(BitsGap / 8)
                         if BytesRemain:
                             BsfFd.write("        Skip %d bytes\n" % BytesRemain)
                     NextOffset = Item['offset'] + Item['length']
-- 
2.21.0.windows.1


[-- Attachment #2: winmail.dat --]
[-- Type: application/ms-tnef, Size: 4019 bytes --]