BaseTools/GenFds: cleanup GenFds

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

diff --git a/BaseTools/Source/Python/GenFds/Fv.py b/BaseTools/Source/Python/GenFds/Fv.py
index c66fc383278d37950d2a6f4f0b4c59a9db48f53a..30525bd11fcc7dbac8e90f19917540bead300a7f 100644 (file)
--- a/BaseTools/Source/Python/GenFds/Fv.py
+++ b/BaseTools/Source/Python/GenFds/Fv.py
@@ -1,4 +1,3 @@
-from __future__ import absolute_import\r
 ## @file\r
 # process FV generation\r
 #\r
@@ -16,16 +15,13 @@ from __future__ import absolute_import
 ##\r
 # Import Modules\r
 #\r
+from __future__ import absolute_import\r
 import Common.LongFilePathOs as os\r
 import subprocess\r
 from io import BytesIO\r
 from struct import *\r
-\r
-from . import Ffs\r
-from . import AprioriSection\r
 from . import FfsFileStatement\r
 from .GenFdsGlobalVariable import GenFdsGlobalVariable\r
-from CommonDataClass.FdfClass import FvClassObject\r
 from Common.Misc import SaveFileOnChange, PackGUID\r
 from Common.LongFilePathSupport import CopyLongFilePath\r
 from Common.LongFilePathSupport import OpenLongFilePath as open\r
@@ -36,13 +32,25 @@ FV_UI_EXT_ENTY_GUID = 'A67DF1FA-8DE8-4E98-AF09-4BDF2EFFBC7C'
 ## generate FV\r
 #\r
 #\r
-class FV (FvClassObject):\r
+class FV (object):\r
     ## The constructor\r
     #\r
     #   @param  self        The object pointer\r
     #\r
     def __init__(self):\r
-        FvClassObject.__init__(self)\r
+        self.UiFvName = None\r
+        self.CreateFileName = None\r
+        self.BlockSizeList = []\r
+        self.DefineVarDict = {}\r
+        self.SetVarDict = {}\r
+        self.FvAlignment = None\r
+        self.FvAttributeDict = {}\r
+        self.FvNameGuid = None\r
+        self.FvNameString = None\r
+        self.AprioriSectionList = []\r
+        self.FfsList = []\r
+        self.BsBaseAddress = None\r
+        self.RtBaseAddress = None\r
         self.FvInfFile = None\r
         self.FvAddressFile = None\r
         self.BaseAddress = None\r
@@ -68,7 +76,7 @@ class FV (FvClassObject):
     #   @param  MacroDict   macro value pair\r
     #   @retval string      Generated FV file path\r
     #\r
-    def AddToBuffer (self, Buffer, BaseAddress=None, BlockSize= None, BlockNum=None, ErasePloarity='1', VtfDict=None, MacroDict = {}, Flag=False) :\r
+    def AddToBuffer (self, Buffer, BaseAddress=None, BlockSize= None, BlockNum=None, ErasePloarity='1', VtfDict=None, MacroDict = {}, Flag=False):\r
 \r
         if BaseAddress is None and self.UiFvName.upper() + 'fv' in GenFdsGlobalVariable.ImageBinDict:\r
             return GenFdsGlobalVariable.ImageBinDict[self.UiFvName.upper() + 'fv']\r
@@ -96,7 +104,7 @@ class FV (FvClassObject):
         if self.FvBaseAddress is not None:\r
             BaseAddress = self.FvBaseAddress\r
         if not Flag:\r
-            self.__InitializeInf__(BaseAddress, BlockSize, BlockNum, ErasePloarity, VtfDict)\r
+            self._InitializeInf(BaseAddress, BlockSize, BlockNum, ErasePloarity, VtfDict)\r
         #\r
         # First Process the Apriori section\r
         #\r
@@ -114,7 +122,7 @@ class FV (FvClassObject):
                                             TAB_LINE_BREAK)\r
 \r
         # Process Modules in FfsList\r
-        for FfsFile in self.FfsList :\r
+        for FfsFile in self.FfsList:\r
             if Flag:\r
                 if isinstance(FfsFile, FfsFileStatement.FileStatement):\r
                     continue\r
