BaseTools: Replace BSD License with BSD+Patent License

[mirror_edk2.git] / BaseTools / Source / C / EfiRom / EfiRom.h

diff --git a/BaseTools/Source/C/EfiRom/EfiRom.h b/BaseTools/Source/C/EfiRom/EfiRom.h
index f90c63fbf4ddf6904fa697a70bc0c4a4e8413b82..0b39e2af2e0c07a145c71b6b0f277546d7ee1dfc 100644 (file)
--- a/BaseTools/Source/C/EfiRom/EfiRom.h
+++ b/BaseTools/Source/C/EfiRom/EfiRom.h
@@ -1,14 +1,8 @@
 /** @file\r
 This file contains the relevant declarations required to generate Option Rom File\r
 \r
-Copyright (c) 1999 - 2017, Intel Corporation. All rights reserved.<BR>\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
+Copyright (c) 1999 - 2018, Intel Corporation. All rights reserved.<BR>\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
 \r
@@ -93,7 +87,7 @@ typedef struct {
   INT8      Pci30;\r
   INT8      DumpOption;\r
 //  INT8      Help;\r
-//  INT8      Version;  \r
+//  INT8      Version;\r
   FILE_LIST *FileList;\r
 } OPTIONS;\r
 \r
@@ -115,9 +109,8 @@ typedef struct {
 //\r
 static STRING_LOOKUP  mMachineTypes[] = {\r
   { EFI_IMAGE_MACHINE_IA32, "IA32" },\r
-  { EFI_IMAGE_MACHINE_IA64, "IA64" },\r
-  { EFI_IMAGE_MACHINE_EBC, "EBC" },\r
   { EFI_IMAGE_MACHINE_X64, "X64" },\r
+  { EFI_IMAGE_MACHINE_EBC, "EBC" },\r
   { EFI_IMAGE_MACHINE_ARMT, "ARM" },\r
   { EFI_IMAGE_MACHINE_AARCH64, "AA64" },\r
   { 0, NULL }\r
@@ -177,7 +170,7 @@ Returns:
 \r
   None\r
 \r
---*/  \r
+--*/\r
 ;\r
 \r
 static\r
@@ -190,7 +183,7 @@ ParseCommandLine (
 /*++\r
 \r
 Routine Description:\r
-  \r
+\r
   Given the Argc/Argv program arguments, and a pointer to an options structure,\r
   parse the command-line options and check their validity.\r
 \r
@@ -218,7 +211,7 @@ CheckPE32File (
 /*++\r
 \r
 Routine Description:\r
-  \r
+\r
   Given the Argc/Argv program arguments, and a pointer to an options structure,\r
   parse the command-line options and check their validity.\r
 \r
@@ -233,7 +226,7 @@ Returns:
   STATUS_SUCCESS    success\r
   non-zero          otherwise\r
 \r
---*/  \r
+--*/\r
 ;\r
 \r
 static\r
@@ -248,7 +241,7 @@ ProcessEfiFile (
 /*++\r
 \r
 Routine Description:\r
-  \r
+\r
   Process a PE32 EFI file.\r
 \r
 Arguments:\r
@@ -276,7 +269,7 @@ ProcessBinFile (
 /*++\r
 \r
 Routine Description:\r
-  \r
+\r
   Process a binary input file.\r
 \r
 Arguments:\r
@@ -289,7 +282,7 @@ Returns:
 \r
   0 - successful\r
 \r
---*/  \r
+--*/\r
 ;\r
 \r
 static\r