IntelFsp2Pkg: Improve FSP Python scripts to support 3.x.

[mirror_edk2.git] / IntelFsp2Pkg / Tools / GenCfgOpt.py

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