@@ -177,7 +185,7 @@ class FV (FvClassObject):
 \r
                 if FvChildAddr != []:\r
                     # Update Ffs again\r
-                    for FfsFile in self.FfsList :\r
+                    for FfsFile in self.FfsList:\r
                         FileName = FfsFile.GenFfs(MacroDict, FvChildAddr, BaseAddress, IsMakefile=Flag, FvName=self.UiFvName)\r
 \r
                     if GenFdsGlobalVariable.LargeFileInFvFlags[-1]:\r
@@ -252,7 +260,7 @@ class FV (FvClassObject):
                             return True\r
         return False\r
 \r
-    ## __InitializeInf__()\r
+    ## _InitializeInf()\r
     #\r
     #   Initilize the inf file to create FV\r
     #\r
@@ -263,7 +271,7 @@ class FV (FvClassObject):
     #   @param  ErasePolarity      Flash erase polarity\r
     #   @param  VtfDict     VTF objects\r
     #\r
-    def __InitializeInf__ (self, BaseAddress = None, BlockSize= None, BlockNum = None, ErasePloarity='1', VtfDict=None) :\r
+    def _InitializeInf (self, BaseAddress = None, BlockSize= None, BlockNum = None, ErasePloarity='1', VtfDict=None):\r
         #\r
         # Create FV inf file\r
         #\r
@@ -275,7 +283,7 @@ class FV (FvClassObject):
         # Add [Options]\r
         #\r
         self.FvInfFile.writelines("[options]" + TAB_LINE_BREAK)\r
-        if BaseAddress is not None :\r
+        if BaseAddress is not None:\r
             self.FvInfFile.writelines("EFI_BASE_ADDRESS = " + \\r
                                        BaseAddress          + \\r
                                        TAB_LINE_BREAK)\r
@@ -294,7 +302,7 @@ class FV (FvClassObject):
                     #set default block size is 1\r
                     self.FvInfFile.writelines("EFI_BLOCK_SIZE  = 0x1" + TAB_LINE_BREAK)\r
 \r
-            for BlockSize in self.BlockSizeList :\r
+            for BlockSize in self.BlockSizeList:\r
                 if BlockSize[0] is not None:\r
                     self.FvInfFile.writelines("EFI_BLOCK_SIZE  = "  + \\r
                                           '0x%X' %BlockSize[0]    + \\r
@@ -320,9 +328,9 @@ class FV (FvClassObject):
                                           ' %s' %ErasePloarity    + \\r
                                           TAB_LINE_BREAK)\r
         if not (self.FvAttributeDict is None):\r
-            for FvAttribute in self.FvAttributeDict.keys() :\r
+            for FvAttribute in self.FvAttributeDict.keys():\r
                 if FvAttribute == "FvUsedSizeEnable":\r
-                    if self.FvAttributeDict[FvAttribute].upper() in ('TRUE', '1') :\r
+                    if self.FvAttributeDict[FvAttribute].upper() in ('TRUE', '1'):\r
                         self.UsedSizeEnable = True\r
                     continue\r
                 self.FvInfFile.writelines("EFI_"            + \\r
@@ -365,8 +373,8 @@ class FV (FvClassObject):
                 Guid = FV_UI_EXT_ENTY_GUID.split('-')\r
                 #\r
                 # Layout:\r
-                #   EFI_FIRMWARE_VOLUME_EXT_ENTRY : size 4\r
-                #   GUID                          : size 16\r
+                #   EFI_FIRMWARE_VOLUME_EXT_ENTRY: size 4\r
+                #   GUID: size 16\r
                 #   FV UI name\r
                 #\r
                 Buffer += (pack('HH', (FvUiLen + 16 + 4), 0x0002)\r
@@ -422,7 +430,6 @@ class FV (FvClassObject):
                                            FvExtHeaderFileName                  + \\r
                                            TAB_LINE_BREAK)\r
 \r
-\r
         #\r
         # Add [Files]\r
         #\r