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

[mirror_edk2.git] / BaseTools / Source / C / GenSec / GenSec.c

diff --git a/BaseTools/Source/C/GenSec/GenSec.c b/BaseTools/Source/C/GenSec/GenSec.c
index 79e8e1bebb0314b877735d0bbe515dab5cb0b3d1..d6b22aee86b7ca9604232b83f985f1df3b8129bf 100644 (file)
--- a/BaseTools/Source/C/GenSec/GenSec.c
+++ b/BaseTools/Source/C/GenSec/GenSec.c
@@ -785,7 +785,7 @@ Returns:
   Offset      = 0;\r
   FileBuffer  = NULL;\r
 \r
-  if (CompareGuid (VendorGuid, &mEfiCrc32SectionGuid) == 0) {\r
+  if (CompareGuid (VendorGuid, &mZeroGuid) == 0) {\r
     Offset = sizeof (CRC32_SECTION_HEADER);\r
   } else {\r
     Offset = sizeof (EFI_GUID_DEFINED_SECTION);\r
@@ -837,7 +837,7 @@ Returns:
   //\r
   // Now data is in FileBuffer + Offset\r
   //\r
-  if (CompareGuid (VendorGuid, &mEfiCrc32SectionGuid) == 0) {\r
+  if (CompareGuid (VendorGuid, &mZeroGuid) == 0) {\r
     //\r
     // Default Guid section is CRC32.\r
     //\r
@@ -1222,10 +1222,6 @@ Returns:
     VerboseMsg ("Compress method is %s", mCompressionTypeName [SectCompSubType]);\r
   } else if (stricmp (SectionName, mSectionTypeName[EFI_SECTION_GUID_DEFINED]) == 0) {\r
     SectType     = EFI_SECTION_GUID_DEFINED;\r
-\r
-    if (CompareGuid (&VendorGuid, &mZeroGuid) == 0) {\r
-      memcpy (&VendorGuid, &mEfiCrc32SectionGuid, sizeof (EFI_GUID));\r
-    }\r
     \r
     if ((SectGuidAttribute & EFI_GUIDED_SECTION_NONE) != 0) {\r
       //\r
@@ -1349,7 +1345,7 @@ Returns:
     break;\r
 \r
   case EFI_SECTION_GUID_DEFINED:\r
-    if (InputFileAlign != NULL && (CompareGuid (&VendorGuid, &mEfiCrc32SectionGuid) != 0)) {\r
+    if (InputFileAlign != NULL && (CompareGuid (&VendorGuid, &mZeroGuid) != 0)) {\r
       //\r
       // Only process alignment for the default known CRC32 guided section.\r
       // For the unknown guided section, the alignment is processed when the dummy all section (EFI_SECTION_ALL) is generated.\r