BaseTools: Update sign tool to make MonotonicCount *after* Payload

[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 02ae7c9f9c6bc6bfa4a078c4c84107b27a2e7734..5489df59a6edf8c3da9ed84d6ec78976629b9cf3 100644 (file)
--- a/BaseTools/Source/Python/GenFds/FdfParser.py
+++ b/BaseTools/Source/Python/GenFds/FdfParser.py
@@ -1385,25 +1385,10 @@ class FdfParser:
 \r
         try:\r
             self.Preprocess()\r
-            while self.__GetFd():\r
-                pass\r
-\r
-            while self.__GetFv():\r
-                pass\r
-\r
-            while self.__GetFmp():\r
-                pass\r
-\r
-            while self.__GetCapsule():\r
-                pass\r
-\r
-            while self.__GetVtf():\r
-                pass\r
-\r
-            while self.__GetRule():\r
-                pass\r
-            \r
-            while self.__GetOptionRom():\r
+            #\r
+            # Keep processing sections of the FDF until no new sections or a syntax error is found\r
+            #\r
+            while self.__GetFd() or self.__GetFv() or self.__GetFmp() or self.__GetCapsule() or self.__GetVtf() or self.__GetRule() or self.__GetOptionRom():\r
                 pass\r
 \r
         except Warning, X:\r
@@ -3259,15 +3244,12 @@ class FdfParser:
             FmpKeyList.remove('MONOTONIC_COUNT')\r
         if FmpKeyList:\r
             raise Warning("Missing keywords %s in FMP payload section." % ', '.join(FmpKeyList), self.FileName, self.CurrentLineNumber)\r
-        ImageFile = self.__ParseRawFileStatement()\r
-        if not ImageFile:\r
+        # get the Image file and Vendor code file\r
+        self.__GetFMPCapsuleData(FmpData)\r
+        if not FmpData.ImageFile:\r
             raise Warning("Missing image file in FMP payload section.", self.FileName, self.CurrentLineNumber)\r
-        FmpData.ImageFile = ImageFile\r
-        VendorCodeFile = self.__ParseRawFileStatement()\r
-        if VendorCodeFile:\r
-            FmpData.VendorCodeFile = VendorCodeFile\r
-        AdditionalFile = self.__ParseRawFileStatement()\r
-        if AdditionalFile:\r
+        # check whether more than one Vendor code file\r
+        if len(FmpData.VendorCodeFile) > 1:\r
             raise Warning("At most one Image file and one Vendor code file are allowed in FMP payload section.", self.FileName, self.CurrentLineNumber)\r
         self.Profile.FmpPayloadDict[FmpUiName] = FmpData\r
         return True\r
@@ -3400,6 +3382,22 @@ class FdfParser:
             if not (IsInf or IsFile or IsFv or IsFd or IsAnyFile or IsAfile or IsFmp):\r
                 break\r
 \r
+    ## __GetFMPCapsuleData() method\r
+    #\r
+    #   Get capsule data for FMP capsule\r
+    #\r
+    #   @param  self        The object pointer\r
+    #   @param  Obj         for whom capsule data are got\r
+    #\r
+    def __GetFMPCapsuleData(self, Obj):\r
+\r
+        while True:\r
+            IsFv = self.__GetFvStatement(Obj, True)\r
+            IsFd = self.__GetFdStatement(Obj, True)\r
+            IsAnyFile = self.__GetAnyFileStatement(Obj, True)\r
+            if not (IsFv or IsFd or IsAnyFile):\r
+                break\r
+\r
     ## __GetFvStatement() method\r
     #\r
     #   Get FV for capsule\r
@@ -3409,7 +3407,7 @@ class FdfParser:
     #   @retval True        Successfully find a FV statement\r
     #   @retval False       Not able to find a FV statement\r
     #\r
-    def __GetFvStatement(self, CapsuleObj):\r
+    def __GetFvStatement(self, CapsuleObj, FMPCapsule = False):\r
 \r
         if not self.__IsKeyword("FV"):\r
             return False\r
@@ -3425,7 +3423,13 @@ class FdfParser:
 \r
         CapsuleFv = CapsuleData.CapsuleFv()\r
         CapsuleFv.FvName = self.__Token\r
-        CapsuleObj.CapsuleDataList.append(CapsuleFv)\r
+        if FMPCapsule:\r
+            if not CapsuleObj.ImageFile:\r
+                CapsuleObj.ImageFile.append(CapsuleFv)\r
+            else:\r
+                CapsuleObj.VendorCodeFile.append(CapsuleFv)\r
+        else:\r
+            CapsuleObj.CapsuleDataList.append(CapsuleFv)\r
         return True\r
 \r
     ## __GetFdStatement() method\r
@@ -3437,7 +3441,7 @@ class FdfParser:
     #   @retval True        Successfully find a FD statement\r
     #   @retval False       Not able to find a FD statement\r
     #\r
-    def __GetFdStatement(self, CapsuleObj):\r
+    def __GetFdStatement(self, CapsuleObj, FMPCapsule = False):\r
 \r
         if not self.__IsKeyword("FD"):\r
             return False\r
@@ -3453,7 +3457,13 @@ class FdfParser:
 \r
         CapsuleFd = CapsuleData.CapsuleFd()\r
         CapsuleFd.FdName = self.__Token\r
-        CapsuleObj.CapsuleDataList.append(CapsuleFd)\r
+        if FMPCapsule:\r
+            if not CapsuleObj.ImageFile:\r
+                CapsuleObj.ImageFile.append(CapsuleFd)\r
+            else:\r
+                CapsuleObj.VendorCodeFile.append(CapsuleFd)\r
+        else:\r
+            CapsuleObj.CapsuleDataList.append(CapsuleFd)\r
         return True\r
 \r
     def __GetFmpStatement(self, CapsuleObj):\r
@@ -3504,14 +3514,20 @@ class FdfParser:
     #   @retval True        Successfully find a Anyfile statement\r
     #   @retval False       Not able to find a AnyFile statement\r
     #\r
-    def __GetAnyFileStatement(self, CapsuleObj):\r
+    def __GetAnyFileStatement(self, CapsuleObj, FMPCapsule = False):\r
         AnyFileName = self.__ParseRawFileStatement()\r
         if not AnyFileName:\r
             return False\r
 \r
         CapsuleAnyFile = CapsuleData.CapsuleAnyFile()\r
         CapsuleAnyFile.FileName = AnyFileName\r
-        CapsuleObj.CapsuleDataList.append(CapsuleAnyFile)\r
+        if FMPCapsule:\r
+            if not CapsuleObj.ImageFile:\r
+                CapsuleObj.ImageFile.append(CapsuleAnyFile)\r
+            else:\r
+                CapsuleObj.VendorCodeFile.append(CapsuleAnyFile)\r
+        else:\r
+            CapsuleObj.CapsuleDataList.append(CapsuleAnyFile)\r
         return True\r
     \r
     ## __GetAfileStatement() method\r