diff --git a/BaseTools/Source/Python/Ecc/CodeFragmentCollector.py b/BaseTools/Source/Python/Ecc/CodeFragmentCollector.py
index 21fed59cad..f844b4a0b3 100644
--- a/BaseTools/Source/Python/Ecc/CodeFragmentCollector.py
+++ b/BaseTools/Source/Python/Ecc/CodeFragmentCollector.py
@@ -27,7 +27,7 @@ if sys.version_info.major == 3:
     from Ecc.CParser4.CParser import CParser
 else:
     import antlr3 as antlr
-    antlr.InputString = antlr.StringStream
+    antlr.InputStream = antlr.StringStream
     from Ecc.CParser3.CLexer import CLexer
     from Ecc.CParser3.CParser import CParser
 
diff --git a/BaseTools/Source/Python/Ecc/Configuration.py b/BaseTools/Source/Python/Ecc/Configuration.py
index c19a3990c7..66c8dd7880 100644
--- a/BaseTools/Source/Python/Ecc/Configuration.py
+++ b/BaseTools/Source/Python/Ecc/Configuration.py
@@ -193,6 +193,8 @@ class Configuration(object):
         # Check if there is no trailing white space in one line.
         self.GeneralCheckTrailingWhiteSpaceLine = 1
 
+        self.CFunctionLayoutCheckNoDeprecated = 1
+
         ## Space Checking
         self.SpaceCheckAll = 1