From 25918452ed5e9d12ea56b3bb2193df9ab96666b1 Mon Sep 17 00:00:00 2001 From: lgao4 Date: Wed, 23 May 2012 08:27:14 +0000 Subject: Sync BaseTools Trunk (version r2524) to EDKII main trunk. Signed-off-by: Liming Gao Reviewed-by: Liu Yingke Reviewed-by: Yurui Zeng git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13353 6f19259b-4bc3-4df7-8a09-765794883524 --- BaseTools/Source/C/GenSec/GenSec.c | 10 +++------- BaseTools/Source/C/Include/Common/BuildVersion.h | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) (limited to 'BaseTools/Source/C') diff --git a/BaseTools/Source/C/GenSec/GenSec.c b/BaseTools/Source/C/GenSec/GenSec.c index 79e8e1bebb..d6b22aee86 100644 --- a/BaseTools/Source/C/GenSec/GenSec.c +++ b/BaseTools/Source/C/GenSec/GenSec.c @@ -785,7 +785,7 @@ Returns: Offset = 0; FileBuffer = NULL; - if (CompareGuid (VendorGuid, &mEfiCrc32SectionGuid) == 0) { + if (CompareGuid (VendorGuid, &mZeroGuid) == 0) { Offset = sizeof (CRC32_SECTION_HEADER); } else { Offset = sizeof (EFI_GUID_DEFINED_SECTION); @@ -837,7 +837,7 @@ Returns: // // Now data is in FileBuffer + Offset // - if (CompareGuid (VendorGuid, &mEfiCrc32SectionGuid) == 0) { + if (CompareGuid (VendorGuid, &mZeroGuid) == 0) { // // Default Guid section is CRC32. // @@ -1222,10 +1222,6 @@ Returns: VerboseMsg ("Compress method is %s", mCompressionTypeName [SectCompSubType]); } else if (stricmp (SectionName, mSectionTypeName[EFI_SECTION_GUID_DEFINED]) == 0) { SectType = EFI_SECTION_GUID_DEFINED; - - if (CompareGuid (&VendorGuid, &mZeroGuid) == 0) { - memcpy (&VendorGuid, &mEfiCrc32SectionGuid, sizeof (EFI_GUID)); - } if ((SectGuidAttribute & EFI_GUIDED_SECTION_NONE) != 0) { // @@ -1349,7 +1345,7 @@ Returns: break; case EFI_SECTION_GUID_DEFINED: - if (InputFileAlign != NULL && (CompareGuid (&VendorGuid, &mEfiCrc32SectionGuid) != 0)) { + if (InputFileAlign != NULL && (CompareGuid (&VendorGuid, &mZeroGuid) != 0)) { // // Only process alignment for the default known CRC32 guided section. // For the unknown guided section, the alignment is processed when the dummy all section (EFI_SECTION_ALL) is generated. diff --git a/BaseTools/Source/C/Include/Common/BuildVersion.h b/BaseTools/Source/C/Include/Common/BuildVersion.h index f9144e5f01..5b50a5c28e 100644 --- a/BaseTools/Source/C/Include/Common/BuildVersion.h +++ b/BaseTools/Source/C/Include/Common/BuildVersion.h @@ -14,4 +14,4 @@ **/ -#define __BUILD_VERSION "Build 2518" +#define __BUILD_VERSION "Build 2524" -- cgit v1.2.3