Sync BaseTools Trunk (version r2524) to EDKII main trunk.

[mirror_edk2.git] / BaseTools / Source / Python / GenFds / FdfParser.py

diff --git a/BaseTools/Source/Python/GenFds/FdfParser.py b/BaseTools/Source/Python/GenFds/FdfParser.py
index dc5c4fa034c5d95bdcb6fa1ea838a7e47014f10c..c9c620d853803170fe056ffd5946ce786e7ea936 100644 (file)
--- a/BaseTools/Source/Python/GenFds/FdfParser.py
+++ b/BaseTools/Source/Python/GenFds/FdfParser.py
@@ -2867,6 +2867,7 @@ class FdfParser:
             GuidSectionObj.SectionType = "GUIDED"\r
             GuidSectionObj.ProcessRequired = AttribDict["PROCESSING_REQUIRED"]\r
             GuidSectionObj.AuthStatusValid = AttribDict["AUTH_STATUS_VALID"]\r
+            GuidSectionObj.ExtraHeaderSize = AttribDict["EXTRA_HEADER_SIZE"]\r
             # Recursive sections...\r
             while True:\r
                 IsLeafSection = self.__GetLeafSection(GuidSectionObj)\r
@@ -2894,23 +2895,26 @@ class FdfParser:
         AttribDict = {}\r
         AttribDict["PROCESSING_REQUIRED"] = "NONE"\r
         AttribDict["AUTH_STATUS_VALID"] = "NONE"\r
-        if self.__IsKeyword("PROCESSING_REQUIRED") or self.__IsKeyword("AUTH_STATUS_VALID"):\r
+        AttribDict["EXTRA_HEADER_SIZE"] = -1\r
+        while self.__IsKeyword("PROCESSING_REQUIRED") or self.__IsKeyword("AUTH_STATUS_VALID") \\r
+            or self.__IsKeyword("EXTRA_HEADER_SIZE"):\r
             AttribKey = self.__Token\r
 \r
             if not self.__IsToken("="):\r
                 raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
 \r
-            if not self.__GetNextToken() or self.__Token.upper() not in ("TRUE", "FALSE", "1", "0"):\r
-                raise Warning("expected TRUE/FALSE (1/0)", self.FileName, self.CurrentLineNumber)\r
-            AttribDict[AttribKey] = self.__Token\r
-\r
-        if self.__IsKeyword("PROCESSING_REQUIRED") or self.__IsKeyword("AUTH_STATUS_VALID"):\r
-            AttribKey = self.__Token\r
-\r
-            if not self.__IsToken("="):\r
-                raise Warning("expected '='")\r
-\r
-            if not self.__GetNextToken() or self.__Token.upper() not in ("TRUE", "FALSE", "1", "0"):\r
+            if not self.__GetNextToken():\r
+                raise Warning("expected TRUE(1)/FALSE(0)/Number", self.FileName, self.CurrentLineNumber)\r
+            elif AttribKey == "EXTRA_HEADER_SIZE":\r
+                Base = 10\r
+                if self.__Token[0:2].upper() == "0X":\r
+                    Base = 16\r
+                try:\r
+                    AttribDict[AttribKey] = int(self.__Token, Base)\r
+                    continue\r
+                except ValueError:\r
+                    raise Warning("expected Number", self.FileName, self.CurrentLineNumber)\r
+            elif self.__Token.upper() not in ("TRUE", "FALSE", "1", "0"):\r
                 raise Warning("expected TRUE/FALSE (1/0)", self.FileName, self.CurrentLineNumber)\r
             AttribDict[AttribKey] = self.__Token\r
 \r
@@ -3712,6 +3716,7 @@ class FdfParser:
             GuidSectionObj.SectionType = "GUIDED"\r
             GuidSectionObj.ProcessRequired = AttribDict["PROCESSING_REQUIRED"]\r
             GuidSectionObj.AuthStatusValid = AttribDict["AUTH_STATUS_VALID"]\r
+            GuidSectionObj.ExtraHeaderSize = AttribDict["EXTRA_HEADER_SIZE"]\r
 \r
             # Efi sections...\r
             while True:\r