Sync BaseTools Branch (version r2362) to EDKII main trunk.

Signed-off-by: lgao4
Reviewed-by: jsu1
Reviewed-by: ydliu

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12525 6f19259b-4bc3-4df7-8a09-765794883524

BaseTools/Source/Python/GenFds/Fv.py

@@ -47,6 +47,7 @@ class FV (FvClassObject):
         self.FvAddressFileName = None
         self.CapsuleName = None
         self.FvBaseAddress = None
+        self.FvForceRebase = None
 
     ## AddToBuffer()
     #
@@ -133,7 +134,8 @@ class FV (FvClassObject):
                                 FvOutputFile,
                                 [self.InfFileName],
                                 AddressFile=FvInfoFileName,
-                                FfsList=FfsFileList
+                                FfsList=FfsFileList,
+                                ForceRebase=self.FvForceRebase
                                 )
 
         NewFvInfo = None
@@ -162,7 +164,8 @@ class FV (FvClassObject):
                                         FvOutputFile,
                                         [self.InfFileName],
                                         AddressFile=FvInfoFileName,
-                                        FfsList=FfsFileList
+                                        FfsList=FfsFileList,
+                                        ForceRebase=self.FvForceRebase
                                         )
 
         #