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

[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 7b6305b48eb9f20e73f6fb8889285a8c794fdf43..fd5ad0e9ac382f104a8a249bec7529dc940ca52f 100644 (file)
--- a/BaseTools/Source/Python/GenFds/Fv.py
+++ b/BaseTools/Source/Python/GenFds/Fv.py
@@ -46,7 +46,9 @@ class FV (FvClassObject):
         self.InfFileName = None\r
         self.FvAddressFileName = None\r
         self.CapsuleName = None\r
-\r
+        self.FvBaseAddress = None\r
+        self.FvForceRebase = None\r
+        \r
     ## AddToBuffer()\r
     #\r
     #   Generate Fv and add it to the Buffer\r
@@ -81,9 +83,12 @@ class FV (FvClassObject):
                             elif RegionData.upper() + 'fv' in GenFds.ImageBinDict.keys():\r
                                 continue\r
                             elif self.UiFvName.upper() == RegionData.upper():\r
-                               GenFdsGlobalVariable.ErrorLogger("Capsule %s in FD region can't contain a FV %s in FD region." % (self.CapsuleName, self.UiFvName.upper()))\r
+                                GenFdsGlobalVariable.ErrorLogger("Capsule %s in FD region can't contain a FV %s in FD region." % (self.CapsuleName, self.UiFvName.upper()))\r
 \r
         GenFdsGlobalVariable.InfLogger( "\nGenerating %s FV" %self.UiFvName)\r
+        \r
+        if self.FvBaseAddress != None:\r
+            BaseAddress = self.FvBaseAddress\r
 \r
         self.__InitializeInf__(BaseAddress, BlockSize, BlockNum, ErasePloarity, VtfDict)\r
         #\r
@@ -129,7 +134,8 @@ class FV (FvClassObject):
                                 FvOutputFile,\r
                                 [self.InfFileName],\r
                                 AddressFile=FvInfoFileName,\r
-                                FfsList=FfsFileList\r
+                                FfsList=FfsFileList,\r
+                                ForceRebase=self.FvForceRebase\r
                                 )\r
 \r
         NewFvInfo = None\r
@@ -158,7 +164,8 @@ class FV (FvClassObject):
                                         FvOutputFile,\r
                                         [self.InfFileName],\r
                                         AddressFile=FvInfoFileName,\r
-                                        FfsList=FfsFileList\r
+                                        FfsList=FfsFileList,\r
+                                        ForceRebase=self.FvForceRebase\r
                                         )\r
 \r
         #\r