1 files changed, 11 insertions, 6 deletions
diff --git a/BaseTools/Source/Python/UPT/Object/Parser/InfDefineObject.py b/BaseTools/Source/Python/UPT/Object/Parser/InfDefineObject.py
index be9a0e196e..1d074ee638 100644
--- a/BaseTools/Source/Python/UPT/Object/Parser/InfDefineObject.py
+++ b/BaseTools/Source/Python/UPT/Object/Parser/InfDefineObject.py
@@ -340,16 +340,21 @@ class InfDefSection(InfDefSectionOptionRomInfo):
                 ErrorInInf(ST.ERR_INF_PARSER_NOT_SUPPORT_EDKI_INF,
                            ErrorCode=ToolError.EDK1_INF_ERROR,
                            LineInfo=self.CurrentLine)
-                
-            self.InfVersion = InfDefMember()
-            self.InfVersion.SetValue(InfVersion)
-            self.InfVersion.Comments = Comments          
-            return True
+        elif IsValidDecVersionVal(InfVersion):
+            if (InfVersion < 65541):
+                ErrorInInf(ST.ERR_INF_PARSER_NOT_SUPPORT_EDKI_INF,
+                           ErrorCode=ToolError.EDK1_INF_ERROR,
+                           LineInfo=self.CurrentLine)
         else:
             ErrorInInf(ST.ERR_INF_PARSER_DEFINE_FROMAT_INVALID%(InfVersion),
                        LineInfo=self.CurrentLine)
             return False
 
+        self.InfVersion = InfDefMember()
+        self.InfVersion.SetValue(InfVersion)
+        self.InfVersion.Comments = Comments
+        return True
+
     ## GetInfVersion
     #                     
     def GetInfVersion(self):
@@ -1000,4 +1005,4 @@ class InfDefObject(InfSectionCommonDef):
     
     def GetDefines(self):
         return self.Defines                      
-        
-\ No newline at end of file
+