Sync BaseTool trunk (version r2640) into EDKII BaseTools.

Signed-off-by: Gao, Liming <liming.gao@intel.com>
Reviewed-by: Liu, Jiang A <jiang.a.liu@intel.com>


git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15089 6f19259b-4bc3-4df7-8a09-765794883524

5 files changed, 11 insertions, 11 deletions

diff --git a/BaseTools/Source/C/Include/Common/BuildVersion.h b/BaseTools/Source/C/Include/Common/BuildVersion.h
index b84bd05..dd9852b 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 2610"

+#define __BUILD_VERSION "Build 2640"

diff --git a/BaseTools/Source/C/Include/Common/PiFirmwareVolume.h b/BaseTools/Source/C/Include/Common/PiFirmwareVolume.h
index ea06eee..9d62a9b 100644
--- a/BaseTools/Source/C/Include/Common/PiFirmwareVolume.h
+++ b/BaseTools/Source/C/Include/Common/PiFirmwareVolume.h
@@ -111,7 +111,7 @@ typedef struct {
   EFI_FV_BLOCK_MAP_ENTRY    BlockMap[1];

 } EFI_FIRMWARE_VOLUME_HEADER;

 

-#define EFI_FVH_SIGNATURE EFI_SIGNATURE_32 ('_', 'F', 'V', 'H')

+#define EFI_FVH_SIGNATURE SIGNATURE_32 ('_', 'F', 'V', 'H')

 

 ///

 /// Firmware Volume Header Revision definition

diff --git a/BaseTools/Source/C/Include/Common/UefiBaseTypes.h b/BaseTools/Source/C/Include/Common/UefiBaseTypes.h
index 43f5854..8f27ed7 100644
--- a/BaseTools/Source/C/Include/Common/UefiBaseTypes.h
+++ b/BaseTools/Source/C/Include/Common/UefiBaseTypes.h
@@ -1,7 +1,7 @@
 /** @file

   Defines data types and constants introduced in UEFI.

 

-  Copyright (c) 2006 - 2007, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 2006 - 2013, 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

@@ -146,10 +146,10 @@ typedef union {
 //

 // Define macros to build data structure signatures from characters.

 //

-#define EFI_SIGNATURE_16(A, B)        ((A) | (B << 8))

-#define EFI_SIGNATURE_32(A, B, C, D)  (EFI_SIGNATURE_16 (A, B) | (EFI_SIGNATURE_16 (C, D) << 16))

-#define EFI_SIGNATURE_64(A, B, C, D, E, F, G, H) \

-    (EFI_SIGNATURE_32 (A, B, C, D) | ((UINT64) (EFI_SIGNATURE_32 (E, F, G, H)) << 32))

+#define SIGNATURE_16(A, B)        ((A) | (B << 8))

+#define SIGNATURE_32(A, B, C, D)  (SIGNATURE_16 (A, B) | (SIGNATURE_16 (C, D) << 16))

+#define SIGNATURE_64(A, B, C, D, E, F, G, H) \

+    (SIGNATURE_32 (A, B, C, D) | ((UINT64) (SIGNATURE_32 (E, F, G, H)) << 32))

 

 

 //

diff --git a/BaseTools/Source/C/Include/IndustryStandard/PeImage.h b/BaseTools/Source/C/Include/IndustryStandard/PeImage.h
index 7e7c0ea..5d55f4d 100644
--- a/BaseTools/Source/C/Include/IndustryStandard/PeImage.h
+++ b/BaseTools/Source/C/Include/IndustryStandard/PeImage.h
@@ -4,7 +4,7 @@
 

   @bug Fix text - doc as defined in MSFT EFI specification.

 

-  Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>

   Portions copyright (c) 2011 - 2013, ARM Ltd. All rights reserved.<BR>

 

   This program and the accompanying materials are licensed and made available

@@ -648,7 +648,7 @@ typedef struct {
 ///

 /// Debug Data Structure defined by Apple Mach-O to Coff utility

 ///

-#define CODEVIEW_SIGNATURE_MTOC  EFI_SIGNATURE_32('M', 'T', 'O', 'C')

+#define CODEVIEW_SIGNATURE_MTOC  SIGNATURE_32('M', 'T', 'O', 'C')

 typedef struct {

   UINT32    Signature;                       ///< "MTOC"

   EFI_GUID  MachOUuid;

diff --git a/BaseTools/Source/C/Include/IndustryStandard/pci22.h b/BaseTools/Source/C/Include/IndustryStandard/pci22.h
index e1d347a..e07aa88 100644
--- a/BaseTools/Source/C/Include/IndustryStandard/pci22.h
+++ b/BaseTools/Source/C/Include/IndustryStandard/pci22.h
@@ -1,7 +1,7 @@
 /** @file

   Support for PCI 2.2 standard.

 

-  Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 2006 - 2013, 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

@@ -335,7 +335,7 @@ typedef union {
 #pragma pack()

 

 #define PCI_EXPANSION_ROM_HEADER_SIGNATURE              0xaa55

-#define PCI_DATA_STRUCTURE_SIGNATURE                    EFI_SIGNATURE_32 ('P', 'C', 'I', 'R')

+#define PCI_DATA_STRUCTURE_SIGNATURE                    SIGNATURE_32 ('P', 'C', 'I', 'R')

 #define PCI_CODE_TYPE_PCAT_IMAGE                        0x00

 #define PCI_CODE_TYPE_EFI_IMAGE                         0x03

 #define EFI_PCI_EXPANSION_ROM_HEADER_COMPRESSED         0x0001