BaseTools: Replace BSD License with BSD+Patent License

[mirror_edk2.git] / BaseTools / Source / C / Include / IndustryStandard / PeImage.h

diff --git a/BaseTools/Source/C/Include/IndustryStandard/PeImage.h b/BaseTools/Source/C/Include/IndustryStandard/PeImage.h
index 8c197f43bb148a48398ddf072bd7f861b0b7c0f1..44037d13f32b0f39981837cc316101b6d4334ccf 100644 (file)
--- a/BaseTools/Source/C/Include/IndustryStandard/PeImage.h
+++ b/BaseTools/Source/C/Include/IndustryStandard/PeImage.h
@@ -4,16 +4,10 @@
 \r
   @bug Fix text - doc as defined in MSFT EFI specification.\r
 \r
-  Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
   Portions copyright (c) 2011 - 2013, ARM Ltd. All rights reserved.<BR>\r
 \r
-  This program and the accompanying materials are licensed and made available\r
-  under the terms and conditions of the BSD License which accompanies this\r
-  distribution.  The full text of the license may be found at\r
-    http://opensource.org/licenses/bsd-license.php\r
-\r
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+  SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
 \r
@@ -42,7 +36,6 @@
 // PE32+ Machine type for EFI images\r
 //\r
 #define IMAGE_FILE_MACHINE_I386     0x014c\r
-#define IMAGE_FILE_MACHINE_IA64     0x0200\r
 #define IMAGE_FILE_MACHINE_EBC      0x0EBC\r
 #define IMAGE_FILE_MACHINE_X64      0x8664\r
 #define IMAGE_FILE_MACHINE_ARM      0x01c0  // Thumb only\r
@@ -52,10 +45,8 @@
 //\r
 // Support old names for backward compatible\r
 //\r
-#define EFI_IMAGE_MACHINE_IA32      IMAGE_FILE_MACHINE_I386 \r
-#define EFI_IMAGE_MACHINE_IA64      IMAGE_FILE_MACHINE_IA64  \r
-#define EFI_IMAGE_MACHINE_IPF       IMAGE_FILE_MACHINE_IA64  \r
-#define EFI_IMAGE_MACHINE_EBC       IMAGE_FILE_MACHINE_EBC  \r
+#define EFI_IMAGE_MACHINE_IA32      IMAGE_FILE_MACHINE_I386\r
+#define EFI_IMAGE_MACHINE_EBC       IMAGE_FILE_MACHINE_EBC\r
 #define EFI_IMAGE_MACHINE_X64       IMAGE_FILE_MACHINE_X64\r
 #define EFI_IMAGE_MACHINE_ARMT      IMAGE_FILE_MACHINE_ARMT\r
 #define EFI_IMAGE_MACHINE_AARCH64   IMAGE_FILE_MACHINE_ARM64\r
@@ -475,23 +466,23 @@ typedef struct {
 //\r
 // x64 processor relocation types.\r
 //\r
-#define IMAGE_REL_AMD64_ABSOLUTE       0x0000\r
-#define IMAGE_REL_AMD64_ADDR64   0x0001\r
-#define IMAGE_REL_AMD64_ADDR32   0x0002\r
-#define IMAGE_REL_AMD64_ADDR32NB       0x0003\r
-#define IMAGE_REL_AMD64_REL32      0x0004\r
-#define IMAGE_REL_AMD64_REL32_1          0x0005\r
-#define IMAGE_REL_AMD64_REL32_2          0x0006\r
-#define IMAGE_REL_AMD64_REL32_3          0x0007\r
-#define IMAGE_REL_AMD64_REL32_4          0x0008\r
-#define IMAGE_REL_AMD64_REL32_5          0x0009\r
-#define IMAGE_REL_AMD64_SECTION          0x000A\r
-#define IMAGE_REL_AMD64_SECREL   0x000B\r
-#define IMAGE_REL_AMD64_SECREL7          0x000C\r
-#define IMAGE_REL_AMD64_TOKEN      0x000D\r
-#define IMAGE_REL_AMD64_SREL32   0x000E\r
-#define IMAGE_REL_AMD64_PAIR       0x000F\r
-#define IMAGE_REL_AMD64_SSPAN32          0x0010\r
+#define IMAGE_REL_AMD64_ABSOLUTE  0x0000\r
+#define IMAGE_REL_AMD64_ADDR64    0x0001\r
+#define IMAGE_REL_AMD64_ADDR32    0x0002\r
+#define IMAGE_REL_AMD64_ADDR32NB  0x0003\r
+#define IMAGE_REL_AMD64_REL32      0x0004\r
+#define IMAGE_REL_AMD64_REL32_1    0x0005\r
+#define IMAGE_REL_AMD64_REL32_2    0x0006\r
+#define IMAGE_REL_AMD64_REL32_3    0x0007\r
+#define IMAGE_REL_AMD64_REL32_4    0x0008\r
+#define IMAGE_REL_AMD64_REL32_5    0x0009\r
+#define IMAGE_REL_AMD64_SECTION    0x000A\r
+#define IMAGE_REL_AMD64_SECREL    0x000B\r
+#define IMAGE_REL_AMD64_SECREL7    0x000C\r
+#define IMAGE_REL_AMD64_TOKEN      0x000D\r
+#define IMAGE_REL_AMD64_SREL32    0x000E\r
+#define IMAGE_REL_AMD64_PAIR      0x000F\r
+#define IMAGE_REL_AMD64_SSPAN32    0x0010\r
 \r
 ///\r
 /// Based relocation format.\r