diff options
| author | lgao4 <lgao4@6f19259b-4bc3-4df7-8a09-765794883524> | 2011-11-25 06:21:03 +0000 |
|---|---|---|
| committer | lgao4 <lgao4@6f19259b-4bc3-4df7-8a09-765794883524> | 2011-11-25 06:21:03 +0000 |
| commit | 2bcc713e74b944bb5aefb433ef33fb4002a62d76 (patch) | |
| tree | 7aa002279415c1fafbedbf287d256177746e0a4a /BaseTools/Source/C/VolInfo | |
| parent | c32dcd284c19bbb0b1db3606a243d9d69d37d6ab (diff) | |
| download | edk2-2bcc713e74b944bb5aefb433ef33fb4002a62d76.tar.gz edk2-2bcc713e74b944bb5aefb433ef33fb4002a62d76.tar.bz2 edk2-2bcc713e74b944bb5aefb433ef33fb4002a62d76.zip | |
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
Diffstat (limited to 'BaseTools/Source/C/VolInfo')
| -rw-r--r-- | BaseTools/Source/C/VolInfo/VolInfo.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/BaseTools/Source/C/VolInfo/VolInfo.c b/BaseTools/Source/C/VolInfo/VolInfo.c index f514ba8c38..7d127e1691 100644 --- a/BaseTools/Source/C/VolInfo/VolInfo.c +++ b/BaseTools/Source/C/VolInfo/VolInfo.c @@ -1,6 +1,6 @@ /** @file -Copyright (c) 1999 - 2010, Intel Corporation. All rights reserved.<BR> +Copyright (c) 1999 - 2011, Intel Corporation. All rights reserved.<BR> This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -845,8 +845,8 @@ Returns: printf (" EFI_FVB2_ALIGNMENT_256K\n"); } - if (VolumeHeader.Attributes & EFI_FVB2_ALIGNMNET_512K) { - printf (" EFI_FVB2_ALIGNMNET_512K\n"); + if (VolumeHeader.Attributes & EFI_FVB2_ALIGNMENT_512K) { + printf (" EFI_FVB2_ALIGNMENT_512K\n"); } if (VolumeHeader.Attributes & EFI_FVB2_ALIGNMENT_1M) { |