BaseTools: Remove unused logic for IPF

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

diff --git a/BaseTools/Source/Python/GenFds/Fd.py b/BaseTools/Source/Python/GenFds/Fd.py
index bfae1217984a1a50825608cd8ecea6d8b51f8773..9c43a62cc3d053502640d8b33111f98a703f2ffb 100644 (file)
--- a/BaseTools/Source/Python/GenFds/Fd.py
+++ b/BaseTools/Source/Python/GenFds/Fd.py
@@ -66,9 +66,6 @@ class FD(FDClassObject):
         for FvObj in GenFdsGlobalVariable.FdfParser.Profile.FvDict:\r
             GenFdsGlobalVariable.VerboseLogger(FvObj)\r
 \r
-        GenFdsGlobalVariable.VerboseLogger('################### Gen VTF ####################')\r
-        self.GenVtfFile()\r
-\r
         HasCapsuleRegion = False\r
         for RegionObj in self.RegionList:\r
             if RegionObj.RegionType == 'CAPSULE':\r
@@ -93,7 +90,7 @@ class FD(FDClassObject):
                     PadRegion.Offset = PreviousRegionStart + PreviousRegionSize\r
                     PadRegion.Size = RegionObj.Offset - PadRegion.Offset\r
                     if not Flag:\r
-                        PadRegion.AddToBuffer(TempFdBuffer, self.BaseAddress, self.BlockSizeList, self.ErasePolarity, GenFdsGlobalVariable.ImageBinDict, self.vtfRawDict, self.DefineVarDict)\r
+                        PadRegion.AddToBuffer(TempFdBuffer, self.BaseAddress, self.BlockSizeList, self.ErasePolarity, GenFdsGlobalVariable.ImageBinDict, self.DefineVarDict)\r
                 PreviousRegionStart = RegionObj.Offset\r
                 PreviousRegionSize = RegionObj.Size\r
                 #\r
@@ -102,7 +99,7 @@ class FD(FDClassObject):
                 if PreviousRegionSize > self.Size:\r
                     pass\r
                 GenFdsGlobalVariable.VerboseLogger('Call each region\'s AddToBuffer function')\r
-                RegionObj.AddToBuffer (TempFdBuffer, self.BaseAddress, self.BlockSizeList, self.ErasePolarity, GenFdsGlobalVariable.ImageBinDict, self.vtfRawDict, self.DefineVarDict)\r
+                RegionObj.AddToBuffer (TempFdBuffer, self.BaseAddress, self.BlockSizeList, self.ErasePolarity, GenFdsGlobalVariable.ImageBinDict, self.DefineVarDict)\r
 \r
         FdBuffer = BytesIO('')\r
         PreviousRegionStart = -1\r
@@ -123,7 +120,7 @@ class FD(FDClassObject):
                 PadRegion.Offset = PreviousRegionStart + PreviousRegionSize\r
                 PadRegion.Size = RegionObj.Offset - PadRegion.Offset\r
                 if not Flag:\r
-                    PadRegion.AddToBuffer(FdBuffer, self.BaseAddress, self.BlockSizeList, self.ErasePolarity, GenFdsGlobalVariable.ImageBinDict, self.vtfRawDict, self.DefineVarDict)\r
+                    PadRegion.AddToBuffer(FdBuffer, self.BaseAddress, self.BlockSizeList, self.ErasePolarity, GenFdsGlobalVariable.ImageBinDict, self.DefineVarDict)\r
             PreviousRegionStart = RegionObj.Offset\r
             PreviousRegionSize = RegionObj.Size\r
             #\r
@@ -137,7 +134,7 @@ class FD(FDClassObject):
             # Call each region's AddToBuffer function\r
             #\r
             GenFdsGlobalVariable.VerboseLogger('Call each region\'s AddToBuffer function')\r
-            RegionObj.AddToBuffer (FdBuffer, self.BaseAddress, self.BlockSizeList, self.ErasePolarity, GenFdsGlobalVariable.ImageBinDict, self.vtfRawDict, self.DefineVarDict, Flag=Flag)\r
+            RegionObj.AddToBuffer (FdBuffer, self.BaseAddress, self.BlockSizeList, self.ErasePolarity, GenFdsGlobalVariable.ImageBinDict, self.DefineVarDict, Flag=Flag)\r
         #\r
         # Write the buffer contents to Fd file\r
         #\r
@@ -148,51 +145,6 @@ class FD(FDClassObject):
         GenFdsGlobalVariable.ImageBinDict[self.FdUiName.upper() + 'fd'] = FdFileName\r
         return FdFileName\r
 \r
-    ## generate VTF\r
-    #\r
-    #   @param  self        The object pointer\r
-    #\r
-    def GenVtfFile (self) :\r
-        #\r
-        # Get this Fd's all Fv name\r
-        #\r
-        FvAddDict ={}\r
-        FvList = []\r
-        for RegionObj in self.RegionList:\r
-            if RegionObj.RegionType == BINARY_FILE_TYPE_FV:\r
-                if len(RegionObj.RegionDataList) == 1:\r
-                    RegionData = RegionObj.RegionDataList[0]\r
-                    FvList.append(RegionData.upper())\r
-                    FvAddDict[RegionData.upper()] = (int(self.BaseAddress, 16) + \\r
-                                                RegionObj.Offset, RegionObj.Size)\r
-                else:\r
-                    Offset = RegionObj.Offset\r
-                    for RegionData in RegionObj.RegionDataList:\r
-                        FvList.append(RegionData.upper())\r
-                        FvObj = GenFdsGlobalVariable.FdfParser.Profile.FvDict.get(RegionData.upper())\r
-                        if len(FvObj.BlockSizeList) < 1:\r
-                            EdkLogger.error("GenFds", GENFDS_ERROR,\r
-                                            'FV.%s must point out FVs blocksize and Fv BlockNum' \\r
-                                            % FvObj.UiFvName)\r
-                        else:\r
-                            Size = 0\r
-                            for blockStatement in FvObj.BlockSizeList:\r
-                                Size = Size + blockStatement[0] * blockStatement[1]\r
-                            FvAddDict[RegionData.upper()] = (int(self.BaseAddress, 16) + \\r
-                                                             Offset, Size)\r
-                            Offset = Offset + Size\r
-        #\r
-        # Check whether this Fd need VTF\r
-        #\r
-        Flag = False\r
-        for VtfObj in GenFdsGlobalVariable.FdfParser.Profile.VtfList:\r
-            compLocList = VtfObj.GetFvList()\r
-            if set(compLocList).issubset(FvList):\r
-                Flag = True\r
-                break\r
-        if Flag == True:\r
-            self.vtfRawDict = VtfObj.GenVtf(FvAddDict)\r
-\r
     ## generate flash map file\r
     #\r
     #   @param  self        The object pointer\r