Sync BaseTools Trunk (version r2524) to EDKII main trunk.

Signed-off-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Liu Yingke <yingke.d.liu@intel.com>
Reviewed-by: Yurui Zeng <yurui.zeng@intel.com>


git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13353 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
lgao4
2012-05-23 08:27:14 +00:00
parent 74dee93181
commit 25918452ed
38 changed files with 63 additions and 39 deletions

View File

@@ -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.