diff --git a/IntelFsp2Pkg/Tools/GenCfgOpt.py b/IntelFsp2Pkg/Tools/GenCfgOpt.py
index e8cec95aa7..654cdfc835 100644
--- a/IntelFsp2Pkg/Tools/GenCfgOpt.py
+++ b/IntelFsp2Pkg/Tools/GenCfgOpt.py
@@ -875,6 +875,9 @@ EndList
         IsArray = False
         if Length in [1,2,4,8]:
             Type = "UINT%d" % (Length * 8)
+            if Name.startswith("UnusedUpdSpace") and Length != 1:
+                IsArray = True
+                Type = "UINT8"
         else:
             IsArray = True
             Type = "UINT8"
@@ -1129,7 +1132,7 @@ EndList
             HeaderFd.write("#ifndef __%s__\n"   % FileName)
             HeaderFd.write("#define __%s__\n\n" % FileName)
             HeaderFd.write("#include <%s>\n\n" % HeaderFileName)
-            HeaderFd.write("#pragma pack(push, 1)\n\n")
+            HeaderFd.write("#pragma pack(1)\n\n")
 
             Export = False
             for Line in IncLines:
@@ -1177,7 +1180,7 @@ EndList
                 for Item in range(len(StructStart)):
                     if Index >= StructStartWithComment[Item] and Index <= StructEnd[Item]:
                         HeaderFd.write (Line)
-            HeaderFd.write("#pragma pack(pop)\n\n")
+            HeaderFd.write("#pragma pack()\n\n")
             HeaderFd.write("#endif\n")
             HeaderFd.close()
 
@@ -1188,7 +1191,7 @@ EndList
         HeaderFd.write("#ifndef __%s__\n"   % FileName)
         HeaderFd.write("#define __%s__\n\n" % FileName)
         HeaderFd.write("#include <FspEas.h>\n\n")
-        HeaderFd.write("#pragma pack(push, 1)\n\n")
+        HeaderFd.write("#pragma pack(1)\n\n")
 
         for item in range(len(UpdRegionCheck)):
             Index = 0
@@ -1222,7 +1225,7 @@ EndList
                 for Item in range(len(StructStart)):
                     if Index >= StructStartWithComment[Item] and Index <= StructEnd[Item]:
                         HeaderFd.write (Line)
-        HeaderFd.write("#pragma pack(pop)\n\n")
+        HeaderFd.write("#pragma pack()\n\n")
         HeaderFd.write("#endif\n")
         HeaderFd.close()