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/C/GenFv/GenFvInternalLib.c

@@ -209,6 +209,7 @@ Returns:
       DebugMsg (NULL, 0, 9, "rebase address", "%s = %s", EFI_FV_BASE_ADDRESS_STRING, Value);
 
       FvInfo->BaseAddress = Value64;
+      FvInfo->BaseAddressSet = TRUE;
     }
   }
 
@@ -2826,11 +2827,20 @@ Returns:
   PeFileBuffer       = NULL;
 
   //
-  // Don't need to relocate image when BaseAddress is not set.
+  // Don't need to relocate image when BaseAddress is zero and no ForceRebase Flag specified.
   //
-  if (FvInfo->BaseAddress == 0) {
+  if ((FvInfo->BaseAddress == 0) && (FvInfo->ForceRebase == -1)) {
     return EFI_SUCCESS;
   }
+  
+  //
+  // If ForceRebase Flag specified to FALSE, will always not take rebase action.
+  //
+  if (FvInfo->ForceRebase == 0) {
+    return EFI_SUCCESS;
+  }
+
+
   XipBase = FvInfo->BaseAddress + XipOffset;
 
   //