From 2bcc713e74b944bb5aefb433ef33fb4002a62d76 Mon Sep 17 00:00:00 2001 From: lgao4 Date: Fri, 25 Nov 2011 06:21:03 +0000 Subject: 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 --- BaseTools/Source/C/GenFv/GenFvInternalLib.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'BaseTools/Source/C/GenFv/GenFvInternalLib.c') diff --git a/BaseTools/Source/C/GenFv/GenFvInternalLib.c b/BaseTools/Source/C/GenFv/GenFvInternalLib.c index 45a2c8022d..684933f64d 100644 --- a/BaseTools/Source/C/GenFv/GenFvInternalLib.c +++ b/BaseTools/Source/C/GenFv/GenFvInternalLib.c @@ -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; } } -- cgit v1.2.3