Sync basetools' source and binary files with r1707 of the basetools project.

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

diff --git a/BaseTools/Source/Python/GenFds/Capsule.py b/BaseTools/Source/Python/GenFds/Capsule.py
index 7f17fcda684d0ab6c6d2746c13058534974d8326..961b88a45837b34bdb26a668f80d35f47dc7b659 100644 (file)
--- a/BaseTools/Source/Python/GenFds/Capsule.py
+++ b/BaseTools/Source/Python/GenFds/Capsule.py
@@ -21,6 +21,7 @@ import os
 import subprocess\r
 import StringIO\r
 from Common.Misc import SaveFileOnChange\r
+from GenFds import GenFds\r
 \r
 \r
 T_CHAR_LF = '\n'\r
@@ -39,17 +40,26 @@ class Capsule (CapsuleClassObject) :
         self.BlockSize = None\r
         # For GenFv\r
         self.BlockNum = None\r
+        self.CapsuleName = None\r
 \r
     ## Generate capsule\r
     #\r
     #   @param  self        The object pointer\r
+    #   @retval string      Generated Capsule file path\r
     #\r
     def GenCapsule(self):\r
+        if self.UiCapsuleName.upper() + 'cap' in GenFds.ImageBinDict.keys():\r
+            return GenFds.ImageBinDict[self.UiCapsuleName.upper() + 'cap']\r
+\r
+        GenFdsGlobalVariable.InfLogger( "\nGenerate %s Capsule" %self.UiCapsuleName)\r
         CapInfFile = self.GenCapInf()\r
         CapInfFile.writelines("[files]" + T_CHAR_LF)\r
-\r
+        CapFileList = []\r
         for CapsuleDataObj in self.CapsuleDataList :\r
+            CapsuleDataObj.CapsuleName = self.CapsuleName\r
             FileName = CapsuleDataObj.GenCapsuleSubItem()\r
+            CapsuleDataObj.CapsuleName = None\r
+            CapFileList.append(FileName)\r
             CapInfFile.writelines("EFI_FILE_NAME = " + \\r
                                    FileName      + \\r
                                    T_CHAR_LF)\r
@@ -63,9 +73,14 @@ class Capsule (CapsuleClassObject) :
         GenFdsGlobalVariable.GenerateFirmwareVolume(\r
                                 CapOutputFile,\r
                                 [self.CapInfFileName],\r
-                                Capsule=True\r
+                                Capsule=True,\r
+                                FfsList=CapFileList\r
                                 )\r
+\r
+        GenFdsGlobalVariable.VerboseLogger( "\nGenerate %s Capsule Successfully" %self.UiCapsuleName)\r
         GenFdsGlobalVariable.SharpCounter = 0\r
+        GenFds.ImageBinDict[self.UiCapsuleName.upper() + 'cap'] = CapOutputFile\r
+        return CapOutputFile\r
 \r
     ## Generate inf file for capsule\r
     #\r