diff options
| author | lgao4 <lgao4@6f19259b-4bc3-4df7-8a09-765794883524> | 2011-10-11 02:49:48 +0000 |
|---|---|---|
| committer | lgao4 <lgao4@6f19259b-4bc3-4df7-8a09-765794883524> | 2011-10-11 02:49:48 +0000 |
| commit | 79b74a03e018ecbf03d8d50e6f20301e249c1ba5 (patch) | |
| tree | effd580da4f1fff58f1f1523e79997732f1748e7 /BaseTools/Source/C/GenFv/GenFvInternalLib.c | |
| parent | 4d10ab79d771f6ad88f54db324a7ac184118ccf7 (diff) | |
| download | edk2-platforms-79b74a03e018ecbf03d8d50e6f20301e249c1ba5.tar.xz | |
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
Diffstat (limited to 'BaseTools/Source/C/GenFv/GenFvInternalLib.c')
| -rw-r--r-- | BaseTools/Source/C/GenFv/GenFvInternalLib.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/BaseTools/Source/C/GenFv/GenFvInternalLib.c b/BaseTools/Source/C/GenFv/GenFvInternalLib.c index d86909b4df..9fdcb47d6b 100644 --- a/BaseTools/Source/C/GenFv/GenFvInternalLib.c +++ b/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;
//
|