Sync BaseTool trunk (version r2423) into EDKII BaseTools. The change mainly includes:
1. Fix !include issues 2. Fix Trim to skip the postfix 'U' for hexadecimal and decimal numbers 3. Fix building error C2733 when building C++ code. 4. Add GCC46 tool chain definition 5. Add new RVCT and RVCTLINUX tool chains Signed-off-by: lgao4 git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12782 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
@@ -84,7 +84,7 @@ CHAR8 *mFvbAlignmentName[] = {
|
||||
EFI_FVB2_ALIGNMENT_64K_STRING,
|
||||
EFI_FVB2_ALIGNMENT_128K_STRING,
|
||||
EFI_FVB2_ALIGNMENT_256K_STRING,
|
||||
EFI_FVB2_ALIGNMNET_512K_STRING,
|
||||
EFI_FVB2_ALIGNMENT_512K_STRING,
|
||||
EFI_FVB2_ALIGNMENT_1M_STRING,
|
||||
EFI_FVB2_ALIGNMENT_2M_STRING,
|
||||
EFI_FVB2_ALIGNMENT_4M_STRING,
|
||||
@@ -1535,7 +1535,7 @@ Returns:
|
||||
//
|
||||
Status = FindApResetVectorPosition (FvImage, &BytePointer);
|
||||
if (EFI_ERROR (Status)) {
|
||||
Error (NULL, 0, 3000, "Invalid", "Cannot find the appropriate location in FvImage to add Ap reset vector!");
|
||||
Error (NULL, 0, 3000, "Invalid", "FV image does not have enough space to place AP reset vector. The FV image needs to reserve at least 4KB of unused space.");
|
||||
return EFI_ABORTED;
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user