* [[edk2-platforms][PATCH V2] 01/30] edk2-platforms: Add License-History.txt
2019-05-15 23:09 [[edk2-platforms][PATCH V2] 00/30] Change edk2-platforms/master to BSD+Patent License Michael D Kinney
@ 2019-05-15 23:09 ` Michael D Kinney
2019-05-16 0:36 ` [edk2-devel] " Chiu, Chasel
` (2 more replies)
2019-05-15 23:09 ` [[edk2-platforms][PATCH V2] 02/30] edk2-platforms: Change License.txt from 2-Clause BSD to BSD+Patent Michael D Kinney
` (29 subsequent siblings)
30 siblings, 3 replies; 63+ messages in thread
From: Michael D Kinney @ 2019-05-15 23:09 UTC (permalink / raw)
To: devel
Cc: Leif Lindholm, Ard Biesheuvel, Thad Gillispie, Daocheng Bu,
Isaac W Oram, Maciej Piwko, Chasel Chiu, Michael Kubacki,
Shifei A Lu, Xiaohu Zhou, Ankit Sinha, Sai Chaganty
Add text file that contains the history of license and contributor
agreement changes.
https://bugzilla.tianocore.org/show_bug.cgi?id=1373
This change is based on the following emails:
https://lists.01.org/pipermail/edk2-devel/2019-February/036260.html
https://lists.01.org/pipermail/edk2-devel/2018-October/030385.html
RFCs with detailed process for the license change:
V3: https://lists.01.org/pipermail/edk2-devel/2019-March/038116.html
V2: https://lists.01.org/pipermail/edk2-devel/2019-March/037669.html
V1: https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Thad Gillispie <thad.gillispie@intel.com>
Cc: Daocheng Bu <daocheng.bu@intel.com>
Cc: Isaac W Oram <isaac.w.oram@intel.com>
Cc: Maciej Piwko <maciej.piwko@intel.com>
Cc: Chasel Chiu <chasel.chiu@intel.com>
Cc: Michael Kubacki <michael.a.kubacki@intel.com>
Cc: Shifei A Lu <shifei.a.lu@intel.com>
Cc: Xiaohu Zhou <bowen.zhou@intel.com>
Cc: Ankit Sinha <ankit.sinha@intel.com>
Cc: Sai Chaganty <rangasai.v.chaganty@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
License-History.txt | 542 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 542 insertions(+)
create mode 100644 License-History.txt
diff --git a/License-History.txt b/License-History.txt
new file mode 100644
index 0000000000..8ab3f67b53
--- /dev/null
+++ b/License-History.txt
@@ -0,0 +1,542 @@
+ License-History.txt
+ ===================
+
+This file contains the history of license change and contributor's agreement
+changes.
+
+Unless otherwise noted in a specific file, the EDK2 project is now licensed
+under the terms listed in the License.txt file. Terms under which Contributions
+made prior to the move to the License.txt formulation are shown below. Those
+terms require notice of the terms themselves be preserved and presented with the
+contributions. This file serves that preservation purpose as a matter of
+documenting the history of the project.
+
+Key Dates
+----------
+* August 3, 2017
+
+ Update the TianoCore Contribution Agreement from Version 1.0
+ to Version 1.1 to cover open source documentation associated
+ with the TianoCore project.
+
+ Version 1.0 covers source code files. Version 1.1 is a
+ backwards compatible extension that adds support for document
+ files in both source form and compiled form.
+
+ References:
+ https://opensource.org/licenses/BSD-2-Clause
+ Complete text of TianoCore Contribution Agreement 1.0 included below
+ Complete text of TianoCore Contribution Agreement 1.1 included below
+
+ Proposals (RFCs):
+ https://lists.01.org/pipermail/edk2-devel/2017-March/008654.html
+
+ TianoCore Bugzilla:
+ https://bugzilla.tianocore.org/show_bug.cgi?id=629
+
+* April 9, 2019
+
+ Replace BSD 2-Clause License with BSD + Patent License removing the need for
+ the TianoCore Contribution Agreement.
+
+ References:
+ https://opensource.org/licenses/BSD-2-Clause
+ Complete text of TianoCore Contribution Agreement 1.0 included below
+ Complete text of TianoCore Contribution Agreement 1.1 included below
+ https://opensource.org/licenses/BSDplusPatent
+
+ Proposals (RFCs):
+ https://lists.01.org/pipermail/edk2-devel/2019-February/036260.html
+ https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html
+
+ TianoCore Bugzilla:
+ https://bugzilla.tianocore.org/show_bug.cgi?id=1373
+
+--------------------------------------------------------------------------------
+License.txt: BSD 2-Clause License
+--------------------------------------------------------------------------------
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in
+ the documentation and/or other materials provided with the
+ distribution.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+
+--------------------------------------------------------------------------------
+Contributions.txt: TianoCore Contribution Agreement 1.1
+--------------------------------------------------------------------------------
+ ======================
+ = Code Contributions =
+ ======================
+
+ To make a contribution to a TianoCore project, follow these steps.
+ 1. Create a change description in the format specified below to
+ use in the source control commit log.
+ 2. Your commit message must include your "Signed-off-by" signature,
+ and "Contributed-under" message.
+ 3. Your "Contributed-under" message explicitly states that the
+ contribution is made under the terms of the specified
+ contribution agreement. Your "Contributed-under" message
+ must include the name of contribution agreement and version.
+ For example: Contributed-under: TianoCore Contribution Agreement 1.1
+ The "TianoCore Contribution Agreement" is included below in
+ this document.
+ 4. Submit your code to the TianoCore project using the process
+ that the project documents on its web page. If the process is
+ not documented, then submit the code on development email list
+ for the project.
+ 5. It is preferred that contributions are submitted using the same
+ copyright license as the base project. When that is not possible,
+ then contributions using the following licenses can be accepted:
+ * BSD (2-clause): http://opensource.org/licenses/BSD-2-Clause
+ * BSD (3-clause): http://opensource.org/licenses/BSD-3-Clause
+ * MIT: http://opensource.org/licenses/MIT
+ * Python-2.0: http://opensource.org/licenses/Python-2.0
+ * Zlib: http://opensource.org/licenses/Zlib
+
+ For documentation:
+ * FreeBSD Documentation License
+ https://www.freebsd.org/copyright/freebsd-doc-license.html
+
+ Contributions of code put into the public domain can also be
+ accepted.
+
+ Contributions using other licenses might be accepted, but further
+ review will be required.
+
+ =====================================================
+ = Change Description / Commit Message / Patch Email =
+ =====================================================
+
+ Your change description should use the standard format for a
+ commit message, and must include your "Signed-off-by" signature
+ and the "Contributed-under" message.
+
+ == Sample Change Description / Commit Message =
+
+ === Start of sample patch email message ===
+
+ From: Contributor Name <contributor@example.com>
+ Subject: [Repository/Branch PATCH] Module: Brief-single-line-summary
+
+ Full-commit-message
+
+ Contributed-under: TianoCore Contribution Agreement 1.1
+ Signed-off-by: Contributor Name <contributor@example.com>
+ ---
+
+ An extra message for the patch email which will not be considered part
+ of the commit message can be added here.
+
+ Patch content inline or attached
+
+ === End of sample patch email message ===
+
+ === Notes for sample patch email ===
+
+ * The first line of commit message is taken from the email's subject
+ line following [Repository/Branch PATCH]. The remaining portion of the
+ commit message is the email's content until the '---' line.
+ * git format-patch is one way to create this format
+
+ === Definitions for sample patch email ===
+
+ * "Repository" is the identifier of the repository the patch applies.
+ This identifier should only be provided for repositories other than
+ 'edk2'. For example 'edk2-BuildSpecification' or 'staging'.
+ * "Branch" is the identifier of the branch the patch applies. This
+ identifier should only be provided for branches other than 'edk2/master'.
+ For example 'edk2/UDK2015', 'edk2-BuildSpecification/release/1.27', or
+ 'staging/edk2-test'.
+ * "Module" is a short identifier for the affected code or documentation. For
+ example 'MdePkg', 'MdeModulePkg/UsbBusDxe', 'Introduction', or
+ 'EDK II INF File Format'.
+ * "Brief-single-line-summary" is a short summary of the change.
+ * The entire first line should be less than ~70 characters.
+ * "Full-commit-message" a verbose multiple line comment describing
+ the change. Each line should be less than ~70 characters.
+ * "Contributed-under" explicitly states that the contribution is
+ made under the terms of the contribution agreement. This
+ agreement is included below in this document.
+ * "Signed-off-by" is the contributor's signature identifying them
+ by their real/legal name and their email address.
+
+ ========================================
+ = TianoCore Contribution Agreement 1.1 =
+ ========================================
+
+ INTEL CORPORATION ("INTEL") MAKES AVAILABLE SOFTWARE, DOCUMENTATION
+ ("DOCUMENTATION"), INFORMATION AND/OR OTHER MATERIALS FOR USE IN THE
+ TIANOCORE OPEN SOURCE PROJECT (COLLECTIVELY "CONTENT"). USE OF THE CONTENT
+ IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT BETWEEN YOU AND
+ INTEL AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES
+ INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR
+ USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND
+ CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR
+ REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS
+ AGREEMENT AND THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE
+ AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT
+ USE THE CONTENT.
+
+ Unless otherwise indicated, all Content (except Documentation) made available
+ on the TianoCore site is provided to you under the terms and conditions of the
+ BSD License ("BSD"). A copy of the BSD License is available at
+ http://opensource.org/licenses/bsd-license.php
+ or when applicable, in the associated License.txt file.
+
+ Unless otherwise indicated, all Documentation made available on the
+ TianoCore site is provided to you under the terms and conditions of the
+ FreeBSD Documentation License ("FreeBSD"). A copy of the license is
+ available at https://www.freebsd.org/copyright/freebsd-doc-license.html or,
+ when applicable, in the associated License.txt file.
+
+ Certain other content may be made available under other licenses as
+ indicated in or with such Content (for example, in a License.txt file).
+
+ You accept and agree to the following terms and conditions for Your
+ present and future Contributions submitted to TianoCore site. Except
+ for the license granted to Intel hereunder, You reserve all right,
+ title, and interest in and to Your Contributions.
+
+ == SECTION 1: Definitions ==
+ * "You" or "Contributor" shall mean the copyright owner or legal
+ entity authorized by the copyright owner that is making a
+ Contribution hereunder. All other entities that control, are
+ controlled by, or are under common control with that entity are
+ considered to be a single Contributor. For the purposes of this
+ definition, "control" means (i) the power, direct or indirect, to
+ cause the direction or management of such entity, whether by
+ contract or otherwise, or (ii) ownership of fifty percent (50%)
+ or more of the outstanding shares, or (iii) beneficial ownership
+ of such entity.
+ * "Contribution" shall mean any original work of authorship,
+ including any modifications or additions to an existing work,
+ that is intentionally submitted by You to the TianoCore site for
+ inclusion in, or documentation of, any of the Content. For the
+ purposes of this definition, "submitted" means any form of
+ electronic, verbal, or written communication sent to the
+ TianoCore site or its representatives, including but not limited
+ to communication on electronic mailing lists, source code
+ control systems, and issue tracking systems that are managed by,
+ or on behalf of, the TianoCore site for the purpose of
+ discussing and improving the Content, but excluding
+ communication that is conspicuously marked or otherwise
+ designated in writing by You as "Not a Contribution."
+
+ == SECTION 2: License for Contributions ==
+ * Contributor hereby agrees that redistribution and use of the
+ Contribution in source and binary forms, with or without
+ modification, are permitted provided that the following
+ conditions are met:
+ ** Redistributions of source code must retain the Contributor's
+ copyright notice, this list of conditions and the following
+ disclaimer.
+ ** Redistributions in binary form must reproduce the Contributor's
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+ * Disclaimer. None of the names of Contributor, Intel, or the names
+ of their respective contributors may be used to endorse or
+ promote products derived from this software without specific
+ prior written permission.
+ * Contributor grants a license (with the right to sublicense) under
+ claims of Contributor's patents that Contributor can license that
+ are infringed by the Contribution (as delivered by Contributor) to
+ make, use, distribute, sell, offer for sale, and import the
+ Contribution and derivative works thereof solely to the minimum
+ extent necessary for licensee to exercise the granted copyright
+ license; this patent license applies solely to those portions of
+ the Contribution that are unmodified. No hardware per se is
+ licensed.
+ * EXCEPT AS EXPRESSLY SET FORTH IN SECTION 3 BELOW, THE
+ CONTRIBUTION IS PROVIDED BY THE CONTRIBUTOR "AS IS" AND ANY
+ EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ CONTRIBUTOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THE
+ CONTRIBUTION, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+ DAMAGE.
+
+ == SECTION 3: Representations ==
+ * You represent that You are legally entitled to grant the above
+ license. If your employer(s) has rights to intellectual property
+ that You create that includes Your Contributions, You represent
+ that You have received permission to make Contributions on behalf
+ of that employer, that Your employer has waived such rights for
+ Your Contributions.
+ * You represent that each of Your Contributions is Your original
+ creation (see Section 4 for submissions on behalf of others).
+ You represent that Your Contribution submissions include complete
+ details of any third-party license or other restriction
+ (including, but not limited to, related patents and trademarks)
+ of which You are personally aware and which are associated with
+ any part of Your Contributions.
+
+ == SECTION 4: Third Party Contributions ==
+ * Should You wish to submit work that is not Your original creation,
+ You may submit it to TianoCore site separately from any
+ Contribution, identifying the complete details of its source
+ and of any license or other restriction (including, but not
+ limited to, related patents, trademarks, and license agreements)
+ of which You are personally aware, and conspicuously marking the
+ work as "Submitted on behalf of a third-party: [named here]".
+
+ == SECTION 5: Miscellaneous ==
+ * Applicable Laws. Any claims arising under or relating to this
+ Agreement shall be governed by the internal substantive laws of
+ the State of Delaware or federal courts located in Delaware,
+ without regard to principles of conflict of laws.
+ * Language. This Agreement is in the English language only, which
+ language shall be controlling in all respects, and all versions
+ of this Agreement in any other language shall be for accommodation
+ only and shall not be binding. All communications and notices made
+ or given pursuant to this Agreement, and all documentation and
+ support to be provided, unless otherwise noted, shall be in the
+ English language.
+--------------------------------------------------------------------------------
+
+--------------------------------------------------------------------------------
+Contributions.txt: TianoCore Contribution Agreement 1.0
+--------------------------------------------------------------------------------
+ ======================
+ = Code Contributions =
+ ======================
+
+ To make a contribution to a TianoCore project, follow these steps.
+ 1. Create a change description in the format specified below to
+ use in the source control commit log.
+ 2. Your commit message must include your "Signed-off-by" signature,
+ and "Contributed-under" message.
+ 3. Your "Contributed-under" message explicitly states that the
+ contribution is made under the terms of the specified
+ contribution agreement. Your "Contributed-under" message
+ must include the name of contribution agreement and version.
+ For example: Contributed-under: TianoCore Contribution Agreement 1.0
+ The "TianoCore Contribution Agreement" is included below in
+ this document.
+ 4. Submit your code to the TianoCore project using the process
+ that the project documents on its web page. If the process is
+ not documented, then submit the code on development email list
+ for the project.
+ 5. It is preferred that contributions are submitted using the same
+ copyright license as the base project. When that is not possible,
+ then contributions using the following licenses can be accepted:
+ * BSD (2-clause): http://opensource.org/licenses/BSD-2-Clause
+ * BSD (3-clause): http://opensource.org/licenses/BSD-3-Clause
+ * MIT: http://opensource.org/licenses/MIT
+ * Python-2.0: http://opensource.org/licenses/Python-2.0
+ * Zlib: http://opensource.org/licenses/Zlib
+
+ Contributions of code put into the public domain can also be
+ accepted.
+
+ Contributions using other licenses might be accepted, but further
+ review will be required.
+
+ =====================================================
+ = Change Description / Commit Message / Patch Email =
+ =====================================================
+
+ Your change description should use the standard format for a
+ commit message, and must include your "Signed-off-by" signature
+ and the "Contributed-under" message.
+
+ == Sample Change Description / Commit Message =
+
+ === Start of sample patch email message ===
+
+ From: Contributor Name <contributor@example.com>
+ Subject: [PATCH] CodeModule: Brief-single-line-summary
+
+ Full-commit-message
+
+ Contributed-under: TianoCore Contribution Agreement 1.0
+ Signed-off-by: Contributor Name <contributor@example.com>
+ ---
+
+ An extra message for the patch email which will not be considered part
+ of the commit message can be added here.
+
+ Patch content inline or attached
+
+ === End of sample patch email message ===
+
+ === Notes for sample patch email ===
+
+ * The first line of commit message is taken from the email's subject
+ line following [PATCH]. The remaining portion of the commit message
+ is the email's content until the '---' line.
+ * git format-patch is one way to create this format
+
+ === Definitions for sample patch email ===
+
+ * "CodeModule" is a short idenfier for the affected code. For
+ example MdePkg, or MdeModulePkg UsbBusDxe.
+ * "Brief-single-line-summary" is a short summary of the change.
+ * The entire first line should be less than ~70 characters.
+ * "Full-commit-message" a verbose multiple line comment describing
+ the change. Each line should be less than ~70 characters.
+ * "Contributed-under" explicitely states that the contribution is
+ made under the terms of the contribtion agreement. This
+ agreement is included below in this document.
+ * "Signed-off-by" is the contributor's signature identifying them
+ by their real/legal name and their email address.
+
+ ========================================
+ = TianoCore Contribution Agreement 1.0 =
+ ========================================
+
+ INTEL CORPORATION ("INTEL") MAKES AVAILABLE SOFTWARE, DOCUMENTATION,
+ INFORMATION AND/OR OTHER MATERIALS FOR USE IN THE TIANOCORE OPEN SOURCE
+ PROJECT (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE
+ TERMS AND CONDITIONS OF THIS AGREEMENT BETWEEN YOU AND INTEL AND/OR THE
+ TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR
+ REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE
+ CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS
+ OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
+ BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS
+ AGREEMENT AND THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE
+ AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT
+ USE THE CONTENT.
+
+ Unless otherwise indicated, all Content made available on the TianoCore
+ site is provided to you under the terms and conditions of the BSD
+ License ("BSD"). A copy of the BSD License is available at
+ http://opensource.org/licenses/bsd-license.php
+ or when applicable, in the associated License.txt file.
+
+ Certain other content may be made available under other licenses as
+ indicated in or with such Content. (For example, in a License.txt file.)
+
+ You accept and agree to the following terms and conditions for Your
+ present and future Contributions submitted to TianoCore site. Except
+ for the license granted to Intel hereunder, You reserve all right,
+ title, and interest in and to Your Contributions.
+
+ == SECTION 1: Definitions ==
+ * "You" or "Contributor" shall mean the copyright owner or legal
+ entity authorized by the copyright owner that is making a
+ Contribution hereunder. All other entities that control, are
+ controlled by, or are under common control with that entity are
+ considered to be a single Contributor. For the purposes of this
+ definition, "control" means (i) the power, direct or indirect, to
+ cause the direction or management of such entity, whether by
+ contract or otherwise, or (ii) ownership of fifty percent (50%)
+ or more of the outstanding shares, or (iii) beneficial ownership
+ of such entity.
+ * "Contribution" shall mean any original work of authorship,
+ including any modifications or additions to an existing work,
+ that is intentionally submitted by You to the TinaoCore site for
+ inclusion in, or documentation of, any of the Content. For the
+ purposes of this definition, "submitted" means any form of
+ electronic, verbal, or written communication sent to the
+ TianoCore site or its representatives, including but not limited
+ to communication on electronic mailing lists, source code
+ control systems, and issue tracking systems that are managed by,
+ or on behalf of, the TianoCore site for the purpose of
+ discussing and improving the Content, but excluding
+ communication that is conspicuously marked or otherwise
+ designated in writing by You as "Not a Contribution."
+
+ == SECTION 2: License for Contributions ==
+ * Contributor hereby agrees that redistribution and use of the
+ Contribution in source and binary forms, with or without
+ modification, are permitted provided that the following
+ conditions are met:
+ ** Redistributions of source code must retain the Contributor's
+ copyright notice, this list of conditions and the following
+ disclaimer.
+ ** Redistributions in binary form must reproduce the Contributor's
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+ * Disclaimer. None of the names of Contributor, Intel, or the names
+ of their respective contributors may be used to endorse or
+ promote products derived from this software without specific
+ prior written permission.
+ * Contributor grants a license (with the right to sublicense) under
+ claims of Contributor's patents that Contributor can license that
+ are infringed by the Contribution (as delivered by Contributor) to
+ make, use, distribute, sell, offer for sale, and import the
+ Contribution and derivative works thereof solely to the minimum
+ extent necessary for licensee to exercise the granted copyright
+ license; this patent license applies solely to those portions of
+ the Contribution that are unmodified. No hardware per se is
+ licensed.
+ * EXCEPT AS EXPRESSLY SET FORTH IN SECTION 3 BELOW, THE
+ CONTRIBUTION IS PROVIDED BY THE CONTRIBUTOR "AS IS" AND ANY
+ EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ CONTRIBUTOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THE
+ CONTRIBUTION, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+ DAMAGE.
+
+ == SECTION 3: Representations ==
+ * You represent that You are legally entitled to grant the above
+ license. If your employer(s) has rights to intellectual property
+ that You create that includes Your Contributions, You represent
+ that You have received permission to make Contributions on behalf
+ of that employer, that Your employer has waived such rights for
+ Your Contributions.
+ * You represent that each of Your Contributions is Your original
+ creation (see Section 4 for submissions on behalf of others).
+ You represent that Your Contribution submissions include complete
+ details of any third-party license or other restriction
+ (including, but not limited to, related patents and trademarks)
+ of which You are personally aware and which are associated with
+ any part of Your Contributions.
+
+ == SECTION 4: Third Party Contributions ==
+ * Should You wish to submit work that is not Your original creation,
+ You may submit it to TianoCore site separately from any
+ Contribution, identifying the complete details of its source
+ and of any license or other restriction (including, but not
+ limited to, related patents, trademarks, and license agreements)
+ of which You are personally aware, and conspicuously marking the
+ work as "Submitted on behalf of a third-party: [named here]".
+
+ == SECTION 5: Miscellaneous ==
+ * Applicable Laws. Any claims arising under or relating to this
+ Agreement shall be governed by the internal substantive laws of
+ the State of Delaware or federal courts located in Delaware,
+ without regard to principles of conflict of laws.
+ * Language. This Agreement is in the English language only, which
+ language shall be controlling in all respects, and all versions
+ of this Agreement in any other language shall be for accommodation
+ only and shall not be binding. All communications and notices made
+ or given pursuant to this Agreement, and all documentation and
+ support to be provided, unless otherwise noted, shall be in the
+ English language.
+--------------------------------------------------------------------------------
+
--
2.21.0.windows.1
^ permalink raw reply related [flat|nested] 63+ messages in thread* Re: [edk2-devel] [[edk2-platforms][PATCH V2] 01/30] edk2-platforms: Add License-History.txt
2019-05-15 23:09 ` [[edk2-platforms][PATCH V2] 01/30] edk2-platforms: Add License-History.txt Michael D Kinney
@ 2019-05-16 0:36 ` Chiu, Chasel
2019-05-17 6:39 ` Kubacki, Michael A
2019-05-17 21:01 ` Sinha, Ankit
2 siblings, 0 replies; 63+ messages in thread
From: Chiu, Chasel @ 2019-05-16 0:36 UTC (permalink / raw)
To: devel@edk2.groups.io, Kinney, Michael D
Cc: Leif Lindholm, Ard Biesheuvel, Gillispie, Thad, Bu, Daocheng,
Oram, Isaac W, Piwko, Maciej, Kubacki, Michael A, Lu, Shifei A,
Zhou, Bowen, Sinha, Ankit, Chaganty, Rangasai V
Reviewed-by: Chasel Chiu <chasel.chiu@intel.com>
> -----Original Message-----
> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of
> Michael D Kinney
> Sent: Thursday, May 16, 2019 7:10 AM
> To: devel@edk2.groups.io
> Cc: Leif Lindholm <leif.lindholm@linaro.org>; Ard Biesheuvel
> <ard.biesheuvel@linaro.org>; Gillispie, Thad <thad.gillispie@intel.com>; Bu,
> Daocheng <daocheng.bu@intel.com>; Oram, Isaac W
> <isaac.w.oram@intel.com>; Piwko, Maciej <maciej.piwko@intel.com>; Chiu,
> Chasel <chasel.chiu@intel.com>; Kubacki, Michael A
> <michael.a.kubacki@intel.com>; Lu, Shifei A <shifei.a.lu@intel.com>; Zhou,
> Bowen <bowen.zhou@intel.com>; Sinha, Ankit <ankit.sinha@intel.com>;
> Chaganty, Rangasai V <rangasai.v.chaganty@intel.com>
> Subject: [edk2-devel] [[edk2-platforms][PATCH V2] 01/30] edk2-platforms: Add
> License-History.txt
>
> Add text file that contains the history of license and contributor agreement
> changes.
>
> https://bugzilla.tianocore.org/show_bug.cgi?id=1373
>
> This change is based on the following emails:
>
> https://lists.01.org/pipermail/edk2-devel/2019-February/036260.html
> https://lists.01.org/pipermail/edk2-devel/2018-October/030385.html
>
> RFCs with detailed process for the license change:
>
> V3: https://lists.01.org/pipermail/edk2-devel/2019-March/038116.html
> V2: https://lists.01.org/pipermail/edk2-devel/2019-March/037669.html
> V1: https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html
>
> Cc: Leif Lindholm <leif.lindholm@linaro.org>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Cc: Thad Gillispie <thad.gillispie@intel.com>
> Cc: Daocheng Bu <daocheng.bu@intel.com>
> Cc: Isaac W Oram <isaac.w.oram@intel.com>
> Cc: Maciej Piwko <maciej.piwko@intel.com>
> Cc: Chasel Chiu <chasel.chiu@intel.com>
> Cc: Michael Kubacki <michael.a.kubacki@intel.com>
> Cc: Shifei A Lu <shifei.a.lu@intel.com>
> Cc: Xiaohu Zhou <bowen.zhou@intel.com>
> Cc: Ankit Sinha <ankit.sinha@intel.com>
> Cc: Sai Chaganty <rangasai.v.chaganty@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
> ---
> License-History.txt | 542
> ++++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 542 insertions(+)
> create mode 100644 License-History.txt
>
> diff --git a/License-History.txt b/License-History.txt new file mode 100644 index
> 0000000000..8ab3f67b53
> --- /dev/null
> +++ b/License-History.txt
> @@ -0,0 +1,542 @@
> + License-History.txt
> + ===================
> +
> +This file contains the history of license change and contributor's
> +agreement changes.
> +
> +Unless otherwise noted in a specific file, the EDK2 project is now
> +licensed under the terms listed in the License.txt file. Terms under
> +which Contributions made prior to the move to the License.txt
> +formulation are shown below. Those terms require notice of the terms
> +themselves be preserved and presented with the contributions. This
> +file serves that preservation purpose as a matter of documenting the history of
> the project.
> +
> +Key Dates
> +----------
> +* August 3, 2017
> +
> + Update the TianoCore Contribution Agreement from Version 1.0 to
> + Version 1.1 to cover open source documentation associated with the
> + TianoCore project.
> +
> + Version 1.0 covers source code files. Version 1.1 is a backwards
> + compatible extension that adds support for document files in both
> + source form and compiled form.
> +
> + References:
> + https://opensource.org/licenses/BSD-2-Clause
> + Complete text of TianoCore Contribution Agreement 1.0 included below
> + Complete text of TianoCore Contribution Agreement 1.1 included
> + below
> +
> + Proposals (RFCs):
> + https://lists.01.org/pipermail/edk2-devel/2017-March/008654.html
> +
> + TianoCore Bugzilla:
> + https://bugzilla.tianocore.org/show_bug.cgi?id=629
> +
> +* April 9, 2019
> +
> + Replace BSD 2-Clause License with BSD + Patent License removing the
> + need for the TianoCore Contribution Agreement.
> +
> + References:
> + https://opensource.org/licenses/BSD-2-Clause
> + Complete text of TianoCore Contribution Agreement 1.0 included below
> + Complete text of TianoCore Contribution Agreement 1.1 included below
> + https://opensource.org/licenses/BSDplusPatent
> +
> + Proposals (RFCs):
> + https://lists.01.org/pipermail/edk2-devel/2019-February/036260.html
> + https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html
> +
> + TianoCore Bugzilla:
> + https://bugzilla.tianocore.org/show_bug.cgi?id=1373
> +
> +-----------------------------------------------------------------------
> +---------
> +License.txt: BSD 2-Clause License
> +--------------------------------------------------------------------------------
> + Redistribution and use in source and binary forms, with or without
> + modification, are permitted provided that the following conditions
> + are met:
> +
> + * Redistributions of source code must retain the above copyright
> + notice, this list of conditions and the following disclaimer.
> + * Redistributions in binary form must reproduce the above copyright
> + notice, this list of conditions and the following disclaimer in
> + the documentation and/or other materials provided with the
> + distribution.
> +
> + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
> CONTRIBUTORS
> + "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
> + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
> FITNESS
> + FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
> + COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
> INDIRECT,
> + INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
> (INCLUDING,
> + BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
> SERVICES;
> + LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
> + CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
> STRICT
> + LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
> + ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
> + POSSIBILITY OF SUCH DAMAGE.
> +-----------------------------------------------------------------------
> +---------
> +
> +-----------------------------------------------------------------------
> +---------
> +Contributions.txt: TianoCore Contribution Agreement 1.1
> +--------------------------------------------------------------------------------
> + ======================
> + = Code Contributions =
> + ======================
> +
> + To make a contribution to a TianoCore project, follow these steps.
> + 1. Create a change description in the format specified below to
> + use in the source control commit log.
> + 2. Your commit message must include your "Signed-off-by" signature,
> + and "Contributed-under" message.
> + 3. Your "Contributed-under" message explicitly states that the
> + contribution is made under the terms of the specified
> + contribution agreement. Your "Contributed-under" message
> + must include the name of contribution agreement and version.
> + For example: Contributed-under: TianoCore Contribution Agreement 1.1
> + The "TianoCore Contribution Agreement" is included below in
> + this document.
> + 4. Submit your code to the TianoCore project using the process
> + that the project documents on its web page. If the process is
> + not documented, then submit the code on development email list
> + for the project.
> + 5. It is preferred that contributions are submitted using the same
> + copyright license as the base project. When that is not possible,
> + then contributions using the following licenses can be accepted:
> + * BSD (2-clause): http://opensource.org/licenses/BSD-2-Clause
> + * BSD (3-clause): http://opensource.org/licenses/BSD-3-Clause
> + * MIT: http://opensource.org/licenses/MIT
> + * Python-2.0: http://opensource.org/licenses/Python-2.0
> + * Zlib: http://opensource.org/licenses/Zlib
> +
> + For documentation:
> + * FreeBSD Documentation License
> + https://www.freebsd.org/copyright/freebsd-doc-license.html
> +
> + Contributions of code put into the public domain can also be
> + accepted.
> +
> + Contributions using other licenses might be accepted, but further
> + review will be required.
> +
> + =====================================================
> + = Change Description / Commit Message / Patch Email =
> + =====================================================
> +
> + Your change description should use the standard format for a
> + commit message, and must include your "Signed-off-by" signature
> + and the "Contributed-under" message.
> +
> + == Sample Change Description / Commit Message =
> +
> + === Start of sample patch email message ===
> +
> + From: Contributor Name <contributor@example.com>
> + Subject: [Repository/Branch PATCH] Module:
> + Brief-single-line-summary
> +
> + Full-commit-message
> +
> + Contributed-under: TianoCore Contribution Agreement 1.1
> + Signed-off-by: Contributor Name <contributor@example.com>
> + ---
> +
> + An extra message for the patch email which will not be considered part
> + of the commit message can be added here.
> +
> + Patch content inline or attached
> +
> + === End of sample patch email message ===
> +
> + === Notes for sample patch email ===
> +
> + * The first line of commit message is taken from the email's subject
> + line following [Repository/Branch PATCH]. The remaining portion of the
> + commit message is the email's content until the '---' line.
> + * git format-patch is one way to create this format
> +
> + === Definitions for sample patch email ===
> +
> + * "Repository" is the identifier of the repository the patch applies.
> + This identifier should only be provided for repositories other than
> + 'edk2'. For example 'edk2-BuildSpecification' or 'staging'.
> + * "Branch" is the identifier of the branch the patch applies. This
> + identifier should only be provided for branches other than 'edk2/master'.
> + For example 'edk2/UDK2015', 'edk2-BuildSpecification/release/1.27', or
> + 'staging/edk2-test'.
> + * "Module" is a short identifier for the affected code or documentation. For
> + example 'MdePkg', 'MdeModulePkg/UsbBusDxe', 'Introduction', or
> + 'EDK II INF File Format'.
> + * "Brief-single-line-summary" is a short summary of the change.
> + * The entire first line should be less than ~70 characters.
> + * "Full-commit-message" a verbose multiple line comment describing
> + the change. Each line should be less than ~70 characters.
> + * "Contributed-under" explicitly states that the contribution is
> + made under the terms of the contribution agreement. This
> + agreement is included below in this document.
> + * "Signed-off-by" is the contributor's signature identifying them
> + by their real/legal name and their email address.
> +
> + ========================================
> + = TianoCore Contribution Agreement 1.1 =
> + ========================================
> +
> + INTEL CORPORATION ("INTEL") MAKES AVAILABLE SOFTWARE,
> DOCUMENTATION
> + ("DOCUMENTATION"), INFORMATION AND/OR OTHER MATERIALS FOR USE
> IN THE
> + TIANOCORE OPEN SOURCE PROJECT (COLLECTIVELY "CONTENT"). USE OF
> THE CONTENT
> + IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT
> BETWEEN YOU AND
> + INTEL AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR
> NOTICES
> + INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE
> THAT YOUR
> + USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE
> TERMS AND
> + CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES
> INDICATED OR
> + REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND
> CONDITIONS OF THIS
> + AGREEMENT AND THE TERMS AND CONDITIONS OF ANY APPLICABLE
> LICENSE
> + AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU
> MAY NOT
> + USE THE CONTENT.
> +
> + Unless otherwise indicated, all Content (except Documentation) made
> available
> + on the TianoCore site is provided to you under the terms and conditions of
> the
> + BSD License ("BSD"). A copy of the BSD License is available at
> + http://opensource.org/licenses/bsd-license.php
> + or when applicable, in the associated License.txt file.
> +
> + Unless otherwise indicated, all Documentation made available on the
> + TianoCore site is provided to you under the terms and conditions of the
> + FreeBSD Documentation License ("FreeBSD"). A copy of the license is
> + available at https://www.freebsd.org/copyright/freebsd-doc-license.html
> or,
> + when applicable, in the associated License.txt file.
> +
> + Certain other content may be made available under other licenses as
> + indicated in or with such Content (for example, in a License.txt file).
> +
> + You accept and agree to the following terms and conditions for Your
> + present and future Contributions submitted to TianoCore site. Except
> + for the license granted to Intel hereunder, You reserve all right,
> + title, and interest in and to Your Contributions.
> +
> + == SECTION 1: Definitions ==
> + * "You" or "Contributor" shall mean the copyright owner or legal
> + entity authorized by the copyright owner that is making a
> + Contribution hereunder. All other entities that control, are
> + controlled by, or are under common control with that entity are
> + considered to be a single Contributor. For the purposes of this
> + definition, "control" means (i) the power, direct or indirect, to
> + cause the direction or management of such entity, whether by
> + contract or otherwise, or (ii) ownership of fifty percent (50%)
> + or more of the outstanding shares, or (iii) beneficial ownership
> + of such entity.
> + * "Contribution" shall mean any original work of authorship,
> + including any modifications or additions to an existing work,
> + that is intentionally submitted by You to the TianoCore site for
> + inclusion in, or documentation of, any of the Content. For the
> + purposes of this definition, "submitted" means any form of
> + electronic, verbal, or written communication sent to the
> + TianoCore site or its representatives, including but not limited
> + to communication on electronic mailing lists, source code
> + control systems, and issue tracking systems that are managed by,
> + or on behalf of, the TianoCore site for the purpose of
> + discussing and improving the Content, but excluding
> + communication that is conspicuously marked or otherwise
> + designated in writing by You as "Not a Contribution."
> +
> + == SECTION 2: License for Contributions ==
> + * Contributor hereby agrees that redistribution and use of the
> + Contribution in source and binary forms, with or without
> + modification, are permitted provided that the following
> + conditions are met:
> + ** Redistributions of source code must retain the Contributor's
> + copyright notice, this list of conditions and the following
> + disclaimer.
> + ** Redistributions in binary form must reproduce the Contributor's
> + copyright notice, this list of conditions and the following
> + disclaimer in the documentation and/or other materials provided
> + with the distribution.
> + * Disclaimer. None of the names of Contributor, Intel, or the names
> + of their respective contributors may be used to endorse or
> + promote products derived from this software without specific
> + prior written permission.
> + * Contributor grants a license (with the right to sublicense) under
> + claims of Contributor's patents that Contributor can license that
> + are infringed by the Contribution (as delivered by Contributor) to
> + make, use, distribute, sell, offer for sale, and import the
> + Contribution and derivative works thereof solely to the minimum
> + extent necessary for licensee to exercise the granted copyright
> + license; this patent license applies solely to those portions of
> + the Contribution that are unmodified. No hardware per se is
> + licensed.
> + * EXCEPT AS EXPRESSLY SET FORTH IN SECTION 3 BELOW, THE
> + CONTRIBUTION IS PROVIDED BY THE CONTRIBUTOR "AS IS" AND ANY
> + EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
> + THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
> + PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
> + CONTRIBUTOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
> + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
> + NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
> + LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
> + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
> + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
> + OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THE
> + CONTRIBUTION, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
> + DAMAGE.
> +
> + == SECTION 3: Representations ==
> + * You represent that You are legally entitled to grant the above
> + license. If your employer(s) has rights to intellectual property
> + that You create that includes Your Contributions, You represent
> + that You have received permission to make Contributions on behalf
> + of that employer, that Your employer has waived such rights for
> + Your Contributions.
> + * You represent that each of Your Contributions is Your original
> + creation (see Section 4 for submissions on behalf of others).
> + You represent that Your Contribution submissions include complete
> + details of any third-party license or other restriction
> + (including, but not limited to, related patents and trademarks)
> + of which You are personally aware and which are associated with
> + any part of Your Contributions.
> +
> + == SECTION 4: Third Party Contributions ==
> + * Should You wish to submit work that is not Your original creation,
> + You may submit it to TianoCore site separately from any
> + Contribution, identifying the complete details of its source
> + and of any license or other restriction (including, but not
> + limited to, related patents, trademarks, and license agreements)
> + of which You are personally aware, and conspicuously marking the
> + work as "Submitted on behalf of a third-party: [named here]".
> +
> + == SECTION 5: Miscellaneous ==
> + * Applicable Laws. Any claims arising under or relating to this
> + Agreement shall be governed by the internal substantive laws of
> + the State of Delaware or federal courts located in Delaware,
> + without regard to principles of conflict of laws.
> + * Language. This Agreement is in the English language only, which
> + language shall be controlling in all respects, and all versions
> + of this Agreement in any other language shall be for accommodation
> + only and shall not be binding. All communications and notices made
> + or given pursuant to this Agreement, and all documentation and
> + support to be provided, unless otherwise noted, shall be in the
> + English language.
> +-----------------------------------------------------------------------
> +---------
> +
> +-----------------------------------------------------------------------
> +---------
> +Contributions.txt: TianoCore Contribution Agreement 1.0
> +--------------------------------------------------------------------------------
> + ======================
> + = Code Contributions =
> + ======================
> +
> + To make a contribution to a TianoCore project, follow these steps.
> + 1. Create a change description in the format specified below to
> + use in the source control commit log.
> + 2. Your commit message must include your "Signed-off-by" signature,
> + and "Contributed-under" message.
> + 3. Your "Contributed-under" message explicitly states that the
> + contribution is made under the terms of the specified
> + contribution agreement. Your "Contributed-under" message
> + must include the name of contribution agreement and version.
> + For example: Contributed-under: TianoCore Contribution Agreement 1.0
> + The "TianoCore Contribution Agreement" is included below in
> + this document.
> + 4. Submit your code to the TianoCore project using the process
> + that the project documents on its web page. If the process is
> + not documented, then submit the code on development email list
> + for the project.
> + 5. It is preferred that contributions are submitted using the same
> + copyright license as the base project. When that is not possible,
> + then contributions using the following licenses can be accepted:
> + * BSD (2-clause): http://opensource.org/licenses/BSD-2-Clause
> + * BSD (3-clause): http://opensource.org/licenses/BSD-3-Clause
> + * MIT: http://opensource.org/licenses/MIT
> + * Python-2.0: http://opensource.org/licenses/Python-2.0
> + * Zlib: http://opensource.org/licenses/Zlib
> +
> + Contributions of code put into the public domain can also be
> + accepted.
> +
> + Contributions using other licenses might be accepted, but further
> + review will be required.
> +
> + =====================================================
> + = Change Description / Commit Message / Patch Email =
> + =====================================================
> +
> + Your change description should use the standard format for a
> + commit message, and must include your "Signed-off-by" signature
> + and the "Contributed-under" message.
> +
> + == Sample Change Description / Commit Message =
> +
> + === Start of sample patch email message ===
> +
> + From: Contributor Name <contributor@example.com>
> + Subject: [PATCH] CodeModule: Brief-single-line-summary
> +
> + Full-commit-message
> +
> + Contributed-under: TianoCore Contribution Agreement 1.0
> + Signed-off-by: Contributor Name <contributor@example.com>
> + ---
> +
> + An extra message for the patch email which will not be considered part
> + of the commit message can be added here.
> +
> + Patch content inline or attached
> +
> + === End of sample patch email message ===
> +
> + === Notes for sample patch email ===
> +
> + * The first line of commit message is taken from the email's subject
> + line following [PATCH]. The remaining portion of the commit message
> + is the email's content until the '---' line.
> + * git format-patch is one way to create this format
> +
> + === Definitions for sample patch email ===
> +
> + * "CodeModule" is a short idenfier for the affected code. For
> + example MdePkg, or MdeModulePkg UsbBusDxe.
> + * "Brief-single-line-summary" is a short summary of the change.
> + * The entire first line should be less than ~70 characters.
> + * "Full-commit-message" a verbose multiple line comment describing
> + the change. Each line should be less than ~70 characters.
> + * "Contributed-under" explicitely states that the contribution is
> + made under the terms of the contribtion agreement. This
> + agreement is included below in this document.
> + * "Signed-off-by" is the contributor's signature identifying them
> + by their real/legal name and their email address.
> +
> + ========================================
> + = TianoCore Contribution Agreement 1.0 =
> + ========================================
> +
> + INTEL CORPORATION ("INTEL") MAKES AVAILABLE SOFTWARE,
> DOCUMENTATION,
> + INFORMATION AND/OR OTHER MATERIALS FOR USE IN THE TIANOCORE
> OPEN SOURCE
> + PROJECT (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED
> BY THE
> + TERMS AND CONDITIONS OF THIS AGREEMENT BETWEEN YOU AND INTEL
> AND/OR THE
> + TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES
> INDICATED OR
> + REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE
> OF THE
> + CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND
> CONDITIONS
> + OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR
> REFERENCED
> + BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS
> + AGREEMENT AND THE TERMS AND CONDITIONS OF ANY APPLICABLE
> LICENSE
> + AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU
> MAY NOT
> + USE THE CONTENT.
> +
> + Unless otherwise indicated, all Content made available on the TianoCore
> + site is provided to you under the terms and conditions of the BSD
> + License ("BSD"). A copy of the BSD License is available at
> + http://opensource.org/licenses/bsd-license.php
> + or when applicable, in the associated License.txt file.
> +
> + Certain other content may be made available under other licenses as
> + indicated in or with such Content. (For example, in a License.txt
> + file.)
> +
> + You accept and agree to the following terms and conditions for Your
> + present and future Contributions submitted to TianoCore site. Except
> + for the license granted to Intel hereunder, You reserve all right,
> + title, and interest in and to Your Contributions.
> +
> + == SECTION 1: Definitions ==
> + * "You" or "Contributor" shall mean the copyright owner or legal
> + entity authorized by the copyright owner that is making a
> + Contribution hereunder. All other entities that control, are
> + controlled by, or are under common control with that entity are
> + considered to be a single Contributor. For the purposes of this
> + definition, "control" means (i) the power, direct or indirect, to
> + cause the direction or management of such entity, whether by
> + contract or otherwise, or (ii) ownership of fifty percent (50%)
> + or more of the outstanding shares, or (iii) beneficial ownership
> + of such entity.
> + * "Contribution" shall mean any original work of authorship,
> + including any modifications or additions to an existing work,
> + that is intentionally submitted by You to the TinaoCore site for
> + inclusion in, or documentation of, any of the Content. For the
> + purposes of this definition, "submitted" means any form of
> + electronic, verbal, or written communication sent to the
> + TianoCore site or its representatives, including but not limited
> + to communication on electronic mailing lists, source code
> + control systems, and issue tracking systems that are managed by,
> + or on behalf of, the TianoCore site for the purpose of
> + discussing and improving the Content, but excluding
> + communication that is conspicuously marked or otherwise
> + designated in writing by You as "Not a Contribution."
> +
> + == SECTION 2: License for Contributions ==
> + * Contributor hereby agrees that redistribution and use of the
> + Contribution in source and binary forms, with or without
> + modification, are permitted provided that the following
> + conditions are met:
> + ** Redistributions of source code must retain the Contributor's
> + copyright notice, this list of conditions and the following
> + disclaimer.
> + ** Redistributions in binary form must reproduce the Contributor's
> + copyright notice, this list of conditions and the following
> + disclaimer in the documentation and/or other materials provided
> + with the distribution.
> + * Disclaimer. None of the names of Contributor, Intel, or the names
> + of their respective contributors may be used to endorse or
> + promote products derived from this software without specific
> + prior written permission.
> + * Contributor grants a license (with the right to sublicense) under
> + claims of Contributor's patents that Contributor can license that
> + are infringed by the Contribution (as delivered by Contributor) to
> + make, use, distribute, sell, offer for sale, and import the
> + Contribution and derivative works thereof solely to the minimum
> + extent necessary for licensee to exercise the granted copyright
> + license; this patent license applies solely to those portions of
> + the Contribution that are unmodified. No hardware per se is
> + licensed.
> + * EXCEPT AS EXPRESSLY SET FORTH IN SECTION 3 BELOW, THE
> + CONTRIBUTION IS PROVIDED BY THE CONTRIBUTOR "AS IS" AND ANY
> + EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
> + THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
> + PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
> + CONTRIBUTOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
> + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
> + NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
> + LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
> + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
> + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
> + OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THE
> + CONTRIBUTION, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
> + DAMAGE.
> +
> + == SECTION 3: Representations ==
> + * You represent that You are legally entitled to grant the above
> + license. If your employer(s) has rights to intellectual property
> + that You create that includes Your Contributions, You represent
> + that You have received permission to make Contributions on behalf
> + of that employer, that Your employer has waived such rights for
> + Your Contributions.
> + * You represent that each of Your Contributions is Your original
> + creation (see Section 4 for submissions on behalf of others).
> + You represent that Your Contribution submissions include complete
> + details of any third-party license or other restriction
> + (including, but not limited to, related patents and trademarks)
> + of which You are personally aware and which are associated with
> + any part of Your Contributions.
> +
> + == SECTION 4: Third Party Contributions ==
> + * Should You wish to submit work that is not Your original creation,
> + You may submit it to TianoCore site separately from any
> + Contribution, identifying the complete details of its source
> + and of any license or other restriction (including, but not
> + limited to, related patents, trademarks, and license agreements)
> + of which You are personally aware, and conspicuously marking the
> + work as "Submitted on behalf of a third-party: [named here]".
> +
> + == SECTION 5: Miscellaneous ==
> + * Applicable Laws. Any claims arising under or relating to this
> + Agreement shall be governed by the internal substantive laws of
> + the State of Delaware or federal courts located in Delaware,
> + without regard to principles of conflict of laws.
> + * Language. This Agreement is in the English language only, which
> + language shall be controlling in all respects, and all versions
> + of this Agreement in any other language shall be for accommodation
> + only and shall not be binding. All communications and notices made
> + or given pursuant to this Agreement, and all documentation and
> + support to be provided, unless otherwise noted, shall be in the
> + English language.
> +-----------------------------------------------------------------------
> +---------
> +
> --
> 2.21.0.windows.1
>
>
>
^ permalink raw reply [flat|nested] 63+ messages in thread* Re: [edk2-devel] [[edk2-platforms][PATCH V2] 01/30] edk2-platforms: Add License-History.txt
2019-05-15 23:09 ` [[edk2-platforms][PATCH V2] 01/30] edk2-platforms: Add License-History.txt Michael D Kinney
2019-05-16 0:36 ` [edk2-devel] " Chiu, Chasel
@ 2019-05-17 6:39 ` Kubacki, Michael A
2019-05-17 21:01 ` Sinha, Ankit
2 siblings, 0 replies; 63+ messages in thread
From: Kubacki, Michael A @ 2019-05-17 6:39 UTC (permalink / raw)
To: devel@edk2.groups.io, Kinney, Michael D
Cc: Leif Lindholm, Ard Biesheuvel, Gillispie, Thad, Bu, Daocheng,
Oram, Isaac W, Piwko, Maciej, Chiu, Chasel, Lu, Shifei A,
Zhou, Bowen, Sinha, Ankit, Chaganty, Rangasai V
Reviewed-by: Michael Kubacki <michael.a.kubacki@intel.com>
> -----Original Message-----
> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of
> Michael D Kinney
> Sent: Wednesday, May 15, 2019 4:10 PM
> To: devel@edk2.groups.io
> Cc: Leif Lindholm <leif.lindholm@linaro.org>; Ard Biesheuvel
> <ard.biesheuvel@linaro.org>; Gillispie, Thad <thad.gillispie@intel.com>; Bu,
> Daocheng <daocheng.bu@intel.com>; Oram, Isaac W
> <isaac.w.oram@intel.com>; Piwko, Maciej <maciej.piwko@intel.com>; Chiu,
> Chasel <chasel.chiu@intel.com>; Kubacki, Michael A
> <michael.a.kubacki@intel.com>; Lu, Shifei A <shifei.a.lu@intel.com>; Zhou,
> Bowen <bowen.zhou@intel.com>; Sinha, Ankit <ankit.sinha@intel.com>;
> Chaganty, Rangasai V <rangasai.v.chaganty@intel.com>
> Subject: [edk2-devel] [[edk2-platforms][PATCH V2] 01/30] edk2-platforms:
> Add License-History.txt
>
> Add text file that contains the history of license and contributor agreement
> changes.
>
> https://bugzilla.tianocore.org/show_bug.cgi?id=1373
>
> This change is based on the following emails:
>
> https://lists.01.org/pipermail/edk2-devel/2019-February/036260.html
> https://lists.01.org/pipermail/edk2-devel/2018-October/030385.html
>
> RFCs with detailed process for the license change:
>
> V3: https://lists.01.org/pipermail/edk2-devel/2019-March/038116.html
> V2: https://lists.01.org/pipermail/edk2-devel/2019-March/037669.html
> V1: https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html
>
> Cc: Leif Lindholm <leif.lindholm@linaro.org>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Cc: Thad Gillispie <thad.gillispie@intel.com>
> Cc: Daocheng Bu <daocheng.bu@intel.com>
> Cc: Isaac W Oram <isaac.w.oram@intel.com>
> Cc: Maciej Piwko <maciej.piwko@intel.com>
> Cc: Chasel Chiu <chasel.chiu@intel.com>
> Cc: Michael Kubacki <michael.a.kubacki@intel.com>
> Cc: Shifei A Lu <shifei.a.lu@intel.com>
> Cc: Xiaohu Zhou <bowen.zhou@intel.com>
> Cc: Ankit Sinha <ankit.sinha@intel.com>
> Cc: Sai Chaganty <rangasai.v.chaganty@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
> ---
> License-History.txt | 542
> ++++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 542 insertions(+)
> create mode 100644 License-History.txt
>
> diff --git a/License-History.txt b/License-History.txt new file mode 100644
> index 0000000000..8ab3f67b53
> --- /dev/null
> +++ b/License-History.txt
> @@ -0,0 +1,542 @@
> + License-History.txt
> + ===================
> +
> +This file contains the history of license change and contributor's
> +agreement changes.
> +
> +Unless otherwise noted in a specific file, the EDK2 project is now
> +licensed under the terms listed in the License.txt file. Terms under
> +which Contributions made prior to the move to the License.txt
> +formulation are shown below. Those terms require notice of the terms
> +themselves be preserved and presented with the contributions. This
> +file serves that preservation purpose as a matter of documenting the
> history of the project.
> +
> +Key Dates
> +----------
> +* August 3, 2017
> +
> + Update the TianoCore Contribution Agreement from Version 1.0 to
> + Version 1.1 to cover open source documentation associated with the
> + TianoCore project.
> +
> + Version 1.0 covers source code files. Version 1.1 is a backwards
> + compatible extension that adds support for document files in both
> + source form and compiled form.
> +
> + References:
> + https://opensource.org/licenses/BSD-2-Clause
> + Complete text of TianoCore Contribution Agreement 1.0 included below
> + Complete text of TianoCore Contribution Agreement 1.1 included
> + below
> +
> + Proposals (RFCs):
> + https://lists.01.org/pipermail/edk2-devel/2017-March/008654.html
> +
> + TianoCore Bugzilla:
> + https://bugzilla.tianocore.org/show_bug.cgi?id=629
> +
> +* April 9, 2019
> +
> + Replace BSD 2-Clause License with BSD + Patent License removing the
> + need for the TianoCore Contribution Agreement.
> +
> + References:
> + https://opensource.org/licenses/BSD-2-Clause
> + Complete text of TianoCore Contribution Agreement 1.0 included below
> + Complete text of TianoCore Contribution Agreement 1.1 included below
> + https://opensource.org/licenses/BSDplusPatent
> +
> + Proposals (RFCs):
> + https://lists.01.org/pipermail/edk2-devel/2019-February/036260.html
> + https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html
> +
> + TianoCore Bugzilla:
> + https://bugzilla.tianocore.org/show_bug.cgi?id=1373
> +
> +-----------------------------------------------------------------------
> +---------
> +License.txt: BSD 2-Clause License
> +--------------------------------------------------------------------------------
> + Redistribution and use in source and binary forms, with or without
> + modification, are permitted provided that the following conditions
> + are met:
> +
> + * Redistributions of source code must retain the above copyright
> + notice, this list of conditions and the following disclaimer.
> + * Redistributions in binary form must reproduce the above copyright
> + notice, this list of conditions and the following disclaimer in
> + the documentation and/or other materials provided with the
> + distribution.
> +
> + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
> CONTRIBUTORS
> + "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT
> NOT
> + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
> FITNESS
> + FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
> + COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
> INDIRECT,
> + INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
> (INCLUDING,
> + BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
> SERVICES;
> + LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
> HOWEVER
> + CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
> STRICT
> + LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
> IN
> + ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
> + POSSIBILITY OF SUCH DAMAGE.
> +-----------------------------------------------------------------------
> +---------
> +
> +-----------------------------------------------------------------------
> +---------
> +Contributions.txt: TianoCore Contribution Agreement 1.1
> +--------------------------------------------------------------------------------
> + ======================
> + = Code Contributions =
> + ======================
> +
> + To make a contribution to a TianoCore project, follow these steps.
> + 1. Create a change description in the format specified below to
> + use in the source control commit log.
> + 2. Your commit message must include your "Signed-off-by" signature,
> + and "Contributed-under" message.
> + 3. Your "Contributed-under" message explicitly states that the
> + contribution is made under the terms of the specified
> + contribution agreement. Your "Contributed-under" message
> + must include the name of contribution agreement and version.
> + For example: Contributed-under: TianoCore Contribution Agreement
> 1.1
> + The "TianoCore Contribution Agreement" is included below in
> + this document.
> + 4. Submit your code to the TianoCore project using the process
> + that the project documents on its web page. If the process is
> + not documented, then submit the code on development email list
> + for the project.
> + 5. It is preferred that contributions are submitted using the same
> + copyright license as the base project. When that is not possible,
> + then contributions using the following licenses can be accepted:
> + * BSD (2-clause): http://opensource.org/licenses/BSD-2-Clause
> + * BSD (3-clause): http://opensource.org/licenses/BSD-3-Clause
> + * MIT: http://opensource.org/licenses/MIT
> + * Python-2.0: http://opensource.org/licenses/Python-2.0
> + * Zlib: http://opensource.org/licenses/Zlib
> +
> + For documentation:
> + * FreeBSD Documentation License
> + https://www.freebsd.org/copyright/freebsd-doc-license.html
> +
> + Contributions of code put into the public domain can also be
> + accepted.
> +
> + Contributions using other licenses might be accepted, but further
> + review will be required.
> +
> + =====================================================
> + = Change Description / Commit Message / Patch Email =
> + =====================================================
> +
> + Your change description should use the standard format for a
> + commit message, and must include your "Signed-off-by" signature
> + and the "Contributed-under" message.
> +
> + == Sample Change Description / Commit Message =
> +
> + === Start of sample patch email message ===
> +
> + From: Contributor Name <contributor@example.com>
> + Subject: [Repository/Branch PATCH] Module:
> + Brief-single-line-summary
> +
> + Full-commit-message
> +
> + Contributed-under: TianoCore Contribution Agreement 1.1
> + Signed-off-by: Contributor Name <contributor@example.com>
> + ---
> +
> + An extra message for the patch email which will not be considered part
> + of the commit message can be added here.
> +
> + Patch content inline or attached
> +
> + === End of sample patch email message ===
> +
> + === Notes for sample patch email ===
> +
> + * The first line of commit message is taken from the email's subject
> + line following [Repository/Branch PATCH]. The remaining portion of the
> + commit message is the email's content until the '---' line.
> + * git format-patch is one way to create this format
> +
> + === Definitions for sample patch email ===
> +
> + * "Repository" is the identifier of the repository the patch applies.
> + This identifier should only be provided for repositories other than
> + 'edk2'. For example 'edk2-BuildSpecification' or 'staging'.
> + * "Branch" is the identifier of the branch the patch applies. This
> + identifier should only be provided for branches other than 'edk2/master'.
> + For example 'edk2/UDK2015', 'edk2-BuildSpecification/release/1.27', or
> + 'staging/edk2-test'.
> + * "Module" is a short identifier for the affected code or documentation.
> For
> + example 'MdePkg', 'MdeModulePkg/UsbBusDxe', 'Introduction', or
> + 'EDK II INF File Format'.
> + * "Brief-single-line-summary" is a short summary of the change.
> + * The entire first line should be less than ~70 characters.
> + * "Full-commit-message" a verbose multiple line comment describing
> + the change. Each line should be less than ~70 characters.
> + * "Contributed-under" explicitly states that the contribution is
> + made under the terms of the contribution agreement. This
> + agreement is included below in this document.
> + * "Signed-off-by" is the contributor's signature identifying them
> + by their real/legal name and their email address.
> +
> + ========================================
> + = TianoCore Contribution Agreement 1.1 =
> + ========================================
> +
> + INTEL CORPORATION ("INTEL") MAKES AVAILABLE SOFTWARE,
> DOCUMENTATION
> + ("DOCUMENTATION"), INFORMATION AND/OR OTHER MATERIALS FOR
> USE IN THE
> + TIANOCORE OPEN SOURCE PROJECT (COLLECTIVELY "CONTENT"). USE
> OF THE CONTENT
> + IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT
> BETWEEN YOU AND
> + INTEL AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS
> OR NOTICES
> + INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU
> AGREE THAT YOUR
> + USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE
> TERMS AND
> + CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES
> INDICATED OR
> + REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND
> CONDITIONS OF THIS
> + AGREEMENT AND THE TERMS AND CONDITIONS OF ANY APPLICABLE
> LICENSE
> + AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN
> YOU MAY NOT
> + USE THE CONTENT.
> +
> + Unless otherwise indicated, all Content (except Documentation) made
> available
> + on the TianoCore site is provided to you under the terms and conditions
> of the
> + BSD License ("BSD"). A copy of the BSD License is available at
> + http://opensource.org/licenses/bsd-license.php
> + or when applicable, in the associated License.txt file.
> +
> + Unless otherwise indicated, all Documentation made available on the
> + TianoCore site is provided to you under the terms and conditions of the
> + FreeBSD Documentation License ("FreeBSD"). A copy of the license is
> + available at https://www.freebsd.org/copyright/freebsd-doc-license.html
> or,
> + when applicable, in the associated License.txt file.
> +
> + Certain other content may be made available under other licenses as
> + indicated in or with such Content (for example, in a License.txt file).
> +
> + You accept and agree to the following terms and conditions for Your
> + present and future Contributions submitted to TianoCore site. Except
> + for the license granted to Intel hereunder, You reserve all right,
> + title, and interest in and to Your Contributions.
> +
> + == SECTION 1: Definitions ==
> + * "You" or "Contributor" shall mean the copyright owner or legal
> + entity authorized by the copyright owner that is making a
> + Contribution hereunder. All other entities that control, are
> + controlled by, or are under common control with that entity are
> + considered to be a single Contributor. For the purposes of this
> + definition, "control" means (i) the power, direct or indirect, to
> + cause the direction or management of such entity, whether by
> + contract or otherwise, or (ii) ownership of fifty percent (50%)
> + or more of the outstanding shares, or (iii) beneficial ownership
> + of such entity.
> + * "Contribution" shall mean any original work of authorship,
> + including any modifications or additions to an existing work,
> + that is intentionally submitted by You to the TianoCore site for
> + inclusion in, or documentation of, any of the Content. For the
> + purposes of this definition, "submitted" means any form of
> + electronic, verbal, or written communication sent to the
> + TianoCore site or its representatives, including but not limited
> + to communication on electronic mailing lists, source code
> + control systems, and issue tracking systems that are managed by,
> + or on behalf of, the TianoCore site for the purpose of
> + discussing and improving the Content, but excluding
> + communication that is conspicuously marked or otherwise
> + designated in writing by You as "Not a Contribution."
> +
> + == SECTION 2: License for Contributions ==
> + * Contributor hereby agrees that redistribution and use of the
> + Contribution in source and binary forms, with or without
> + modification, are permitted provided that the following
> + conditions are met:
> + ** Redistributions of source code must retain the Contributor's
> + copyright notice, this list of conditions and the following
> + disclaimer.
> + ** Redistributions in binary form must reproduce the Contributor's
> + copyright notice, this list of conditions and the following
> + disclaimer in the documentation and/or other materials provided
> + with the distribution.
> + * Disclaimer. None of the names of Contributor, Intel, or the names
> + of their respective contributors may be used to endorse or
> + promote products derived from this software without specific
> + prior written permission.
> + * Contributor grants a license (with the right to sublicense) under
> + claims of Contributor's patents that Contributor can license that
> + are infringed by the Contribution (as delivered by Contributor) to
> + make, use, distribute, sell, offer for sale, and import the
> + Contribution and derivative works thereof solely to the minimum
> + extent necessary for licensee to exercise the granted copyright
> + license; this patent license applies solely to those portions of
> + the Contribution that are unmodified. No hardware per se is
> + licensed.
> + * EXCEPT AS EXPRESSLY SET FORTH IN SECTION 3 BELOW, THE
> + CONTRIBUTION IS PROVIDED BY THE CONTRIBUTOR "AS IS" AND ANY
> + EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
> + THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
> + PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
> + CONTRIBUTOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
> + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
> BUT
> + NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
> SERVICES;
> + LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
> + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
> + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
> + OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THE
> + CONTRIBUTION, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
> + DAMAGE.
> +
> + == SECTION 3: Representations ==
> + * You represent that You are legally entitled to grant the above
> + license. If your employer(s) has rights to intellectual property
> + that You create that includes Your Contributions, You represent
> + that You have received permission to make Contributions on behalf
> + of that employer, that Your employer has waived such rights for
> + Your Contributions.
> + * You represent that each of Your Contributions is Your original
> + creation (see Section 4 for submissions on behalf of others).
> + You represent that Your Contribution submissions include complete
> + details of any third-party license or other restriction
> + (including, but not limited to, related patents and trademarks)
> + of which You are personally aware and which are associated with
> + any part of Your Contributions.
> +
> + == SECTION 4: Third Party Contributions ==
> + * Should You wish to submit work that is not Your original creation,
> + You may submit it to TianoCore site separately from any
> + Contribution, identifying the complete details of its source
> + and of any license or other restriction (including, but not
> + limited to, related patents, trademarks, and license agreements)
> + of which You are personally aware, and conspicuously marking the
> + work as "Submitted on behalf of a third-party: [named here]".
> +
> + == SECTION 5: Miscellaneous ==
> + * Applicable Laws. Any claims arising under or relating to this
> + Agreement shall be governed by the internal substantive laws of
> + the State of Delaware or federal courts located in Delaware,
> + without regard to principles of conflict of laws.
> + * Language. This Agreement is in the English language only, which
> + language shall be controlling in all respects, and all versions
> + of this Agreement in any other language shall be for accommodation
> + only and shall not be binding. All communications and notices made
> + or given pursuant to this Agreement, and all documentation and
> + support to be provided, unless otherwise noted, shall be in the
> + English language.
> +-----------------------------------------------------------------------
> +---------
> +
> +-----------------------------------------------------------------------
> +---------
> +Contributions.txt: TianoCore Contribution Agreement 1.0
> +--------------------------------------------------------------------------------
> + ======================
> + = Code Contributions =
> + ======================
> +
> + To make a contribution to a TianoCore project, follow these steps.
> + 1. Create a change description in the format specified below to
> + use in the source control commit log.
> + 2. Your commit message must include your "Signed-off-by" signature,
> + and "Contributed-under" message.
> + 3. Your "Contributed-under" message explicitly states that the
> + contribution is made under the terms of the specified
> + contribution agreement. Your "Contributed-under" message
> + must include the name of contribution agreement and version.
> + For example: Contributed-under: TianoCore Contribution Agreement
> 1.0
> + The "TianoCore Contribution Agreement" is included below in
> + this document.
> + 4. Submit your code to the TianoCore project using the process
> + that the project documents on its web page. If the process is
> + not documented, then submit the code on development email list
> + for the project.
> + 5. It is preferred that contributions are submitted using the same
> + copyright license as the base project. When that is not possible,
> + then contributions using the following licenses can be accepted:
> + * BSD (2-clause): http://opensource.org/licenses/BSD-2-Clause
> + * BSD (3-clause): http://opensource.org/licenses/BSD-3-Clause
> + * MIT: http://opensource.org/licenses/MIT
> + * Python-2.0: http://opensource.org/licenses/Python-2.0
> + * Zlib: http://opensource.org/licenses/Zlib
> +
> + Contributions of code put into the public domain can also be
> + accepted.
> +
> + Contributions using other licenses might be accepted, but further
> + review will be required.
> +
> + =====================================================
> + = Change Description / Commit Message / Patch Email =
> + =====================================================
> +
> + Your change description should use the standard format for a
> + commit message, and must include your "Signed-off-by" signature
> + and the "Contributed-under" message.
> +
> + == Sample Change Description / Commit Message =
> +
> + === Start of sample patch email message ===
> +
> + From: Contributor Name <contributor@example.com>
> + Subject: [PATCH] CodeModule: Brief-single-line-summary
> +
> + Full-commit-message
> +
> + Contributed-under: TianoCore Contribution Agreement 1.0
> + Signed-off-by: Contributor Name <contributor@example.com>
> + ---
> +
> + An extra message for the patch email which will not be considered part
> + of the commit message can be added here.
> +
> + Patch content inline or attached
> +
> + === End of sample patch email message ===
> +
> + === Notes for sample patch email ===
> +
> + * The first line of commit message is taken from the email's subject
> + line following [PATCH]. The remaining portion of the commit message
> + is the email's content until the '---' line.
> + * git format-patch is one way to create this format
> +
> + === Definitions for sample patch email ===
> +
> + * "CodeModule" is a short idenfier for the affected code. For
> + example MdePkg, or MdeModulePkg UsbBusDxe.
> + * "Brief-single-line-summary" is a short summary of the change.
> + * The entire first line should be less than ~70 characters.
> + * "Full-commit-message" a verbose multiple line comment describing
> + the change. Each line should be less than ~70 characters.
> + * "Contributed-under" explicitely states that the contribution is
> + made under the terms of the contribtion agreement. This
> + agreement is included below in this document.
> + * "Signed-off-by" is the contributor's signature identifying them
> + by their real/legal name and their email address.
> +
> + ========================================
> + = TianoCore Contribution Agreement 1.0 =
> + ========================================
> +
> + INTEL CORPORATION ("INTEL") MAKES AVAILABLE SOFTWARE,
> DOCUMENTATION,
> + INFORMATION AND/OR OTHER MATERIALS FOR USE IN THE TIANOCORE
> OPEN SOURCE
> + PROJECT (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS
> GOVERNED BY THE
> + TERMS AND CONDITIONS OF THIS AGREEMENT BETWEEN YOU AND
> INTEL AND/OR THE
> + TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES
> INDICATED OR
> + REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR
> USE OF THE
> + CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND
> CONDITIONS
> + OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR
> REFERENCED
> + BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF
> THIS
> + AGREEMENT AND THE TERMS AND CONDITIONS OF ANY APPLICABLE
> LICENSE
> + AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN
> YOU MAY NOT
> + USE THE CONTENT.
> +
> + Unless otherwise indicated, all Content made available on the TianoCore
> + site is provided to you under the terms and conditions of the BSD
> + License ("BSD"). A copy of the BSD License is available at
> + http://opensource.org/licenses/bsd-license.php
> + or when applicable, in the associated License.txt file.
> +
> + Certain other content may be made available under other licenses as
> + indicated in or with such Content. (For example, in a License.txt
> + file.)
> +
> + You accept and agree to the following terms and conditions for Your
> + present and future Contributions submitted to TianoCore site. Except
> + for the license granted to Intel hereunder, You reserve all right,
> + title, and interest in and to Your Contributions.
> +
> + == SECTION 1: Definitions ==
> + * "You" or "Contributor" shall mean the copyright owner or legal
> + entity authorized by the copyright owner that is making a
> + Contribution hereunder. All other entities that control, are
> + controlled by, or are under common control with that entity are
> + considered to be a single Contributor. For the purposes of this
> + definition, "control" means (i) the power, direct or indirect, to
> + cause the direction or management of such entity, whether by
> + contract or otherwise, or (ii) ownership of fifty percent (50%)
> + or more of the outstanding shares, or (iii) beneficial ownership
> + of such entity.
> + * "Contribution" shall mean any original work of authorship,
> + including any modifications or additions to an existing work,
> + that is intentionally submitted by You to the TinaoCore site for
> + inclusion in, or documentation of, any of the Content. For the
> + purposes of this definition, "submitted" means any form of
> + electronic, verbal, or written communication sent to the
> + TianoCore site or its representatives, including but not limited
> + to communication on electronic mailing lists, source code
> + control systems, and issue tracking systems that are managed by,
> + or on behalf of, the TianoCore site for the purpose of
> + discussing and improving the Content, but excluding
> + communication that is conspicuously marked or otherwise
> + designated in writing by You as "Not a Contribution."
> +
> + == SECTION 2: License for Contributions ==
> + * Contributor hereby agrees that redistribution and use of the
> + Contribution in source and binary forms, with or without
> + modification, are permitted provided that the following
> + conditions are met:
> + ** Redistributions of source code must retain the Contributor's
> + copyright notice, this list of conditions and the following
> + disclaimer.
> + ** Redistributions in binary form must reproduce the Contributor's
> + copyright notice, this list of conditions and the following
> + disclaimer in the documentation and/or other materials provided
> + with the distribution.
> + * Disclaimer. None of the names of Contributor, Intel, or the names
> + of their respective contributors may be used to endorse or
> + promote products derived from this software without specific
> + prior written permission.
> + * Contributor grants a license (with the right to sublicense) under
> + claims of Contributor's patents that Contributor can license that
> + are infringed by the Contribution (as delivered by Contributor) to
> + make, use, distribute, sell, offer for sale, and import the
> + Contribution and derivative works thereof solely to the minimum
> + extent necessary for licensee to exercise the granted copyright
> + license; this patent license applies solely to those portions of
> + the Contribution that are unmodified. No hardware per se is
> + licensed.
> + * EXCEPT AS EXPRESSLY SET FORTH IN SECTION 3 BELOW, THE
> + CONTRIBUTION IS PROVIDED BY THE CONTRIBUTOR "AS IS" AND ANY
> + EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
> + THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
> + PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
> + CONTRIBUTOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
> + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
> BUT
> + NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
> SERVICES;
> + LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
> + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
> + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
> + OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THE
> + CONTRIBUTION, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
> + DAMAGE.
> +
> + == SECTION 3: Representations ==
> + * You represent that You are legally entitled to grant the above
> + license. If your employer(s) has rights to intellectual property
> + that You create that includes Your Contributions, You represent
> + that You have received permission to make Contributions on behalf
> + of that employer, that Your employer has waived such rights for
> + Your Contributions.
> + * You represent that each of Your Contributions is Your original
> + creation (see Section 4 for submissions on behalf of others).
> + You represent that Your Contribution submissions include complete
> + details of any third-party license or other restriction
> + (including, but not limited to, related patents and trademarks)
> + of which You are personally aware and which are associated with
> + any part of Your Contributions.
> +
> + == SECTION 4: Third Party Contributions ==
> + * Should You wish to submit work that is not Your original creation,
> + You may submit it to TianoCore site separately from any
> + Contribution, identifying the complete details of its source
> + and of any license or other restriction (including, but not
> + limited to, related patents, trademarks, and license agreements)
> + of which You are personally aware, and conspicuously marking the
> + work as "Submitted on behalf of a third-party: [named here]".
> +
> + == SECTION 5: Miscellaneous ==
> + * Applicable Laws. Any claims arising under or relating to this
> + Agreement shall be governed by the internal substantive laws of
> + the State of Delaware or federal courts located in Delaware,
> + without regard to principles of conflict of laws.
> + * Language. This Agreement is in the English language only, which
> + language shall be controlling in all respects, and all versions
> + of this Agreement in any other language shall be for accommodation
> + only and shall not be binding. All communications and notices made
> + or given pursuant to this Agreement, and all documentation and
> + support to be provided, unless otherwise noted, shall be in the
> + English language.
> +-----------------------------------------------------------------------
> +---------
> +
> --
> 2.21.0.windows.1
>
>
>
^ permalink raw reply [flat|nested] 63+ messages in thread* Re: [edk2-devel] [[edk2-platforms][PATCH V2] 01/30] edk2-platforms: Add License-History.txt
2019-05-15 23:09 ` [[edk2-platforms][PATCH V2] 01/30] edk2-platforms: Add License-History.txt Michael D Kinney
2019-05-16 0:36 ` [edk2-devel] " Chiu, Chasel
2019-05-17 6:39 ` Kubacki, Michael A
@ 2019-05-17 21:01 ` Sinha, Ankit
2 siblings, 0 replies; 63+ messages in thread
From: Sinha, Ankit @ 2019-05-17 21:01 UTC (permalink / raw)
To: devel@edk2.groups.io, Kinney, Michael D
Cc: Leif Lindholm, Ard Biesheuvel, Gillispie, Thad, Bu, Daocheng,
Oram, Isaac W, Piwko, Maciej, Chiu, Chasel, Kubacki, Michael A,
Lu, Shifei A, Zhou, Bowen, Chaganty, Rangasai V
Reviewed-by: Ankit Sinha <ankit.sinha@intel.com>
-----Original Message-----
From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of Michael D Kinney
Sent: Wednesday, May 15, 2019 4:10 PM
To: devel@edk2.groups.io
Cc: Leif Lindholm <leif.lindholm@linaro.org>; Ard Biesheuvel <ard.biesheuvel@linaro.org>; Gillispie, Thad <thad.gillispie@intel.com>; Bu, Daocheng <daocheng.bu@intel.com>; Oram, Isaac W <isaac.w.oram@intel.com>; Piwko, Maciej <maciej.piwko@intel.com>; Chiu, Chasel <chasel.chiu@intel.com>; Kubacki, Michael A <michael.a.kubacki@intel.com>; Lu, Shifei A <shifei.a.lu@intel.com>; Zhou, Bowen <bowen.zhou@intel.com>; Sinha, Ankit <ankit.sinha@intel.com>; Chaganty, Rangasai V <rangasai.v.chaganty@intel.com>
Subject: [edk2-devel] [[edk2-platforms][PATCH V2] 01/30] edk2-platforms: Add License-History.txt
Add text file that contains the history of license and contributor agreement changes.
https://bugzilla.tianocore.org/show_bug.cgi?id=1373
This change is based on the following emails:
https://lists.01.org/pipermail/edk2-devel/2019-February/036260.html
https://lists.01.org/pipermail/edk2-devel/2018-October/030385.html
RFCs with detailed process for the license change:
V3: https://lists.01.org/pipermail/edk2-devel/2019-March/038116.html
V2: https://lists.01.org/pipermail/edk2-devel/2019-March/037669.html
V1: https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Thad Gillispie <thad.gillispie@intel.com>
Cc: Daocheng Bu <daocheng.bu@intel.com>
Cc: Isaac W Oram <isaac.w.oram@intel.com>
Cc: Maciej Piwko <maciej.piwko@intel.com>
Cc: Chasel Chiu <chasel.chiu@intel.com>
Cc: Michael Kubacki <michael.a.kubacki@intel.com>
Cc: Shifei A Lu <shifei.a.lu@intel.com>
Cc: Xiaohu Zhou <bowen.zhou@intel.com>
Cc: Ankit Sinha <ankit.sinha@intel.com>
Cc: Sai Chaganty <rangasai.v.chaganty@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
License-History.txt | 542 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 542 insertions(+)
create mode 100644 License-History.txt
diff --git a/License-History.txt b/License-History.txt new file mode 100644 index 0000000000..8ab3f67b53
--- /dev/null
+++ b/License-History.txt
@@ -0,0 +1,542 @@
+ License-History.txt
+ ===================
+
+This file contains the history of license change and contributor's
+agreement changes.
+
+Unless otherwise noted in a specific file, the EDK2 project is now
+licensed under the terms listed in the License.txt file. Terms under
+which Contributions made prior to the move to the License.txt
+formulation are shown below. Those terms require notice of the terms
+themselves be preserved and presented with the contributions. This
+file serves that preservation purpose as a matter of documenting the history of the project.
+
+Key Dates
+----------
+* August 3, 2017
+
+ Update the TianoCore Contribution Agreement from Version 1.0 to
+ Version 1.1 to cover open source documentation associated with the
+ TianoCore project.
+
+ Version 1.0 covers source code files. Version 1.1 is a backwards
+ compatible extension that adds support for document files in both
+ source form and compiled form.
+
+ References:
+ https://opensource.org/licenses/BSD-2-Clause
+ Complete text of TianoCore Contribution Agreement 1.0 included below
+ Complete text of TianoCore Contribution Agreement 1.1 included
+ below
+
+ Proposals (RFCs):
+ https://lists.01.org/pipermail/edk2-devel/2017-March/008654.html
+
+ TianoCore Bugzilla:
+ https://bugzilla.tianocore.org/show_bug.cgi?id=629
+
+* April 9, 2019
+
+ Replace BSD 2-Clause License with BSD + Patent License removing the
+ need for the TianoCore Contribution Agreement.
+
+ References:
+ https://opensource.org/licenses/BSD-2-Clause
+ Complete text of TianoCore Contribution Agreement 1.0 included below
+ Complete text of TianoCore Contribution Agreement 1.1 included below
+ https://opensource.org/licenses/BSDplusPatent
+
+ Proposals (RFCs):
+ https://lists.01.org/pipermail/edk2-devel/2019-February/036260.html
+ https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html
+
+ TianoCore Bugzilla:
+ https://bugzilla.tianocore.org/show_bug.cgi?id=1373
+
+-----------------------------------------------------------------------
+---------
+License.txt: BSD 2-Clause License
+--------------------------------------------------------------------------------
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in
+ the documentation and/or other materials provided with the
+ distribution.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+-----------------------------------------------------------------------
+---------
+
+-----------------------------------------------------------------------
+---------
+Contributions.txt: TianoCore Contribution Agreement 1.1
+--------------------------------------------------------------------------------
+ ======================
+ = Code Contributions =
+ ======================
+
+ To make a contribution to a TianoCore project, follow these steps.
+ 1. Create a change description in the format specified below to
+ use in the source control commit log.
+ 2. Your commit message must include your "Signed-off-by" signature,
+ and "Contributed-under" message.
+ 3. Your "Contributed-under" message explicitly states that the
+ contribution is made under the terms of the specified
+ contribution agreement. Your "Contributed-under" message
+ must include the name of contribution agreement and version.
+ For example: Contributed-under: TianoCore Contribution Agreement 1.1
+ The "TianoCore Contribution Agreement" is included below in
+ this document.
+ 4. Submit your code to the TianoCore project using the process
+ that the project documents on its web page. If the process is
+ not documented, then submit the code on development email list
+ for the project.
+ 5. It is preferred that contributions are submitted using the same
+ copyright license as the base project. When that is not possible,
+ then contributions using the following licenses can be accepted:
+ * BSD (2-clause): http://opensource.org/licenses/BSD-2-Clause
+ * BSD (3-clause): http://opensource.org/licenses/BSD-3-Clause
+ * MIT: http://opensource.org/licenses/MIT
+ * Python-2.0: http://opensource.org/licenses/Python-2.0
+ * Zlib: http://opensource.org/licenses/Zlib
+
+ For documentation:
+ * FreeBSD Documentation License
+ https://www.freebsd.org/copyright/freebsd-doc-license.html
+
+ Contributions of code put into the public domain can also be
+ accepted.
+
+ Contributions using other licenses might be accepted, but further
+ review will be required.
+
+ =====================================================
+ = Change Description / Commit Message / Patch Email =
+ =====================================================
+
+ Your change description should use the standard format for a
+ commit message, and must include your "Signed-off-by" signature
+ and the "Contributed-under" message.
+
+ == Sample Change Description / Commit Message =
+
+ === Start of sample patch email message ===
+
+ From: Contributor Name <contributor@example.com>
+ Subject: [Repository/Branch PATCH] Module:
+ Brief-single-line-summary
+
+ Full-commit-message
+
+ Contributed-under: TianoCore Contribution Agreement 1.1
+ Signed-off-by: Contributor Name <contributor@example.com>
+ ---
+
+ An extra message for the patch email which will not be considered part
+ of the commit message can be added here.
+
+ Patch content inline or attached
+
+ === End of sample patch email message ===
+
+ === Notes for sample patch email ===
+
+ * The first line of commit message is taken from the email's subject
+ line following [Repository/Branch PATCH]. The remaining portion of the
+ commit message is the email's content until the '---' line.
+ * git format-patch is one way to create this format
+
+ === Definitions for sample patch email ===
+
+ * "Repository" is the identifier of the repository the patch applies.
+ This identifier should only be provided for repositories other than
+ 'edk2'. For example 'edk2-BuildSpecification' or 'staging'.
+ * "Branch" is the identifier of the branch the patch applies. This
+ identifier should only be provided for branches other than 'edk2/master'.
+ For example 'edk2/UDK2015', 'edk2-BuildSpecification/release/1.27', or
+ 'staging/edk2-test'.
+ * "Module" is a short identifier for the affected code or documentation. For
+ example 'MdePkg', 'MdeModulePkg/UsbBusDxe', 'Introduction', or
+ 'EDK II INF File Format'.
+ * "Brief-single-line-summary" is a short summary of the change.
+ * The entire first line should be less than ~70 characters.
+ * "Full-commit-message" a verbose multiple line comment describing
+ the change. Each line should be less than ~70 characters.
+ * "Contributed-under" explicitly states that the contribution is
+ made under the terms of the contribution agreement. This
+ agreement is included below in this document.
+ * "Signed-off-by" is the contributor's signature identifying them
+ by their real/legal name and their email address.
+
+ ========================================
+ = TianoCore Contribution Agreement 1.1 =
+ ========================================
+
+ INTEL CORPORATION ("INTEL") MAKES AVAILABLE SOFTWARE, DOCUMENTATION
+ ("DOCUMENTATION"), INFORMATION AND/OR OTHER MATERIALS FOR USE IN THE
+ TIANOCORE OPEN SOURCE PROJECT (COLLECTIVELY "CONTENT"). USE OF THE CONTENT
+ IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT BETWEEN YOU AND
+ INTEL AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES
+ INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR
+ USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND
+ CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR
+ REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS
+ AGREEMENT AND THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE
+ AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT
+ USE THE CONTENT.
+
+ Unless otherwise indicated, all Content (except Documentation) made available
+ on the TianoCore site is provided to you under the terms and conditions of the
+ BSD License ("BSD"). A copy of the BSD License is available at
+ http://opensource.org/licenses/bsd-license.php
+ or when applicable, in the associated License.txt file.
+
+ Unless otherwise indicated, all Documentation made available on the
+ TianoCore site is provided to you under the terms and conditions of the
+ FreeBSD Documentation License ("FreeBSD"). A copy of the license is
+ available at https://www.freebsd.org/copyright/freebsd-doc-license.html or,
+ when applicable, in the associated License.txt file.
+
+ Certain other content may be made available under other licenses as
+ indicated in or with such Content (for example, in a License.txt file).
+
+ You accept and agree to the following terms and conditions for Your
+ present and future Contributions submitted to TianoCore site. Except
+ for the license granted to Intel hereunder, You reserve all right,
+ title, and interest in and to Your Contributions.
+
+ == SECTION 1: Definitions ==
+ * "You" or "Contributor" shall mean the copyright owner or legal
+ entity authorized by the copyright owner that is making a
+ Contribution hereunder. All other entities that control, are
+ controlled by, or are under common control with that entity are
+ considered to be a single Contributor. For the purposes of this
+ definition, "control" means (i) the power, direct or indirect, to
+ cause the direction or management of such entity, whether by
+ contract or otherwise, or (ii) ownership of fifty percent (50%)
+ or more of the outstanding shares, or (iii) beneficial ownership
+ of such entity.
+ * "Contribution" shall mean any original work of authorship,
+ including any modifications or additions to an existing work,
+ that is intentionally submitted by You to the TianoCore site for
+ inclusion in, or documentation of, any of the Content. For the
+ purposes of this definition, "submitted" means any form of
+ electronic, verbal, or written communication sent to the
+ TianoCore site or its representatives, including but not limited
+ to communication on electronic mailing lists, source code
+ control systems, and issue tracking systems that are managed by,
+ or on behalf of, the TianoCore site for the purpose of
+ discussing and improving the Content, but excluding
+ communication that is conspicuously marked or otherwise
+ designated in writing by You as "Not a Contribution."
+
+ == SECTION 2: License for Contributions ==
+ * Contributor hereby agrees that redistribution and use of the
+ Contribution in source and binary forms, with or without
+ modification, are permitted provided that the following
+ conditions are met:
+ ** Redistributions of source code must retain the Contributor's
+ copyright notice, this list of conditions and the following
+ disclaimer.
+ ** Redistributions in binary form must reproduce the Contributor's
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+ * Disclaimer. None of the names of Contributor, Intel, or the names
+ of their respective contributors may be used to endorse or
+ promote products derived from this software without specific
+ prior written permission.
+ * Contributor grants a license (with the right to sublicense) under
+ claims of Contributor's patents that Contributor can license that
+ are infringed by the Contribution (as delivered by Contributor) to
+ make, use, distribute, sell, offer for sale, and import the
+ Contribution and derivative works thereof solely to the minimum
+ extent necessary for licensee to exercise the granted copyright
+ license; this patent license applies solely to those portions of
+ the Contribution that are unmodified. No hardware per se is
+ licensed.
+ * EXCEPT AS EXPRESSLY SET FORTH IN SECTION 3 BELOW, THE
+ CONTRIBUTION IS PROVIDED BY THE CONTRIBUTOR "AS IS" AND ANY
+ EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ CONTRIBUTOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THE
+ CONTRIBUTION, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+ DAMAGE.
+
+ == SECTION 3: Representations ==
+ * You represent that You are legally entitled to grant the above
+ license. If your employer(s) has rights to intellectual property
+ that You create that includes Your Contributions, You represent
+ that You have received permission to make Contributions on behalf
+ of that employer, that Your employer has waived such rights for
+ Your Contributions.
+ * You represent that each of Your Contributions is Your original
+ creation (see Section 4 for submissions on behalf of others).
+ You represent that Your Contribution submissions include complete
+ details of any third-party license or other restriction
+ (including, but not limited to, related patents and trademarks)
+ of which You are personally aware and which are associated with
+ any part of Your Contributions.
+
+ == SECTION 4: Third Party Contributions ==
+ * Should You wish to submit work that is not Your original creation,
+ You may submit it to TianoCore site separately from any
+ Contribution, identifying the complete details of its source
+ and of any license or other restriction (including, but not
+ limited to, related patents, trademarks, and license agreements)
+ of which You are personally aware, and conspicuously marking the
+ work as "Submitted on behalf of a third-party: [named here]".
+
+ == SECTION 5: Miscellaneous ==
+ * Applicable Laws. Any claims arising under or relating to this
+ Agreement shall be governed by the internal substantive laws of
+ the State of Delaware or federal courts located in Delaware,
+ without regard to principles of conflict of laws.
+ * Language. This Agreement is in the English language only, which
+ language shall be controlling in all respects, and all versions
+ of this Agreement in any other language shall be for accommodation
+ only and shall not be binding. All communications and notices made
+ or given pursuant to this Agreement, and all documentation and
+ support to be provided, unless otherwise noted, shall be in the
+ English language.
+-----------------------------------------------------------------------
+---------
+
+-----------------------------------------------------------------------
+---------
+Contributions.txt: TianoCore Contribution Agreement 1.0
+--------------------------------------------------------------------------------
+ ======================
+ = Code Contributions =
+ ======================
+
+ To make a contribution to a TianoCore project, follow these steps.
+ 1. Create a change description in the format specified below to
+ use in the source control commit log.
+ 2. Your commit message must include your "Signed-off-by" signature,
+ and "Contributed-under" message.
+ 3. Your "Contributed-under" message explicitly states that the
+ contribution is made under the terms of the specified
+ contribution agreement. Your "Contributed-under" message
+ must include the name of contribution agreement and version.
+ For example: Contributed-under: TianoCore Contribution Agreement 1.0
+ The "TianoCore Contribution Agreement" is included below in
+ this document.
+ 4. Submit your code to the TianoCore project using the process
+ that the project documents on its web page. If the process is
+ not documented, then submit the code on development email list
+ for the project.
+ 5. It is preferred that contributions are submitted using the same
+ copyright license as the base project. When that is not possible,
+ then contributions using the following licenses can be accepted:
+ * BSD (2-clause): http://opensource.org/licenses/BSD-2-Clause
+ * BSD (3-clause): http://opensource.org/licenses/BSD-3-Clause
+ * MIT: http://opensource.org/licenses/MIT
+ * Python-2.0: http://opensource.org/licenses/Python-2.0
+ * Zlib: http://opensource.org/licenses/Zlib
+
+ Contributions of code put into the public domain can also be
+ accepted.
+
+ Contributions using other licenses might be accepted, but further
+ review will be required.
+
+ =====================================================
+ = Change Description / Commit Message / Patch Email =
+ =====================================================
+
+ Your change description should use the standard format for a
+ commit message, and must include your "Signed-off-by" signature
+ and the "Contributed-under" message.
+
+ == Sample Change Description / Commit Message =
+
+ === Start of sample patch email message ===
+
+ From: Contributor Name <contributor@example.com>
+ Subject: [PATCH] CodeModule: Brief-single-line-summary
+
+ Full-commit-message
+
+ Contributed-under: TianoCore Contribution Agreement 1.0
+ Signed-off-by: Contributor Name <contributor@example.com>
+ ---
+
+ An extra message for the patch email which will not be considered part
+ of the commit message can be added here.
+
+ Patch content inline or attached
+
+ === End of sample patch email message ===
+
+ === Notes for sample patch email ===
+
+ * The first line of commit message is taken from the email's subject
+ line following [PATCH]. The remaining portion of the commit message
+ is the email's content until the '---' line.
+ * git format-patch is one way to create this format
+
+ === Definitions for sample patch email ===
+
+ * "CodeModule" is a short idenfier for the affected code. For
+ example MdePkg, or MdeModulePkg UsbBusDxe.
+ * "Brief-single-line-summary" is a short summary of the change.
+ * The entire first line should be less than ~70 characters.
+ * "Full-commit-message" a verbose multiple line comment describing
+ the change. Each line should be less than ~70 characters.
+ * "Contributed-under" explicitely states that the contribution is
+ made under the terms of the contribtion agreement. This
+ agreement is included below in this document.
+ * "Signed-off-by" is the contributor's signature identifying them
+ by their real/legal name and their email address.
+
+ ========================================
+ = TianoCore Contribution Agreement 1.0 =
+ ========================================
+
+ INTEL CORPORATION ("INTEL") MAKES AVAILABLE SOFTWARE, DOCUMENTATION,
+ INFORMATION AND/OR OTHER MATERIALS FOR USE IN THE TIANOCORE OPEN SOURCE
+ PROJECT (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE
+ TERMS AND CONDITIONS OF THIS AGREEMENT BETWEEN YOU AND INTEL AND/OR THE
+ TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR
+ REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE
+ CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS
+ OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
+ BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS
+ AGREEMENT AND THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE
+ AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT
+ USE THE CONTENT.
+
+ Unless otherwise indicated, all Content made available on the TianoCore
+ site is provided to you under the terms and conditions of the BSD
+ License ("BSD"). A copy of the BSD License is available at
+ http://opensource.org/licenses/bsd-license.php
+ or when applicable, in the associated License.txt file.
+
+ Certain other content may be made available under other licenses as
+ indicated in or with such Content. (For example, in a License.txt
+ file.)
+
+ You accept and agree to the following terms and conditions for Your
+ present and future Contributions submitted to TianoCore site. Except
+ for the license granted to Intel hereunder, You reserve all right,
+ title, and interest in and to Your Contributions.
+
+ == SECTION 1: Definitions ==
+ * "You" or "Contributor" shall mean the copyright owner or legal
+ entity authorized by the copyright owner that is making a
+ Contribution hereunder. All other entities that control, are
+ controlled by, or are under common control with that entity are
+ considered to be a single Contributor. For the purposes of this
+ definition, "control" means (i) the power, direct or indirect, to
+ cause the direction or management of such entity, whether by
+ contract or otherwise, or (ii) ownership of fifty percent (50%)
+ or more of the outstanding shares, or (iii) beneficial ownership
+ of such entity.
+ * "Contribution" shall mean any original work of authorship,
+ including any modifications or additions to an existing work,
+ that is intentionally submitted by You to the TinaoCore site for
+ inclusion in, or documentation of, any of the Content. For the
+ purposes of this definition, "submitted" means any form of
+ electronic, verbal, or written communication sent to the
+ TianoCore site or its representatives, including but not limited
+ to communication on electronic mailing lists, source code
+ control systems, and issue tracking systems that are managed by,
+ or on behalf of, the TianoCore site for the purpose of
+ discussing and improving the Content, but excluding
+ communication that is conspicuously marked or otherwise
+ designated in writing by You as "Not a Contribution."
+
+ == SECTION 2: License for Contributions ==
+ * Contributor hereby agrees that redistribution and use of the
+ Contribution in source and binary forms, with or without
+ modification, are permitted provided that the following
+ conditions are met:
+ ** Redistributions of source code must retain the Contributor's
+ copyright notice, this list of conditions and the following
+ disclaimer.
+ ** Redistributions in binary form must reproduce the Contributor's
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+ * Disclaimer. None of the names of Contributor, Intel, or the names
+ of their respective contributors may be used to endorse or
+ promote products derived from this software without specific
+ prior written permission.
+ * Contributor grants a license (with the right to sublicense) under
+ claims of Contributor's patents that Contributor can license that
+ are infringed by the Contribution (as delivered by Contributor) to
+ make, use, distribute, sell, offer for sale, and import the
+ Contribution and derivative works thereof solely to the minimum
+ extent necessary for licensee to exercise the granted copyright
+ license; this patent license applies solely to those portions of
+ the Contribution that are unmodified. No hardware per se is
+ licensed.
+ * EXCEPT AS EXPRESSLY SET FORTH IN SECTION 3 BELOW, THE
+ CONTRIBUTION IS PROVIDED BY THE CONTRIBUTOR "AS IS" AND ANY
+ EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ CONTRIBUTOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THE
+ CONTRIBUTION, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+ DAMAGE.
+
+ == SECTION 3: Representations ==
+ * You represent that You are legally entitled to grant the above
+ license. If your employer(s) has rights to intellectual property
+ that You create that includes Your Contributions, You represent
+ that You have received permission to make Contributions on behalf
+ of that employer, that Your employer has waived such rights for
+ Your Contributions.
+ * You represent that each of Your Contributions is Your original
+ creation (see Section 4 for submissions on behalf of others).
+ You represent that Your Contribution submissions include complete
+ details of any third-party license or other restriction
+ (including, but not limited to, related patents and trademarks)
+ of which You are personally aware and which are associated with
+ any part of Your Contributions.
+
+ == SECTION 4: Third Party Contributions ==
+ * Should You wish to submit work that is not Your original creation,
+ You may submit it to TianoCore site separately from any
+ Contribution, identifying the complete details of its source
+ and of any license or other restriction (including, but not
+ limited to, related patents, trademarks, and license agreements)
+ of which You are personally aware, and conspicuously marking the
+ work as "Submitted on behalf of a third-party: [named here]".
+
+ == SECTION 5: Miscellaneous ==
+ * Applicable Laws. Any claims arising under or relating to this
+ Agreement shall be governed by the internal substantive laws of
+ the State of Delaware or federal courts located in Delaware,
+ without regard to principles of conflict of laws.
+ * Language. This Agreement is in the English language only, which
+ language shall be controlling in all respects, and all versions
+ of this Agreement in any other language shall be for accommodation
+ only and shall not be binding. All communications and notices made
+ or given pursuant to this Agreement, and all documentation and
+ support to be provided, unless otherwise noted, shall be in the
+ English language.
+-----------------------------------------------------------------------
+---------
+
--
2.21.0.windows.1
^ permalink raw reply [flat|nested] 63+ messages in thread
* [[edk2-platforms][PATCH V2] 02/30] edk2-platforms: Change License.txt from 2-Clause BSD to BSD+Patent
2019-05-15 23:09 [[edk2-platforms][PATCH V2] 00/30] Change edk2-platforms/master to BSD+Patent License Michael D Kinney
2019-05-15 23:09 ` [[edk2-platforms][PATCH V2] 01/30] edk2-platforms: Add License-History.txt Michael D Kinney
@ 2019-05-15 23:09 ` Michael D Kinney
2019-05-16 0:17 ` Chiu, Chasel
2019-05-17 6:42 ` Kubacki, Michael A
2019-05-15 23:09 ` [[edk2-platforms][PATCH V2] 03/30] Platform/96Boards: Replace BSD License with BSD+Patent License Michael D Kinney
` (28 subsequent siblings)
30 siblings, 2 replies; 63+ messages in thread
From: Michael D Kinney @ 2019-05-15 23:09 UTC (permalink / raw)
To: devel
Cc: Leif Lindholm, Ard Biesheuvel, Thad Gillispie, Daocheng Bu,
Isaac W Oram, Maciej Piwko, Chasel Chiu, Michael Kubacki,
Shifei A Lu, Xiaohu Zhou, Ankit Sinha, Sai Chaganty
Change License.txt in the root of the edk2-platforms repository from
the 2-Clause BSD License to the BSD+Patent License.
The text difference between these licenses in the patch is larger
than expected due to different choices for the position of the line
breaks. The text from the BSD 2-Clause license and its disclaimer
are the same. New clauses from the BSD+Patent license have been
added.
The License.txt files in other directories that contain the 2-Clause
BSD License are deleted. The single License.txt in the root of the
edk2-platforms repository with the BSD+Patent License contents is the
preferred license for the edk2-platforms repository.
https://bugzilla.tianocore.org/show_bug.cgi?id=1373
This change is based on the following emails:
https://lists.01.org/pipermail/edk2-devel/2019-February/036260.html
https://lists.01.org/pipermail/edk2-devel/2018-October/030385.html
RFCs with detailed process for the license change:
V3: https://lists.01.org/pipermail/edk2-devel/2019-March/038116.html
V2: https://lists.01.org/pipermail/edk2-devel/2019-March/037669.html
V1: https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Thad Gillispie <thad.gillispie@intel.com>
Cc: Daocheng Bu <daocheng.bu@intel.com>
Cc: Isaac W Oram <isaac.w.oram@intel.com>
Cc: Maciej Piwko <maciej.piwko@intel.com>
Cc: Chasel Chiu <chasel.chiu@intel.com>
Cc: Michael Kubacki <michael.a.kubacki@intel.com>
Cc: Shifei A Lu <shifei.a.lu@intel.com>
Cc: Xiaohu Zhou <bowen.zhou@intel.com>
Cc: Ankit Sinha <ankit.sinha@intel.com>
Cc: Sai Chaganty <rangasai.v.chaganty@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
License.txt | 70 +++++++++++++------
Platform/AMD/License.txt | 25 -------
Platform/Intel/AdvancedFeaturePkg/License.txt | 25 -------
Platform/Intel/ClevoOpenBoardPkg/License.txt | 25 -------
.../Intel/KabylakeOpenBoardPkg/License.txt | 25 -------
Platform/Intel/MinPlatformPkg/License.txt | 25 -------
Platform/LeMaker/License.txt | 25 -------
Platform/SoftIron/License.txt | 25 -------
Silicon/AMD/Styx/License.txt | 25 -------
Silicon/Intel/KabylakeSiliconPkg/License.txt | 25 -------
10 files changed, 48 insertions(+), 247 deletions(-)
delete mode 100644 Platform/AMD/License.txt
delete mode 100644 Platform/Intel/AdvancedFeaturePkg/License.txt
delete mode 100644 Platform/Intel/ClevoOpenBoardPkg/License.txt
delete mode 100644 Platform/Intel/KabylakeOpenBoardPkg/License.txt
delete mode 100644 Platform/Intel/MinPlatformPkg/License.txt
delete mode 100644 Platform/LeMaker/License.txt
delete mode 100644 Platform/SoftIron/License.txt
delete mode 100644 Silicon/AMD/Styx/License.txt
delete mode 100644 Silicon/Intel/KabylakeSiliconPkg/License.txt
diff --git a/License.txt b/License.txt
index dea6f02f0f..ee840505cb 100644
--- a/License.txt
+++ b/License.txt
@@ -1,25 +1,51 @@
-Copyright (c) 2012-2017, Linaro Ltd. All rights reserved.
+Copyright (c) 2019, TianoCore and contributors. All rights reserved.
+
+SPDX-License-Identifier: BSD-2-Clause-Patent
Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-* Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in
- the documentation and/or other materials provided with the
- distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+
+Subject to the terms and conditions of this license, each copyright holder
+and contributor hereby grants to those receiving rights under this license
+a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+(except for failure to satisfy the conditions of this license) patent
+license to make, have made, use, offer to sell, sell, import, and otherwise
+transfer this software, where such license applies only to those patent
+claims, already acquired or hereafter acquired, licensable by such copyright
+holder or contributor that are necessarily infringed by:
+
+(a) their Contribution(s) (the licensed copyrights of copyright holders and
+ non-copyrightable additions of contributors, in source or binary form)
+ alone; or
+
+(b) combination of their Contribution(s) with the work of authorship to
+ which such Contribution(s) was added by such copyright holder or
+ contributor, if, at the time the Contribution is added, such addition
+ causes such combination to be necessarily infringed. The patent license
+ shall not apply to any other combinations which include the
+ Contribution.
+
+Except as expressly stated above, no rights or licenses from any copyright
+holder or contributor is granted under this license, whether expressly, by
+implication, estoppel or otherwise.
+
+DISCLAIMER
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
diff --git a/Platform/AMD/License.txt b/Platform/AMD/License.txt
deleted file mode 100644
index ff85835d63..0000000000
--- a/Platform/AMD/License.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-Copyright (c) 2013 - 2016, AMD Inc. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in
- the documentation and/or other materials provided with the
- distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
diff --git a/Platform/Intel/AdvancedFeaturePkg/License.txt b/Platform/Intel/AdvancedFeaturePkg/License.txt
deleted file mode 100644
index 3bb2e6d1ea..0000000000
--- a/Platform/Intel/AdvancedFeaturePkg/License.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-Copyright (c) 2017, Intel Corporation. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-* Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in
- the documentation and/or other materials provided with the
- distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
diff --git a/Platform/Intel/ClevoOpenBoardPkg/License.txt b/Platform/Intel/ClevoOpenBoardPkg/License.txt
deleted file mode 100644
index 7e5d5e5ee4..0000000000
--- a/Platform/Intel/ClevoOpenBoardPkg/License.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-* Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in
- the documentation and/or other materials provided with the
- distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/License.txt b/Platform/Intel/KabylakeOpenBoardPkg/License.txt
deleted file mode 100644
index 3bb2e6d1ea..0000000000
--- a/Platform/Intel/KabylakeOpenBoardPkg/License.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-Copyright (c) 2017, Intel Corporation. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-* Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in
- the documentation and/or other materials provided with the
- distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
diff --git a/Platform/Intel/MinPlatformPkg/License.txt b/Platform/Intel/MinPlatformPkg/License.txt
deleted file mode 100644
index 3bb2e6d1ea..0000000000
--- a/Platform/Intel/MinPlatformPkg/License.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-Copyright (c) 2017, Intel Corporation. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-* Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in
- the documentation and/or other materials provided with the
- distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
diff --git a/Platform/LeMaker/License.txt b/Platform/LeMaker/License.txt
deleted file mode 100644
index ff85835d63..0000000000
--- a/Platform/LeMaker/License.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-Copyright (c) 2013 - 2016, AMD Inc. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in
- the documentation and/or other materials provided with the
- distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
diff --git a/Platform/SoftIron/License.txt b/Platform/SoftIron/License.txt
deleted file mode 100644
index ff85835d63..0000000000
--- a/Platform/SoftIron/License.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-Copyright (c) 2013 - 2016, AMD Inc. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in
- the documentation and/or other materials provided with the
- distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
diff --git a/Silicon/AMD/Styx/License.txt b/Silicon/AMD/Styx/License.txt
deleted file mode 100644
index ff85835d63..0000000000
--- a/Silicon/AMD/Styx/License.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-Copyright (c) 2013 - 2016, AMD Inc. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in
- the documentation and/or other materials provided with the
- distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
diff --git a/Silicon/Intel/KabylakeSiliconPkg/License.txt b/Silicon/Intel/KabylakeSiliconPkg/License.txt
deleted file mode 100644
index 3bb2e6d1ea..0000000000
--- a/Silicon/Intel/KabylakeSiliconPkg/License.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-Copyright (c) 2017, Intel Corporation. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-* Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in
- the documentation and/or other materials provided with the
- distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
--
2.21.0.windows.1
^ permalink raw reply related [flat|nested] 63+ messages in thread* Re: [[edk2-platforms][PATCH V2] 02/30] edk2-platforms: Change License.txt from 2-Clause BSD to BSD+Patent
2019-05-15 23:09 ` [[edk2-platforms][PATCH V2] 02/30] edk2-platforms: Change License.txt from 2-Clause BSD to BSD+Patent Michael D Kinney
@ 2019-05-16 0:17 ` Chiu, Chasel
2019-05-17 6:42 ` Kubacki, Michael A
1 sibling, 0 replies; 63+ messages in thread
From: Chiu, Chasel @ 2019-05-16 0:17 UTC (permalink / raw)
To: Kinney, Michael D, devel@edk2.groups.io
Cc: Leif Lindholm, Ard Biesheuvel, Gillispie, Thad, Bu, Daocheng,
Oram, Isaac W, Piwko, Maciej, Kubacki, Michael A, Lu, Shifei A,
Zhou, Bowen, Sinha, Ankit, Chaganty, Rangasai V
Reviewed-by: Chasel Chiu <chasel.chiu@intel.com>
> -----Original Message-----
> From: Kinney, Michael D
> Sent: Thursday, May 16, 2019 7:10 AM
> To: devel@edk2.groups.io
> Cc: Leif Lindholm <leif.lindholm@linaro.org>; Ard Biesheuvel
> <ard.biesheuvel@linaro.org>; Gillispie, Thad <thad.gillispie@intel.com>; Bu,
> Daocheng <daocheng.bu@intel.com>; Oram, Isaac W
> <isaac.w.oram@intel.com>; Piwko, Maciej <maciej.piwko@intel.com>; Chiu,
> Chasel <chasel.chiu@intel.com>; Kubacki, Michael A
> <michael.a.kubacki@intel.com>; Lu, Shifei A <shifei.a.lu@intel.com>; Zhou,
> Bowen <bowen.zhou@intel.com>; Sinha, Ankit <ankit.sinha@intel.com>;
> Chaganty, Rangasai V <rangasai.v.chaganty@intel.com>
> Subject: [[edk2-platforms][PATCH V2] 02/30] edk2-platforms: Change
> License.txt from 2-Clause BSD to BSD+Patent
>
> Change License.txt in the root of the edk2-platforms repository from the
> 2-Clause BSD License to the BSD+Patent License.
>
> The text difference between these licenses in the patch is larger than expected
> due to different choices for the position of the line breaks. The text from the
> BSD 2-Clause license and its disclaimer are the same. New clauses from the
> BSD+Patent license have been added.
>
> The License.txt files in other directories that contain the 2-Clause BSD License are
> deleted. The single License.txt in the root of the edk2-platforms repository with
> the BSD+Patent License contents is the preferred license for the edk2-platforms
> repository.
>
> https://bugzilla.tianocore.org/show_bug.cgi?id=1373
>
> This change is based on the following emails:
>
> https://lists.01.org/pipermail/edk2-devel/2019-February/036260.html
> https://lists.01.org/pipermail/edk2-devel/2018-October/030385.html
>
> RFCs with detailed process for the license change:
>
> V3: https://lists.01.org/pipermail/edk2-devel/2019-March/038116.html
> V2: https://lists.01.org/pipermail/edk2-devel/2019-March/037669.html
> V1: https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html
>
> Cc: Leif Lindholm <leif.lindholm@linaro.org>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Cc: Thad Gillispie <thad.gillispie@intel.com>
> Cc: Daocheng Bu <daocheng.bu@intel.com>
> Cc: Isaac W Oram <isaac.w.oram@intel.com>
> Cc: Maciej Piwko <maciej.piwko@intel.com>
> Cc: Chasel Chiu <chasel.chiu@intel.com>
> Cc: Michael Kubacki <michael.a.kubacki@intel.com>
> Cc: Shifei A Lu <shifei.a.lu@intel.com>
> Cc: Xiaohu Zhou <bowen.zhou@intel.com>
> Cc: Ankit Sinha <ankit.sinha@intel.com>
> Cc: Sai Chaganty <rangasai.v.chaganty@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
> ---
> License.txt | 70 +++++++++++++------
> Platform/AMD/License.txt | 25 -------
> Platform/Intel/AdvancedFeaturePkg/License.txt | 25 -------
> Platform/Intel/ClevoOpenBoardPkg/License.txt | 25 -------
> .../Intel/KabylakeOpenBoardPkg/License.txt | 25 -------
> Platform/Intel/MinPlatformPkg/License.txt | 25 -------
> Platform/LeMaker/License.txt | 25 -------
> Platform/SoftIron/License.txt | 25 -------
> Silicon/AMD/Styx/License.txt | 25 -------
> Silicon/Intel/KabylakeSiliconPkg/License.txt | 25 -------
> 10 files changed, 48 insertions(+), 247 deletions(-) delete mode 100644
> Platform/AMD/License.txt delete mode 100644
> Platform/Intel/AdvancedFeaturePkg/License.txt
> delete mode 100644 Platform/Intel/ClevoOpenBoardPkg/License.txt
> delete mode 100644 Platform/Intel/KabylakeOpenBoardPkg/License.txt
> delete mode 100644 Platform/Intel/MinPlatformPkg/License.txt
> delete mode 100644 Platform/LeMaker/License.txt delete mode 100644
> Platform/SoftIron/License.txt delete mode 100644
> Silicon/AMD/Styx/License.txt delete mode 100644
> Silicon/Intel/KabylakeSiliconPkg/License.txt
>
> diff --git a/License.txt b/License.txt
> index dea6f02f0f..ee840505cb 100644
> --- a/License.txt
> +++ b/License.txt
> @@ -1,25 +1,51 @@
> -Copyright (c) 2012-2017, Linaro Ltd. All rights reserved.
> +Copyright (c) 2019, TianoCore and contributors. All rights reserved.
> +
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> Redistribution and use in source and binary forms, with or without
> -modification, are permitted provided that the following conditions -are met:
> -
> -* Redistributions of source code must retain the above copyright
> - notice, this list of conditions and the following disclaimer.
> -* Redistributions in binary form must reproduce the above copyright
> - notice, this list of conditions and the following disclaimer in
> - the documentation and/or other materials provided with the
> - distribution.
> -
> -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
> CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
> INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF
> MERCHANTABILITY AND FITNESS -FOR A PARTICULAR PURPOSE ARE
> DISCLAIMED. IN NO EVENT SHALL THE -COPYRIGHT HOLDER OR CONTRIBUTORS
> BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR
> CONSEQUENTIAL DAMAGES (INCLUDING, -BUT NOT LIMITED TO,
> PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR
> PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY
> THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -LIABILITY, OR TORT
> (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -ANY WAY OUT OF THE
> USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
> +modification, are permitted provided that the following conditions are met:
> +
> +1. Redistributions of source code must retain the above copyright notice,
> + this list of conditions and the following disclaimer.
> +
> +2. Redistributions in binary form must reproduce the above copyright notice,
> + this list of conditions and the following disclaimer in the documentation
> + and/or other materials provided with the distribution.
> +
> +Subject to the terms and conditions of this license, each copyright
> +holder and contributor hereby grants to those receiving rights under
> +this license a perpetual, worldwide, non-exclusive, no-charge,
> +royalty-free, irrevocable (except for failure to satisfy the conditions
> +of this license) patent license to make, have made, use, offer to sell,
> +sell, import, and otherwise transfer this software, where such license
> +applies only to those patent claims, already acquired or hereafter
> +acquired, licensable by such copyright holder or contributor that are
> necessarily infringed by:
> +
> +(a) their Contribution(s) (the licensed copyrights of copyright holders and
> + non-copyrightable additions of contributors, in source or binary form)
> + alone; or
> +
> +(b) combination of their Contribution(s) with the work of authorship to
> + which such Contribution(s) was added by such copyright holder or
> + contributor, if, at the time the Contribution is added, such addition
> + causes such combination to be necessarily infringed. The patent license
> + shall not apply to any other combinations which include the
> + Contribution.
> +
> +Except as expressly stated above, no rights or licenses from any
> +copyright holder or contributor is granted under this license, whether
> +expressly, by implication, estoppel or otherwise.
> +
> +DISCLAIMER
> +
> +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
> CONTRIBUTORS "AS IS"
> +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
> TO,
> +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
> PARTICULAR
> +PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR
> +CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
> +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
> TO,
> +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
> +PROFITS; OR BUSINESS
> +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
> WHETHER IN
> +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
> OTHERWISE)
> +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
> +THE
> POSSIBILITY OF SUCH DAMAGE.
> diff --git a/Platform/AMD/License.txt b/Platform/AMD/License.txt deleted file
> mode 100644 index ff85835d63..0000000000
> --- a/Platform/AMD/License.txt
> +++ /dev/null
> @@ -1,25 +0,0 @@
> -Copyright (c) 2013 - 2016, AMD Inc. All rights reserved.
> -
> -Redistribution and use in source and binary forms, with or without
> -modification, are permitted provided that the following conditions -are met:
> -
> -1. Redistributions of source code must retain the above copyright
> - notice, this list of conditions and the following disclaimer.
> -2. Redistributions in binary form must reproduce the above copyright
> - notice, this list of conditions and the following disclaimer in
> - the documentation and/or other materials provided with the
> - distribution.
> -
> -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
> CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
> INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF
> MERCHANTABILITY AND FITNESS -FOR A PARTICULAR PURPOSE ARE
> DISCLAIMED. IN NO EVENT SHALL THE -COPYRIGHT HOLDER OR CONTRIBUTORS
> BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR
> CONSEQUENTIAL DAMAGES (INCLUDING, -BUT NOT LIMITED TO,
> PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR
> PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY
> THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -LIABILITY, OR TORT
> (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -ANY WAY OUT OF THE
> USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH
> DAMAGE.
> diff --git a/Platform/Intel/AdvancedFeaturePkg/License.txt
> b/Platform/Intel/AdvancedFeaturePkg/License.txt
> deleted file mode 100644
> index 3bb2e6d1ea..0000000000
> --- a/Platform/Intel/AdvancedFeaturePkg/License.txt
> +++ /dev/null
> @@ -1,25 +0,0 @@
> -Copyright (c) 2017, Intel Corporation. All rights reserved.
> -
> -Redistribution and use in source and binary forms, with or without
> -modification, are permitted provided that the following conditions -are met:
> -
> -* Redistributions of source code must retain the above copyright
> - notice, this list of conditions and the following disclaimer.
> -* Redistributions in binary form must reproduce the above copyright
> - notice, this list of conditions and the following disclaimer in
> - the documentation and/or other materials provided with the
> - distribution.
> -
> -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
> CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
> INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF
> MERCHANTABILITY AND FITNESS -FOR A PARTICULAR PURPOSE ARE
> DISCLAIMED. IN NO EVENT SHALL THE -COPYRIGHT HOLDER OR CONTRIBUTORS
> BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR
> CONSEQUENTIAL DAMAGES (INCLUDING, -BUT NOT LIMITED TO,
> PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR
> PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY
> THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -LIABILITY, OR TORT
> (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -ANY WAY OUT OF THE
> USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH
> DAMAGE.
> diff --git a/Platform/Intel/ClevoOpenBoardPkg/License.txt
> b/Platform/Intel/ClevoOpenBoardPkg/License.txt
> deleted file mode 100644
> index 7e5d5e5ee4..0000000000
> --- a/Platform/Intel/ClevoOpenBoardPkg/License.txt
> +++ /dev/null
> @@ -1,25 +0,0 @@
> -Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
> -
> -Redistribution and use in source and binary forms, with or without
> -modification, are permitted provided that the following conditions -are met:
> -
> -* Redistributions of source code must retain the above copyright
> - notice, this list of conditions and the following disclaimer.
> -* Redistributions in binary form must reproduce the above copyright
> - notice, this list of conditions and the following disclaimer in
> - the documentation and/or other materials provided with the
> - distribution.
> -
> -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
> CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
> INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF
> MERCHANTABILITY AND FITNESS -FOR A PARTICULAR PURPOSE ARE
> DISCLAIMED. IN NO EVENT SHALL THE -COPYRIGHT HOLDER OR CONTRIBUTORS
> BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR
> CONSEQUENTIAL DAMAGES (INCLUDING, -BUT NOT LIMITED TO,
> PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR
> PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY
> THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -LIABILITY, OR TORT
> (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -ANY WAY OUT OF THE
> USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH
> DAMAGE.
> diff --git a/Platform/Intel/KabylakeOpenBoardPkg/License.txt
> b/Platform/Intel/KabylakeOpenBoardPkg/License.txt
> deleted file mode 100644
> index 3bb2e6d1ea..0000000000
> --- a/Platform/Intel/KabylakeOpenBoardPkg/License.txt
> +++ /dev/null
> @@ -1,25 +0,0 @@
> -Copyright (c) 2017, Intel Corporation. All rights reserved.
> -
> -Redistribution and use in source and binary forms, with or without
> -modification, are permitted provided that the following conditions -are met:
> -
> -* Redistributions of source code must retain the above copyright
> - notice, this list of conditions and the following disclaimer.
> -* Redistributions in binary form must reproduce the above copyright
> - notice, this list of conditions and the following disclaimer in
> - the documentation and/or other materials provided with the
> - distribution.
> -
> -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
> CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
> INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF
> MERCHANTABILITY AND FITNESS -FOR A PARTICULAR PURPOSE ARE
> DISCLAIMED. IN NO EVENT SHALL THE -COPYRIGHT HOLDER OR CONTRIBUTORS
> BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR
> CONSEQUENTIAL DAMAGES (INCLUDING, -BUT NOT LIMITED TO,
> PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR
> PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY
> THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -LIABILITY, OR TORT
> (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -ANY WAY OUT OF THE
> USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH
> DAMAGE.
> diff --git a/Platform/Intel/MinPlatformPkg/License.txt
> b/Platform/Intel/MinPlatformPkg/License.txt
> deleted file mode 100644
> index 3bb2e6d1ea..0000000000
> --- a/Platform/Intel/MinPlatformPkg/License.txt
> +++ /dev/null
> @@ -1,25 +0,0 @@
> -Copyright (c) 2017, Intel Corporation. All rights reserved.
> -
> -Redistribution and use in source and binary forms, with or without
> -modification, are permitted provided that the following conditions -are met:
> -
> -* Redistributions of source code must retain the above copyright
> - notice, this list of conditions and the following disclaimer.
> -* Redistributions in binary form must reproduce the above copyright
> - notice, this list of conditions and the following disclaimer in
> - the documentation and/or other materials provided with the
> - distribution.
> -
> -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
> CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
> INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF
> MERCHANTABILITY AND FITNESS -FOR A PARTICULAR PURPOSE ARE
> DISCLAIMED. IN NO EVENT SHALL THE -COPYRIGHT HOLDER OR CONTRIBUTORS
> BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR
> CONSEQUENTIAL DAMAGES (INCLUDING, -BUT NOT LIMITED TO,
> PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR
> PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY
> THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -LIABILITY, OR TORT
> (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -ANY WAY OUT OF THE
> USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH
> DAMAGE.
> diff --git a/Platform/LeMaker/License.txt b/Platform/LeMaker/License.txt
> deleted file mode 100644 index ff85835d63..0000000000
> --- a/Platform/LeMaker/License.txt
> +++ /dev/null
> @@ -1,25 +0,0 @@
> -Copyright (c) 2013 - 2016, AMD Inc. All rights reserved.
> -
> -Redistribution and use in source and binary forms, with or without
> -modification, are permitted provided that the following conditions -are met:
> -
> -1. Redistributions of source code must retain the above copyright
> - notice, this list of conditions and the following disclaimer.
> -2. Redistributions in binary form must reproduce the above copyright
> - notice, this list of conditions and the following disclaimer in
> - the documentation and/or other materials provided with the
> - distribution.
> -
> -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
> CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
> INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF
> MERCHANTABILITY AND FITNESS -FOR A PARTICULAR PURPOSE ARE
> DISCLAIMED. IN NO EVENT SHALL THE -COPYRIGHT HOLDER OR CONTRIBUTORS
> BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR
> CONSEQUENTIAL DAMAGES (INCLUDING, -BUT NOT LIMITED TO,
> PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR
> PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY
> THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -LIABILITY, OR TORT
> (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -ANY WAY OUT OF THE
> USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH
> DAMAGE.
> diff --git a/Platform/SoftIron/License.txt b/Platform/SoftIron/License.txt
> deleted file mode 100644 index ff85835d63..0000000000
> --- a/Platform/SoftIron/License.txt
> +++ /dev/null
> @@ -1,25 +0,0 @@
> -Copyright (c) 2013 - 2016, AMD Inc. All rights reserved.
> -
> -Redistribution and use in source and binary forms, with or without
> -modification, are permitted provided that the following conditions -are met:
> -
> -1. Redistributions of source code must retain the above copyright
> - notice, this list of conditions and the following disclaimer.
> -2. Redistributions in binary form must reproduce the above copyright
> - notice, this list of conditions and the following disclaimer in
> - the documentation and/or other materials provided with the
> - distribution.
> -
> -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
> CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
> INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF
> MERCHANTABILITY AND FITNESS -FOR A PARTICULAR PURPOSE ARE
> DISCLAIMED. IN NO EVENT SHALL THE -COPYRIGHT HOLDER OR CONTRIBUTORS
> BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR
> CONSEQUENTIAL DAMAGES (INCLUDING, -BUT NOT LIMITED TO,
> PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR
> PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY
> THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -LIABILITY, OR TORT
> (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -ANY WAY OUT OF THE
> USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH
> DAMAGE.
> diff --git a/Silicon/AMD/Styx/License.txt b/Silicon/AMD/Styx/License.txt deleted
> file mode 100644 index ff85835d63..0000000000
> --- a/Silicon/AMD/Styx/License.txt
> +++ /dev/null
> @@ -1,25 +0,0 @@
> -Copyright (c) 2013 - 2016, AMD Inc. All rights reserved.
> -
> -Redistribution and use in source and binary forms, with or without
> -modification, are permitted provided that the following conditions -are met:
> -
> -1. Redistributions of source code must retain the above copyright
> - notice, this list of conditions and the following disclaimer.
> -2. Redistributions in binary form must reproduce the above copyright
> - notice, this list of conditions and the following disclaimer in
> - the documentation and/or other materials provided with the
> - distribution.
> -
> -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
> CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
> INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF
> MERCHANTABILITY AND FITNESS -FOR A PARTICULAR PURPOSE ARE
> DISCLAIMED. IN NO EVENT SHALL THE -COPYRIGHT HOLDER OR CONTRIBUTORS
> BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR
> CONSEQUENTIAL DAMAGES (INCLUDING, -BUT NOT LIMITED TO,
> PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR
> PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY
> THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -LIABILITY, OR TORT
> (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -ANY WAY OUT OF THE
> USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH
> DAMAGE.
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/License.txt
> b/Silicon/Intel/KabylakeSiliconPkg/License.txt
> deleted file mode 100644
> index 3bb2e6d1ea..0000000000
> --- a/Silicon/Intel/KabylakeSiliconPkg/License.txt
> +++ /dev/null
> @@ -1,25 +0,0 @@
> -Copyright (c) 2017, Intel Corporation. All rights reserved.
> -
> -Redistribution and use in source and binary forms, with or without
> -modification, are permitted provided that the following conditions -are met:
> -
> -* Redistributions of source code must retain the above copyright
> - notice, this list of conditions and the following disclaimer.
> -* Redistributions in binary form must reproduce the above copyright
> - notice, this list of conditions and the following disclaimer in
> - the documentation and/or other materials provided with the
> - distribution.
> -
> -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
> CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
> INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF
> MERCHANTABILITY AND FITNESS -FOR A PARTICULAR PURPOSE ARE
> DISCLAIMED. IN NO EVENT SHALL THE -COPYRIGHT HOLDER OR CONTRIBUTORS
> BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR
> CONSEQUENTIAL DAMAGES (INCLUDING, -BUT NOT LIMITED TO,
> PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR
> PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY
> THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -LIABILITY, OR TORT
> (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -ANY WAY OUT OF THE
> USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH
> DAMAGE.
> --
> 2.21.0.windows.1
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: [[edk2-platforms][PATCH V2] 02/30] edk2-platforms: Change License.txt from 2-Clause BSD to BSD+Patent
2019-05-15 23:09 ` [[edk2-platforms][PATCH V2] 02/30] edk2-platforms: Change License.txt from 2-Clause BSD to BSD+Patent Michael D Kinney
2019-05-16 0:17 ` Chiu, Chasel
@ 2019-05-17 6:42 ` Kubacki, Michael A
1 sibling, 0 replies; 63+ messages in thread
From: Kubacki, Michael A @ 2019-05-17 6:42 UTC (permalink / raw)
To: Kinney, Michael D, devel@edk2.groups.io
Cc: Leif Lindholm, Ard Biesheuvel, Gillispie, Thad, Bu, Daocheng,
Oram, Isaac W, Piwko, Maciej, Chiu, Chasel, Lu, Shifei A,
Zhou, Bowen, Sinha, Ankit, Chaganty, Rangasai V
Reviewed-by: Michael Kubacki <michael.a.kubacki@intel.com>
> -----Original Message-----
> From: Kinney, Michael D
> Sent: Wednesday, May 15, 2019 4:10 PM
> To: devel@edk2.groups.io
> Cc: Leif Lindholm <leif.lindholm@linaro.org>; Ard Biesheuvel
> <ard.biesheuvel@linaro.org>; Gillispie, Thad <thad.gillispie@intel.com>; Bu,
> Daocheng <daocheng.bu@intel.com>; Oram, Isaac W
> <isaac.w.oram@intel.com>; Piwko, Maciej <maciej.piwko@intel.com>; Chiu,
> Chasel <chasel.chiu@intel.com>; Kubacki, Michael A
> <michael.a.kubacki@intel.com>; Lu, Shifei A <shifei.a.lu@intel.com>; Zhou,
> Bowen <bowen.zhou@intel.com>; Sinha, Ankit <ankit.sinha@intel.com>;
> Chaganty, Rangasai V <rangasai.v.chaganty@intel.com>
> Subject: [[edk2-platforms][PATCH V2] 02/30] edk2-platforms: Change
> License.txt from 2-Clause BSD to BSD+Patent
>
> Change License.txt in the root of the edk2-platforms repository from the 2-
> Clause BSD License to the BSD+Patent License.
>
> The text difference between these licenses in the patch is larger than
> expected due to different choices for the position of the line breaks. The
> text from the BSD 2-Clause license and its disclaimer are the same. New
> clauses from the BSD+Patent license have been added.
>
> The License.txt files in other directories that contain the 2-Clause BSD
> License are deleted. The single License.txt in the root of the edk2-platforms
> repository with the BSD+Patent License contents is the preferred license for
> the edk2-platforms repository.
>
> https://bugzilla.tianocore.org/show_bug.cgi?id=1373
>
> This change is based on the following emails:
>
> https://lists.01.org/pipermail/edk2-devel/2019-February/036260.html
> https://lists.01.org/pipermail/edk2-devel/2018-October/030385.html
>
> RFCs with detailed process for the license change:
>
> V3: https://lists.01.org/pipermail/edk2-devel/2019-March/038116.html
> V2: https://lists.01.org/pipermail/edk2-devel/2019-March/037669.html
> V1: https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html
>
> Cc: Leif Lindholm <leif.lindholm@linaro.org>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Cc: Thad Gillispie <thad.gillispie@intel.com>
> Cc: Daocheng Bu <daocheng.bu@intel.com>
> Cc: Isaac W Oram <isaac.w.oram@intel.com>
> Cc: Maciej Piwko <maciej.piwko@intel.com>
> Cc: Chasel Chiu <chasel.chiu@intel.com>
> Cc: Michael Kubacki <michael.a.kubacki@intel.com>
> Cc: Shifei A Lu <shifei.a.lu@intel.com>
> Cc: Xiaohu Zhou <bowen.zhou@intel.com>
> Cc: Ankit Sinha <ankit.sinha@intel.com>
> Cc: Sai Chaganty <rangasai.v.chaganty@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
> ---
> License.txt | 70 +++++++++++++------
> Platform/AMD/License.txt | 25 -------
> Platform/Intel/AdvancedFeaturePkg/License.txt | 25 -------
> Platform/Intel/ClevoOpenBoardPkg/License.txt | 25 -------
> .../Intel/KabylakeOpenBoardPkg/License.txt | 25 -------
> Platform/Intel/MinPlatformPkg/License.txt | 25 -------
> Platform/LeMaker/License.txt | 25 -------
> Platform/SoftIron/License.txt | 25 -------
> Silicon/AMD/Styx/License.txt | 25 -------
> Silicon/Intel/KabylakeSiliconPkg/License.txt | 25 -------
> 10 files changed, 48 insertions(+), 247 deletions(-) delete mode 100644
> Platform/AMD/License.txt delete mode 100644
> Platform/Intel/AdvancedFeaturePkg/License.txt
> delete mode 100644 Platform/Intel/ClevoOpenBoardPkg/License.txt
> delete mode 100644 Platform/Intel/KabylakeOpenBoardPkg/License.txt
> delete mode 100644 Platform/Intel/MinPlatformPkg/License.txt
> delete mode 100644 Platform/LeMaker/License.txt delete mode 100644
> Platform/SoftIron/License.txt delete mode 100644
> Silicon/AMD/Styx/License.txt delete mode 100644
> Silicon/Intel/KabylakeSiliconPkg/License.txt
>
> diff --git a/License.txt b/License.txt
> index dea6f02f0f..ee840505cb 100644
> --- a/License.txt
> +++ b/License.txt
> @@ -1,25 +1,51 @@
> -Copyright (c) 2012-2017, Linaro Ltd. All rights reserved.
> +Copyright (c) 2019, TianoCore and contributors. All rights reserved.
> +
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> Redistribution and use in source and binary forms, with or without -
> modification, are permitted provided that the following conditions -are met:
> -
> -* Redistributions of source code must retain the above copyright
> - notice, this list of conditions and the following disclaimer.
> -* Redistributions in binary form must reproduce the above copyright
> - notice, this list of conditions and the following disclaimer in
> - the documentation and/or other materials provided with the
> - distribution.
> -
> -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
> CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
> INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF
> MERCHANTABILITY AND FITNESS -FOR A PARTICULAR PURPOSE ARE
> DISCLAIMED. IN NO EVENT SHALL THE -COPYRIGHT HOLDER OR
> CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL,
> SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -BUT
> NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -
> LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -
> CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
> STRICT -LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
> ARISING IN -ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
> ADVISED OF THE
> +modification, are permitted provided that the following conditions are met:
> +
> +1. Redistributions of source code must retain the above copyright notice,
> + this list of conditions and the following disclaimer.
> +
> +2. Redistributions in binary form must reproduce the above copyright
> notice,
> + this list of conditions and the following disclaimer in the documentation
> + and/or other materials provided with the distribution.
> +
> +Subject to the terms and conditions of this license, each copyright
> +holder and contributor hereby grants to those receiving rights under
> +this license a perpetual, worldwide, non-exclusive, no-charge,
> +royalty-free, irrevocable (except for failure to satisfy the conditions
> +of this license) patent license to make, have made, use, offer to sell,
> +sell, import, and otherwise transfer this software, where such license
> +applies only to those patent claims, already acquired or hereafter
> +acquired, licensable by such copyright holder or contributor that are
> necessarily infringed by:
> +
> +(a) their Contribution(s) (the licensed copyrights of copyright holders and
> + non-copyrightable additions of contributors, in source or binary form)
> + alone; or
> +
> +(b) combination of their Contribution(s) with the work of authorship to
> + which such Contribution(s) was added by such copyright holder or
> + contributor, if, at the time the Contribution is added, such addition
> + causes such combination to be necessarily infringed. The patent license
> + shall not apply to any other combinations which include the
> + Contribution.
> +
> +Except as expressly stated above, no rights or licenses from any
> +copyright holder or contributor is granted under this license, whether
> +expressly, by implication, estoppel or otherwise.
> +
> +DISCLAIMER
> +
> +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
> CONTRIBUTORS "AS IS"
> +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
> LIMITED TO,
> +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
> PARTICULAR
> +PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
> OR
> +CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
> SPECIAL,
> +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
> LIMITED TO,
> +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
> OR
> +PROFITS; OR BUSINESS
> +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
> WHETHER IN
> +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
> OTHERWISE)
> +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
> ADVISED OF
> +THE
> POSSIBILITY OF SUCH DAMAGE.
> diff --git a/Platform/AMD/License.txt b/Platform/AMD/License.txt deleted
> file mode 100644 index ff85835d63..0000000000
> --- a/Platform/AMD/License.txt
> +++ /dev/null
> @@ -1,25 +0,0 @@
> -Copyright (c) 2013 - 2016, AMD Inc. All rights reserved.
> -
> -Redistribution and use in source and binary forms, with or without -
> modification, are permitted provided that the following conditions -are met:
> -
> -1. Redistributions of source code must retain the above copyright
> - notice, this list of conditions and the following disclaimer.
> -2. Redistributions in binary form must reproduce the above copyright
> - notice, this list of conditions and the following disclaimer in
> - the documentation and/or other materials provided with the
> - distribution.
> -
> -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
> CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
> INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF
> MERCHANTABILITY AND FITNESS -FOR A PARTICULAR PURPOSE ARE
> DISCLAIMED. IN NO EVENT SHALL THE -COPYRIGHT HOLDER OR
> CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL,
> SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -BUT
> NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -
> LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -
> CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
> STRICT -LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
> ARISING IN -ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
> ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE.
> diff --git a/Platform/Intel/AdvancedFeaturePkg/License.txt
> b/Platform/Intel/AdvancedFeaturePkg/License.txt
> deleted file mode 100644
> index 3bb2e6d1ea..0000000000
> --- a/Platform/Intel/AdvancedFeaturePkg/License.txt
> +++ /dev/null
> @@ -1,25 +0,0 @@
> -Copyright (c) 2017, Intel Corporation. All rights reserved.
> -
> -Redistribution and use in source and binary forms, with or without -
> modification, are permitted provided that the following conditions -are met:
> -
> -* Redistributions of source code must retain the above copyright
> - notice, this list of conditions and the following disclaimer.
> -* Redistributions in binary form must reproduce the above copyright
> - notice, this list of conditions and the following disclaimer in
> - the documentation and/or other materials provided with the
> - distribution.
> -
> -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
> CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
> INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF
> MERCHANTABILITY AND FITNESS -FOR A PARTICULAR PURPOSE ARE
> DISCLAIMED. IN NO EVENT SHALL THE -COPYRIGHT HOLDER OR
> CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL,
> SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -BUT
> NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -
> LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -
> CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
> STRICT -LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
> ARISING IN -ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
> ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE.
> diff --git a/Platform/Intel/ClevoOpenBoardPkg/License.txt
> b/Platform/Intel/ClevoOpenBoardPkg/License.txt
> deleted file mode 100644
> index 7e5d5e5ee4..0000000000
> --- a/Platform/Intel/ClevoOpenBoardPkg/License.txt
> +++ /dev/null
> @@ -1,25 +0,0 @@
> -Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
> -
> -Redistribution and use in source and binary forms, with or without -
> modification, are permitted provided that the following conditions -are met:
> -
> -* Redistributions of source code must retain the above copyright
> - notice, this list of conditions and the following disclaimer.
> -* Redistributions in binary form must reproduce the above copyright
> - notice, this list of conditions and the following disclaimer in
> - the documentation and/or other materials provided with the
> - distribution.
> -
> -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
> CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
> INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF
> MERCHANTABILITY AND FITNESS -FOR A PARTICULAR PURPOSE ARE
> DISCLAIMED. IN NO EVENT SHALL THE -COPYRIGHT HOLDER OR
> CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL,
> SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -BUT
> NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -
> LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -
> CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
> STRICT -LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
> ARISING IN -ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
> ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE.
> diff --git a/Platform/Intel/KabylakeOpenBoardPkg/License.txt
> b/Platform/Intel/KabylakeOpenBoardPkg/License.txt
> deleted file mode 100644
> index 3bb2e6d1ea..0000000000
> --- a/Platform/Intel/KabylakeOpenBoardPkg/License.txt
> +++ /dev/null
> @@ -1,25 +0,0 @@
> -Copyright (c) 2017, Intel Corporation. All rights reserved.
> -
> -Redistribution and use in source and binary forms, with or without -
> modification, are permitted provided that the following conditions -are met:
> -
> -* Redistributions of source code must retain the above copyright
> - notice, this list of conditions and the following disclaimer.
> -* Redistributions in binary form must reproduce the above copyright
> - notice, this list of conditions and the following disclaimer in
> - the documentation and/or other materials provided with the
> - distribution.
> -
> -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
> CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
> INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF
> MERCHANTABILITY AND FITNESS -FOR A PARTICULAR PURPOSE ARE
> DISCLAIMED. IN NO EVENT SHALL THE -COPYRIGHT HOLDER OR
> CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL,
> SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -BUT
> NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -
> LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -
> CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
> STRICT -LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
> ARISING IN -ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
> ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE.
> diff --git a/Platform/Intel/MinPlatformPkg/License.txt
> b/Platform/Intel/MinPlatformPkg/License.txt
> deleted file mode 100644
> index 3bb2e6d1ea..0000000000
> --- a/Platform/Intel/MinPlatformPkg/License.txt
> +++ /dev/null
> @@ -1,25 +0,0 @@
> -Copyright (c) 2017, Intel Corporation. All rights reserved.
> -
> -Redistribution and use in source and binary forms, with or without -
> modification, are permitted provided that the following conditions -are met:
> -
> -* Redistributions of source code must retain the above copyright
> - notice, this list of conditions and the following disclaimer.
> -* Redistributions in binary form must reproduce the above copyright
> - notice, this list of conditions and the following disclaimer in
> - the documentation and/or other materials provided with the
> - distribution.
> -
> -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
> CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
> INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF
> MERCHANTABILITY AND FITNESS -FOR A PARTICULAR PURPOSE ARE
> DISCLAIMED. IN NO EVENT SHALL THE -COPYRIGHT HOLDER OR
> CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL,
> SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -BUT
> NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -
> LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -
> CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
> STRICT -LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
> ARISING IN -ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
> ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE.
> diff --git a/Platform/LeMaker/License.txt b/Platform/LeMaker/License.txt
> deleted file mode 100644 index ff85835d63..0000000000
> --- a/Platform/LeMaker/License.txt
> +++ /dev/null
> @@ -1,25 +0,0 @@
> -Copyright (c) 2013 - 2016, AMD Inc. All rights reserved.
> -
> -Redistribution and use in source and binary forms, with or without -
> modification, are permitted provided that the following conditions -are met:
> -
> -1. Redistributions of source code must retain the above copyright
> - notice, this list of conditions and the following disclaimer.
> -2. Redistributions in binary form must reproduce the above copyright
> - notice, this list of conditions and the following disclaimer in
> - the documentation and/or other materials provided with the
> - distribution.
> -
> -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
> CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
> INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF
> MERCHANTABILITY AND FITNESS -FOR A PARTICULAR PURPOSE ARE
> DISCLAIMED. IN NO EVENT SHALL THE -COPYRIGHT HOLDER OR
> CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL,
> SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -BUT
> NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -
> LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -
> CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
> STRICT -LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
> ARISING IN -ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
> ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE.
> diff --git a/Platform/SoftIron/License.txt b/Platform/SoftIron/License.txt
> deleted file mode 100644 index ff85835d63..0000000000
> --- a/Platform/SoftIron/License.txt
> +++ /dev/null
> @@ -1,25 +0,0 @@
> -Copyright (c) 2013 - 2016, AMD Inc. All rights reserved.
> -
> -Redistribution and use in source and binary forms, with or without -
> modification, are permitted provided that the following conditions -are met:
> -
> -1. Redistributions of source code must retain the above copyright
> - notice, this list of conditions and the following disclaimer.
> -2. Redistributions in binary form must reproduce the above copyright
> - notice, this list of conditions and the following disclaimer in
> - the documentation and/or other materials provided with the
> - distribution.
> -
> -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
> CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
> INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF
> MERCHANTABILITY AND FITNESS -FOR A PARTICULAR PURPOSE ARE
> DISCLAIMED. IN NO EVENT SHALL THE -COPYRIGHT HOLDER OR
> CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL,
> SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -BUT
> NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -
> LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -
> CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
> STRICT -LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
> ARISING IN -ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
> ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE.
> diff --git a/Silicon/AMD/Styx/License.txt b/Silicon/AMD/Styx/License.txt
> deleted file mode 100644 index ff85835d63..0000000000
> --- a/Silicon/AMD/Styx/License.txt
> +++ /dev/null
> @@ -1,25 +0,0 @@
> -Copyright (c) 2013 - 2016, AMD Inc. All rights reserved.
> -
> -Redistribution and use in source and binary forms, with or without -
> modification, are permitted provided that the following conditions -are met:
> -
> -1. Redistributions of source code must retain the above copyright
> - notice, this list of conditions and the following disclaimer.
> -2. Redistributions in binary form must reproduce the above copyright
> - notice, this list of conditions and the following disclaimer in
> - the documentation and/or other materials provided with the
> - distribution.
> -
> -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
> CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
> INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF
> MERCHANTABILITY AND FITNESS -FOR A PARTICULAR PURPOSE ARE
> DISCLAIMED. IN NO EVENT SHALL THE -COPYRIGHT HOLDER OR
> CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL,
> SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -BUT
> NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -
> LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -
> CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
> STRICT -LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
> ARISING IN -ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
> ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE.
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/License.txt
> b/Silicon/Intel/KabylakeSiliconPkg/License.txt
> deleted file mode 100644
> index 3bb2e6d1ea..0000000000
> --- a/Silicon/Intel/KabylakeSiliconPkg/License.txt
> +++ /dev/null
> @@ -1,25 +0,0 @@
> -Copyright (c) 2017, Intel Corporation. All rights reserved.
> -
> -Redistribution and use in source and binary forms, with or without -
> modification, are permitted provided that the following conditions -are met:
> -
> -* Redistributions of source code must retain the above copyright
> - notice, this list of conditions and the following disclaimer.
> -* Redistributions in binary form must reproduce the above copyright
> - notice, this list of conditions and the following disclaimer in
> - the documentation and/or other materials provided with the
> - distribution.
> -
> -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
> CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
> INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF
> MERCHANTABILITY AND FITNESS -FOR A PARTICULAR PURPOSE ARE
> DISCLAIMED. IN NO EVENT SHALL THE -COPYRIGHT HOLDER OR
> CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL,
> SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -BUT
> NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -
> LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -
> CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
> STRICT -LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
> ARISING IN -ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
> ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE.
> --
> 2.21.0.windows.1
^ permalink raw reply [flat|nested] 63+ messages in thread
* [[edk2-platforms][PATCH V2] 03/30] Platform/96Boards: Replace BSD License with BSD+Patent License
2019-05-15 23:09 [[edk2-platforms][PATCH V2] 00/30] Change edk2-platforms/master to BSD+Patent License Michael D Kinney
2019-05-15 23:09 ` [[edk2-platforms][PATCH V2] 01/30] edk2-platforms: Add License-History.txt Michael D Kinney
2019-05-15 23:09 ` [[edk2-platforms][PATCH V2] 02/30] edk2-platforms: Change License.txt from 2-Clause BSD to BSD+Patent Michael D Kinney
@ 2019-05-15 23:09 ` Michael D Kinney
2019-05-15 23:09 ` [[edk2-platforms][PATCH V2] 04/30] Platform/ARM: " Michael D Kinney
` (27 subsequent siblings)
30 siblings, 0 replies; 63+ messages in thread
From: Michael D Kinney @ 2019-05-15 23:09 UTC (permalink / raw)
To: devel; +Cc: Leif Lindholm, Ard Biesheuvel
https://bugzilla.tianocore.org/show_bug.cgi?id=1373
Replace BSD 2-Clause License with BSD+Patent License. This change is
based on the following emails:
https://lists.01.org/pipermail/edk2-devel/2019-February/036260.html
https://lists.01.org/pipermail/edk2-devel/2018-October/030385.html
RFCs with detailed process for the license change:
V3: https://lists.01.org/pipermail/edk2-devel/2019-March/038116.html
V2: https://lists.01.org/pipermail/edk2-devel/2019-March/037669.html
V1: https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
Platform/96Boards/96Boards.dec | 8 +-------
Platform/96Boards/96BoardsI2cDxe/96BoardsI2cDxe.c | 7 +------
Platform/96Boards/96BoardsI2cDxe/96BoardsI2cDxe.inf | 8 +-------
Platform/96Boards/Include/Guid/FormSet.h | 8 +-------
Platform/96Boards/Include/Protocol/LsConnector.h | 8 +-------
Platform/96Boards/Include/Protocol/Mezzanine.h | 8 +-------
Platform/96Boards/LsConnectorDxe/LsConnectorDxe.c | 8 +-------
Platform/96Boards/LsConnectorDxe/LsConnectorDxe.h | 8 +-------
Platform/96Boards/LsConnectorDxe/LsConnectorDxe.inf | 9 +--------
Platform/96Boards/LsConnectorDxe/LsConnectorHii.uni | 8 +-------
Platform/96Boards/LsConnectorDxe/LsConnectorHii.vfr | 8 +-------
Platform/96Boards/Secure96Dxe/Secure96.asl | 9 +--------
Platform/96Boards/Secure96Dxe/Secure96.dts | 9 +--------
Platform/96Boards/Secure96Dxe/Secure96.h | 8 +-------
Platform/96Boards/Secure96Dxe/Secure96Dxe.c | 8 +-------
Platform/96Boards/Secure96Dxe/Secure96Dxe.inf | 8 +-------
16 files changed, 16 insertions(+), 114 deletions(-)
diff --git a/Platform/96Boards/96Boards.dec b/Platform/96Boards/96Boards.dec
index 49641828aa..cae1f7e943 100644
--- a/Platform/96Boards/96Boards.dec
+++ b/Platform/96Boards/96Boards.dec
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, Linaro Ltd. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/96Boards/96BoardsI2cDxe/96BoardsI2cDxe.c b/Platform/96Boards/96BoardsI2cDxe/96BoardsI2cDxe.c
index 79bb9ed5ff..e4ecbca62c 100644
--- a/Platform/96Boards/96BoardsI2cDxe/96BoardsI2cDxe.c
+++ b/Platform/96Boards/96BoardsI2cDxe/96BoardsI2cDxe.c
@@ -2,12 +2,7 @@
Copyright (c) 2018, Linaro, Ltd. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/96Boards/96BoardsI2cDxe/96BoardsI2cDxe.inf b/Platform/96Boards/96BoardsI2cDxe/96BoardsI2cDxe.inf
index 7eb1fc5030..ae69f0933e 100644
--- a/Platform/96Boards/96BoardsI2cDxe/96BoardsI2cDxe.inf
+++ b/Platform/96Boards/96BoardsI2cDxe/96BoardsI2cDxe.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, Linaro Ltd. 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 distribution. The full text of the license may
-# be found at http://opensource.org/licenses/bsd-license.php.
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/96Boards/Include/Guid/FormSet.h b/Platform/96Boards/Include/Guid/FormSet.h
index a0475e641d..bd144e5335 100644
--- a/Platform/96Boards/Include/Guid/FormSet.h
+++ b/Platform/96Boards/Include/Guid/FormSet.h
@@ -2,13 +2,7 @@
Copyright (c) 2018, Linaro Limited. All rights reserved.
- This program and the accompanying materials are licensed and made available
- under the terms and conditions of the BSD License which accompanies this
- distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/96Boards/Include/Protocol/LsConnector.h b/Platform/96Boards/Include/Protocol/LsConnector.h
index f337cfe0f7..ee3c5e0284 100644
--- a/Platform/96Boards/Include/Protocol/LsConnector.h
+++ b/Platform/96Boards/Include/Protocol/LsConnector.h
@@ -2,13 +2,7 @@
Copyright (c) 2018, Linaro, Ltd. 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
- distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/96Boards/Include/Protocol/Mezzanine.h b/Platform/96Boards/Include/Protocol/Mezzanine.h
index 97f43e9a92..4e960a0bca 100644
--- a/Platform/96Boards/Include/Protocol/Mezzanine.h
+++ b/Platform/96Boards/Include/Protocol/Mezzanine.h
@@ -2,13 +2,7 @@
Copyright (c) 2018, Linaro, Ltd. 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
- distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/96Boards/LsConnectorDxe/LsConnectorDxe.c b/Platform/96Boards/LsConnectorDxe/LsConnectorDxe.c
index 27044c5da6..a55f56f4ba 100644
--- a/Platform/96Boards/LsConnectorDxe/LsConnectorDxe.c
+++ b/Platform/96Boards/LsConnectorDxe/LsConnectorDxe.c
@@ -2,13 +2,7 @@
Copyright (c) 2018, Linaro, Ltd. All rights reserved.
- This program and the accompanying materials are licensed and made available
- under the terms and conditions of the BSD License which accompanies this
- distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/96Boards/LsConnectorDxe/LsConnectorDxe.h b/Platform/96Boards/LsConnectorDxe/LsConnectorDxe.h
index c2a21c52b7..16fa66b2a0 100644
--- a/Platform/96Boards/LsConnectorDxe/LsConnectorDxe.h
+++ b/Platform/96Boards/LsConnectorDxe/LsConnectorDxe.h
@@ -2,13 +2,7 @@
Copyright (c) 2018, Linaro Limited. All rights reserved.
- This program and the accompanying materials are licensed and made available
- under the terms and conditions of the BSD License which accompanies this
- distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/96Boards/LsConnectorDxe/LsConnectorDxe.inf b/Platform/96Boards/LsConnectorDxe/LsConnectorDxe.inf
index 20b9637c19..bd4d6c0db9 100644
--- a/Platform/96Boards/LsConnectorDxe/LsConnectorDxe.inf
+++ b/Platform/96Boards/LsConnectorDxe/LsConnectorDxe.inf
@@ -2,14 +2,7 @@
#
# Copyright (c) 2018, Linaro, Ltd. 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 distribution. The full text of the license may be
-# found at http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
-# IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/96Boards/LsConnectorDxe/LsConnectorHii.uni b/Platform/96Boards/LsConnectorDxe/LsConnectorHii.uni
index 23f4c58592..c5bceb2797 100644
--- a/Platform/96Boards/LsConnectorDxe/LsConnectorHii.uni
+++ b/Platform/96Boards/LsConnectorDxe/LsConnectorHii.uni
@@ -2,13 +2,7 @@
Copyright (c) 2018, Linaro, Ltd. All rights reserved.
- This program and the accompanying materials are licensed and made available
- under the terms and conditions of the BSD License which accompanies this
- distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/96Boards/LsConnectorDxe/LsConnectorHii.vfr b/Platform/96Boards/LsConnectorDxe/LsConnectorHii.vfr
index c4dd69db8e..18486f2026 100644
--- a/Platform/96Boards/LsConnectorDxe/LsConnectorHii.vfr
+++ b/Platform/96Boards/LsConnectorDxe/LsConnectorHii.vfr
@@ -2,13 +2,7 @@
Copyright (c) 2018, Linaro, Ltd. All rights reserved.
- This program and the accompanying materials are licensed and made available
- under the terms and conditions of the BSD License which accompanies this
- distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/96Boards/Secure96Dxe/Secure96.asl b/Platform/96Boards/Secure96Dxe/Secure96.asl
index f458929fff..4018d43724 100644
--- a/Platform/96Boards/Secure96Dxe/Secure96.asl
+++ b/Platform/96Boards/Secure96Dxe/Secure96.asl
@@ -1,14 +1,7 @@
/** @file
* Copyright (c) 2019, Linaro Limited. All rights reserved.
*
- * This program and the accompanying materials are licensed and made
- * available under the terms and conditions of the BSD License which
- * accompanies this distribution. The full text of the license may be
- * found at http://opensource.org/licenses/bsd-license.php
- *
- * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
- * IMPLIED.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*/
#include "Secure96.h"
diff --git a/Platform/96Boards/Secure96Dxe/Secure96.dts b/Platform/96Boards/Secure96Dxe/Secure96.dts
index a221bdf9bb..d066fcb193 100644
--- a/Platform/96Boards/Secure96Dxe/Secure96.dts
+++ b/Platform/96Boards/Secure96Dxe/Secure96.dts
@@ -1,14 +1,7 @@
/** @file
* Copyright (c) 2018, Linaro Limited. All rights reserved.
*
- * This program and the accompanying materials are licensed and made
- * available under the terms and conditions of the BSD License which
- * accompanies this distribution. The full text of the license may be
- * found at http://opensource.org/licenses/bsd-license.php
- *
- * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
- * IMPLIED.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*/
#include "Secure96.h"
diff --git a/Platform/96Boards/Secure96Dxe/Secure96.h b/Platform/96Boards/Secure96Dxe/Secure96.h
index a44dc4804f..c34fc5eea0 100644
--- a/Platform/96Boards/Secure96Dxe/Secure96.h
+++ b/Platform/96Boards/Secure96Dxe/Secure96.h
@@ -2,13 +2,7 @@
Copyright (c) 2018, Linaro, Ltd. 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
- distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _SECURE96_H_
diff --git a/Platform/96Boards/Secure96Dxe/Secure96Dxe.c b/Platform/96Boards/Secure96Dxe/Secure96Dxe.c
index 68f8ec812b..a9794845a3 100644
--- a/Platform/96Boards/Secure96Dxe/Secure96Dxe.c
+++ b/Platform/96Boards/Secure96Dxe/Secure96Dxe.c
@@ -3,13 +3,7 @@
Copyright (c) 2018, Linaro, Ltd. 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
- distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include <PiDxe.h>
diff --git a/Platform/96Boards/Secure96Dxe/Secure96Dxe.inf b/Platform/96Boards/Secure96Dxe/Secure96Dxe.inf
index ce4c8b5f8f..efba89816c 100644
--- a/Platform/96Boards/Secure96Dxe/Secure96Dxe.inf
+++ b/Platform/96Boards/Secure96Dxe/Secure96Dxe.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, Linaro, Ltd. 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 distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
--
2.21.0.windows.1
^ permalink raw reply related [flat|nested] 63+ messages in thread* [[edk2-platforms][PATCH V2] 04/30] Platform/ARM: Replace BSD License with BSD+Patent License
2019-05-15 23:09 [[edk2-platforms][PATCH V2] 00/30] Change edk2-platforms/master to BSD+Patent License Michael D Kinney
` (2 preceding siblings ...)
2019-05-15 23:09 ` [[edk2-platforms][PATCH V2] 03/30] Platform/96Boards: Replace BSD License with BSD+Patent License Michael D Kinney
@ 2019-05-15 23:09 ` Michael D Kinney
2019-05-17 10:52 ` Leif Lindholm
2019-05-15 23:09 ` [[edk2-platforms][PATCH V2] 05/30] Platform/AMD: " Michael D Kinney
` (26 subsequent siblings)
30 siblings, 1 reply; 63+ messages in thread
From: Michael D Kinney @ 2019-05-15 23:09 UTC (permalink / raw)
To: devel; +Cc: Leif Lindholm, Ard Biesheuvel
https://bugzilla.tianocore.org/show_bug.cgi?id=1373
Replace BSD 2-Clause License with BSD+Patent License. This change is
based on the following emails:
https://lists.01.org/pipermail/edk2-devel/2019-February/036260.html
https://lists.01.org/pipermail/edk2-devel/2018-October/030385.html
RFCs with detailed process for the license change:
V3: https://lists.01.org/pipermail/edk2-devel/2019-March/038116.html
V2: https://lists.01.org/pipermail/edk2-devel/2019-March/037669.html
V1: https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
Platform/ARM/ARM.dec | 8 +------
Platform/ARM/Drivers/BootMonFs/BootMonFs.dec | 8 +------
Platform/ARM/Drivers/BootMonFs/BootMonFs.inf | 8 +------
Platform/ARM/Drivers/BootMonFs/BootMonFsApi.h | 8 +------
Platform/ARM/Drivers/BootMonFs/BootMonFsDir.c | 8 +------
.../Drivers/BootMonFs/BootMonFsEntryPoint.c | 8 +------
Platform/ARM/Drivers/BootMonFs/BootMonFsHw.h | 8 +------
.../ARM/Drivers/BootMonFs/BootMonFsImages.c | 8 +------
.../ARM/Drivers/BootMonFs/BootMonFsInternal.h | 8 +------
.../Drivers/BootMonFs/BootMonFsOpenClose.c | 8 +------
.../Drivers/BootMonFs/BootMonFsReadWrite.c | 8 +------
.../Drivers/BootMonFs/BootMonFsUnsupported.c | 8 +------
.../ARM/Drivers/FdtPlatformDxe/FdtPlatform.c | 8 +------
.../ARM/Drivers/FdtPlatformDxe/FdtPlatform.h | 8 +------
.../Drivers/FdtPlatformDxe/FdtPlatformDxe.dec | 8 +------
.../Drivers/FdtPlatformDxe/FdtPlatformDxe.inf | 8 +------
.../Drivers/FdtPlatformDxe/FdtPlatformDxe.uni | 8 +------
.../ARM/Drivers/FdtPlatformDxe/README.txt | 8 +------
.../ARM/Drivers/FdtPlatformDxe/ShellDumpFdt.c | 8 +------
.../ARM/Drivers/FdtPlatformDxe/ShellSetFdt.c | 8 +------
Platform/ARM/Include/Guid/BootMonFsFileInfo.h | 8 +------
Platform/ARM/Include/Library/ArmShellCmdLib.h | 8 +------
Platform/ARM/Include/Library/BdsLib.h | 8 +------
.../JunoPkg/AcpiTables/AcpiSsdtRootPci.asl | 8 +------
.../ARM/JunoPkg/AcpiTables/AcpiTables.inf | 8 +------
Platform/ARM/JunoPkg/AcpiTables/Dbg2.aslc | 8 +------
Platform/ARM/JunoPkg/AcpiTables/Dsdt.asl | 8 +------
Platform/ARM/JunoPkg/AcpiTables/Fadt.aslc | 8 +------
Platform/ARM/JunoPkg/AcpiTables/Gtdt.aslc | 8 +------
Platform/ARM/JunoPkg/AcpiTables/Madt.aslc | 8 +------
Platform/ARM/JunoPkg/AcpiTables/Spcr.aslc | 8 +------
Platform/ARM/JunoPkg/ArmJuno.dec | 8 +------
Platform/ARM/JunoPkg/ArmJuno.dsc | 8 +------
Platform/ARM/JunoPkg/ArmJuno.fdf | 8 +------
.../ConfigurationManager.dsc.inc | 8 +------
.../ConfigurationManager.c | 8 +------
.../ConfigurationManager.h | 8 +------
.../ConfigurationManagerDxe.inf | 8 +------
.../ConfigurationManagerDxe/Platform.h | 8 +------
.../PlatformASLTablesLib/Dsdt.asl | 8 +------
.../PlatformASLTablesLib.inf | 8 +------
.../PlatformASLTablesLib/SsdtJunoUsb.asl | 8 +------
.../PlatformASLTablesLib/SsdtPci.asl | 8 +------
.../PlatformASLTablesLib/SsdtUart.asl | 8 +------
.../JunoPkg/Drivers/ArmJunoDxe/AcpiTables.c | 8 +------
.../JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.c | 8 +------
.../JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf | 8 +------
.../Drivers/ArmJunoDxe/ArmJunoDxeInternal.h | 8 +------
Platform/ARM/JunoPkg/Include/ArmPlatform.h | 8 +------
.../ArmJunoLib/AArch64/ArmJunoHelper.S | 8 +------
.../Library/ArmJunoLib/Arm/ArmJunoHelper.S | 8 +------
.../ARM/JunoPkg/Library/ArmJunoLib/ArmJuno.c | 8 +------
.../JunoPkg/Library/ArmJunoLib/ArmJunoLib.inf | 8 +------
.../JunoPkg/Library/ArmJunoLib/ArmJunoMem.c | 8 +------
.../Library/ArmJunoMtlLib/ArmJunoMtlLib.c | 8 +------
.../Library/ArmJunoMtlLib/ArmJunoMtlLib.inf | 8 +------
.../ArmJunoMtlLib/ArmJunoMtlPrivateLib.h | 8 +------
.../Library/HdLcdArmJunoLib/HdLcdArmJuno.c | 8 +------
.../HdLcdArmJunoLib/HdLcdArmJunoLib.inf | 8 +------
.../JunoPciHostBridgeLib.c | 8 +------
.../JunoPciHostBridgeLib.inf | 8 +------
.../JunoPciHostBridgeLib/XPressRich3.c | 8 +------
.../JunoPciHostBridgeLib/XPressRich3.h | 8 +------
.../Library/NorFlashJunoLib/NorFlashJuno.c | 8 +------
.../NorFlashJunoLib/NorFlashJunoLib.inf | 8 +------
.../SmbiosPlatformDxe/SmbiosPlatformDxe.c | 8 +------
.../SmbiosPlatformDxe/SmbiosPlatformDxe.inf | 7 +-----
.../ArmShellCmdRunAxf/ArmShellCmdRunAxf.c | 8 +------
.../ArmShellCmdRunAxf/ArmShellCmdRunAxf.h | 8 +------
.../ArmShellCmdRunAxf/ArmShellCmdRunAxf.inf | 8 +------
.../ArmShellCmdRunAxf/ArmShellCmdRunAxf.uni | 8 +------
.../ArmShellCmdRunAxf/BootMonFsLoader.c | 8 +------
.../ArmShellCmdRunAxf/BootMonFsLoader.h | 8 +------
.../ARM/Library/ArmShellCmdRunAxf/ElfLoader.c | 8 +------
.../ARM/Library/ArmShellCmdRunAxf/ElfLoader.h | 8 +------
.../ARM/Library/ArmShellCmdRunAxf/RunAxf.c | 8 +------
.../ARM/Library/ArmShellCmdRunAxf/elf32.h | 8 +------
.../ARM/Library/ArmShellCmdRunAxf/elf64.h | 8 +------
.../Library/ArmShellCmdRunAxf/elf_common.h | 8 +------
Platform/ARM/Library/BdsLib/BdsFilePath.c | 8 +------
Platform/ARM/Library/BdsLib/BdsHelper.c | 8 +------
Platform/ARM/Library/BdsLib/BdsInternal.h | 8 +------
Platform/ARM/Library/BdsLib/BdsLib.inf | 8 +------
Platform/ARM/SgiPkg/AcpiTables/Dbg2.aslc | 8 +------
Platform/ARM/SgiPkg/AcpiTables/Fadt.aslc | 8 +------
Platform/ARM/SgiPkg/AcpiTables/Gtdt.aslc | 8 +------
Platform/ARM/SgiPkg/AcpiTables/Iort.aslc | 8 +------
Platform/ARM/SgiPkg/AcpiTables/Mcfg.aslc | 8 +------
.../ARM/SgiPkg/AcpiTables/RdE1Edge/Dsdt.asl | 8 +------
.../ARM/SgiPkg/AcpiTables/RdE1Edge/Madt.aslc | 8 +------
.../SgiPkg/AcpiTables/RdE1EdgeAcpiTables.inf | 8 +------
.../ARM/SgiPkg/AcpiTables/RdN1Edge/Dsdt.asl | 8 +------
.../ARM/SgiPkg/AcpiTables/RdN1Edge/Madt.aslc | 8 +------
.../SgiPkg/AcpiTables/RdN1EdgeAcpiTables.inf | 8 +------
.../ARM/SgiPkg/AcpiTables/Sgi575/Dsdt.asl | 8 +------
.../ARM/SgiPkg/AcpiTables/Sgi575/Madt.aslc | 8 +------
.../SgiPkg/AcpiTables/Sgi575AcpiTables.inf | 8 +------
Platform/ARM/SgiPkg/AcpiTables/Spcr.aslc | 8 +------
Platform/ARM/SgiPkg/AcpiTables/Ssdt.asl | 8 +------
.../SgiPkg/Drivers/PlatformDxe/PlatformDxe.c | 8 +------
.../Drivers/PlatformDxe/PlatformDxe.inf | 8 +------
.../Drivers/PlatformDxe/VirtioDevices.c | 8 +------
.../Include/Guid/SgiVirtioDevicesFormSet.h | 8 +------
.../ARM/SgiPkg/Include/Ppi/SgiPlatformId.h | 8 +------
| 8 +------
Platform/ARM/SgiPkg/Include/SgiPlatform.h | 8 +------
.../Library/HdLcdArmSgiLib/HdLcdArmSgi.c | 8 +------
.../Library/HdLcdArmSgiLib/HdLcdArmSgiLib.inf | 8 +------
.../SgiPkg/Library/NorFlashLib/NorFlashLib.c | 8 +------
.../Library/NorFlashLib/NorFlashLib.inf | 8 +------
.../PciHostBridgeLib/PciHostBridgeLib.c | 8 +------
.../PciHostBridgeLib/PciHostBridgeLib.inf | 8 +------
.../Library/PlatformLib/AArch64/Helper.S | 8 +------
.../SgiPkg/Library/PlatformLib/PlatformLib.c | 8 +------
.../Library/PlatformLib/PlatformLib.inf | 8 +------
.../Library/PlatformLib/PlatformLibMem.c | 8 +------
.../Library/SgiPlatformPei/SgiPlatformPei.inf | 8 +------
.../Library/SgiPlatformPei/SgiPlatformPeim.c | 8 +------
Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc | 8 +------
Platform/ARM/SgiPkg/PlatformStandaloneMm.fdf | 8 +------
Platform/ARM/SgiPkg/SgiPlatform.dec | 8 +------
Platform/ARM/SgiPkg/SgiPlatform.dsc | 8 +------
Platform/ARM/SgiPkg/SgiPlatform.fdf | 8 +------
.../ARM/VExpressPkg/AcpiTables/AcpiTables.inf | 8 +------
Platform/ARM/VExpressPkg/AcpiTables/Dsdt.asl | 23 +------------------
Platform/ARM/VExpressPkg/AcpiTables/Fadt.aslc | 8 +------
.../ARM/VExpressPkg/AcpiTables/FvpPlatform.h | 8 +------
Platform/ARM/VExpressPkg/AcpiTables/Gtdt.aslc | 8 +------
Platform/ARM/VExpressPkg/AcpiTables/Madt.aslc | 8 +------
Platform/ARM/VExpressPkg/AcpiTables/Spcr.aslc | 8 +------
.../ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc | 8 +------
.../ARM/VExpressPkg/ArmVExpress-CTA15-A7.fdf | 8 +------
.../VExpressPkg/ArmVExpress-FVP-AArch64.dsc | 8 +------
.../VExpressPkg/ArmVExpress-FVP-AArch64.fdf | 8 +------
.../ArmVExpress-networking.fdf.inc | 9 +-------
Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc | 8 +------
Platform/ARM/VExpressPkg/ArmVExpressPkg.dec | 8 +------
.../ConfigurationManager.dsc.inc | 8 +------
.../ConfigurationManager.c | 8 +------
.../ConfigurationManager.h | 8 +------
.../ConfigurationManagerDxe.inf | 8 +------
.../ConfigurationManagerDxe/Platform.h | 8 +------
.../PlatformASLTablesLib/Dsdt.asl | 8 +------
.../PlatformASLTablesLib.inf | 8 +------
.../Drivers/ArmVExpressDxe/ArmFvpDxe.c | 8 +------
.../Drivers/ArmVExpressDxe/ArmFvpDxe.inf | 8 +------
.../Drivers/ArmVExpressDxe/ArmHwDxe.c | 8 +------
.../Drivers/ArmVExpressDxe/ArmHwDxe.inf | 8 +------
.../ArmVExpressFastBoot.c | 8 +------
.../ArmVExpressFastBootDxe.inf | 7 +-----
.../Include/Library/ArmPlatformSysConfigLib.h | 8 +------
.../Include/Library/LcdPlatformLib.h | 8 +------
.../Include/Platform/CTA15-A7/ArmPlatform.h | 8 +------
.../Include/Platform/RTSM/ArmPlatform.h | 8 +------
.../VExpressPkg/Include/VExpressMotherBoard.h | 8 +------
.../Library/ArmMaliDpLib/ArmMaliDpLib.c | 8 +------
.../Library/ArmMaliDpLib/ArmMaliDpLib.inf | 8 +------
.../ArmVExpressDtPlatformDtbLoaderLib.c | 8 +------
.../ArmVExpressDtPlatformDtbLoaderLib.inf | 8 +------
.../ArmVExpressLibCTA15-A7/ArmVExpressLib.inf | 8 +------
.../Library/ArmVExpressLibCTA15-A7/CTA15-A7.c | 8 +------
.../ArmVExpressLibCTA15-A7/CTA15-A7Helper.S | 8 +------
.../ArmVExpressLibCTA15-A7/CTA15-A7Helper.asm | 8 +------
.../ArmVExpressLibCTA15-A7/CTA15-A7Mem.c | 8 +------
.../ArmVExpressLibRTSM/AArch64/RTSMHelper.S | 8 +------
.../ArmVExpressLibRTSM/Arm/RTSMHelper.S | 8 +------
.../ArmVExpressLibRTSM/Arm/RTSMHelper.asm | 8 +------
.../ArmVExpressLibRTSM/ArmVExpressLib.inf | 8 +------
.../ArmVExpressLibRTSM/ArmVExpressLibSec.inf | 8 +------
.../Library/ArmVExpressLibRTSM/RTSM.c | 8 +------
.../Library/ArmVExpressLibRTSM/RTSMMem.c | 8 +------
.../ArmVExpressSysConfig.c | 8 +------
.../ArmVExpressSysConfigLib.inf | 8 +------
.../ArmVExpressSysConfigRuntimeLib.c | 8 +------
.../ArmVExpressSysConfigRuntimeLib.inf | 8 +------
.../HdLcdArmVExpressLib/HdLcdArmVExpress.c | 8 +------
.../HdLcdArmVExpressLib.inf | 8 +------
.../NorFlashArmVExpress.c | 8 +------
.../NorFlashArmVExpressLib.inf | 8 +------
.../PL111LcdArmVExpress.c | 8 +------
.../PL111LcdArmVExpressLib.inf | 8 +------
.../Library/ResetSystemLib/ResetSystemLib.c | 8 +------
.../Library/ResetSystemLib/ResetSystemLib.inf | 7 +-----
183 files changed, 183 insertions(+), 1294 deletions(-)
diff --git a/Platform/ARM/ARM.dec b/Platform/ARM/ARM.dec
index 6a6eeb6559..5175b313f9 100644
--- a/Platform/ARM/ARM.dec
+++ b/Platform/ARM/ARM.dec
@@ -2,13 +2,7 @@
#
# Copyright (c) 2011-2017, ARM Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
diff --git a/Platform/ARM/Drivers/BootMonFs/BootMonFs.dec b/Platform/ARM/Drivers/BootMonFs/BootMonFs.dec
index 533dee3b61..1819e2f46d 100644
--- a/Platform/ARM/Drivers/BootMonFs/BootMonFs.dec
+++ b/Platform/ARM/Drivers/BootMonFs/BootMonFs.dec
@@ -2,13 +2,7 @@
#
# Copyright (c) 2011-2017, ARM Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
diff --git a/Platform/ARM/Drivers/BootMonFs/BootMonFs.inf b/Platform/ARM/Drivers/BootMonFs/BootMonFs.inf
index 5b9353f0ee..7c2e216186 100644
--- a/Platform/ARM/Drivers/BootMonFs/BootMonFs.inf
+++ b/Platform/ARM/Drivers/BootMonFs/BootMonFs.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2012-2015, ARM Ltd. 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 distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
diff --git a/Platform/ARM/Drivers/BootMonFs/BootMonFsApi.h b/Platform/ARM/Drivers/BootMonFs/BootMonFsApi.h
index d690520a0f..b8317c3782 100644
--- a/Platform/ARM/Drivers/BootMonFs/BootMonFsApi.h
+++ b/Platform/ARM/Drivers/BootMonFs/BootMonFsApi.h
@@ -2,13 +2,7 @@
*
* Copyright (c) 2012-2014, ARM Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/ARM/Drivers/BootMonFs/BootMonFsDir.c b/Platform/ARM/Drivers/BootMonFs/BootMonFsDir.c
index 64ea0ec680..43c808f8ba 100644
--- a/Platform/ARM/Drivers/BootMonFs/BootMonFsDir.c
+++ b/Platform/ARM/Drivers/BootMonFs/BootMonFsDir.c
@@ -2,13 +2,7 @@
*
* Copyright (c) 2012-2014, ARM Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/ARM/Drivers/BootMonFs/BootMonFsEntryPoint.c b/Platform/ARM/Drivers/BootMonFs/BootMonFsEntryPoint.c
index a1150856f6..d0ef411858 100644
--- a/Platform/ARM/Drivers/BootMonFs/BootMonFsEntryPoint.c
+++ b/Platform/ARM/Drivers/BootMonFs/BootMonFsEntryPoint.c
@@ -2,13 +2,7 @@
*
* Copyright (c) 2012-2014, ARM Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/ARM/Drivers/BootMonFs/BootMonFsHw.h b/Platform/ARM/Drivers/BootMonFs/BootMonFsHw.h
index c1bef755ae..11e77b4758 100644
--- a/Platform/ARM/Drivers/BootMonFs/BootMonFsHw.h
+++ b/Platform/ARM/Drivers/BootMonFs/BootMonFsHw.h
@@ -2,13 +2,7 @@
*
* Copyright (c) 2012-2014, ARM Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/ARM/Drivers/BootMonFs/BootMonFsImages.c b/Platform/ARM/Drivers/BootMonFs/BootMonFsImages.c
index 346c360292..16bef8e3b1 100644
--- a/Platform/ARM/Drivers/BootMonFs/BootMonFsImages.c
+++ b/Platform/ARM/Drivers/BootMonFs/BootMonFsImages.c
@@ -2,13 +2,7 @@
*
* Copyright (c) 2012-2014, ARM Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/ARM/Drivers/BootMonFs/BootMonFsInternal.h b/Platform/ARM/Drivers/BootMonFs/BootMonFsInternal.h
index c0c6599cb7..5d6799e3b2 100644
--- a/Platform/ARM/Drivers/BootMonFs/BootMonFsInternal.h
+++ b/Platform/ARM/Drivers/BootMonFs/BootMonFsInternal.h
@@ -2,13 +2,7 @@
*
* Copyright (c) 2012-2014, ARM Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/ARM/Drivers/BootMonFs/BootMonFsOpenClose.c b/Platform/ARM/Drivers/BootMonFs/BootMonFsOpenClose.c
index ae10055255..1f6e35f04e 100644
--- a/Platform/ARM/Drivers/BootMonFs/BootMonFsOpenClose.c
+++ b/Platform/ARM/Drivers/BootMonFs/BootMonFsOpenClose.c
@@ -2,13 +2,7 @@
*
* Copyright (c) 2012-2015, ARM Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/ARM/Drivers/BootMonFs/BootMonFsReadWrite.c b/Platform/ARM/Drivers/BootMonFs/BootMonFsReadWrite.c
index f8124e95ac..88f42b77a4 100644
--- a/Platform/ARM/Drivers/BootMonFs/BootMonFsReadWrite.c
+++ b/Platform/ARM/Drivers/BootMonFs/BootMonFsReadWrite.c
@@ -2,13 +2,7 @@
*
* Copyright (c) 2012-2014, ARM Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/ARM/Drivers/BootMonFs/BootMonFsUnsupported.c b/Platform/ARM/Drivers/BootMonFs/BootMonFsUnsupported.c
index 4ecc4ea008..2161aeb38c 100644
--- a/Platform/ARM/Drivers/BootMonFs/BootMonFsUnsupported.c
+++ b/Platform/ARM/Drivers/BootMonFs/BootMonFsUnsupported.c
@@ -2,13 +2,7 @@
*
* Copyright (c) 2012-2014, ARM Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/ARM/Drivers/FdtPlatformDxe/FdtPlatform.c b/Platform/ARM/Drivers/FdtPlatformDxe/FdtPlatform.c
index b4be2a0789..cc24b970af 100644
--- a/Platform/ARM/Drivers/FdtPlatformDxe/FdtPlatform.c
+++ b/Platform/ARM/Drivers/FdtPlatformDxe/FdtPlatform.c
@@ -2,13 +2,7 @@
Copyright (c) 2015, ARM Ltd. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/ARM/Drivers/FdtPlatformDxe/FdtPlatform.h b/Platform/ARM/Drivers/FdtPlatformDxe/FdtPlatform.h
index a631f2847b..ec62285f2b 100644
--- a/Platform/ARM/Drivers/FdtPlatformDxe/FdtPlatform.h
+++ b/Platform/ARM/Drivers/FdtPlatformDxe/FdtPlatform.h
@@ -2,13 +2,7 @@
Copyright (c) 2015, ARM Ltd. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/ARM/Drivers/FdtPlatformDxe/FdtPlatformDxe.dec b/Platform/ARM/Drivers/FdtPlatformDxe/FdtPlatformDxe.dec
index 3faced5895..550156938f 100644
--- a/Platform/ARM/Drivers/FdtPlatformDxe/FdtPlatformDxe.dec
+++ b/Platform/ARM/Drivers/FdtPlatformDxe/FdtPlatformDxe.dec
@@ -2,13 +2,7 @@
#
# Copyright (c) 2011-2017, ARM Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
diff --git a/Platform/ARM/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf b/Platform/ARM/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf
index d4aef4bfce..d307e2ddca 100644
--- a/Platform/ARM/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf
+++ b/Platform/ARM/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2015, ARM Ltd. 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 distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
diff --git a/Platform/ARM/Drivers/FdtPlatformDxe/FdtPlatformDxe.uni b/Platform/ARM/Drivers/FdtPlatformDxe/FdtPlatformDxe.uni
index f8bde83484..22d9442b13 100644
--- a/Platform/ARM/Drivers/FdtPlatformDxe/FdtPlatformDxe.uni
+++ b/Platform/ARM/Drivers/FdtPlatformDxe/FdtPlatformDxe.uni
@@ -2,13 +2,7 @@
//
// Copyright (c) 2014, ARM Ltd. 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
-// distribution. The full text of the license may be found at
-// http://opensource.org/licenses/bsd-license.php
-//
-// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+// SPDX-License-Identifier: BSD-2-Clause-Patent
//
//
// Module Name:
diff --git a/Platform/ARM/Drivers/FdtPlatformDxe/README.txt b/Platform/ARM/Drivers/FdtPlatformDxe/README.txt
index 5f052d9a63..bad7a77782 100644
--- a/Platform/ARM/Drivers/FdtPlatformDxe/README.txt
+++ b/Platform/ARM/Drivers/FdtPlatformDxe/README.txt
@@ -2,13 +2,7 @@
Copyright (c) 2015, ARM Ltd. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/ARM/Drivers/FdtPlatformDxe/ShellDumpFdt.c b/Platform/ARM/Drivers/FdtPlatformDxe/ShellDumpFdt.c
index c7dc898568..7606205b10 100644
--- a/Platform/ARM/Drivers/FdtPlatformDxe/ShellDumpFdt.c
+++ b/Platform/ARM/Drivers/FdtPlatformDxe/ShellDumpFdt.c
@@ -2,13 +2,7 @@
Copyright (c) 2015, ARM Ltd. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/ARM/Drivers/FdtPlatformDxe/ShellSetFdt.c b/Platform/ARM/Drivers/FdtPlatformDxe/ShellSetFdt.c
index 9be23c8455..56076f236d 100644
--- a/Platform/ARM/Drivers/FdtPlatformDxe/ShellSetFdt.c
+++ b/Platform/ARM/Drivers/FdtPlatformDxe/ShellSetFdt.c
@@ -2,13 +2,7 @@
Copyright (c) 2015, ARM Ltd. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/ARM/Include/Guid/BootMonFsFileInfo.h b/Platform/ARM/Include/Guid/BootMonFsFileInfo.h
index c4d805c14f..e961f6f3d3 100644
--- a/Platform/ARM/Include/Guid/BootMonFsFileInfo.h
+++ b/Platform/ARM/Include/Guid/BootMonFsFileInfo.h
@@ -2,13 +2,7 @@
*
* Copyright (c) 2014, ARM Ltd. All rights reserved.
*
-* This program and the accompanying materials are licensed and made available
-* under the terms and conditions of the BSD License which accompanies this
-* distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT
-* WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/ARM/Include/Library/ArmShellCmdLib.h b/Platform/ARM/Include/Library/ArmShellCmdLib.h
index eb31cd4053..f947af20cb 100644
--- a/Platform/ARM/Include/Library/ArmShellCmdLib.h
+++ b/Platform/ARM/Include/Library/ArmShellCmdLib.h
@@ -4,13 +4,7 @@
*
* Copyright (C) 2014, ARM Ltd
*
-* This program and the accompanying materials are licensed and made available
-* under the terms and conditions of the BSD License which accompanies this
-* distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT
-* WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/ARM/Include/Library/BdsLib.h b/Platform/ARM/Include/Library/BdsLib.h
index eab8684392..04954be1b7 100644
--- a/Platform/ARM/Include/Library/BdsLib.h
+++ b/Platform/ARM/Include/Library/BdsLib.h
@@ -2,13 +2,7 @@
*
* Copyright (c) 2013-2015, ARM Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/ARM/JunoPkg/AcpiTables/AcpiSsdtRootPci.asl b/Platform/ARM/JunoPkg/AcpiTables/AcpiSsdtRootPci.asl
index 96f1c59305..ba41a95865 100644
--- a/Platform/ARM/JunoPkg/AcpiTables/AcpiSsdtRootPci.asl
+++ b/Platform/ARM/JunoPkg/AcpiTables/AcpiSsdtRootPci.asl
@@ -2,13 +2,7 @@
Differentiated System Description Table Fields (SSDT)
Copyright (c) 2014-2015, ARM Ltd. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/ARM/JunoPkg/AcpiTables/AcpiTables.inf b/Platform/ARM/JunoPkg/AcpiTables/AcpiTables.inf
index 539974ff24..f140febc4a 100644
--- a/Platform/ARM/JunoPkg/AcpiTables/AcpiTables.inf
+++ b/Platform/ARM/JunoPkg/AcpiTables/AcpiTables.inf
@@ -4,13 +4,7 @@
#
# Copyright (c) 2014-2017, ARM Ltd. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/ARM/JunoPkg/AcpiTables/Dbg2.aslc b/Platform/ARM/JunoPkg/AcpiTables/Dbg2.aslc
index be30cd0a65..3d43aa0ea9 100644
--- a/Platform/ARM/JunoPkg/AcpiTables/Dbg2.aslc
+++ b/Platform/ARM/JunoPkg/AcpiTables/Dbg2.aslc
@@ -3,13 +3,7 @@
*
* Copyright (c) 2012-2016, ARM Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/ARM/JunoPkg/AcpiTables/Dsdt.asl b/Platform/ARM/JunoPkg/AcpiTables/Dsdt.asl
index 702b057757..186fd6a471 100644
--- a/Platform/ARM/JunoPkg/AcpiTables/Dsdt.asl
+++ b/Platform/ARM/JunoPkg/AcpiTables/Dsdt.asl
@@ -2,13 +2,7 @@
Differentiated System Description Table Fields (DSDT)
Copyright (c) 2014-2018, ARM Ltd. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/ARM/JunoPkg/AcpiTables/Fadt.aslc b/Platform/ARM/JunoPkg/AcpiTables/Fadt.aslc
index 6b756292bd..504bafd122 100644
--- a/Platform/ARM/JunoPkg/AcpiTables/Fadt.aslc
+++ b/Platform/ARM/JunoPkg/AcpiTables/Fadt.aslc
@@ -3,13 +3,7 @@
*
* Copyright (c) 2012 - 2016, ARM Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/ARM/JunoPkg/AcpiTables/Gtdt.aslc b/Platform/ARM/JunoPkg/AcpiTables/Gtdt.aslc
index 9d1296fdf2..f43834c959 100644
--- a/Platform/ARM/JunoPkg/AcpiTables/Gtdt.aslc
+++ b/Platform/ARM/JunoPkg/AcpiTables/Gtdt.aslc
@@ -3,13 +3,7 @@
*
* Copyright (c) 2012 - 2017, ARM Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/ARM/JunoPkg/AcpiTables/Madt.aslc b/Platform/ARM/JunoPkg/AcpiTables/Madt.aslc
index dffa5d6196..ebbc9662e7 100644
--- a/Platform/ARM/JunoPkg/AcpiTables/Madt.aslc
+++ b/Platform/ARM/JunoPkg/AcpiTables/Madt.aslc
@@ -3,13 +3,7 @@
*
* Copyright (c) 2012 - 2016, ARM Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/ARM/JunoPkg/AcpiTables/Spcr.aslc b/Platform/ARM/JunoPkg/AcpiTables/Spcr.aslc
index 8371669b7b..1696c4aede 100644
--- a/Platform/ARM/JunoPkg/AcpiTables/Spcr.aslc
+++ b/Platform/ARM/JunoPkg/AcpiTables/Spcr.aslc
@@ -3,13 +3,7 @@
*
* Copyright (c) 2014 - 2016, ARM Limited. All rights reserved.
*
-* This program and the accompanying materials are licensed and made available
-* under the terms and conditions of the BSD License which accompanies this
-* distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/ARM/JunoPkg/ArmJuno.dec b/Platform/ARM/JunoPkg/ArmJuno.dec
index c511796d89..27fe757907 100644
--- a/Platform/ARM/JunoPkg/ArmJuno.dec
+++ b/Platform/ARM/JunoPkg/ArmJuno.dec
@@ -1,13 +1,7 @@
#
# Copyright (c) 2013-2018, ARM Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
[Defines]
diff --git a/Platform/ARM/JunoPkg/ArmJuno.dsc b/Platform/ARM/JunoPkg/ArmJuno.dsc
index a355c1e1d9..954faca1bb 100644
--- a/Platform/ARM/JunoPkg/ArmJuno.dsc
+++ b/Platform/ARM/JunoPkg/ArmJuno.dsc
@@ -1,13 +1,7 @@
#
# Copyright (c) 2013-2018, ARM Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
################################################################################
diff --git a/Platform/ARM/JunoPkg/ArmJuno.fdf b/Platform/ARM/JunoPkg/ArmJuno.fdf
index b1295a579b..7c128b2c5b 100644
--- a/Platform/ARM/JunoPkg/ArmJuno.fdf
+++ b/Platform/ARM/JunoPkg/ArmJuno.fdf
@@ -1,13 +1,7 @@
#
# Copyright (c) 2013-2018, ARM Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
################################################################################
diff --git a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManager.dsc.inc b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManager.dsc.inc
index a5fe869483..6699a01609 100644
--- a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManager.dsc.inc
+++ b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManager.dsc.inc
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017 - 2018, ARM Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
##
[Defines]
diff --git a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
index d316c382c7..78b906ddb8 100644
--- a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
+++ b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
@@ -3,13 +3,7 @@
Copyright (c) 2017 - 2019, ARM Limited. All rights reserved.
- This program and the accompanying materials
- are licensed and made available under the terms and conditions of the BSD License
- which accompanies this distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
@par Glossary:
- Cm or CM - Configuration Manager
diff --git a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
index b0720a2509..060817430f 100644
--- a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
+++ b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
@@ -2,13 +2,7 @@
Copyright (c) 2017 - 2019, ARM Limited. All rights reserved.
- This program and the accompanying materials
- are licensed and made available under the terms and conditions of the BSD License
- which accompanies this distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
@par Glossary:
- Cm or CM - Configuration Manager
diff --git a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf
index 93d29e6124..dd71f815db 100644
--- a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf
+++ b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017 - 2019, ARM Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
##
[Defines]
diff --git a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/Platform.h b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/Platform.h
index c98c65c615..7c583ea92a 100644
--- a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/Platform.h
+++ b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/Platform.h
@@ -2,13 +2,7 @@
Copyright (c) 2017 - 2019, ARM Limited. All rights reserved.
- This program and the accompanying materials
- are licensed and made available under the terms and conditions of the BSD License
- which accompanies this distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/ARM/JunoPkg/ConfigurationManager/PlatformASLTablesLib/Dsdt.asl b/Platform/ARM/JunoPkg/ConfigurationManager/PlatformASLTablesLib/Dsdt.asl
index d01cc5e54c..6c04508387 100644
--- a/Platform/ARM/JunoPkg/ConfigurationManager/PlatformASLTablesLib/Dsdt.asl
+++ b/Platform/ARM/JunoPkg/ConfigurationManager/PlatformASLTablesLib/Dsdt.asl
@@ -2,13 +2,7 @@
Differentiated System Description Table Fields (DSDT)
Copyright (c) 2014 - 2019, ARM Ltd. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/ARM/JunoPkg/ConfigurationManager/PlatformASLTablesLib/PlatformASLTablesLib.inf b/Platform/ARM/JunoPkg/ConfigurationManager/PlatformASLTablesLib/PlatformASLTablesLib.inf
index 59b43a9d76..93978cff97 100644
--- a/Platform/ARM/JunoPkg/ConfigurationManager/PlatformASLTablesLib/PlatformASLTablesLib.inf
+++ b/Platform/ARM/JunoPkg/ConfigurationManager/PlatformASLTablesLib/PlatformASLTablesLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017 - 2019, ARM Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
##
[Defines]
diff --git a/Platform/ARM/JunoPkg/ConfigurationManager/PlatformASLTablesLib/SsdtJunoUsb.asl b/Platform/ARM/JunoPkg/ConfigurationManager/PlatformASLTablesLib/SsdtJunoUsb.asl
index 6630f3fc00..8ff9d150b9 100644
--- a/Platform/ARM/JunoPkg/ConfigurationManager/PlatformASLTablesLib/SsdtJunoUsb.asl
+++ b/Platform/ARM/JunoPkg/ConfigurationManager/PlatformASLTablesLib/SsdtJunoUsb.asl
@@ -2,13 +2,7 @@
SSDT for Juno USB
Copyright (c) 2014-2019, ARM Ltd. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/ARM/JunoPkg/ConfigurationManager/PlatformASLTablesLib/SsdtPci.asl b/Platform/ARM/JunoPkg/ConfigurationManager/PlatformASLTablesLib/SsdtPci.asl
index d38b1d5841..2ed37ea83c 100644
--- a/Platform/ARM/JunoPkg/ConfigurationManager/PlatformASLTablesLib/SsdtPci.asl
+++ b/Platform/ARM/JunoPkg/ConfigurationManager/PlatformASLTablesLib/SsdtPci.asl
@@ -2,13 +2,7 @@
SSDT for Juno PCIe
Copyright (c) 2014 - 2019, ARM Ltd. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/ARM/JunoPkg/ConfigurationManager/PlatformASLTablesLib/SsdtUart.asl b/Platform/ARM/JunoPkg/ConfigurationManager/PlatformASLTablesLib/SsdtUart.asl
index 198307f9a3..55a7ffc83f 100644
--- a/Platform/ARM/JunoPkg/ConfigurationManager/PlatformASLTablesLib/SsdtUart.asl
+++ b/Platform/ARM/JunoPkg/ConfigurationManager/PlatformASLTablesLib/SsdtUart.asl
@@ -2,13 +2,7 @@
SSDT for UART
Copyright (c) 2014 - 2019, ARM Ltd. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include "ArmPlatform.h"
diff --git a/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/AcpiTables.c b/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/AcpiTables.c
index bf08346434..aaa493a928 100644
--- a/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/AcpiTables.c
+++ b/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/AcpiTables.c
@@ -4,13 +4,7 @@
Copyright (c) 2015, ARM Ltd. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.c b/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.c
index 0a42d21d4e..c5967f5b71 100644
--- a/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.c
+++ b/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.c
@@ -2,13 +2,7 @@
*
* Copyright (c) 2013-2017, ARM Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf b/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf
index ab154da43e..7c118d9c9c 100644
--- a/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf
+++ b/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf
@@ -1,13 +1,7 @@
#
# Copyright (c) 2013-2015, ARM Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
[Defines]
diff --git a/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxeInternal.h b/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxeInternal.h
index 5d2b68fabd..e6d20448c5 100644
--- a/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxeInternal.h
+++ b/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxeInternal.h
@@ -2,13 +2,7 @@
*
* Copyright (c) 2013-2015, ARM Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/ARM/JunoPkg/Include/ArmPlatform.h b/Platform/ARM/JunoPkg/Include/ArmPlatform.h
index 399fd95279..249887c256 100644
--- a/Platform/ARM/JunoPkg/Include/ArmPlatform.h
+++ b/Platform/ARM/JunoPkg/Include/ArmPlatform.h
@@ -2,13 +2,7 @@
*
* Copyright (c) 2013-2017, ARM Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/ARM/JunoPkg/Library/ArmJunoLib/AArch64/ArmJunoHelper.S b/Platform/ARM/JunoPkg/Library/ArmJunoLib/AArch64/ArmJunoHelper.S
index 4bdf08d1a9..e8f7d195b2 100644
--- a/Platform/ARM/JunoPkg/Library/ArmJunoLib/AArch64/ArmJunoHelper.S
+++ b/Platform/ARM/JunoPkg/Library/ArmJunoLib/AArch64/ArmJunoHelper.S
@@ -2,13 +2,7 @@
*
* Copyright (c) 2013-2014, ARM Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/ARM/JunoPkg/Library/ArmJunoLib/Arm/ArmJunoHelper.S b/Platform/ARM/JunoPkg/Library/ArmJunoLib/Arm/ArmJunoHelper.S
index a7e904eac6..bdd94e3df6 100644
--- a/Platform/ARM/JunoPkg/Library/ArmJunoLib/Arm/ArmJunoHelper.S
+++ b/Platform/ARM/JunoPkg/Library/ArmJunoLib/Arm/ArmJunoHelper.S
@@ -2,13 +2,7 @@
*
* Copyright (c) 2013-2014, ARM Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/ARM/JunoPkg/Library/ArmJunoLib/ArmJuno.c b/Platform/ARM/JunoPkg/Library/ArmJunoLib/ArmJuno.c
index cbc5ed5955..c5d4f70fc0 100644
--- a/Platform/ARM/JunoPkg/Library/ArmJunoLib/ArmJuno.c
+++ b/Platform/ARM/JunoPkg/Library/ArmJunoLib/ArmJuno.c
@@ -2,13 +2,7 @@
*
* Copyright (c) 2013-2016, ARM Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/ARM/JunoPkg/Library/ArmJunoLib/ArmJunoLib.inf b/Platform/ARM/JunoPkg/Library/ArmJunoLib/ArmJunoLib.inf
index 90628e04b2..145663c2fa 100644
--- a/Platform/ARM/JunoPkg/Library/ArmJunoLib/ArmJunoLib.inf
+++ b/Platform/ARM/JunoPkg/Library/ArmJunoLib/ArmJunoLib.inf
@@ -1,13 +1,7 @@
#
# Copyright (c) 2013-2018, ARM Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
[Defines]
diff --git a/Platform/ARM/JunoPkg/Library/ArmJunoLib/ArmJunoMem.c b/Platform/ARM/JunoPkg/Library/ArmJunoLib/ArmJunoMem.c
index 2403f51fa9..990a1664e4 100644
--- a/Platform/ARM/JunoPkg/Library/ArmJunoLib/ArmJunoMem.c
+++ b/Platform/ARM/JunoPkg/Library/ArmJunoLib/ArmJunoMem.c
@@ -2,13 +2,7 @@
*
* Copyright (c) 2013-2018, ARM Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/ARM/JunoPkg/Library/ArmJunoMtlLib/ArmJunoMtlLib.c b/Platform/ARM/JunoPkg/Library/ArmJunoMtlLib/ArmJunoMtlLib.c
index ee1efe1574..235392ab95 100644
--- a/Platform/ARM/JunoPkg/Library/ArmJunoMtlLib/ArmJunoMtlLib.c
+++ b/Platform/ARM/JunoPkg/Library/ArmJunoMtlLib/ArmJunoMtlLib.c
@@ -2,13 +2,7 @@
Copyright (c) 2017-2018, Arm Limited. All rights reserved.
- This program and the accompanying materials
- are licensed and made available under the terms and conditions of the BSD License
- which accompanies this distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
System Control and Management Interface V1.0
http://infocenter.arm.com/help/topic/com.arm.doc.den0056a/
diff --git a/Platform/ARM/JunoPkg/Library/ArmJunoMtlLib/ArmJunoMtlLib.inf b/Platform/ARM/JunoPkg/Library/ArmJunoMtlLib/ArmJunoMtlLib.inf
index 4b46c8071d..0b1460c274 100644
--- a/Platform/ARM/JunoPkg/Library/ArmJunoMtlLib/ArmJunoMtlLib.inf
+++ b/Platform/ARM/JunoPkg/Library/ArmJunoMtlLib/ArmJunoMtlLib.inf
@@ -1,13 +1,7 @@
#/** @file
# Copyright (c) 2017-2018, Arm Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#**/
[Defines]
diff --git a/Platform/ARM/JunoPkg/Library/ArmJunoMtlLib/ArmJunoMtlPrivateLib.h b/Platform/ARM/JunoPkg/Library/ArmJunoMtlLib/ArmJunoMtlPrivateLib.h
index b2bac5e513..e0de203e7c 100644
--- a/Platform/ARM/JunoPkg/Library/ArmJunoMtlLib/ArmJunoMtlPrivateLib.h
+++ b/Platform/ARM/JunoPkg/Library/ArmJunoMtlLib/ArmJunoMtlPrivateLib.h
@@ -2,13 +2,7 @@
Copyright (c) 2017-2018, Arm Limited. All rights reserved.
- This program and the accompanying materials
- are licensed and made available under the terms and conditions of the BSD License
- which accompanies this distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
System Control and Management Interface V1.0
http://infocenter.arm.com/help/topic/com.arm.doc.den0056a/
diff --git a/Platform/ARM/JunoPkg/Library/HdLcdArmJunoLib/HdLcdArmJuno.c b/Platform/ARM/JunoPkg/Library/HdLcdArmJunoLib/HdLcdArmJuno.c
index 3e43ad6b76..4b961b7a9f 100644
--- a/Platform/ARM/JunoPkg/Library/HdLcdArmJunoLib/HdLcdArmJuno.c
+++ b/Platform/ARM/JunoPkg/Library/HdLcdArmJunoLib/HdLcdArmJuno.c
@@ -2,13 +2,7 @@
Copyright (c) 2013-2018, ARM Ltd. All rights reserved.
- This program and the accompanying materials
- are licensed and made available under the terms and conditions of the BSD License
- which accompanies this distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/ARM/JunoPkg/Library/HdLcdArmJunoLib/HdLcdArmJunoLib.inf b/Platform/ARM/JunoPkg/Library/HdLcdArmJunoLib/HdLcdArmJunoLib.inf
index 5590d95e2d..346c1a3d12 100644
--- a/Platform/ARM/JunoPkg/Library/HdLcdArmJunoLib/HdLcdArmJunoLib.inf
+++ b/Platform/ARM/JunoPkg/Library/HdLcdArmJunoLib/HdLcdArmJunoLib.inf
@@ -4,13 +4,7 @@
#
# Copyright (c) 2013-2018, ARM Ltd. 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 distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
diff --git a/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/JunoPciHostBridgeLib.c b/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/JunoPciHostBridgeLib.c
index 5263a2985d..a78dda8cba 100644
--- a/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/JunoPciHostBridgeLib.c
+++ b/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/JunoPciHostBridgeLib.c
@@ -3,13 +3,7 @@
Copyright (c) 2017, Linaro Ltd. 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
- distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php.
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT
- WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include <PiDxe.h>
diff --git a/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/JunoPciHostBridgeLib.inf b/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/JunoPciHostBridgeLib.inf
index 8f68f4b4f2..8b4a6e2fad 100644
--- a/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/JunoPciHostBridgeLib.inf
+++ b/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/JunoPciHostBridgeLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, Linaro Ltd. 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
-# distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
-# IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#
##
diff --git a/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/XPressRich3.c b/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/XPressRich3.c
index a6d782949e..0755dc1556 100644
--- a/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/XPressRich3.c
+++ b/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/XPressRich3.c
@@ -4,13 +4,7 @@
* Copyright (c) 2011-2015, ARM Ltd. All rights reserved.
* Copyright (c) 2017, Linaro, Ltd. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/XPressRich3.h b/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/XPressRich3.h
index 07f52c210e..420bdda753 100644
--- a/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/XPressRich3.h
+++ b/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/XPressRich3.h
@@ -3,13 +3,7 @@
*
* Copyright (c) 2011-2015, ARM Ltd. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/ARM/JunoPkg/Library/NorFlashJunoLib/NorFlashJuno.c b/Platform/ARM/JunoPkg/Library/NorFlashJunoLib/NorFlashJuno.c
index 2e49f3acfe..52b2bcbe3a 100644
--- a/Platform/ARM/JunoPkg/Library/NorFlashJunoLib/NorFlashJuno.c
+++ b/Platform/ARM/JunoPkg/Library/NorFlashJunoLib/NorFlashJuno.c
@@ -2,13 +2,7 @@
Copyright (c) 2011-2014, ARM Ltd. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/ARM/JunoPkg/Library/NorFlashJunoLib/NorFlashJunoLib.inf b/Platform/ARM/JunoPkg/Library/NorFlashJunoLib/NorFlashJunoLib.inf
index 881a479d85..e5e5628de3 100644
--- a/Platform/ARM/JunoPkg/Library/NorFlashJunoLib/NorFlashJunoLib.inf
+++ b/Platform/ARM/JunoPkg/Library/NorFlashJunoLib/NorFlashJunoLib.inf
@@ -1,13 +1,7 @@
#/** @file
#
# Copyright (c) 2011 - 2014, ARM Ltd. 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 distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
diff --git a/Platform/ARM/JunoPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.c b/Platform/ARM/JunoPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.c
index fe5498e9fb..ac18b16ca6 100644
--- a/Platform/ARM/JunoPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.c
+++ b/Platform/ARM/JunoPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.c
@@ -3,13 +3,7 @@
Copyright (c) 2015, ARM Limited. All rights reserved.
- This program and the accompanying materials
- are licensed and made available under the terms and conditions of the BSD License
- which accompanies this distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include <ArmPlatform.h>
diff --git a/Platform/ARM/JunoPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf b/Platform/ARM/JunoPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
index a8305925cd..f938cdf148 100644
--- a/Platform/ARM/JunoPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
+++ b/Platform/ARM/JunoPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
@@ -5,12 +5,7 @@
# Copyright (c) 2011, Intel Corporation. All rights reserved.
# Copyright (c) 2015, ARM Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/ARM/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.c b/Platform/ARM/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.c
index 67bbb9e863..ee0fc99a83 100644
--- a/Platform/ARM/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.c
+++ b/Platform/ARM/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.c
@@ -2,13 +2,7 @@
*
* Copyright (c) 2014, ARM Ltd. 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
-* distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/ARM/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.h b/Platform/ARM/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.h
index 2708b53cc1..18d1e9de68 100644
--- a/Platform/ARM/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.h
+++ b/Platform/ARM/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.h
@@ -2,13 +2,7 @@
*
* Copyright (c) 2014, ARM Ltd. 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
-* distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/ARM/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.inf b/Platform/ARM/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.inf
index 8473b0fa90..74c6a0e84f 100644
--- a/Platform/ARM/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.inf
+++ b/Platform/ARM/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2014, ARM Ltd. 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
-# distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/ARM/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.uni b/Platform/ARM/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.uni
index 6b72960791..c2ccd6de4c 100644
--- a/Platform/ARM/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.uni
+++ b/Platform/ARM/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.uni
@@ -2,13 +2,7 @@
//
// Copyright (c) 2014, ARM Ltd. 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
-// distribution. The full text of the license may be found at
-// http://opensource.org/licenses/bsd-license.php
-//
-// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+// SPDX-License-Identifier: BSD-2-Clause-Patent
//
//
// Module Name:
diff --git a/Platform/ARM/Library/ArmShellCmdRunAxf/BootMonFsLoader.c b/Platform/ARM/Library/ArmShellCmdRunAxf/BootMonFsLoader.c
index 0bce037dcb..43d4a38ab3 100644
--- a/Platform/ARM/Library/ArmShellCmdRunAxf/BootMonFsLoader.c
+++ b/Platform/ARM/Library/ArmShellCmdRunAxf/BootMonFsLoader.c
@@ -2,13 +2,7 @@
*
* Copyright (c) 2014, ARM Ltd. All rights reserved.
*
-* This program and the accompanying materials are licensed and made available
-* under the terms and conditions of the BSD License which accompanies this
-* distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT
-* WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/ARM/Library/ArmShellCmdRunAxf/BootMonFsLoader.h b/Platform/ARM/Library/ArmShellCmdRunAxf/BootMonFsLoader.h
index de3c0adcd1..b2bba0d332 100644
--- a/Platform/ARM/Library/ArmShellCmdRunAxf/BootMonFsLoader.h
+++ b/Platform/ARM/Library/ArmShellCmdRunAxf/BootMonFsLoader.h
@@ -2,13 +2,7 @@
*
* Copyright (c) 2014, ARM Ltd. All rights reserved.
*
-* This program and the accompanying materials are licensed and made available
-* under the terms and conditions of the BSD License which accompanies this
-* distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT
-* WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/ARM/Library/ArmShellCmdRunAxf/ElfLoader.c b/Platform/ARM/Library/ArmShellCmdRunAxf/ElfLoader.c
index 6bb0d22de2..b3f3452937 100644
--- a/Platform/ARM/Library/ArmShellCmdRunAxf/ElfLoader.c
+++ b/Platform/ARM/Library/ArmShellCmdRunAxf/ElfLoader.c
@@ -2,13 +2,7 @@
*
* Copyright (c) 2014, ARM Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/ARM/Library/ArmShellCmdRunAxf/ElfLoader.h b/Platform/ARM/Library/ArmShellCmdRunAxf/ElfLoader.h
index 7020a6c4e7..dbd43ea898 100644
--- a/Platform/ARM/Library/ArmShellCmdRunAxf/ElfLoader.h
+++ b/Platform/ARM/Library/ArmShellCmdRunAxf/ElfLoader.h
@@ -2,13 +2,7 @@
*
* Copyright (c) 2014, ARM Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/ARM/Library/ArmShellCmdRunAxf/RunAxf.c b/Platform/ARM/Library/ArmShellCmdRunAxf/RunAxf.c
index 9f4fc78030..153aed2ab6 100644
--- a/Platform/ARM/Library/ArmShellCmdRunAxf/RunAxf.c
+++ b/Platform/ARM/Library/ArmShellCmdRunAxf/RunAxf.c
@@ -4,13 +4,7 @@
*
* Copyright (c) 2014, ARM Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/ARM/Library/ArmShellCmdRunAxf/elf32.h b/Platform/ARM/Library/ArmShellCmdRunAxf/elf32.h
index 3951444a30..14dc5a4169 100644
--- a/Platform/ARM/Library/ArmShellCmdRunAxf/elf32.h
+++ b/Platform/ARM/Library/ArmShellCmdRunAxf/elf32.h
@@ -2,13 +2,7 @@
Ported ELF include files from FreeBSD
Copyright (c) 2009 - 2010, Apple Inc. 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 distribution. The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/ARM/Library/ArmShellCmdRunAxf/elf64.h b/Platform/ARM/Library/ArmShellCmdRunAxf/elf64.h
index 1cfe0c9539..8872ece3fb 100644
--- a/Platform/ARM/Library/ArmShellCmdRunAxf/elf64.h
+++ b/Platform/ARM/Library/ArmShellCmdRunAxf/elf64.h
@@ -2,13 +2,7 @@
Ported ELF include files from FreeBSD
Copyright (c) 2009 - 2010, Apple Inc. 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 distribution. The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
/*-
diff --git a/Platform/ARM/Library/ArmShellCmdRunAxf/elf_common.h b/Platform/ARM/Library/ArmShellCmdRunAxf/elf_common.h
index ed3cedc1b0..ea3827a568 100644
--- a/Platform/ARM/Library/ArmShellCmdRunAxf/elf_common.h
+++ b/Platform/ARM/Library/ArmShellCmdRunAxf/elf_common.h
@@ -3,13 +3,7 @@ Ported ELF include files from FreeBSD
Copyright (c) 2009 - 2010, Apple Inc. 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 under the terms and conditions of the BSD License
-which accompanies this distribution. The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/ARM/Library/BdsLib/BdsFilePath.c b/Platform/ARM/Library/BdsLib/BdsFilePath.c
index ad66b2f827..f0ffc6475d 100644
--- a/Platform/ARM/Library/BdsLib/BdsFilePath.c
+++ b/Platform/ARM/Library/BdsLib/BdsFilePath.c
@@ -2,13 +2,7 @@
*
* Copyright (c) 2011-2014, ARM Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/ARM/Library/BdsLib/BdsHelper.c b/Platform/ARM/Library/BdsLib/BdsHelper.c
index de40fb5cf6..88a6dedbcb 100644
--- a/Platform/ARM/Library/BdsLib/BdsHelper.c
+++ b/Platform/ARM/Library/BdsLib/BdsHelper.c
@@ -2,13 +2,7 @@
*
* Copyright (c) 2011-2015, ARM Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/ARM/Library/BdsLib/BdsInternal.h b/Platform/ARM/Library/BdsLib/BdsInternal.h
index 850618c624..f9761a9019 100644
--- a/Platform/ARM/Library/BdsLib/BdsInternal.h
+++ b/Platform/ARM/Library/BdsLib/BdsInternal.h
@@ -2,13 +2,7 @@
*
* Copyright (c) 2011-2015, ARM Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/ARM/Library/BdsLib/BdsLib.inf b/Platform/ARM/Library/BdsLib/BdsLib.inf
index 7441fe539b..12995cf174 100644
--- a/Platform/ARM/Library/BdsLib/BdsLib.inf
+++ b/Platform/ARM/Library/BdsLib/BdsLib.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2011-2014, ARM Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#*/
diff --git a/Platform/ARM/SgiPkg/AcpiTables/Dbg2.aslc b/Platform/ARM/SgiPkg/AcpiTables/Dbg2.aslc
index dd85ecaebf..279f847cce 100644
--- a/Platform/ARM/SgiPkg/AcpiTables/Dbg2.aslc
+++ b/Platform/ARM/SgiPkg/AcpiTables/Dbg2.aslc
@@ -3,13 +3,7 @@
*
* Copyright (c) 2018, ARM Limited. All rights reserved.
*
-* This program and the accompanying materials are licensed and made available
-* under the terms and conditions of the BSD License which accompanies this
-* distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/ARM/SgiPkg/AcpiTables/Fadt.aslc b/Platform/ARM/SgiPkg/AcpiTables/Fadt.aslc
index 35b3ec80fc..9472aff2e0 100644
--- a/Platform/ARM/SgiPkg/AcpiTables/Fadt.aslc
+++ b/Platform/ARM/SgiPkg/AcpiTables/Fadt.aslc
@@ -3,13 +3,7 @@
*
* Copyright (c) 2018, ARM Limited. All rights reserved.
*
-* This program and the accompanying materials are licensed and made available
-* under the terms and conditions of the BSD License which accompanies this
-* distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/ARM/SgiPkg/AcpiTables/Gtdt.aslc b/Platform/ARM/SgiPkg/AcpiTables/Gtdt.aslc
index d7105f3823..a8b587ba88 100644
--- a/Platform/ARM/SgiPkg/AcpiTables/Gtdt.aslc
+++ b/Platform/ARM/SgiPkg/AcpiTables/Gtdt.aslc
@@ -3,13 +3,7 @@
*
* Copyright (c) 2018, ARM Limited. All rights reserved.
*
-* This program and the accompanying materials are licensed and made available
-* under the terms and conditions of the BSD License which accompanies this
-* distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/ARM/SgiPkg/AcpiTables/Iort.aslc b/Platform/ARM/SgiPkg/AcpiTables/Iort.aslc
index b32e76e408..58ec31ddc8 100644
--- a/Platform/ARM/SgiPkg/AcpiTables/Iort.aslc
+++ b/Platform/ARM/SgiPkg/AcpiTables/Iort.aslc
@@ -3,13 +3,7 @@
*
* Copyright (c) 2018, ARM Ltd. All rights reserved.
*
-* This program and the accompanying materials are licensed and made available
-* under the terms and conditions of the BSD License which accompanies this
-* distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/ARM/SgiPkg/AcpiTables/Mcfg.aslc b/Platform/ARM/SgiPkg/AcpiTables/Mcfg.aslc
index bb4026014d..090297d954 100644
--- a/Platform/ARM/SgiPkg/AcpiTables/Mcfg.aslc
+++ b/Platform/ARM/SgiPkg/AcpiTables/Mcfg.aslc
@@ -3,13 +3,7 @@
*
* Copyright (c) 2018, ARM Ltd. All rights reserved.
*
-* This program and the accompanying materials are licensed and made available
-* under the terms and conditions of the BSD License which accompanies this
-* distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdE1Edge/Dsdt.asl b/Platform/ARM/SgiPkg/AcpiTables/RdE1Edge/Dsdt.asl
index c2f2dfb46e..5583e61097 100644
--- a/Platform/ARM/SgiPkg/AcpiTables/RdE1Edge/Dsdt.asl
+++ b/Platform/ARM/SgiPkg/AcpiTables/RdE1Edge/Dsdt.asl
@@ -3,13 +3,7 @@
*
* Copyright (c) 2018, ARM Ltd. All rights reserved.
*
-* This program and the accompanying materials are licensed and made available
-* under the terms and conditions of the BSD License which accompanies this
-* distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdE1Edge/Madt.aslc b/Platform/ARM/SgiPkg/AcpiTables/RdE1Edge/Madt.aslc
index 0d66d8afa0..48e7a61478 100644
--- a/Platform/ARM/SgiPkg/AcpiTables/RdE1Edge/Madt.aslc
+++ b/Platform/ARM/SgiPkg/AcpiTables/RdE1Edge/Madt.aslc
@@ -3,13 +3,7 @@
*
* Copyright (c) 2018, ARM Limited. All rights reserved.
*
-* This program and the accompanying materials are licensed and made available
-* under the terms and conditions of the BSD License which accompanies this
-* distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdE1EdgeAcpiTables.inf b/Platform/ARM/SgiPkg/AcpiTables/RdE1EdgeAcpiTables.inf
index da6d634595..3a4d4e7b95 100644
--- a/Platform/ARM/SgiPkg/AcpiTables/RdE1EdgeAcpiTables.inf
+++ b/Platform/ARM/SgiPkg/AcpiTables/RdE1EdgeAcpiTables.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2018, ARM Ltd. All rights reserved.
#
-# This program and the accompanying materials are licensed and made available
-# under the terms and conditions of the BSD License which accompanies this
-# distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdN1Edge/Dsdt.asl b/Platform/ARM/SgiPkg/AcpiTables/RdN1Edge/Dsdt.asl
index 9226229222..45316d5005 100644
--- a/Platform/ARM/SgiPkg/AcpiTables/RdN1Edge/Dsdt.asl
+++ b/Platform/ARM/SgiPkg/AcpiTables/RdN1Edge/Dsdt.asl
@@ -3,13 +3,7 @@
*
* Copyright (c) 2018, ARM Ltd. All rights reserved.
*
-* This program and the accompanying materials are licensed and made available
-* under the terms and conditions of the BSD License which accompanies this
-* distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdN1Edge/Madt.aslc b/Platform/ARM/SgiPkg/AcpiTables/RdN1Edge/Madt.aslc
index d29eda5960..6312743a47 100644
--- a/Platform/ARM/SgiPkg/AcpiTables/RdN1Edge/Madt.aslc
+++ b/Platform/ARM/SgiPkg/AcpiTables/RdN1Edge/Madt.aslc
@@ -3,13 +3,7 @@
*
* Copyright (c) 2018, ARM Limited. All rights reserved.
*
-* This program and the accompanying materials are licensed and made available
-* under the terms and conditions of the BSD License which accompanies this
-* distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeAcpiTables.inf b/Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeAcpiTables.inf
index aa9fec7822..58c33ecb8e 100644
--- a/Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeAcpiTables.inf
+++ b/Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeAcpiTables.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2018, ARM Ltd. All rights reserved.
#
-# This program and the accompanying materials are licensed and made available
-# under the terms and conditions of the BSD License which accompanies this
-# distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/ARM/SgiPkg/AcpiTables/Sgi575/Dsdt.asl b/Platform/ARM/SgiPkg/AcpiTables/Sgi575/Dsdt.asl
index 36bc8c3809..bf0c964b7a 100644
--- a/Platform/ARM/SgiPkg/AcpiTables/Sgi575/Dsdt.asl
+++ b/Platform/ARM/SgiPkg/AcpiTables/Sgi575/Dsdt.asl
@@ -3,13 +3,7 @@
*
* Copyright (c) 2018, ARM Ltd. All rights reserved.
*
-* This program and the accompanying materials are licensed and made available
-* under the terms and conditions of the BSD License which accompanies this
-* distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/ARM/SgiPkg/AcpiTables/Sgi575/Madt.aslc b/Platform/ARM/SgiPkg/AcpiTables/Sgi575/Madt.aslc
index 4f981203b2..dedabaaecd 100644
--- a/Platform/ARM/SgiPkg/AcpiTables/Sgi575/Madt.aslc
+++ b/Platform/ARM/SgiPkg/AcpiTables/Sgi575/Madt.aslc
@@ -3,13 +3,7 @@
*
* Copyright (c) 2018, ARM Limited. All rights reserved.
*
-* This program and the accompanying materials are licensed and made available
-* under the terms and conditions of the BSD License which accompanies this
-* distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/ARM/SgiPkg/AcpiTables/Sgi575AcpiTables.inf b/Platform/ARM/SgiPkg/AcpiTables/Sgi575AcpiTables.inf
index c666ea9d51..097ef854df 100644
--- a/Platform/ARM/SgiPkg/AcpiTables/Sgi575AcpiTables.inf
+++ b/Platform/ARM/SgiPkg/AcpiTables/Sgi575AcpiTables.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2018, ARM Ltd. All rights reserved.
#
-# This program and the accompanying materials are licensed and made available
-# under the terms and conditions of the BSD License which accompanies this
-# distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/ARM/SgiPkg/AcpiTables/Spcr.aslc b/Platform/ARM/SgiPkg/AcpiTables/Spcr.aslc
index 0aa1c3ec2d..6321445300 100644
--- a/Platform/ARM/SgiPkg/AcpiTables/Spcr.aslc
+++ b/Platform/ARM/SgiPkg/AcpiTables/Spcr.aslc
@@ -3,13 +3,7 @@
*
* Copyright (c) 2018, ARM Limited. All rights reserved.
*
-* This program and the accompanying materials are licensed and made available
-* under the terms and conditions of the BSD License which accompanies this
-* distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/ARM/SgiPkg/AcpiTables/Ssdt.asl b/Platform/ARM/SgiPkg/AcpiTables/Ssdt.asl
index 1901368d0e..49c630d531 100644
--- a/Platform/ARM/SgiPkg/AcpiTables/Ssdt.asl
+++ b/Platform/ARM/SgiPkg/AcpiTables/Ssdt.asl
@@ -3,13 +3,7 @@
*
* Copyright (c) 2018, ARM Limited. All rights reserved.
*
-* This program and the accompanying materials are licensed and made available
-* under the terms and conditions of the BSD License which accompanies this
-* distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.c b/Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.c
index cc9b0a6385..09e00e5d53 100644
--- a/Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.c
+++ b/Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.c
@@ -2,13 +2,7 @@
*
* Copyright (c) 2018, ARM Limited. All rights reserved.
*
-* This program and the accompanying materials are licensed and made available
-* under the terms and conditions of the BSD License which accompanies this
-* distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.inf b/Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.inf
index 7752256b6f..a95c0d1ddd 100644
--- a/Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.inf
+++ b/Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.inf
@@ -1,13 +1,7 @@
#
# Copyright (c) 2018, ARM Limited. All rights reserved.
#
-# This program and the accompanying materials are licensed and made available
-# under the terms and conditions of the BSD License which accompanies this
-# distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
[Defines]
diff --git a/Platform/ARM/SgiPkg/Drivers/PlatformDxe/VirtioDevices.c b/Platform/ARM/SgiPkg/Drivers/PlatformDxe/VirtioDevices.c
index 92ad704c61..9e5f7e704e 100644
--- a/Platform/ARM/SgiPkg/Drivers/PlatformDxe/VirtioDevices.c
+++ b/Platform/ARM/SgiPkg/Drivers/PlatformDxe/VirtioDevices.c
@@ -2,13 +2,7 @@
Copyright (c) 2018, ARM Ltd. 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
- distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/ARM/SgiPkg/Include/Guid/SgiVirtioDevicesFormSet.h b/Platform/ARM/SgiPkg/Include/Guid/SgiVirtioDevicesFormSet.h
index b7aab64d7b..78c2d2d279 100644
--- a/Platform/ARM/SgiPkg/Include/Guid/SgiVirtioDevicesFormSet.h
+++ b/Platform/ARM/SgiPkg/Include/Guid/SgiVirtioDevicesFormSet.h
@@ -2,13 +2,7 @@
*
* Copyright (c) 2018, ARM Limited. All rights reserved.
*
-* This program and the accompanying materials are licensed and made available
-* under the terms and conditions of the BSD License which accompanies this
-* distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/ARM/SgiPkg/Include/Ppi/SgiPlatformId.h b/Platform/ARM/SgiPkg/Include/Ppi/SgiPlatformId.h
index b830326833..01eef49d8f 100644
--- a/Platform/ARM/SgiPkg/Include/Ppi/SgiPlatformId.h
+++ b/Platform/ARM/SgiPkg/Include/Ppi/SgiPlatformId.h
@@ -2,13 +2,7 @@
*
* Copyright (c) 2018, ARM Limited. All rights reserved.
*
-* This program and the accompanying materials are licensed and made available
-* under the terms and conditions of the BSD License which accompanies this
-* distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
--git a/Platform/ARM/SgiPkg/Include/SgiAcpiHeader.h b/Platform/ARM/SgiPkg/Include/SgiAcpiHeader.h
index 30352b06a6..5083dde15d 100644
--- a/Platform/ARM/SgiPkg/Include/SgiAcpiHeader.h
+++ b/Platform/ARM/SgiPkg/Include/SgiAcpiHeader.h
@@ -2,13 +2,7 @@
*
* Copyright (c) 2018, ARM Limited. All rights reserved.
*
-* This program and the accompanying materials are licensed and made available
-* under the terms and conditions of the BSD License which accompanies this
-* distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/ARM/SgiPkg/Include/SgiPlatform.h b/Platform/ARM/SgiPkg/Include/SgiPlatform.h
index e89a5083b3..e4a2e8cc09 100644
--- a/Platform/ARM/SgiPkg/Include/SgiPlatform.h
+++ b/Platform/ARM/SgiPkg/Include/SgiPlatform.h
@@ -2,13 +2,7 @@
*
* Copyright (c) 2018, ARM Limited. All rights reserved.
*
-* This program and the accompanying materials are licensed and made available
-* under the terms and conditions of the BSD License which accompanies this
-* distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/ARM/SgiPkg/Library/HdLcdArmSgiLib/HdLcdArmSgi.c b/Platform/ARM/SgiPkg/Library/HdLcdArmSgiLib/HdLcdArmSgi.c
index 55f10f4eb7..6f747d2545 100644
--- a/Platform/ARM/SgiPkg/Library/HdLcdArmSgiLib/HdLcdArmSgi.c
+++ b/Platform/ARM/SgiPkg/Library/HdLcdArmSgiLib/HdLcdArmSgi.c
@@ -2,13 +2,7 @@
*
* Copyright (c) 2018, ARM Limited. All rights reserved.
*
-* This program and the accompanying materials are licensed and made available
-* under the terms and conditions of the BSD License which accompanies this
-* distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/ARM/SgiPkg/Library/HdLcdArmSgiLib/HdLcdArmSgiLib.inf b/Platform/ARM/SgiPkg/Library/HdLcdArmSgiLib/HdLcdArmSgiLib.inf
index 751f0d9288..75a6ba2ae6 100644
--- a/Platform/ARM/SgiPkg/Library/HdLcdArmSgiLib/HdLcdArmSgiLib.inf
+++ b/Platform/ARM/SgiPkg/Library/HdLcdArmSgiLib/HdLcdArmSgiLib.inf
@@ -1,13 +1,7 @@
#
# Copyright (c) 2018, ARM Limited. All rights reserved.
#
-# This program and the accompanying materials are licensed and made available
-# under the terms and conditions of the BSD License which accompanies this
-# distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
[Defines]
diff --git a/Platform/ARM/SgiPkg/Library/NorFlashLib/NorFlashLib.c b/Platform/ARM/SgiPkg/Library/NorFlashLib/NorFlashLib.c
index 04e9710bf2..e3bf2726b5 100644
--- a/Platform/ARM/SgiPkg/Library/NorFlashLib/NorFlashLib.c
+++ b/Platform/ARM/SgiPkg/Library/NorFlashLib/NorFlashLib.c
@@ -2,13 +2,7 @@
Copyright (c) 2018, ARM Ltd. All rights reserved.
- This program and the accompanying materials are licensed and made available
- under the terms and conditions of the BSD License which accompanies this
- distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/ARM/SgiPkg/Library/NorFlashLib/NorFlashLib.inf b/Platform/ARM/SgiPkg/Library/NorFlashLib/NorFlashLib.inf
index 3a6b33b538..a1439c10d1 100644
--- a/Platform/ARM/SgiPkg/Library/NorFlashLib/NorFlashLib.inf
+++ b/Platform/ARM/SgiPkg/Library/NorFlashLib/NorFlashLib.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, ARM Ltd. All rights reserved.
-# This program and the accompanying materials are licensed and made available
-# under the terms and conditions of the BSD License which accompanies this
-# distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
diff --git a/Platform/ARM/SgiPkg/Library/PciHostBridgeLib/PciHostBridgeLib.c b/Platform/ARM/SgiPkg/Library/PciHostBridgeLib/PciHostBridgeLib.c
index ddda194224..e53aab58f8 100644
--- a/Platform/ARM/SgiPkg/Library/PciHostBridgeLib/PciHostBridgeLib.c
+++ b/Platform/ARM/SgiPkg/Library/PciHostBridgeLib/PciHostBridgeLib.c
@@ -3,13 +3,7 @@
*
* Copyright (c) 2018, ARM Limited. All rights reserved.
*
-* This program and the accompanying materials are licensed and made available
-* under the terms and conditions of the BSD License which accompanies this
-* distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/ARM/SgiPkg/Library/PciHostBridgeLib/PciHostBridgeLib.inf b/Platform/ARM/SgiPkg/Library/PciHostBridgeLib/PciHostBridgeLib.inf
index 16c2295f75..a9fdd874d0 100644
--- a/Platform/ARM/SgiPkg/Library/PciHostBridgeLib/PciHostBridgeLib.inf
+++ b/Platform/ARM/SgiPkg/Library/PciHostBridgeLib/PciHostBridgeLib.inf
@@ -4,13 +4,7 @@
# Copyright (c) 2016, Intel Corporation. All rights reserved.
# Copyright (c) 2017, ARM Limited. All rights reserved.
#
-# This program and the accompanying materials are licensed and made available
-# under the terms and conditions of the BSD License which accompanies this
-# distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
-# IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/ARM/SgiPkg/Library/PlatformLib/AArch64/Helper.S b/Platform/ARM/SgiPkg/Library/PlatformLib/AArch64/Helper.S
index 5dc64316ce..e2572b51e9 100644
--- a/Platform/ARM/SgiPkg/Library/PlatformLib/AArch64/Helper.S
+++ b/Platform/ARM/SgiPkg/Library/PlatformLib/AArch64/Helper.S
@@ -2,13 +2,7 @@
*
* Copyright (c) 2018, ARM Limited. All rights reserved.
*
-* This program and the accompanying materials are licensed and made available
-* under the terms and conditions of the BSD License which accompanies this
-* distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLib.c b/Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLib.c
index d264292216..9731d7ccce 100644
--- a/Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLib.c
+++ b/Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLib.c
@@ -2,13 +2,7 @@
*
* Copyright (c) 2018, ARM Limited. All rights reserved.
*
-* This program and the accompanying materials are licensed and made available
-* under the terms and conditions of the BSD License which accompanies this
-* distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLib.inf b/Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLib.inf
index c0fcc81982..3db70e900d 100644
--- a/Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLib.inf
+++ b/Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLib.inf
@@ -1,13 +1,7 @@
#
# Copyright (c) 2018, ARM Limited. All rights reserved.
#
-# This program and the accompanying materials are licensed and made available
-# under the terms and conditions of the BSD License which accompanies this
-# distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
[Defines]
diff --git a/Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLibMem.c b/Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLibMem.c
index 60729e3c71..845aeaf4dd 100644
--- a/Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLibMem.c
+++ b/Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLibMem.c
@@ -2,13 +2,7 @@
*
* Copyright (c) 2018, ARM Limited. All rights reserved.
*
-* This program and the accompanying materials are licensed and made available
-* under the terms and conditions of the BSD License which accompanies this
-* distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/ARM/SgiPkg/Library/SgiPlatformPei/SgiPlatformPei.inf b/Platform/ARM/SgiPkg/Library/SgiPlatformPei/SgiPlatformPei.inf
index a9173cc572..407160c075 100644
--- a/Platform/ARM/SgiPkg/Library/SgiPlatformPei/SgiPlatformPei.inf
+++ b/Platform/ARM/SgiPkg/Library/SgiPlatformPei/SgiPlatformPei.inf
@@ -1,13 +1,7 @@
#
# Copyright (c) 2018, ARM Limited. All rights reserved.
#
-# This program and the accompanying materials are licensed and made available
-# under the terms and conditions of the BSD License which accompanies this
-# distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
[Defines]
diff --git a/Platform/ARM/SgiPkg/Library/SgiPlatformPei/SgiPlatformPeim.c b/Platform/ARM/SgiPkg/Library/SgiPlatformPei/SgiPlatformPeim.c
index d133921f23..4daa1832df 100644
--- a/Platform/ARM/SgiPkg/Library/SgiPlatformPei/SgiPlatformPeim.c
+++ b/Platform/ARM/SgiPkg/Library/SgiPlatformPei/SgiPlatformPeim.c
@@ -2,13 +2,7 @@
*
* Copyright (c) 2018, ARM Limited. All rights reserved.
*
-* This program and the accompanying materials are licensed and made available
-* under the terms and conditions of the BSD License which accompanies this
-* distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc b/Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc
index 49fc91944d..7ae19560ea 100644
--- a/Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc
+++ b/Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc
@@ -1,13 +1,7 @@
#
# Copyright (c) 2018, ARM Limited. All rights reserved.
#
-# This program and the accompanying materials are licensed and made available
-# under the terms and conditions of the BSD License which accompanies this
-# distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
################################################################################
diff --git a/Platform/ARM/SgiPkg/PlatformStandaloneMm.fdf b/Platform/ARM/SgiPkg/PlatformStandaloneMm.fdf
index 810460ca98..5a0772cd85 100644
--- a/Platform/ARM/SgiPkg/PlatformStandaloneMm.fdf
+++ b/Platform/ARM/SgiPkg/PlatformStandaloneMm.fdf
@@ -1,13 +1,7 @@
#
# Copyright (c) 2018, ARM Limited. All rights reserved.
#
-# This program and the accompanying materials are licensed and made available
-# under the terms and conditions of the BSD License which accompanies this
-# distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
################################################################################
diff --git a/Platform/ARM/SgiPkg/SgiPlatform.dec b/Platform/ARM/SgiPkg/SgiPlatform.dec
index 612c494c2d..229552ea78 100644
--- a/Platform/ARM/SgiPkg/SgiPlatform.dec
+++ b/Platform/ARM/SgiPkg/SgiPlatform.dec
@@ -1,13 +1,7 @@
#
# Copyright (c) 2018, ARM Limited. All rights reserved.
#
-# This program and the accompanying materials are licensed and made available
-# under the terms and conditions of the BSD License which accompanies this
-# distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
[Defines]
diff --git a/Platform/ARM/SgiPkg/SgiPlatform.dsc b/Platform/ARM/SgiPkg/SgiPlatform.dsc
index ae55139175..a5b7eea1d3 100644
--- a/Platform/ARM/SgiPkg/SgiPlatform.dsc
+++ b/Platform/ARM/SgiPkg/SgiPlatform.dsc
@@ -1,13 +1,7 @@
#
# Copyright (c) 2018, ARM Limited. All rights reserved.
#
-# This program and the accompanying materials are licensed and made available
-# under the terms and conditions of the BSD License which accompanies this
-# distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
################################################################################
diff --git a/Platform/ARM/SgiPkg/SgiPlatform.fdf b/Platform/ARM/SgiPkg/SgiPlatform.fdf
index b163dab5c3..527bbd825d 100644
--- a/Platform/ARM/SgiPkg/SgiPlatform.fdf
+++ b/Platform/ARM/SgiPkg/SgiPlatform.fdf
@@ -1,13 +1,7 @@
#
# Copyright (c) 2018, ARM Limited. All rights reserved.
#
-# This program and the accompanying materials are licensed and made available
-# under the terms and conditions of the BSD License which accompanies this
-# distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
################################################################################
diff --git a/Platform/ARM/VExpressPkg/AcpiTables/AcpiTables.inf b/Platform/ARM/VExpressPkg/AcpiTables/AcpiTables.inf
index 35685274a0..bca1d21de7 100644
--- a/Platform/ARM/VExpressPkg/AcpiTables/AcpiTables.inf
+++ b/Platform/ARM/VExpressPkg/AcpiTables/AcpiTables.inf
@@ -4,13 +4,7 @@
#
# Copyright (c) 2014-2017, ARM Ltd. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/ARM/VExpressPkg/AcpiTables/Dsdt.asl b/Platform/ARM/VExpressPkg/AcpiTables/Dsdt.asl
index 7e81ab7ea1..f9b44bb25f 100644
--- a/Platform/ARM/VExpressPkg/AcpiTables/Dsdt.asl
+++ b/Platform/ARM/VExpressPkg/AcpiTables/Dsdt.asl
@@ -2,28 +2,7 @@
* Copyright (c) 2013, Al Stone <al.stone@linaro.org>
* All rights reserved.
*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions
-* are met:
-*
-* 1. Redistributions of source code must retain the above copyright
-* notice, this list of conditions and the following disclaimer.
-*
-* 2. Redistributions in binary form must reproduce the above copyright
-* notice, this list of conditions and the following disclaimer in the
-* documentation and/or other materials provided with the distribution.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-* HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
-* TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
*
* NB: This License is also known as the "BSD 2-Clause License".
diff --git a/Platform/ARM/VExpressPkg/AcpiTables/Fadt.aslc b/Platform/ARM/VExpressPkg/AcpiTables/Fadt.aslc
index 087c191ecd..4eaec61b32 100644
--- a/Platform/ARM/VExpressPkg/AcpiTables/Fadt.aslc
+++ b/Platform/ARM/VExpressPkg/AcpiTables/Fadt.aslc
@@ -3,13 +3,7 @@
*
* Copyright (c) 2012 - 2016, ARM Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/ARM/VExpressPkg/AcpiTables/FvpPlatform.h b/Platform/ARM/VExpressPkg/AcpiTables/FvpPlatform.h
index e3582bfe33..21df93f6ee 100644
--- a/Platform/ARM/VExpressPkg/AcpiTables/FvpPlatform.h
+++ b/Platform/ARM/VExpressPkg/AcpiTables/FvpPlatform.h
@@ -4,13 +4,7 @@
* Copyright (c) 2015, Hisilicon Limited. All rights reserved.
* Copyright (c) 2015, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
* Based on the files under ArmPlatformPkg/ArmJunoPkg/AcpiTables/
*
diff --git a/Platform/ARM/VExpressPkg/AcpiTables/Gtdt.aslc b/Platform/ARM/VExpressPkg/AcpiTables/Gtdt.aslc
index 7a0b2b686e..9007fc936c 100644
--- a/Platform/ARM/VExpressPkg/AcpiTables/Gtdt.aslc
+++ b/Platform/ARM/VExpressPkg/AcpiTables/Gtdt.aslc
@@ -4,13 +4,7 @@
* Copyright (c) 2012 - 2018, ARM Limited. All rights reserved.
* Copyright (c) 2016, Linaro Ltd. All rights reserved
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/ARM/VExpressPkg/AcpiTables/Madt.aslc b/Platform/ARM/VExpressPkg/AcpiTables/Madt.aslc
index bf90a9f5a9..b34422e13f 100644
--- a/Platform/ARM/VExpressPkg/AcpiTables/Madt.aslc
+++ b/Platform/ARM/VExpressPkg/AcpiTables/Madt.aslc
@@ -4,13 +4,7 @@
* Copyright (c) 2012 - 2015, ARM Limited. All rights reserved.
* Copyright (c) 2016 Linaro Ltd. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/ARM/VExpressPkg/AcpiTables/Spcr.aslc b/Platform/ARM/VExpressPkg/AcpiTables/Spcr.aslc
index 68caa24567..7a6b635ac7 100644
--- a/Platform/ARM/VExpressPkg/AcpiTables/Spcr.aslc
+++ b/Platform/ARM/VExpressPkg/AcpiTables/Spcr.aslc
@@ -4,13 +4,7 @@
* Copyright (c) 2014 - 2016, ARM Limited. All rights reserved.
* Copyright (c) 2016, Linaro Ltd. All rights reserved.
*
-* This program and the accompanying materials are licensed and made available
-* under the terms and conditions of the BSD License which accompanies this
-* distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc
index 3a3b4e3dbb..2f8021d3ea 100644
--- a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc
+++ b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc
@@ -2,13 +2,7 @@
# Copyright (c) 2012-2018, ARM Limited. All rights reserved.
# Copyright (c) 2015, 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 distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#
diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.fdf b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.fdf
index ecd57f3a3e..082f80d999 100644
--- a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.fdf
+++ b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.fdf
@@ -2,13 +2,7 @@
# Copyright (c) 2012-2015, ARM Limited. All rights reserved.
# Copyright (c) 2015, 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 distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
################################################################################
diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc b/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc
index 1cf2ebb58f..63d79a4885 100644
--- a/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc
+++ b/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc
@@ -1,13 +1,7 @@
#
# Copyright (c) 2011-2018, ARM Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#
diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.fdf b/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.fdf
index fc998ec746..8f49ed3dba 100644
--- a/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.fdf
+++ b/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.fdf
@@ -1,13 +1,7 @@
#
# Copyright (c) 2011 - 2018, ARM Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
################################################################################
diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-networking.fdf.inc b/Platform/ARM/VExpressPkg/ArmVExpress-networking.fdf.inc
index b647f65ad1..6d060303b9 100644
--- a/Platform/ARM/VExpressPkg/ArmVExpress-networking.fdf.inc
+++ b/Platform/ARM/VExpressPkg/ArmVExpress-networking.fdf.inc
@@ -1,14 +1,7 @@
#
# Copyright (c) 2012-2014, ARM Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions
-# of the BSD License which accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#
diff --git a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc
index e7a77c0ad9..7b5dc93a70 100644
--- a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc
+++ b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc
@@ -1,13 +1,7 @@
#
# Copyright (c) 2011-2018, ARM Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#
diff --git a/Platform/ARM/VExpressPkg/ArmVExpressPkg.dec b/Platform/ARM/VExpressPkg/ArmVExpressPkg.dec
index ac77540362..a659cda2e4 100644
--- a/Platform/ARM/VExpressPkg/ArmVExpressPkg.dec
+++ b/Platform/ARM/VExpressPkg/ArmVExpressPkg.dec
@@ -3,13 +3,7 @@
#
# Copyright (c) 2012-2018, ARM Limited. All rights reserved.
#
-# This program and the accompanying materials are licensed and made available
-# under the terms and conditions of the BSD License which accompanies this
-# distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
diff --git a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManager.dsc.inc b/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManager.dsc.inc
index 788b145b27..9b044bba5d 100644
--- a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManager.dsc.inc
+++ b/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManager.dsc.inc
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017 - 2018, ARM Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
##
[Defines]
diff --git a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c b/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
index eb8c77cf46..010702ae1d 100644
--- a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
+++ b/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
@@ -3,13 +3,7 @@
Copyright (c) 2017 - 2019, ARM Limited. All rights reserved.
- This program and the accompanying materials
- are licensed and made available under the terms and conditions of the BSD License
- which accompanies this distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
@par Glossary:
- Cm or CM - Configuration Manager
diff --git a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h b/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
index eb1938badc..c61750dc55 100644
--- a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
+++ b/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
@@ -2,13 +2,7 @@
Copyright (c) 2017 - 2019, ARM Limited. All rights reserved.
- This program and the accompanying materials
- are licensed and made available under the terms and conditions of the BSD License
- which accompanies this distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
@par Glossary:
- Cm or CM - Configuration Manager
diff --git a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf b/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf
index b9e7a8620b..14f4323f00 100644
--- a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf
+++ b/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017 - 2019, ARM Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
##
[Defines]
diff --git a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/Platform.h b/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/Platform.h
index 676cb22d27..426d5a7737 100644
--- a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/Platform.h
+++ b/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/Platform.h
@@ -2,13 +2,7 @@
Copyright (c) 2017 - 2019, ARM Limited. All rights reserved.
- This program and the accompanying materials
- are licensed and made available under the terms and conditions of the BSD License
- which accompanies this distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/ARM/VExpressPkg/ConfigurationManager/PlatformASLTablesLib/Dsdt.asl b/Platform/ARM/VExpressPkg/ConfigurationManager/PlatformASLTablesLib/Dsdt.asl
index 625930db4d..9192a00707 100644
--- a/Platform/ARM/VExpressPkg/ConfigurationManager/PlatformASLTablesLib/Dsdt.asl
+++ b/Platform/ARM/VExpressPkg/ConfigurationManager/PlatformASLTablesLib/Dsdt.asl
@@ -2,13 +2,7 @@
Differentiated System Description Table Fields (DSDT)
Copyright (c) 2014-2017, ARM Ltd. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/ARM/VExpressPkg/ConfigurationManager/PlatformASLTablesLib/PlatformASLTablesLib.inf b/Platform/ARM/VExpressPkg/ConfigurationManager/PlatformASLTablesLib/PlatformASLTablesLib.inf
index 49482b1852..23a71c365b 100644
--- a/Platform/ARM/VExpressPkg/ConfigurationManager/PlatformASLTablesLib/PlatformASLTablesLib.inf
+++ b/Platform/ARM/VExpressPkg/ConfigurationManager/PlatformASLTablesLib/PlatformASLTablesLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017 - 2019, ARM Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
##
[Defines]
diff --git a/Platform/ARM/VExpressPkg/Drivers/ArmVExpressDxe/ArmFvpDxe.c b/Platform/ARM/VExpressPkg/Drivers/ArmVExpressDxe/ArmFvpDxe.c
index 7827c50d8b..189069484b 100644
--- a/Platform/ARM/VExpressPkg/Drivers/ArmVExpressDxe/ArmFvpDxe.c
+++ b/Platform/ARM/VExpressPkg/Drivers/ArmVExpressDxe/ArmFvpDxe.c
@@ -2,13 +2,7 @@
Copyright (c) 2013-2015, ARM Ltd. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/ARM/VExpressPkg/Drivers/ArmVExpressDxe/ArmFvpDxe.inf b/Platform/ARM/VExpressPkg/Drivers/ArmVExpressDxe/ArmFvpDxe.inf
index 3b19028dd9..a4021c2d9e 100644
--- a/Platform/ARM/VExpressPkg/Drivers/ArmVExpressDxe/ArmFvpDxe.inf
+++ b/Platform/ARM/VExpressPkg/Drivers/ArmVExpressDxe/ArmFvpDxe.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2013-2015, ARM Ltd. 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 distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
diff --git a/Platform/ARM/VExpressPkg/Drivers/ArmVExpressDxe/ArmHwDxe.c b/Platform/ARM/VExpressPkg/Drivers/ArmVExpressDxe/ArmHwDxe.c
index 19efa3c23d..dbb34cd19e 100644
--- a/Platform/ARM/VExpressPkg/Drivers/ArmVExpressDxe/ArmHwDxe.c
+++ b/Platform/ARM/VExpressPkg/Drivers/ArmVExpressDxe/ArmHwDxe.c
@@ -2,13 +2,7 @@
Copyright (c) 2013-2015, ARM Ltd. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/ARM/VExpressPkg/Drivers/ArmVExpressDxe/ArmHwDxe.inf b/Platform/ARM/VExpressPkg/Drivers/ArmVExpressDxe/ArmHwDxe.inf
index 8bf289f8da..ddaa3f52cc 100644
--- a/Platform/ARM/VExpressPkg/Drivers/ArmVExpressDxe/ArmHwDxe.inf
+++ b/Platform/ARM/VExpressPkg/Drivers/ArmVExpressDxe/ArmHwDxe.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2013-2015, ARM Ltd. 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 distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
diff --git a/Platform/ARM/VExpressPkg/Drivers/ArmVExpressFastBootDxe/ArmVExpressFastBoot.c b/Platform/ARM/VExpressPkg/Drivers/ArmVExpressFastBootDxe/ArmVExpressFastBoot.c
index 9a4a6c7007..e7cf64b745 100644
--- a/Platform/ARM/VExpressPkg/Drivers/ArmVExpressFastBootDxe/ArmVExpressFastBoot.c
+++ b/Platform/ARM/VExpressPkg/Drivers/ArmVExpressFastBootDxe/ArmVExpressFastBoot.c
@@ -3,13 +3,7 @@
Copyright (c) 2014, ARM Ltd. All rights reserved.<BR>
Copyright (c) 2016, Linaro Ltd. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/ARM/VExpressPkg/Drivers/ArmVExpressFastBootDxe/ArmVExpressFastBootDxe.inf b/Platform/ARM/VExpressPkg/Drivers/ArmVExpressFastBootDxe/ArmVExpressFastBootDxe.inf
index c5b32d88f1..d95dc0268e 100644
--- a/Platform/ARM/VExpressPkg/Drivers/ArmVExpressFastBootDxe/ArmVExpressFastBootDxe.inf
+++ b/Platform/ARM/VExpressPkg/Drivers/ArmVExpressFastBootDxe/ArmVExpressFastBootDxe.inf
@@ -2,12 +2,7 @@
#
# Copyright (c) 2014, ARM Ltd. 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 distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#
#**/
diff --git a/Platform/ARM/VExpressPkg/Include/Library/ArmPlatformSysConfigLib.h b/Platform/ARM/VExpressPkg/Include/Library/ArmPlatformSysConfigLib.h
index 39a0cc7f73..f9e9052fa9 100644
--- a/Platform/ARM/VExpressPkg/Include/Library/ArmPlatformSysConfigLib.h
+++ b/Platform/ARM/VExpressPkg/Include/Library/ArmPlatformSysConfigLib.h
@@ -2,13 +2,7 @@
Copyright (c) 2011-2012, ARM Ltd. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/ARM/VExpressPkg/Include/Library/LcdPlatformLib.h b/Platform/ARM/VExpressPkg/Include/Library/LcdPlatformLib.h
index b9bdf471e2..5591147313 100644
--- a/Platform/ARM/VExpressPkg/Include/Library/LcdPlatformLib.h
+++ b/Platform/ARM/VExpressPkg/Include/Library/LcdPlatformLib.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2011, ARM Ltd. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/ARM/VExpressPkg/Include/Platform/CTA15-A7/ArmPlatform.h b/Platform/ARM/VExpressPkg/Include/Platform/CTA15-A7/ArmPlatform.h
index b52f89a5cb..db6303a05f 100644
--- a/Platform/ARM/VExpressPkg/Include/Platform/CTA15-A7/ArmPlatform.h
+++ b/Platform/ARM/VExpressPkg/Include/Platform/CTA15-A7/ArmPlatform.h
@@ -3,13 +3,7 @@
*
* Copyright (c) 2012, ARM Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/ARM/VExpressPkg/Include/Platform/RTSM/ArmPlatform.h b/Platform/ARM/VExpressPkg/Include/Platform/RTSM/ArmPlatform.h
index e267912ef5..499f62b2dc 100644
--- a/Platform/ARM/VExpressPkg/Include/Platform/RTSM/ArmPlatform.h
+++ b/Platform/ARM/VExpressPkg/Include/Platform/RTSM/ArmPlatform.h
@@ -3,13 +3,7 @@
*
* Copyright (c) 2011, ARM Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/ARM/VExpressPkg/Include/VExpressMotherBoard.h b/Platform/ARM/VExpressPkg/Include/VExpressMotherBoard.h
index 38691c3582..c06adb159e 100644
--- a/Platform/ARM/VExpressPkg/Include/VExpressMotherBoard.h
+++ b/Platform/ARM/VExpressPkg/Include/VExpressMotherBoard.h
@@ -3,13 +3,7 @@
*
* Copyright (c) 2011-2015, ARM Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/ARM/VExpressPkg/Library/ArmMaliDpLib/ArmMaliDpLib.c b/Platform/ARM/VExpressPkg/Library/ArmMaliDpLib/ArmMaliDpLib.c
index 04ad341d14..aa55bc2e5b 100644
--- a/Platform/ARM/VExpressPkg/Library/ArmMaliDpLib/ArmMaliDpLib.c
+++ b/Platform/ARM/VExpressPkg/Library/ArmMaliDpLib/ArmMaliDpLib.c
@@ -4,13 +4,7 @@
Copyright (c) 2017-2018, Arm Limited. All rights reserved.
- This program and the accompanying materials
- are licensed and made available under the terms and conditions of the BSD License
- which accompanies this distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/ARM/VExpressPkg/Library/ArmMaliDpLib/ArmMaliDpLib.inf b/Platform/ARM/VExpressPkg/Library/ArmMaliDpLib/ArmMaliDpLib.inf
index 78f7d307b7..784e84bd92 100644
--- a/Platform/ARM/VExpressPkg/Library/ArmMaliDpLib/ArmMaliDpLib.inf
+++ b/Platform/ARM/VExpressPkg/Library/ArmMaliDpLib/ArmMaliDpLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017-2018, Arm Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#**/
[Defines]
diff --git a/Platform/ARM/VExpressPkg/Library/ArmVExpressDtPlatformDtbLoaderLib/ArmVExpressDtPlatformDtbLoaderLib.c b/Platform/ARM/VExpressPkg/Library/ArmVExpressDtPlatformDtbLoaderLib/ArmVExpressDtPlatformDtbLoaderLib.c
index 3a5613c837..5734145bb0 100644
--- a/Platform/ARM/VExpressPkg/Library/ArmVExpressDtPlatformDtbLoaderLib/ArmVExpressDtPlatformDtbLoaderLib.c
+++ b/Platform/ARM/VExpressPkg/Library/ArmVExpressDtPlatformDtbLoaderLib/ArmVExpressDtPlatformDtbLoaderLib.c
@@ -2,13 +2,7 @@
*
* Copyright (c) 2017, Linaro, Ltd. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/ARM/VExpressPkg/Library/ArmVExpressDtPlatformDtbLoaderLib/ArmVExpressDtPlatformDtbLoaderLib.inf b/Platform/ARM/VExpressPkg/Library/ArmVExpressDtPlatformDtbLoaderLib/ArmVExpressDtPlatformDtbLoaderLib.inf
index 6218aba9d0..7992ffa22c 100644
--- a/Platform/ARM/VExpressPkg/Library/ArmVExpressDtPlatformDtbLoaderLib/ArmVExpressDtPlatformDtbLoaderLib.inf
+++ b/Platform/ARM/VExpressPkg/Library/ArmVExpressDtPlatformDtbLoaderLib/ArmVExpressDtPlatformDtbLoaderLib.inf
@@ -2,13 +2,7 @@
*
* Copyright (c) 2017, Linaro, Ltd. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/ArmVExpressLib.inf b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/ArmVExpressLib.inf
index 329f80dcfe..e585fe6c18 100644
--- a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/ArmVExpressLib.inf
+++ b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/ArmVExpressLib.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2011-2012, ARM Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#*/
diff --git a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/CTA15-A7.c b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/CTA15-A7.c
index a6ddd1b792..09521bdf00 100644
--- a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/CTA15-A7.c
+++ b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/CTA15-A7.c
@@ -2,13 +2,7 @@
*
* Copyright (c) 2012, ARM Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/CTA15-A7Helper.S b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/CTA15-A7Helper.S
index 3719a5ace6..b7ee78aa09 100644
--- a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/CTA15-A7Helper.S
+++ b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/CTA15-A7Helper.S
@@ -1,13 +1,7 @@
//
// Copyright (c) 2012-2013, ARM Limited. All rights reserved.
//
-// This program and the accompanying materials
-// are licensed and made available under the terms and conditions of the BSD License
-// which accompanies this distribution. The full text of the license may be found at
-// http://opensource.org/licenses/bsd-license.php
-//
-// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+// SPDX-License-Identifier: BSD-2-Clause-Patent
//
//
diff --git a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/CTA15-A7Helper.asm b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/CTA15-A7Helper.asm
index c035843da0..9fb06ea009 100644
--- a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/CTA15-A7Helper.asm
+++ b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/CTA15-A7Helper.asm
@@ -1,13 +1,7 @@
//
// Copyright (c) 2012-2013, ARM Limited. All rights reserved.
//
-// This program and the accompanying materials
-// are licensed and made available under the terms and conditions of the BSD License
-// which accompanies this distribution. The full text of the license may be found at
-// http://opensource.org/licenses/bsd-license.php
-//
-// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+// SPDX-License-Identifier: BSD-2-Clause-Patent
//
//
diff --git a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/CTA15-A7Mem.c b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/CTA15-A7Mem.c
index 05e9abc572..66dfda660f 100644
--- a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/CTA15-A7Mem.c
+++ b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/CTA15-A7Mem.c
@@ -2,13 +2,7 @@
*
* Copyright (c) 2012, ARM Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/AArch64/RTSMHelper.S b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/AArch64/RTSMHelper.S
index db6d83c3cc..65ecf2d94a 100644
--- a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/AArch64/RTSMHelper.S
+++ b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/AArch64/RTSMHelper.S
@@ -1,13 +1,7 @@
#
# Copyright (c) 2011-2013, ARM Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#
diff --git a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/Arm/RTSMHelper.S b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/Arm/RTSMHelper.S
index 35743b08dc..08eb9ad091 100644
--- a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/Arm/RTSMHelper.S
+++ b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/Arm/RTSMHelper.S
@@ -1,13 +1,7 @@
#
# Copyright (c) 2011-2013, ARM Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#
diff --git a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/Arm/RTSMHelper.asm b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/Arm/RTSMHelper.asm
index 66068e6595..5ae6f9eab8 100644
--- a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/Arm/RTSMHelper.asm
+++ b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/Arm/RTSMHelper.asm
@@ -1,13 +1,7 @@
//
// Copyright (c) 2011-2013, ARM Limited. All rights reserved.
//
-// This program and the accompanying materials
-// are licensed and made available under the terms and conditions of the BSD License
-// which accompanies this distribution. The full text of the license may be found at
-// http://opensource.org/licenses/bsd-license.php
-//
-// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+// SPDX-License-Identifier: BSD-2-Clause-Patent
//
//
diff --git a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLib.inf b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLib.inf
index 53898c5e95..d3441b0852 100644
--- a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLib.inf
+++ b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLib.inf
@@ -1,13 +1,7 @@
#/* @file
# Copyright (c) 2011-2018, ARM Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#*/
diff --git a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLibSec.inf b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLibSec.inf
index ec29d99835..ede7ab0a32 100644
--- a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLibSec.inf
+++ b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLibSec.inf
@@ -1,13 +1,7 @@
#/* @file
# Copyright (c) 2011-2018, ARM Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#*/
diff --git a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/RTSM.c b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/RTSM.c
index 7760e82521..e7a8c1dbbd 100644
--- a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/RTSM.c
+++ b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/RTSM.c
@@ -2,13 +2,7 @@
*
* Copyright (c) 2011-2013, ARM Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/RTSMMem.c b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/RTSMMem.c
index eb8f6a48cd..21ffd64fb6 100644
--- a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/RTSMMem.c
+++ b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/RTSMMem.c
@@ -2,13 +2,7 @@
*
* Copyright (c) 2011-2018, ARM Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/ARM/VExpressPkg/Library/ArmVExpressSysConfigLib/ArmVExpressSysConfig.c b/Platform/ARM/VExpressPkg/Library/ArmVExpressSysConfigLib/ArmVExpressSysConfig.c
index 6dfbacd117..e50a551a39 100644
--- a/Platform/ARM/VExpressPkg/Library/ArmVExpressSysConfigLib/ArmVExpressSysConfig.c
+++ b/Platform/ARM/VExpressPkg/Library/ArmVExpressSysConfigLib/ArmVExpressSysConfig.c
@@ -2,13 +2,7 @@
Copyright (c) 2011-2012, ARM Ltd. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/ARM/VExpressPkg/Library/ArmVExpressSysConfigLib/ArmVExpressSysConfigLib.inf b/Platform/ARM/VExpressPkg/Library/ArmVExpressSysConfigLib/ArmVExpressSysConfigLib.inf
index c400ab831a..36f447ee79 100644
--- a/Platform/ARM/VExpressPkg/Library/ArmVExpressSysConfigLib/ArmVExpressSysConfigLib.inf
+++ b/Platform/ARM/VExpressPkg/Library/ArmVExpressSysConfigLib/ArmVExpressSysConfigLib.inf
@@ -4,13 +4,7 @@
#
# Copyright (c) 2011-2012, ARM Ltd. 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 distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
diff --git a/Platform/ARM/VExpressPkg/Library/ArmVExpressSysConfigRuntimeLib/ArmVExpressSysConfigRuntimeLib.c b/Platform/ARM/VExpressPkg/Library/ArmVExpressSysConfigRuntimeLib/ArmVExpressSysConfigRuntimeLib.c
index 1f915e3b02..2a5bd4dd38 100644
--- a/Platform/ARM/VExpressPkg/Library/ArmVExpressSysConfigRuntimeLib/ArmVExpressSysConfigRuntimeLib.c
+++ b/Platform/ARM/VExpressPkg/Library/ArmVExpressSysConfigRuntimeLib/ArmVExpressSysConfigRuntimeLib.c
@@ -2,13 +2,7 @@
Copyright (c) 2011-2012, ARM Ltd. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/ARM/VExpressPkg/Library/ArmVExpressSysConfigRuntimeLib/ArmVExpressSysConfigRuntimeLib.inf b/Platform/ARM/VExpressPkg/Library/ArmVExpressSysConfigRuntimeLib/ArmVExpressSysConfigRuntimeLib.inf
index cce8b9096f..5179165f98 100644
--- a/Platform/ARM/VExpressPkg/Library/ArmVExpressSysConfigRuntimeLib/ArmVExpressSysConfigRuntimeLib.inf
+++ b/Platform/ARM/VExpressPkg/Library/ArmVExpressSysConfigRuntimeLib/ArmVExpressSysConfigRuntimeLib.inf
@@ -5,13 +5,7 @@
# Copyright (c) 2011-2012, ARM Ltd. All rights reserved.<BR>
# Copyright (c) 2015, Linaro Ltd. 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 distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
diff --git a/Platform/ARM/VExpressPkg/Library/HdLcdArmVExpressLib/HdLcdArmVExpress.c b/Platform/ARM/VExpressPkg/Library/HdLcdArmVExpressLib/HdLcdArmVExpress.c
index 711f036d74..c4b163d35f 100644
--- a/Platform/ARM/VExpressPkg/Library/HdLcdArmVExpressLib/HdLcdArmVExpress.c
+++ b/Platform/ARM/VExpressPkg/Library/HdLcdArmVExpressLib/HdLcdArmVExpress.c
@@ -2,13 +2,7 @@
Copyright (c) 2012-2018, ARM Ltd. All rights reserved.
- This program and the accompanying materials
- are licensed and made available under the terms and conditions of the BSD License
- which accompanies this distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/ARM/VExpressPkg/Library/HdLcdArmVExpressLib/HdLcdArmVExpressLib.inf b/Platform/ARM/VExpressPkg/Library/HdLcdArmVExpressLib/HdLcdArmVExpressLib.inf
index c7b1b7fae7..191261d062 100644
--- a/Platform/ARM/VExpressPkg/Library/HdLcdArmVExpressLib/HdLcdArmVExpressLib.inf
+++ b/Platform/ARM/VExpressPkg/Library/HdLcdArmVExpressLib/HdLcdArmVExpressLib.inf
@@ -4,13 +4,7 @@
#
# Copyright (c) 2011-2018, ARM Ltd. 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 distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
diff --git a/Platform/ARM/VExpressPkg/Library/NorFlashArmVExpressLib/NorFlashArmVExpress.c b/Platform/ARM/VExpressPkg/Library/NorFlashArmVExpressLib/NorFlashArmVExpress.c
index ac270dc3a6..ec5ac8cc62 100644
--- a/Platform/ARM/VExpressPkg/Library/NorFlashArmVExpressLib/NorFlashArmVExpress.c
+++ b/Platform/ARM/VExpressPkg/Library/NorFlashArmVExpressLib/NorFlashArmVExpress.c
@@ -2,13 +2,7 @@
Copyright (c) 2011-2014, ARM Ltd. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/ARM/VExpressPkg/Library/NorFlashArmVExpressLib/NorFlashArmVExpressLib.inf b/Platform/ARM/VExpressPkg/Library/NorFlashArmVExpressLib/NorFlashArmVExpressLib.inf
index 6c0ca97c99..a411ba4d00 100644
--- a/Platform/ARM/VExpressPkg/Library/NorFlashArmVExpressLib/NorFlashArmVExpressLib.inf
+++ b/Platform/ARM/VExpressPkg/Library/NorFlashArmVExpressLib/NorFlashArmVExpressLib.inf
@@ -1,13 +1,7 @@
#/** @file
#
# Copyright (c) 2011, ARM Ltd. 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 distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
diff --git a/Platform/ARM/VExpressPkg/Library/PL111LcdArmVExpressLib/PL111LcdArmVExpress.c b/Platform/ARM/VExpressPkg/Library/PL111LcdArmVExpressLib/PL111LcdArmVExpress.c
index bcf4f6593c..b7396a87bd 100644
--- a/Platform/ARM/VExpressPkg/Library/PL111LcdArmVExpressLib/PL111LcdArmVExpress.c
+++ b/Platform/ARM/VExpressPkg/Library/PL111LcdArmVExpressLib/PL111LcdArmVExpress.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2011-2018, ARM Ltd. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/ARM/VExpressPkg/Library/PL111LcdArmVExpressLib/PL111LcdArmVExpressLib.inf b/Platform/ARM/VExpressPkg/Library/PL111LcdArmVExpressLib/PL111LcdArmVExpressLib.inf
index b1fa100def..999a0814f5 100644
--- a/Platform/ARM/VExpressPkg/Library/PL111LcdArmVExpressLib/PL111LcdArmVExpressLib.inf
+++ b/Platform/ARM/VExpressPkg/Library/PL111LcdArmVExpressLib/PL111LcdArmVExpressLib.inf
@@ -4,13 +4,7 @@
#
# Copyright (c) 2011-2018, ARM Ltd. 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 distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
diff --git a/Platform/ARM/VExpressPkg/Library/ResetSystemLib/ResetSystemLib.c b/Platform/ARM/VExpressPkg/Library/ResetSystemLib/ResetSystemLib.c
index 85f8baa2b7..b12b1c2f8a 100644
--- a/Platform/ARM/VExpressPkg/Library/ResetSystemLib/ResetSystemLib.c
+++ b/Platform/ARM/VExpressPkg/Library/ResetSystemLib/ResetSystemLib.c
@@ -8,13 +8,7 @@
Copyright (c) 2017, Linaro Ltd. All rights reserved.<BR>
Copyright (c) 2019, 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/ARM/VExpressPkg/Library/ResetSystemLib/ResetSystemLib.inf b/Platform/ARM/VExpressPkg/Library/ResetSystemLib/ResetSystemLib.inf
index e7caf04f7f..e18df3c0ba 100644
--- a/Platform/ARM/VExpressPkg/Library/ResetSystemLib/ResetSystemLib.inf
+++ b/Platform/ARM/VExpressPkg/Library/ResetSystemLib/ResetSystemLib.inf
@@ -4,12 +4,7 @@
# Copyright (c) 2008, Apple Inc. All rights reserved.<BR>
# Copyright (c) 2017, Linaro Ltd. 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 distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#
#**/
--
2.21.0.windows.1
^ permalink raw reply related [flat|nested] 63+ messages in thread* Re: [[edk2-platforms][PATCH V2] 04/30] Platform/ARM: Replace BSD License with BSD+Patent License
2019-05-15 23:09 ` [[edk2-platforms][PATCH V2] 04/30] Platform/ARM: " Michael D Kinney
@ 2019-05-17 10:52 ` Leif Lindholm
0 siblings, 0 replies; 63+ messages in thread
From: Leif Lindholm @ 2019-05-17 10:52 UTC (permalink / raw)
To: Michael D Kinney; +Cc: devel, Ard Biesheuvel
On Wed, May 15, 2019 at 04:09:45PM -0700, Michael D Kinney wrote:
> https://bugzilla.tianocore.org/show_bug.cgi?id=1373
>
> Replace BSD 2-Clause License with BSD+Patent License. This change is
> based on the following emails:
>
> https://lists.01.org/pipermail/edk2-devel/2019-February/036260.html
> https://lists.01.org/pipermail/edk2-devel/2018-October/030385.html
>
> RFCs with detailed process for the license change:
>
> V3: https://lists.01.org/pipermail/edk2-devel/2019-March/038116.html
> V2: https://lists.01.org/pipermail/edk2-devel/2019-March/037669.html
> V1: https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html
As far as I can tell, this excludes the device tree source files
originating from ARM-TF - currently licensed under 3-clause BSD
(2-clause plus non-endorsement clause).
This is correct, and as discussed offline, but it would be worth
pointing it out explicitly in the commit message.
(Conversations about relicensing the 3-clause files are happening in
the background.)
Other than that, looks good to me.
/
Leif
> Cc: Leif Lindholm <leif.lindholm@linaro.org>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
> ---
> Platform/ARM/ARM.dec | 8 +------
> Platform/ARM/Drivers/BootMonFs/BootMonFs.dec | 8 +------
> Platform/ARM/Drivers/BootMonFs/BootMonFs.inf | 8 +------
> Platform/ARM/Drivers/BootMonFs/BootMonFsApi.h | 8 +------
> Platform/ARM/Drivers/BootMonFs/BootMonFsDir.c | 8 +------
> .../Drivers/BootMonFs/BootMonFsEntryPoint.c | 8 +------
> Platform/ARM/Drivers/BootMonFs/BootMonFsHw.h | 8 +------
> .../ARM/Drivers/BootMonFs/BootMonFsImages.c | 8 +------
> .../ARM/Drivers/BootMonFs/BootMonFsInternal.h | 8 +------
> .../Drivers/BootMonFs/BootMonFsOpenClose.c | 8 +------
> .../Drivers/BootMonFs/BootMonFsReadWrite.c | 8 +------
> .../Drivers/BootMonFs/BootMonFsUnsupported.c | 8 +------
> .../ARM/Drivers/FdtPlatformDxe/FdtPlatform.c | 8 +------
> .../ARM/Drivers/FdtPlatformDxe/FdtPlatform.h | 8 +------
> .../Drivers/FdtPlatformDxe/FdtPlatformDxe.dec | 8 +------
> .../Drivers/FdtPlatformDxe/FdtPlatformDxe.inf | 8 +------
> .../Drivers/FdtPlatformDxe/FdtPlatformDxe.uni | 8 +------
> .../ARM/Drivers/FdtPlatformDxe/README.txt | 8 +------
> .../ARM/Drivers/FdtPlatformDxe/ShellDumpFdt.c | 8 +------
> .../ARM/Drivers/FdtPlatformDxe/ShellSetFdt.c | 8 +------
> Platform/ARM/Include/Guid/BootMonFsFileInfo.h | 8 +------
> Platform/ARM/Include/Library/ArmShellCmdLib.h | 8 +------
> Platform/ARM/Include/Library/BdsLib.h | 8 +------
> .../JunoPkg/AcpiTables/AcpiSsdtRootPci.asl | 8 +------
> .../ARM/JunoPkg/AcpiTables/AcpiTables.inf | 8 +------
> Platform/ARM/JunoPkg/AcpiTables/Dbg2.aslc | 8 +------
> Platform/ARM/JunoPkg/AcpiTables/Dsdt.asl | 8 +------
> Platform/ARM/JunoPkg/AcpiTables/Fadt.aslc | 8 +------
> Platform/ARM/JunoPkg/AcpiTables/Gtdt.aslc | 8 +------
> Platform/ARM/JunoPkg/AcpiTables/Madt.aslc | 8 +------
> Platform/ARM/JunoPkg/AcpiTables/Spcr.aslc | 8 +------
> Platform/ARM/JunoPkg/ArmJuno.dec | 8 +------
> Platform/ARM/JunoPkg/ArmJuno.dsc | 8 +------
> Platform/ARM/JunoPkg/ArmJuno.fdf | 8 +------
> .../ConfigurationManager.dsc.inc | 8 +------
> .../ConfigurationManager.c | 8 +------
> .../ConfigurationManager.h | 8 +------
> .../ConfigurationManagerDxe.inf | 8 +------
> .../ConfigurationManagerDxe/Platform.h | 8 +------
> .../PlatformASLTablesLib/Dsdt.asl | 8 +------
> .../PlatformASLTablesLib.inf | 8 +------
> .../PlatformASLTablesLib/SsdtJunoUsb.asl | 8 +------
> .../PlatformASLTablesLib/SsdtPci.asl | 8 +------
> .../PlatformASLTablesLib/SsdtUart.asl | 8 +------
> .../JunoPkg/Drivers/ArmJunoDxe/AcpiTables.c | 8 +------
> .../JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.c | 8 +------
> .../JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf | 8 +------
> .../Drivers/ArmJunoDxe/ArmJunoDxeInternal.h | 8 +------
> Platform/ARM/JunoPkg/Include/ArmPlatform.h | 8 +------
> .../ArmJunoLib/AArch64/ArmJunoHelper.S | 8 +------
> .../Library/ArmJunoLib/Arm/ArmJunoHelper.S | 8 +------
> .../ARM/JunoPkg/Library/ArmJunoLib/ArmJuno.c | 8 +------
> .../JunoPkg/Library/ArmJunoLib/ArmJunoLib.inf | 8 +------
> .../JunoPkg/Library/ArmJunoLib/ArmJunoMem.c | 8 +------
> .../Library/ArmJunoMtlLib/ArmJunoMtlLib.c | 8 +------
> .../Library/ArmJunoMtlLib/ArmJunoMtlLib.inf | 8 +------
> .../ArmJunoMtlLib/ArmJunoMtlPrivateLib.h | 8 +------
> .../Library/HdLcdArmJunoLib/HdLcdArmJuno.c | 8 +------
> .../HdLcdArmJunoLib/HdLcdArmJunoLib.inf | 8 +------
> .../JunoPciHostBridgeLib.c | 8 +------
> .../JunoPciHostBridgeLib.inf | 8 +------
> .../JunoPciHostBridgeLib/XPressRich3.c | 8 +------
> .../JunoPciHostBridgeLib/XPressRich3.h | 8 +------
> .../Library/NorFlashJunoLib/NorFlashJuno.c | 8 +------
> .../NorFlashJunoLib/NorFlashJunoLib.inf | 8 +------
> .../SmbiosPlatformDxe/SmbiosPlatformDxe.c | 8 +------
> .../SmbiosPlatformDxe/SmbiosPlatformDxe.inf | 7 +-----
> .../ArmShellCmdRunAxf/ArmShellCmdRunAxf.c | 8 +------
> .../ArmShellCmdRunAxf/ArmShellCmdRunAxf.h | 8 +------
> .../ArmShellCmdRunAxf/ArmShellCmdRunAxf.inf | 8 +------
> .../ArmShellCmdRunAxf/ArmShellCmdRunAxf.uni | 8 +------
> .../ArmShellCmdRunAxf/BootMonFsLoader.c | 8 +------
> .../ArmShellCmdRunAxf/BootMonFsLoader.h | 8 +------
> .../ARM/Library/ArmShellCmdRunAxf/ElfLoader.c | 8 +------
> .../ARM/Library/ArmShellCmdRunAxf/ElfLoader.h | 8 +------
> .../ARM/Library/ArmShellCmdRunAxf/RunAxf.c | 8 +------
> .../ARM/Library/ArmShellCmdRunAxf/elf32.h | 8 +------
> .../ARM/Library/ArmShellCmdRunAxf/elf64.h | 8 +------
> .../Library/ArmShellCmdRunAxf/elf_common.h | 8 +------
> Platform/ARM/Library/BdsLib/BdsFilePath.c | 8 +------
> Platform/ARM/Library/BdsLib/BdsHelper.c | 8 +------
> Platform/ARM/Library/BdsLib/BdsInternal.h | 8 +------
> Platform/ARM/Library/BdsLib/BdsLib.inf | 8 +------
> Platform/ARM/SgiPkg/AcpiTables/Dbg2.aslc | 8 +------
> Platform/ARM/SgiPkg/AcpiTables/Fadt.aslc | 8 +------
> Platform/ARM/SgiPkg/AcpiTables/Gtdt.aslc | 8 +------
> Platform/ARM/SgiPkg/AcpiTables/Iort.aslc | 8 +------
> Platform/ARM/SgiPkg/AcpiTables/Mcfg.aslc | 8 +------
> .../ARM/SgiPkg/AcpiTables/RdE1Edge/Dsdt.asl | 8 +------
> .../ARM/SgiPkg/AcpiTables/RdE1Edge/Madt.aslc | 8 +------
> .../SgiPkg/AcpiTables/RdE1EdgeAcpiTables.inf | 8 +------
> .../ARM/SgiPkg/AcpiTables/RdN1Edge/Dsdt.asl | 8 +------
> .../ARM/SgiPkg/AcpiTables/RdN1Edge/Madt.aslc | 8 +------
> .../SgiPkg/AcpiTables/RdN1EdgeAcpiTables.inf | 8 +------
> .../ARM/SgiPkg/AcpiTables/Sgi575/Dsdt.asl | 8 +------
> .../ARM/SgiPkg/AcpiTables/Sgi575/Madt.aslc | 8 +------
> .../SgiPkg/AcpiTables/Sgi575AcpiTables.inf | 8 +------
> Platform/ARM/SgiPkg/AcpiTables/Spcr.aslc | 8 +------
> Platform/ARM/SgiPkg/AcpiTables/Ssdt.asl | 8 +------
> .../SgiPkg/Drivers/PlatformDxe/PlatformDxe.c | 8 +------
> .../Drivers/PlatformDxe/PlatformDxe.inf | 8 +------
> .../Drivers/PlatformDxe/VirtioDevices.c | 8 +------
> .../Include/Guid/SgiVirtioDevicesFormSet.h | 8 +------
> .../ARM/SgiPkg/Include/Ppi/SgiPlatformId.h | 8 +------
> Platform/ARM/SgiPkg/Include/SgiAcpiHeader.h | 8 +------
> Platform/ARM/SgiPkg/Include/SgiPlatform.h | 8 +------
> .../Library/HdLcdArmSgiLib/HdLcdArmSgi.c | 8 +------
> .../Library/HdLcdArmSgiLib/HdLcdArmSgiLib.inf | 8 +------
> .../SgiPkg/Library/NorFlashLib/NorFlashLib.c | 8 +------
> .../Library/NorFlashLib/NorFlashLib.inf | 8 +------
> .../PciHostBridgeLib/PciHostBridgeLib.c | 8 +------
> .../PciHostBridgeLib/PciHostBridgeLib.inf | 8 +------
> .../Library/PlatformLib/AArch64/Helper.S | 8 +------
> .../SgiPkg/Library/PlatformLib/PlatformLib.c | 8 +------
> .../Library/PlatformLib/PlatformLib.inf | 8 +------
> .../Library/PlatformLib/PlatformLibMem.c | 8 +------
> .../Library/SgiPlatformPei/SgiPlatformPei.inf | 8 +------
> .../Library/SgiPlatformPei/SgiPlatformPeim.c | 8 +------
> Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc | 8 +------
> Platform/ARM/SgiPkg/PlatformStandaloneMm.fdf | 8 +------
> Platform/ARM/SgiPkg/SgiPlatform.dec | 8 +------
> Platform/ARM/SgiPkg/SgiPlatform.dsc | 8 +------
> Platform/ARM/SgiPkg/SgiPlatform.fdf | 8 +------
> .../ARM/VExpressPkg/AcpiTables/AcpiTables.inf | 8 +------
> Platform/ARM/VExpressPkg/AcpiTables/Dsdt.asl | 23 +------------------
> Platform/ARM/VExpressPkg/AcpiTables/Fadt.aslc | 8 +------
> .../ARM/VExpressPkg/AcpiTables/FvpPlatform.h | 8 +------
> Platform/ARM/VExpressPkg/AcpiTables/Gtdt.aslc | 8 +------
> Platform/ARM/VExpressPkg/AcpiTables/Madt.aslc | 8 +------
> Platform/ARM/VExpressPkg/AcpiTables/Spcr.aslc | 8 +------
> .../ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc | 8 +------
> .../ARM/VExpressPkg/ArmVExpress-CTA15-A7.fdf | 8 +------
> .../VExpressPkg/ArmVExpress-FVP-AArch64.dsc | 8 +------
> .../VExpressPkg/ArmVExpress-FVP-AArch64.fdf | 8 +------
> .../ArmVExpress-networking.fdf.inc | 9 +-------
> Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc | 8 +------
> Platform/ARM/VExpressPkg/ArmVExpressPkg.dec | 8 +------
> .../ConfigurationManager.dsc.inc | 8 +------
> .../ConfigurationManager.c | 8 +------
> .../ConfigurationManager.h | 8 +------
> .../ConfigurationManagerDxe.inf | 8 +------
> .../ConfigurationManagerDxe/Platform.h | 8 +------
> .../PlatformASLTablesLib/Dsdt.asl | 8 +------
> .../PlatformASLTablesLib.inf | 8 +------
> .../Drivers/ArmVExpressDxe/ArmFvpDxe.c | 8 +------
> .../Drivers/ArmVExpressDxe/ArmFvpDxe.inf | 8 +------
> .../Drivers/ArmVExpressDxe/ArmHwDxe.c | 8 +------
> .../Drivers/ArmVExpressDxe/ArmHwDxe.inf | 8 +------
> .../ArmVExpressFastBoot.c | 8 +------
> .../ArmVExpressFastBootDxe.inf | 7 +-----
> .../Include/Library/ArmPlatformSysConfigLib.h | 8 +------
> .../Include/Library/LcdPlatformLib.h | 8 +------
> .../Include/Platform/CTA15-A7/ArmPlatform.h | 8 +------
> .../Include/Platform/RTSM/ArmPlatform.h | 8 +------
> .../VExpressPkg/Include/VExpressMotherBoard.h | 8 +------
> .../Library/ArmMaliDpLib/ArmMaliDpLib.c | 8 +------
> .../Library/ArmMaliDpLib/ArmMaliDpLib.inf | 8 +------
> .../ArmVExpressDtPlatformDtbLoaderLib.c | 8 +------
> .../ArmVExpressDtPlatformDtbLoaderLib.inf | 8 +------
> .../ArmVExpressLibCTA15-A7/ArmVExpressLib.inf | 8 +------
> .../Library/ArmVExpressLibCTA15-A7/CTA15-A7.c | 8 +------
> .../ArmVExpressLibCTA15-A7/CTA15-A7Helper.S | 8 +------
> .../ArmVExpressLibCTA15-A7/CTA15-A7Helper.asm | 8 +------
> .../ArmVExpressLibCTA15-A7/CTA15-A7Mem.c | 8 +------
> .../ArmVExpressLibRTSM/AArch64/RTSMHelper.S | 8 +------
> .../ArmVExpressLibRTSM/Arm/RTSMHelper.S | 8 +------
> .../ArmVExpressLibRTSM/Arm/RTSMHelper.asm | 8 +------
> .../ArmVExpressLibRTSM/ArmVExpressLib.inf | 8 +------
> .../ArmVExpressLibRTSM/ArmVExpressLibSec.inf | 8 +------
> .../Library/ArmVExpressLibRTSM/RTSM.c | 8 +------
> .../Library/ArmVExpressLibRTSM/RTSMMem.c | 8 +------
> .../ArmVExpressSysConfig.c | 8 +------
> .../ArmVExpressSysConfigLib.inf | 8 +------
> .../ArmVExpressSysConfigRuntimeLib.c | 8 +------
> .../ArmVExpressSysConfigRuntimeLib.inf | 8 +------
> .../HdLcdArmVExpressLib/HdLcdArmVExpress.c | 8 +------
> .../HdLcdArmVExpressLib.inf | 8 +------
> .../NorFlashArmVExpress.c | 8 +------
> .../NorFlashArmVExpressLib.inf | 8 +------
> .../PL111LcdArmVExpress.c | 8 +------
> .../PL111LcdArmVExpressLib.inf | 8 +------
> .../Library/ResetSystemLib/ResetSystemLib.c | 8 +------
> .../Library/ResetSystemLib/ResetSystemLib.inf | 7 +-----
> 183 files changed, 183 insertions(+), 1294 deletions(-)
>
> diff --git a/Platform/ARM/ARM.dec b/Platform/ARM/ARM.dec
> index 6a6eeb6559..5175b313f9 100644
> --- a/Platform/ARM/ARM.dec
> +++ b/Platform/ARM/ARM.dec
> @@ -2,13 +2,7 @@
> #
> # Copyright (c) 2011-2017, ARM Limited. All rights reserved.
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD License
> -# which accompanies this distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> #**/
>
> diff --git a/Platform/ARM/Drivers/BootMonFs/BootMonFs.dec b/Platform/ARM/Drivers/BootMonFs/BootMonFs.dec
> index 533dee3b61..1819e2f46d 100644
> --- a/Platform/ARM/Drivers/BootMonFs/BootMonFs.dec
> +++ b/Platform/ARM/Drivers/BootMonFs/BootMonFs.dec
> @@ -2,13 +2,7 @@
> #
> # Copyright (c) 2011-2017, ARM Limited. All rights reserved.
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD License
> -# which accompanies this distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> #**/
>
> diff --git a/Platform/ARM/Drivers/BootMonFs/BootMonFs.inf b/Platform/ARM/Drivers/BootMonFs/BootMonFs.inf
> index 5b9353f0ee..7c2e216186 100644
> --- a/Platform/ARM/Drivers/BootMonFs/BootMonFs.inf
> +++ b/Platform/ARM/Drivers/BootMonFs/BootMonFs.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2012-2015, ARM Ltd. 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 distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> #**/
>
> diff --git a/Platform/ARM/Drivers/BootMonFs/BootMonFsApi.h b/Platform/ARM/Drivers/BootMonFs/BootMonFsApi.h
> index d690520a0f..b8317c3782 100644
> --- a/Platform/ARM/Drivers/BootMonFs/BootMonFsApi.h
> +++ b/Platform/ARM/Drivers/BootMonFs/BootMonFsApi.h
> @@ -2,13 +2,7 @@
> *
> * Copyright (c) 2012-2014, ARM Limited. All rights reserved.
> *
> -* This program and the accompanying materials
> -* are licensed and made available under the terms and conditions of the BSD License
> -* which accompanies this distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/ARM/Drivers/BootMonFs/BootMonFsDir.c b/Platform/ARM/Drivers/BootMonFs/BootMonFsDir.c
> index 64ea0ec680..43c808f8ba 100644
> --- a/Platform/ARM/Drivers/BootMonFs/BootMonFsDir.c
> +++ b/Platform/ARM/Drivers/BootMonFs/BootMonFsDir.c
> @@ -2,13 +2,7 @@
> *
> * Copyright (c) 2012-2014, ARM Limited. All rights reserved.
> *
> -* This program and the accompanying materials
> -* are licensed and made available under the terms and conditions of the BSD License
> -* which accompanies this distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/ARM/Drivers/BootMonFs/BootMonFsEntryPoint.c b/Platform/ARM/Drivers/BootMonFs/BootMonFsEntryPoint.c
> index a1150856f6..d0ef411858 100644
> --- a/Platform/ARM/Drivers/BootMonFs/BootMonFsEntryPoint.c
> +++ b/Platform/ARM/Drivers/BootMonFs/BootMonFsEntryPoint.c
> @@ -2,13 +2,7 @@
> *
> * Copyright (c) 2012-2014, ARM Limited. All rights reserved.
> *
> -* This program and the accompanying materials
> -* are licensed and made available under the terms and conditions of the BSD License
> -* which accompanies this distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/ARM/Drivers/BootMonFs/BootMonFsHw.h b/Platform/ARM/Drivers/BootMonFs/BootMonFsHw.h
> index c1bef755ae..11e77b4758 100644
> --- a/Platform/ARM/Drivers/BootMonFs/BootMonFsHw.h
> +++ b/Platform/ARM/Drivers/BootMonFs/BootMonFsHw.h
> @@ -2,13 +2,7 @@
> *
> * Copyright (c) 2012-2014, ARM Limited. All rights reserved.
> *
> -* This program and the accompanying materials
> -* are licensed and made available under the terms and conditions of the BSD License
> -* which accompanies this distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/ARM/Drivers/BootMonFs/BootMonFsImages.c b/Platform/ARM/Drivers/BootMonFs/BootMonFsImages.c
> index 346c360292..16bef8e3b1 100644
> --- a/Platform/ARM/Drivers/BootMonFs/BootMonFsImages.c
> +++ b/Platform/ARM/Drivers/BootMonFs/BootMonFsImages.c
> @@ -2,13 +2,7 @@
> *
> * Copyright (c) 2012-2014, ARM Limited. All rights reserved.
> *
> -* This program and the accompanying materials
> -* are licensed and made available under the terms and conditions of the BSD License
> -* which accompanies this distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/ARM/Drivers/BootMonFs/BootMonFsInternal.h b/Platform/ARM/Drivers/BootMonFs/BootMonFsInternal.h
> index c0c6599cb7..5d6799e3b2 100644
> --- a/Platform/ARM/Drivers/BootMonFs/BootMonFsInternal.h
> +++ b/Platform/ARM/Drivers/BootMonFs/BootMonFsInternal.h
> @@ -2,13 +2,7 @@
> *
> * Copyright (c) 2012-2014, ARM Limited. All rights reserved.
> *
> -* This program and the accompanying materials
> -* are licensed and made available under the terms and conditions of the BSD License
> -* which accompanies this distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/ARM/Drivers/BootMonFs/BootMonFsOpenClose.c b/Platform/ARM/Drivers/BootMonFs/BootMonFsOpenClose.c
> index ae10055255..1f6e35f04e 100644
> --- a/Platform/ARM/Drivers/BootMonFs/BootMonFsOpenClose.c
> +++ b/Platform/ARM/Drivers/BootMonFs/BootMonFsOpenClose.c
> @@ -2,13 +2,7 @@
> *
> * Copyright (c) 2012-2015, ARM Limited. All rights reserved.
> *
> -* This program and the accompanying materials
> -* are licensed and made available under the terms and conditions of the BSD License
> -* which accompanies this distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/ARM/Drivers/BootMonFs/BootMonFsReadWrite.c b/Platform/ARM/Drivers/BootMonFs/BootMonFsReadWrite.c
> index f8124e95ac..88f42b77a4 100644
> --- a/Platform/ARM/Drivers/BootMonFs/BootMonFsReadWrite.c
> +++ b/Platform/ARM/Drivers/BootMonFs/BootMonFsReadWrite.c
> @@ -2,13 +2,7 @@
> *
> * Copyright (c) 2012-2014, ARM Limited. All rights reserved.
> *
> -* This program and the accompanying materials
> -* are licensed and made available under the terms and conditions of the BSD License
> -* which accompanies this distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/ARM/Drivers/BootMonFs/BootMonFsUnsupported.c b/Platform/ARM/Drivers/BootMonFs/BootMonFsUnsupported.c
> index 4ecc4ea008..2161aeb38c 100644
> --- a/Platform/ARM/Drivers/BootMonFs/BootMonFsUnsupported.c
> +++ b/Platform/ARM/Drivers/BootMonFs/BootMonFsUnsupported.c
> @@ -2,13 +2,7 @@
> *
> * Copyright (c) 2012-2014, ARM Limited. All rights reserved.
> *
> -* This program and the accompanying materials
> -* are licensed and made available under the terms and conditions of the BSD License
> -* which accompanies this distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/ARM/Drivers/FdtPlatformDxe/FdtPlatform.c b/Platform/ARM/Drivers/FdtPlatformDxe/FdtPlatform.c
> index b4be2a0789..cc24b970af 100644
> --- a/Platform/ARM/Drivers/FdtPlatformDxe/FdtPlatform.c
> +++ b/Platform/ARM/Drivers/FdtPlatformDxe/FdtPlatform.c
> @@ -2,13 +2,7 @@
>
> Copyright (c) 2015, ARM Ltd. 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 distribution. The full text of the license may be found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/ARM/Drivers/FdtPlatformDxe/FdtPlatform.h b/Platform/ARM/Drivers/FdtPlatformDxe/FdtPlatform.h
> index a631f2847b..ec62285f2b 100644
> --- a/Platform/ARM/Drivers/FdtPlatformDxe/FdtPlatform.h
> +++ b/Platform/ARM/Drivers/FdtPlatformDxe/FdtPlatform.h
> @@ -2,13 +2,7 @@
>
> Copyright (c) 2015, ARM Ltd. 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 distribution. The full text of the license may be found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/ARM/Drivers/FdtPlatformDxe/FdtPlatformDxe.dec b/Platform/ARM/Drivers/FdtPlatformDxe/FdtPlatformDxe.dec
> index 3faced5895..550156938f 100644
> --- a/Platform/ARM/Drivers/FdtPlatformDxe/FdtPlatformDxe.dec
> +++ b/Platform/ARM/Drivers/FdtPlatformDxe/FdtPlatformDxe.dec
> @@ -2,13 +2,7 @@
> #
> # Copyright (c) 2011-2017, ARM Limited. All rights reserved.
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD License
> -# which accompanies this distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> #**/
>
> diff --git a/Platform/ARM/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf b/Platform/ARM/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf
> index d4aef4bfce..d307e2ddca 100644
> --- a/Platform/ARM/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf
> +++ b/Platform/ARM/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf
> @@ -2,13 +2,7 @@
> #
> # Copyright (c) 2015, ARM Ltd. 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 distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> #**/
>
> diff --git a/Platform/ARM/Drivers/FdtPlatformDxe/FdtPlatformDxe.uni b/Platform/ARM/Drivers/FdtPlatformDxe/FdtPlatformDxe.uni
> index f8bde83484..22d9442b13 100644
> --- a/Platform/ARM/Drivers/FdtPlatformDxe/FdtPlatformDxe.uni
> +++ b/Platform/ARM/Drivers/FdtPlatformDxe/FdtPlatformDxe.uni
> @@ -2,13 +2,7 @@
> //
> // Copyright (c) 2014, ARM Ltd. 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
> -// distribution. The full text of the license may be found at
> -// http://opensource.org/licenses/bsd-license.php
> -//
> -// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +// SPDX-License-Identifier: BSD-2-Clause-Patent
> //
> //
> // Module Name:
> diff --git a/Platform/ARM/Drivers/FdtPlatformDxe/README.txt b/Platform/ARM/Drivers/FdtPlatformDxe/README.txt
> index 5f052d9a63..bad7a77782 100644
> --- a/Platform/ARM/Drivers/FdtPlatformDxe/README.txt
> +++ b/Platform/ARM/Drivers/FdtPlatformDxe/README.txt
> @@ -2,13 +2,7 @@
>
> Copyright (c) 2015, ARM Ltd. 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 distribution. The full text of the license may be found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/ARM/Drivers/FdtPlatformDxe/ShellDumpFdt.c b/Platform/ARM/Drivers/FdtPlatformDxe/ShellDumpFdt.c
> index c7dc898568..7606205b10 100644
> --- a/Platform/ARM/Drivers/FdtPlatformDxe/ShellDumpFdt.c
> +++ b/Platform/ARM/Drivers/FdtPlatformDxe/ShellDumpFdt.c
> @@ -2,13 +2,7 @@
>
> Copyright (c) 2015, ARM Ltd. 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 distribution. The full text of the license may be found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/ARM/Drivers/FdtPlatformDxe/ShellSetFdt.c b/Platform/ARM/Drivers/FdtPlatformDxe/ShellSetFdt.c
> index 9be23c8455..56076f236d 100644
> --- a/Platform/ARM/Drivers/FdtPlatformDxe/ShellSetFdt.c
> +++ b/Platform/ARM/Drivers/FdtPlatformDxe/ShellSetFdt.c
> @@ -2,13 +2,7 @@
>
> Copyright (c) 2015, ARM Ltd. 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 distribution. The full text of the license may be found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/ARM/Include/Guid/BootMonFsFileInfo.h b/Platform/ARM/Include/Guid/BootMonFsFileInfo.h
> index c4d805c14f..e961f6f3d3 100644
> --- a/Platform/ARM/Include/Guid/BootMonFsFileInfo.h
> +++ b/Platform/ARM/Include/Guid/BootMonFsFileInfo.h
> @@ -2,13 +2,7 @@
> *
> * Copyright (c) 2014, ARM Ltd. All rights reserved.
> *
> -* This program and the accompanying materials are licensed and made available
> -* under the terms and conditions of the BSD License which accompanies this
> -* distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT
> -* WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/ARM/Include/Library/ArmShellCmdLib.h b/Platform/ARM/Include/Library/ArmShellCmdLib.h
> index eb31cd4053..f947af20cb 100644
> --- a/Platform/ARM/Include/Library/ArmShellCmdLib.h
> +++ b/Platform/ARM/Include/Library/ArmShellCmdLib.h
> @@ -4,13 +4,7 @@
> *
> * Copyright (C) 2014, ARM Ltd
> *
> -* This program and the accompanying materials are licensed and made available
> -* under the terms and conditions of the BSD License which accompanies this
> -* distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT
> -* WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/ARM/Include/Library/BdsLib.h b/Platform/ARM/Include/Library/BdsLib.h
> index eab8684392..04954be1b7 100644
> --- a/Platform/ARM/Include/Library/BdsLib.h
> +++ b/Platform/ARM/Include/Library/BdsLib.h
> @@ -2,13 +2,7 @@
> *
> * Copyright (c) 2013-2015, ARM Limited. All rights reserved.
> *
> -* This program and the accompanying materials
> -* are licensed and made available under the terms and conditions of the BSD License
> -* which accompanies this distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/ARM/JunoPkg/AcpiTables/AcpiSsdtRootPci.asl b/Platform/ARM/JunoPkg/AcpiTables/AcpiSsdtRootPci.asl
> index 96f1c59305..ba41a95865 100644
> --- a/Platform/ARM/JunoPkg/AcpiTables/AcpiSsdtRootPci.asl
> +++ b/Platform/ARM/JunoPkg/AcpiTables/AcpiSsdtRootPci.asl
> @@ -2,13 +2,7 @@
> Differentiated System Description Table Fields (SSDT)
>
> Copyright (c) 2014-2015, ARM Ltd. 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 distribution. The full text of the license may be found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/ARM/JunoPkg/AcpiTables/AcpiTables.inf b/Platform/ARM/JunoPkg/AcpiTables/AcpiTables.inf
> index 539974ff24..f140febc4a 100644
> --- a/Platform/ARM/JunoPkg/AcpiTables/AcpiTables.inf
> +++ b/Platform/ARM/JunoPkg/AcpiTables/AcpiTables.inf
> @@ -4,13 +4,7 @@
> #
> # Copyright (c) 2014-2017, ARM Ltd. All rights reserved.
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD License
> -# which accompanies this distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Platform/ARM/JunoPkg/AcpiTables/Dbg2.aslc b/Platform/ARM/JunoPkg/AcpiTables/Dbg2.aslc
> index be30cd0a65..3d43aa0ea9 100644
> --- a/Platform/ARM/JunoPkg/AcpiTables/Dbg2.aslc
> +++ b/Platform/ARM/JunoPkg/AcpiTables/Dbg2.aslc
> @@ -3,13 +3,7 @@
> *
> * Copyright (c) 2012-2016, ARM Limited. All rights reserved.
> *
> -* This program and the accompanying materials
> -* are licensed and made available under the terms and conditions of the BSD License
> -* which accompanies this distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/ARM/JunoPkg/AcpiTables/Dsdt.asl b/Platform/ARM/JunoPkg/AcpiTables/Dsdt.asl
> index 702b057757..186fd6a471 100644
> --- a/Platform/ARM/JunoPkg/AcpiTables/Dsdt.asl
> +++ b/Platform/ARM/JunoPkg/AcpiTables/Dsdt.asl
> @@ -2,13 +2,7 @@
> Differentiated System Description Table Fields (DSDT)
>
> Copyright (c) 2014-2018, ARM Ltd. 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 distribution. The full text of the license may be found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/ARM/JunoPkg/AcpiTables/Fadt.aslc b/Platform/ARM/JunoPkg/AcpiTables/Fadt.aslc
> index 6b756292bd..504bafd122 100644
> --- a/Platform/ARM/JunoPkg/AcpiTables/Fadt.aslc
> +++ b/Platform/ARM/JunoPkg/AcpiTables/Fadt.aslc
> @@ -3,13 +3,7 @@
> *
> * Copyright (c) 2012 - 2016, ARM Limited. All rights reserved.
> *
> -* This program and the accompanying materials
> -* are licensed and made available under the terms and conditions of the BSD License
> -* which accompanies this distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/ARM/JunoPkg/AcpiTables/Gtdt.aslc b/Platform/ARM/JunoPkg/AcpiTables/Gtdt.aslc
> index 9d1296fdf2..f43834c959 100644
> --- a/Platform/ARM/JunoPkg/AcpiTables/Gtdt.aslc
> +++ b/Platform/ARM/JunoPkg/AcpiTables/Gtdt.aslc
> @@ -3,13 +3,7 @@
> *
> * Copyright (c) 2012 - 2017, ARM Limited. All rights reserved.
> *
> -* This program and the accompanying materials
> -* are licensed and made available under the terms and conditions of the BSD License
> -* which accompanies this distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/ARM/JunoPkg/AcpiTables/Madt.aslc b/Platform/ARM/JunoPkg/AcpiTables/Madt.aslc
> index dffa5d6196..ebbc9662e7 100644
> --- a/Platform/ARM/JunoPkg/AcpiTables/Madt.aslc
> +++ b/Platform/ARM/JunoPkg/AcpiTables/Madt.aslc
> @@ -3,13 +3,7 @@
> *
> * Copyright (c) 2012 - 2016, ARM Limited. All rights reserved.
> *
> -* This program and the accompanying materials
> -* are licensed and made available under the terms and conditions of the BSD License
> -* which accompanies this distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/ARM/JunoPkg/AcpiTables/Spcr.aslc b/Platform/ARM/JunoPkg/AcpiTables/Spcr.aslc
> index 8371669b7b..1696c4aede 100644
> --- a/Platform/ARM/JunoPkg/AcpiTables/Spcr.aslc
> +++ b/Platform/ARM/JunoPkg/AcpiTables/Spcr.aslc
> @@ -3,13 +3,7 @@
> *
> * Copyright (c) 2014 - 2016, ARM Limited. All rights reserved.
> *
> -* This program and the accompanying materials are licensed and made available
> -* under the terms and conditions of the BSD License which accompanies this
> -* distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/ARM/JunoPkg/ArmJuno.dec b/Platform/ARM/JunoPkg/ArmJuno.dec
> index c511796d89..27fe757907 100644
> --- a/Platform/ARM/JunoPkg/ArmJuno.dec
> +++ b/Platform/ARM/JunoPkg/ArmJuno.dec
> @@ -1,13 +1,7 @@
> #
> # Copyright (c) 2013-2018, ARM Limited. All rights reserved.
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD License
> -# which accompanies this distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
>
> [Defines]
> diff --git a/Platform/ARM/JunoPkg/ArmJuno.dsc b/Platform/ARM/JunoPkg/ArmJuno.dsc
> index a355c1e1d9..954faca1bb 100644
> --- a/Platform/ARM/JunoPkg/ArmJuno.dsc
> +++ b/Platform/ARM/JunoPkg/ArmJuno.dsc
> @@ -1,13 +1,7 @@
> #
> # Copyright (c) 2013-2018, ARM Limited. All rights reserved.
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD License
> -# which accompanies this distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
>
> ################################################################################
> diff --git a/Platform/ARM/JunoPkg/ArmJuno.fdf b/Platform/ARM/JunoPkg/ArmJuno.fdf
> index b1295a579b..7c128b2c5b 100644
> --- a/Platform/ARM/JunoPkg/ArmJuno.fdf
> +++ b/Platform/ARM/JunoPkg/ArmJuno.fdf
> @@ -1,13 +1,7 @@
> #
> # Copyright (c) 2013-2018, ARM Limited. All rights reserved.
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD License
> -# which accompanies this distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
>
> ################################################################################
> diff --git a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManager.dsc.inc b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManager.dsc.inc
> index a5fe869483..6699a01609 100644
> --- a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManager.dsc.inc
> +++ b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManager.dsc.inc
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017 - 2018, ARM Limited. All rights reserved.
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD License
> -# which accompanies this distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> ##
>
> [Defines]
> diff --git a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
> index d316c382c7..78b906ddb8 100644
> --- a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
> +++ b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
> @@ -3,13 +3,7 @@
>
> Copyright (c) 2017 - 2019, ARM Limited. All rights reserved.
>
> - This program and the accompanying materials
> - are licensed and made available under the terms and conditions of the BSD License
> - which accompanies this distribution. The full text of the license may be found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> @par Glossary:
> - Cm or CM - Configuration Manager
> diff --git a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
> index b0720a2509..060817430f 100644
> --- a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
> +++ b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
> @@ -2,13 +2,7 @@
>
> Copyright (c) 2017 - 2019, ARM Limited. All rights reserved.
>
> - This program and the accompanying materials
> - are licensed and made available under the terms and conditions of the BSD License
> - which accompanies this distribution. The full text of the license may be found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> @par Glossary:
> - Cm or CM - Configuration Manager
> diff --git a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf
> index 93d29e6124..dd71f815db 100644
> --- a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf
> +++ b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017 - 2019, ARM Limited. All rights reserved.
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD License
> -# which accompanies this distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> ##
>
> [Defines]
> diff --git a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/Platform.h b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/Platform.h
> index c98c65c615..7c583ea92a 100644
> --- a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/Platform.h
> +++ b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/Platform.h
> @@ -2,13 +2,7 @@
>
> Copyright (c) 2017 - 2019, ARM Limited. All rights reserved.
>
> - This program and the accompanying materials
> - are licensed and made available under the terms and conditions of the BSD License
> - which accompanies this distribution. The full text of the license may be found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/ARM/JunoPkg/ConfigurationManager/PlatformASLTablesLib/Dsdt.asl b/Platform/ARM/JunoPkg/ConfigurationManager/PlatformASLTablesLib/Dsdt.asl
> index d01cc5e54c..6c04508387 100644
> --- a/Platform/ARM/JunoPkg/ConfigurationManager/PlatformASLTablesLib/Dsdt.asl
> +++ b/Platform/ARM/JunoPkg/ConfigurationManager/PlatformASLTablesLib/Dsdt.asl
> @@ -2,13 +2,7 @@
> Differentiated System Description Table Fields (DSDT)
>
> Copyright (c) 2014 - 2019, ARM Ltd. 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 distribution. The full text of the license may be found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/ARM/JunoPkg/ConfigurationManager/PlatformASLTablesLib/PlatformASLTablesLib.inf b/Platform/ARM/JunoPkg/ConfigurationManager/PlatformASLTablesLib/PlatformASLTablesLib.inf
> index 59b43a9d76..93978cff97 100644
> --- a/Platform/ARM/JunoPkg/ConfigurationManager/PlatformASLTablesLib/PlatformASLTablesLib.inf
> +++ b/Platform/ARM/JunoPkg/ConfigurationManager/PlatformASLTablesLib/PlatformASLTablesLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017 - 2019, ARM Limited. All rights reserved.
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD License
> -# which accompanies this distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> ##
>
> [Defines]
> diff --git a/Platform/ARM/JunoPkg/ConfigurationManager/PlatformASLTablesLib/SsdtJunoUsb.asl b/Platform/ARM/JunoPkg/ConfigurationManager/PlatformASLTablesLib/SsdtJunoUsb.asl
> index 6630f3fc00..8ff9d150b9 100644
> --- a/Platform/ARM/JunoPkg/ConfigurationManager/PlatformASLTablesLib/SsdtJunoUsb.asl
> +++ b/Platform/ARM/JunoPkg/ConfigurationManager/PlatformASLTablesLib/SsdtJunoUsb.asl
> @@ -2,13 +2,7 @@
> SSDT for Juno USB
>
> Copyright (c) 2014-2019, ARM Ltd. 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 distribution. The full text of the license may be found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/ARM/JunoPkg/ConfigurationManager/PlatformASLTablesLib/SsdtPci.asl b/Platform/ARM/JunoPkg/ConfigurationManager/PlatformASLTablesLib/SsdtPci.asl
> index d38b1d5841..2ed37ea83c 100644
> --- a/Platform/ARM/JunoPkg/ConfigurationManager/PlatformASLTablesLib/SsdtPci.asl
> +++ b/Platform/ARM/JunoPkg/ConfigurationManager/PlatformASLTablesLib/SsdtPci.asl
> @@ -2,13 +2,7 @@
> SSDT for Juno PCIe
>
> Copyright (c) 2014 - 2019, ARM Ltd. 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 distribution. The full text of the license may be found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/ARM/JunoPkg/ConfigurationManager/PlatformASLTablesLib/SsdtUart.asl b/Platform/ARM/JunoPkg/ConfigurationManager/PlatformASLTablesLib/SsdtUart.asl
> index 198307f9a3..55a7ffc83f 100644
> --- a/Platform/ARM/JunoPkg/ConfigurationManager/PlatformASLTablesLib/SsdtUart.asl
> +++ b/Platform/ARM/JunoPkg/ConfigurationManager/PlatformASLTablesLib/SsdtUart.asl
> @@ -2,13 +2,7 @@
> SSDT for UART
>
> Copyright (c) 2014 - 2019, ARM Ltd. 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 distribution. The full text of the license may be found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "ArmPlatform.h"
> diff --git a/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/AcpiTables.c b/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/AcpiTables.c
> index bf08346434..aaa493a928 100644
> --- a/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/AcpiTables.c
> +++ b/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/AcpiTables.c
> @@ -4,13 +4,7 @@
>
> Copyright (c) 2015, ARM Ltd. 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 distribution. The full text of the license may be found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.c b/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.c
> index 0a42d21d4e..c5967f5b71 100644
> --- a/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.c
> +++ b/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.c
> @@ -2,13 +2,7 @@
> *
> * Copyright (c) 2013-2017, ARM Limited. All rights reserved.
> *
> -* This program and the accompanying materials
> -* are licensed and made available under the terms and conditions of the BSD License
> -* which accompanies this distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf b/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf
> index ab154da43e..7c118d9c9c 100644
> --- a/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf
> +++ b/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf
> @@ -1,13 +1,7 @@
> #
> # Copyright (c) 2013-2015, ARM Limited. All rights reserved.
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD License
> -# which accompanies this distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
>
> [Defines]
> diff --git a/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxeInternal.h b/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxeInternal.h
> index 5d2b68fabd..e6d20448c5 100644
> --- a/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxeInternal.h
> +++ b/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxeInternal.h
> @@ -2,13 +2,7 @@
> *
> * Copyright (c) 2013-2015, ARM Limited. All rights reserved.
> *
> -* This program and the accompanying materials
> -* are licensed and made available under the terms and conditions of the BSD License
> -* which accompanies this distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/ARM/JunoPkg/Include/ArmPlatform.h b/Platform/ARM/JunoPkg/Include/ArmPlatform.h
> index 399fd95279..249887c256 100644
> --- a/Platform/ARM/JunoPkg/Include/ArmPlatform.h
> +++ b/Platform/ARM/JunoPkg/Include/ArmPlatform.h
> @@ -2,13 +2,7 @@
> *
> * Copyright (c) 2013-2017, ARM Limited. All rights reserved.
> *
> -* This program and the accompanying materials
> -* are licensed and made available under the terms and conditions of the BSD License
> -* which accompanies this distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/ARM/JunoPkg/Library/ArmJunoLib/AArch64/ArmJunoHelper.S b/Platform/ARM/JunoPkg/Library/ArmJunoLib/AArch64/ArmJunoHelper.S
> index 4bdf08d1a9..e8f7d195b2 100644
> --- a/Platform/ARM/JunoPkg/Library/ArmJunoLib/AArch64/ArmJunoHelper.S
> +++ b/Platform/ARM/JunoPkg/Library/ArmJunoLib/AArch64/ArmJunoHelper.S
> @@ -2,13 +2,7 @@
> *
> * Copyright (c) 2013-2014, ARM Limited. All rights reserved.
> *
> -* This program and the accompanying materials
> -* are licensed and made available under the terms and conditions of the BSD License
> -* which accompanies this distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/ARM/JunoPkg/Library/ArmJunoLib/Arm/ArmJunoHelper.S b/Platform/ARM/JunoPkg/Library/ArmJunoLib/Arm/ArmJunoHelper.S
> index a7e904eac6..bdd94e3df6 100644
> --- a/Platform/ARM/JunoPkg/Library/ArmJunoLib/Arm/ArmJunoHelper.S
> +++ b/Platform/ARM/JunoPkg/Library/ArmJunoLib/Arm/ArmJunoHelper.S
> @@ -2,13 +2,7 @@
> *
> * Copyright (c) 2013-2014, ARM Limited. All rights reserved.
> *
> -* This program and the accompanying materials
> -* are licensed and made available under the terms and conditions of the BSD License
> -* which accompanies this distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/ARM/JunoPkg/Library/ArmJunoLib/ArmJuno.c b/Platform/ARM/JunoPkg/Library/ArmJunoLib/ArmJuno.c
> index cbc5ed5955..c5d4f70fc0 100644
> --- a/Platform/ARM/JunoPkg/Library/ArmJunoLib/ArmJuno.c
> +++ b/Platform/ARM/JunoPkg/Library/ArmJunoLib/ArmJuno.c
> @@ -2,13 +2,7 @@
> *
> * Copyright (c) 2013-2016, ARM Limited. All rights reserved.
> *
> -* This program and the accompanying materials
> -* are licensed and made available under the terms and conditions of the BSD License
> -* which accompanies this distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/ARM/JunoPkg/Library/ArmJunoLib/ArmJunoLib.inf b/Platform/ARM/JunoPkg/Library/ArmJunoLib/ArmJunoLib.inf
> index 90628e04b2..145663c2fa 100644
> --- a/Platform/ARM/JunoPkg/Library/ArmJunoLib/ArmJunoLib.inf
> +++ b/Platform/ARM/JunoPkg/Library/ArmJunoLib/ArmJunoLib.inf
> @@ -1,13 +1,7 @@
> #
> # Copyright (c) 2013-2018, ARM Limited. All rights reserved.
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD License
> -# which accompanies this distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
>
> [Defines]
> diff --git a/Platform/ARM/JunoPkg/Library/ArmJunoLib/ArmJunoMem.c b/Platform/ARM/JunoPkg/Library/ArmJunoLib/ArmJunoMem.c
> index 2403f51fa9..990a1664e4 100644
> --- a/Platform/ARM/JunoPkg/Library/ArmJunoLib/ArmJunoMem.c
> +++ b/Platform/ARM/JunoPkg/Library/ArmJunoLib/ArmJunoMem.c
> @@ -2,13 +2,7 @@
> *
> * Copyright (c) 2013-2018, ARM Limited. All rights reserved.
> *
> -* This program and the accompanying materials
> -* are licensed and made available under the terms and conditions of the BSD License
> -* which accompanies this distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/ARM/JunoPkg/Library/ArmJunoMtlLib/ArmJunoMtlLib.c b/Platform/ARM/JunoPkg/Library/ArmJunoMtlLib/ArmJunoMtlLib.c
> index ee1efe1574..235392ab95 100644
> --- a/Platform/ARM/JunoPkg/Library/ArmJunoMtlLib/ArmJunoMtlLib.c
> +++ b/Platform/ARM/JunoPkg/Library/ArmJunoMtlLib/ArmJunoMtlLib.c
> @@ -2,13 +2,7 @@
>
> Copyright (c) 2017-2018, Arm Limited. All rights reserved.
>
> - This program and the accompanying materials
> - are licensed and made available under the terms and conditions of the BSD License
> - which accompanies this distribution. The full text of the license may be found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> System Control and Management Interface V1.0
> http://infocenter.arm.com/help/topic/com.arm.doc.den0056a/
> diff --git a/Platform/ARM/JunoPkg/Library/ArmJunoMtlLib/ArmJunoMtlLib.inf b/Platform/ARM/JunoPkg/Library/ArmJunoMtlLib/ArmJunoMtlLib.inf
> index 4b46c8071d..0b1460c274 100644
> --- a/Platform/ARM/JunoPkg/Library/ArmJunoMtlLib/ArmJunoMtlLib.inf
> +++ b/Platform/ARM/JunoPkg/Library/ArmJunoMtlLib/ArmJunoMtlLib.inf
> @@ -1,13 +1,7 @@
> #/** @file
> # Copyright (c) 2017-2018, Arm Limited. All rights reserved.
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD License
> -# which accompanies this distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #**/
>
> [Defines]
> diff --git a/Platform/ARM/JunoPkg/Library/ArmJunoMtlLib/ArmJunoMtlPrivateLib.h b/Platform/ARM/JunoPkg/Library/ArmJunoMtlLib/ArmJunoMtlPrivateLib.h
> index b2bac5e513..e0de203e7c 100644
> --- a/Platform/ARM/JunoPkg/Library/ArmJunoMtlLib/ArmJunoMtlPrivateLib.h
> +++ b/Platform/ARM/JunoPkg/Library/ArmJunoMtlLib/ArmJunoMtlPrivateLib.h
> @@ -2,13 +2,7 @@
>
> Copyright (c) 2017-2018, Arm Limited. All rights reserved.
>
> - This program and the accompanying materials
> - are licensed and made available under the terms and conditions of the BSD License
> - which accompanies this distribution. The full text of the license may be found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> System Control and Management Interface V1.0
> http://infocenter.arm.com/help/topic/com.arm.doc.den0056a/
> diff --git a/Platform/ARM/JunoPkg/Library/HdLcdArmJunoLib/HdLcdArmJuno.c b/Platform/ARM/JunoPkg/Library/HdLcdArmJunoLib/HdLcdArmJuno.c
> index 3e43ad6b76..4b961b7a9f 100644
> --- a/Platform/ARM/JunoPkg/Library/HdLcdArmJunoLib/HdLcdArmJuno.c
> +++ b/Platform/ARM/JunoPkg/Library/HdLcdArmJunoLib/HdLcdArmJuno.c
> @@ -2,13 +2,7 @@
>
> Copyright (c) 2013-2018, ARM Ltd. All rights reserved.
>
> - This program and the accompanying materials
> - are licensed and made available under the terms and conditions of the BSD License
> - which accompanies this distribution. The full text of the license may be found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/ARM/JunoPkg/Library/HdLcdArmJunoLib/HdLcdArmJunoLib.inf b/Platform/ARM/JunoPkg/Library/HdLcdArmJunoLib/HdLcdArmJunoLib.inf
> index 5590d95e2d..346c1a3d12 100644
> --- a/Platform/ARM/JunoPkg/Library/HdLcdArmJunoLib/HdLcdArmJunoLib.inf
> +++ b/Platform/ARM/JunoPkg/Library/HdLcdArmJunoLib/HdLcdArmJunoLib.inf
> @@ -4,13 +4,7 @@
> #
> # Copyright (c) 2013-2018, ARM Ltd. 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 distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> #**/
>
> diff --git a/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/JunoPciHostBridgeLib.c b/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/JunoPciHostBridgeLib.c
> index 5263a2985d..a78dda8cba 100644
> --- a/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/JunoPciHostBridgeLib.c
> +++ b/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/JunoPciHostBridgeLib.c
> @@ -3,13 +3,7 @@
>
> Copyright (c) 2017, Linaro Ltd. 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
> - distribution. The full text of the license may be found at
> - http://opensource.org/licenses/bsd-license.php.
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT
> - WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include <PiDxe.h>
> diff --git a/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/JunoPciHostBridgeLib.inf b/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/JunoPciHostBridgeLib.inf
> index 8f68f4b4f2..8b4a6e2fad 100644
> --- a/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/JunoPciHostBridgeLib.inf
> +++ b/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/JunoPciHostBridgeLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, Linaro Ltd. 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
> -# distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> -# IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> #
> ##
> diff --git a/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/XPressRich3.c b/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/XPressRich3.c
> index a6d782949e..0755dc1556 100644
> --- a/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/XPressRich3.c
> +++ b/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/XPressRich3.c
> @@ -4,13 +4,7 @@
> * Copyright (c) 2011-2015, ARM Ltd. All rights reserved.
> * Copyright (c) 2017, Linaro, Ltd. All rights reserved.
> *
> -* This program and the accompanying materials
> -* are licensed and made available under the terms and conditions of the BSD License
> -* which accompanies this distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/XPressRich3.h b/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/XPressRich3.h
> index 07f52c210e..420bdda753 100644
> --- a/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/XPressRich3.h
> +++ b/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/XPressRich3.h
> @@ -3,13 +3,7 @@
> *
> * Copyright (c) 2011-2015, ARM Ltd. All rights reserved.
> *
> -* This program and the accompanying materials
> -* are licensed and made available under the terms and conditions of the BSD License
> -* which accompanies this distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/ARM/JunoPkg/Library/NorFlashJunoLib/NorFlashJuno.c b/Platform/ARM/JunoPkg/Library/NorFlashJunoLib/NorFlashJuno.c
> index 2e49f3acfe..52b2bcbe3a 100644
> --- a/Platform/ARM/JunoPkg/Library/NorFlashJunoLib/NorFlashJuno.c
> +++ b/Platform/ARM/JunoPkg/Library/NorFlashJunoLib/NorFlashJuno.c
> @@ -2,13 +2,7 @@
>
> Copyright (c) 2011-2014, ARM Ltd. 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 distribution. The full text of the license may be found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/ARM/JunoPkg/Library/NorFlashJunoLib/NorFlashJunoLib.inf b/Platform/ARM/JunoPkg/Library/NorFlashJunoLib/NorFlashJunoLib.inf
> index 881a479d85..e5e5628de3 100644
> --- a/Platform/ARM/JunoPkg/Library/NorFlashJunoLib/NorFlashJunoLib.inf
> +++ b/Platform/ARM/JunoPkg/Library/NorFlashJunoLib/NorFlashJunoLib.inf
> @@ -1,13 +1,7 @@
> #/** @file
> #
> # Copyright (c) 2011 - 2014, ARM Ltd. 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 distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> #**/
>
> diff --git a/Platform/ARM/JunoPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.c b/Platform/ARM/JunoPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.c
> index fe5498e9fb..ac18b16ca6 100644
> --- a/Platform/ARM/JunoPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.c
> +++ b/Platform/ARM/JunoPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.c
> @@ -3,13 +3,7 @@
>
> Copyright (c) 2015, ARM Limited. All rights reserved.
>
> - This program and the accompanying materials
> - are licensed and made available under the terms and conditions of the BSD License
> - which accompanies this distribution. The full text of the license may be found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include <ArmPlatform.h>
> diff --git a/Platform/ARM/JunoPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf b/Platform/ARM/JunoPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
> index a8305925cd..f938cdf148 100644
> --- a/Platform/ARM/JunoPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
> +++ b/Platform/ARM/JunoPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
> @@ -5,12 +5,7 @@
> # Copyright (c) 2011, Intel Corporation. All rights reserved.
> # Copyright (c) 2015, ARM Limited. All rights reserved.
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD License
> -# which accompanies this distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Platform/ARM/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.c b/Platform/ARM/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.c
> index 67bbb9e863..ee0fc99a83 100644
> --- a/Platform/ARM/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.c
> +++ b/Platform/ARM/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.c
> @@ -2,13 +2,7 @@
> *
> * Copyright (c) 2014, ARM Ltd. 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
> -* distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/ARM/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.h b/Platform/ARM/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.h
> index 2708b53cc1..18d1e9de68 100644
> --- a/Platform/ARM/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.h
> +++ b/Platform/ARM/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.h
> @@ -2,13 +2,7 @@
> *
> * Copyright (c) 2014, ARM Ltd. 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
> -* distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/ARM/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.inf b/Platform/ARM/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.inf
> index 8473b0fa90..74c6a0e84f 100644
> --- a/Platform/ARM/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.inf
> +++ b/Platform/ARM/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.inf
> @@ -2,13 +2,7 @@
> #
> # Copyright (c) 2014, ARM Ltd. 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
> -# distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Platform/ARM/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.uni b/Platform/ARM/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.uni
> index 6b72960791..c2ccd6de4c 100644
> --- a/Platform/ARM/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.uni
> +++ b/Platform/ARM/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.uni
> @@ -2,13 +2,7 @@
> //
> // Copyright (c) 2014, ARM Ltd. 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
> -// distribution. The full text of the license may be found at
> -// http://opensource.org/licenses/bsd-license.php
> -//
> -// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +// SPDX-License-Identifier: BSD-2-Clause-Patent
> //
> //
> // Module Name:
> diff --git a/Platform/ARM/Library/ArmShellCmdRunAxf/BootMonFsLoader.c b/Platform/ARM/Library/ArmShellCmdRunAxf/BootMonFsLoader.c
> index 0bce037dcb..43d4a38ab3 100644
> --- a/Platform/ARM/Library/ArmShellCmdRunAxf/BootMonFsLoader.c
> +++ b/Platform/ARM/Library/ArmShellCmdRunAxf/BootMonFsLoader.c
> @@ -2,13 +2,7 @@
> *
> * Copyright (c) 2014, ARM Ltd. All rights reserved.
> *
> -* This program and the accompanying materials are licensed and made available
> -* under the terms and conditions of the BSD License which accompanies this
> -* distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT
> -* WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/ARM/Library/ArmShellCmdRunAxf/BootMonFsLoader.h b/Platform/ARM/Library/ArmShellCmdRunAxf/BootMonFsLoader.h
> index de3c0adcd1..b2bba0d332 100644
> --- a/Platform/ARM/Library/ArmShellCmdRunAxf/BootMonFsLoader.h
> +++ b/Platform/ARM/Library/ArmShellCmdRunAxf/BootMonFsLoader.h
> @@ -2,13 +2,7 @@
> *
> * Copyright (c) 2014, ARM Ltd. All rights reserved.
> *
> -* This program and the accompanying materials are licensed and made available
> -* under the terms and conditions of the BSD License which accompanies this
> -* distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT
> -* WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/ARM/Library/ArmShellCmdRunAxf/ElfLoader.c b/Platform/ARM/Library/ArmShellCmdRunAxf/ElfLoader.c
> index 6bb0d22de2..b3f3452937 100644
> --- a/Platform/ARM/Library/ArmShellCmdRunAxf/ElfLoader.c
> +++ b/Platform/ARM/Library/ArmShellCmdRunAxf/ElfLoader.c
> @@ -2,13 +2,7 @@
> *
> * Copyright (c) 2014, ARM Limited. All rights reserved.
> *
> -* This program and the accompanying materials
> -* are licensed and made available under the terms and conditions of the BSD License
> -* which accompanies this distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/ARM/Library/ArmShellCmdRunAxf/ElfLoader.h b/Platform/ARM/Library/ArmShellCmdRunAxf/ElfLoader.h
> index 7020a6c4e7..dbd43ea898 100644
> --- a/Platform/ARM/Library/ArmShellCmdRunAxf/ElfLoader.h
> +++ b/Platform/ARM/Library/ArmShellCmdRunAxf/ElfLoader.h
> @@ -2,13 +2,7 @@
> *
> * Copyright (c) 2014, ARM Limited. All rights reserved.
> *
> -* This program and the accompanying materials
> -* are licensed and made available under the terms and conditions of the BSD License
> -* which accompanies this distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/ARM/Library/ArmShellCmdRunAxf/RunAxf.c b/Platform/ARM/Library/ArmShellCmdRunAxf/RunAxf.c
> index 9f4fc78030..153aed2ab6 100644
> --- a/Platform/ARM/Library/ArmShellCmdRunAxf/RunAxf.c
> +++ b/Platform/ARM/Library/ArmShellCmdRunAxf/RunAxf.c
> @@ -4,13 +4,7 @@
> *
> * Copyright (c) 2014, ARM Limited. All rights reserved.
> *
> -* This program and the accompanying materials
> -* are licensed and made available under the terms and conditions of the BSD License
> -* which accompanies this distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/ARM/Library/ArmShellCmdRunAxf/elf32.h b/Platform/ARM/Library/ArmShellCmdRunAxf/elf32.h
> index 3951444a30..14dc5a4169 100644
> --- a/Platform/ARM/Library/ArmShellCmdRunAxf/elf32.h
> +++ b/Platform/ARM/Library/ArmShellCmdRunAxf/elf32.h
> @@ -2,13 +2,7 @@
> Ported ELF include files from FreeBSD
>
> Copyright (c) 2009 - 2010, Apple Inc. 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 distribution. The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
>
> **/
> diff --git a/Platform/ARM/Library/ArmShellCmdRunAxf/elf64.h b/Platform/ARM/Library/ArmShellCmdRunAxf/elf64.h
> index 1cfe0c9539..8872ece3fb 100644
> --- a/Platform/ARM/Library/ArmShellCmdRunAxf/elf64.h
> +++ b/Platform/ARM/Library/ArmShellCmdRunAxf/elf64.h
> @@ -2,13 +2,7 @@
> Ported ELF include files from FreeBSD
>
> Copyright (c) 2009 - 2010, Apple Inc. 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 distribution. The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> /*-
> diff --git a/Platform/ARM/Library/ArmShellCmdRunAxf/elf_common.h b/Platform/ARM/Library/ArmShellCmdRunAxf/elf_common.h
> index ed3cedc1b0..ea3827a568 100644
> --- a/Platform/ARM/Library/ArmShellCmdRunAxf/elf_common.h
> +++ b/Platform/ARM/Library/ArmShellCmdRunAxf/elf_common.h
> @@ -3,13 +3,7 @@ Ported ELF include files from FreeBSD
>
> Copyright (c) 2009 - 2010, Apple Inc. 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 under the terms and conditions of the BSD License
> -which accompanies this distribution. The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
>
> **/
> diff --git a/Platform/ARM/Library/BdsLib/BdsFilePath.c b/Platform/ARM/Library/BdsLib/BdsFilePath.c
> index ad66b2f827..f0ffc6475d 100644
> --- a/Platform/ARM/Library/BdsLib/BdsFilePath.c
> +++ b/Platform/ARM/Library/BdsLib/BdsFilePath.c
> @@ -2,13 +2,7 @@
> *
> * Copyright (c) 2011-2014, ARM Limited. All rights reserved.
> *
> -* This program and the accompanying materials
> -* are licensed and made available under the terms and conditions of the BSD License
> -* which accompanies this distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/ARM/Library/BdsLib/BdsHelper.c b/Platform/ARM/Library/BdsLib/BdsHelper.c
> index de40fb5cf6..88a6dedbcb 100644
> --- a/Platform/ARM/Library/BdsLib/BdsHelper.c
> +++ b/Platform/ARM/Library/BdsLib/BdsHelper.c
> @@ -2,13 +2,7 @@
> *
> * Copyright (c) 2011-2015, ARM Limited. All rights reserved.
> *
> -* This program and the accompanying materials
> -* are licensed and made available under the terms and conditions of the BSD License
> -* which accompanies this distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/ARM/Library/BdsLib/BdsInternal.h b/Platform/ARM/Library/BdsLib/BdsInternal.h
> index 850618c624..f9761a9019 100644
> --- a/Platform/ARM/Library/BdsLib/BdsInternal.h
> +++ b/Platform/ARM/Library/BdsLib/BdsInternal.h
> @@ -2,13 +2,7 @@
> *
> * Copyright (c) 2011-2015, ARM Limited. All rights reserved.
> *
> -* This program and the accompanying materials
> -* are licensed and made available under the terms and conditions of the BSD License
> -* which accompanies this distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/ARM/Library/BdsLib/BdsLib.inf b/Platform/ARM/Library/BdsLib/BdsLib.inf
> index 7441fe539b..12995cf174 100644
> --- a/Platform/ARM/Library/BdsLib/BdsLib.inf
> +++ b/Platform/ARM/Library/BdsLib/BdsLib.inf
> @@ -2,13 +2,7 @@
> #
> # Copyright (c) 2011-2014, ARM Limited. All rights reserved.
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD License
> -# which accompanies this distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> #*/
>
> diff --git a/Platform/ARM/SgiPkg/AcpiTables/Dbg2.aslc b/Platform/ARM/SgiPkg/AcpiTables/Dbg2.aslc
> index dd85ecaebf..279f847cce 100644
> --- a/Platform/ARM/SgiPkg/AcpiTables/Dbg2.aslc
> +++ b/Platform/ARM/SgiPkg/AcpiTables/Dbg2.aslc
> @@ -3,13 +3,7 @@
> *
> * Copyright (c) 2018, ARM Limited. All rights reserved.
> *
> -* This program and the accompanying materials are licensed and made available
> -* under the terms and conditions of the BSD License which accompanies this
> -* distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/ARM/SgiPkg/AcpiTables/Fadt.aslc b/Platform/ARM/SgiPkg/AcpiTables/Fadt.aslc
> index 35b3ec80fc..9472aff2e0 100644
> --- a/Platform/ARM/SgiPkg/AcpiTables/Fadt.aslc
> +++ b/Platform/ARM/SgiPkg/AcpiTables/Fadt.aslc
> @@ -3,13 +3,7 @@
> *
> * Copyright (c) 2018, ARM Limited. All rights reserved.
> *
> -* This program and the accompanying materials are licensed and made available
> -* under the terms and conditions of the BSD License which accompanies this
> -* distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/ARM/SgiPkg/AcpiTables/Gtdt.aslc b/Platform/ARM/SgiPkg/AcpiTables/Gtdt.aslc
> index d7105f3823..a8b587ba88 100644
> --- a/Platform/ARM/SgiPkg/AcpiTables/Gtdt.aslc
> +++ b/Platform/ARM/SgiPkg/AcpiTables/Gtdt.aslc
> @@ -3,13 +3,7 @@
> *
> * Copyright (c) 2018, ARM Limited. All rights reserved.
> *
> -* This program and the accompanying materials are licensed and made available
> -* under the terms and conditions of the BSD License which accompanies this
> -* distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/ARM/SgiPkg/AcpiTables/Iort.aslc b/Platform/ARM/SgiPkg/AcpiTables/Iort.aslc
> index b32e76e408..58ec31ddc8 100644
> --- a/Platform/ARM/SgiPkg/AcpiTables/Iort.aslc
> +++ b/Platform/ARM/SgiPkg/AcpiTables/Iort.aslc
> @@ -3,13 +3,7 @@
> *
> * Copyright (c) 2018, ARM Ltd. All rights reserved.
> *
> -* This program and the accompanying materials are licensed and made available
> -* under the terms and conditions of the BSD License which accompanies this
> -* distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/ARM/SgiPkg/AcpiTables/Mcfg.aslc b/Platform/ARM/SgiPkg/AcpiTables/Mcfg.aslc
> index bb4026014d..090297d954 100644
> --- a/Platform/ARM/SgiPkg/AcpiTables/Mcfg.aslc
> +++ b/Platform/ARM/SgiPkg/AcpiTables/Mcfg.aslc
> @@ -3,13 +3,7 @@
> *
> * Copyright (c) 2018, ARM Ltd. All rights reserved.
> *
> -* This program and the accompanying materials are licensed and made available
> -* under the terms and conditions of the BSD License which accompanies this
> -* distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdE1Edge/Dsdt.asl b/Platform/ARM/SgiPkg/AcpiTables/RdE1Edge/Dsdt.asl
> index c2f2dfb46e..5583e61097 100644
> --- a/Platform/ARM/SgiPkg/AcpiTables/RdE1Edge/Dsdt.asl
> +++ b/Platform/ARM/SgiPkg/AcpiTables/RdE1Edge/Dsdt.asl
> @@ -3,13 +3,7 @@
> *
> * Copyright (c) 2018, ARM Ltd. All rights reserved.
> *
> -* This program and the accompanying materials are licensed and made available
> -* under the terms and conditions of the BSD License which accompanies this
> -* distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdE1Edge/Madt.aslc b/Platform/ARM/SgiPkg/AcpiTables/RdE1Edge/Madt.aslc
> index 0d66d8afa0..48e7a61478 100644
> --- a/Platform/ARM/SgiPkg/AcpiTables/RdE1Edge/Madt.aslc
> +++ b/Platform/ARM/SgiPkg/AcpiTables/RdE1Edge/Madt.aslc
> @@ -3,13 +3,7 @@
> *
> * Copyright (c) 2018, ARM Limited. All rights reserved.
> *
> -* This program and the accompanying materials are licensed and made available
> -* under the terms and conditions of the BSD License which accompanies this
> -* distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdE1EdgeAcpiTables.inf b/Platform/ARM/SgiPkg/AcpiTables/RdE1EdgeAcpiTables.inf
> index da6d634595..3a4d4e7b95 100644
> --- a/Platform/ARM/SgiPkg/AcpiTables/RdE1EdgeAcpiTables.inf
> +++ b/Platform/ARM/SgiPkg/AcpiTables/RdE1EdgeAcpiTables.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2018, ARM Ltd. All rights reserved.
> #
> -# This program and the accompanying materials are licensed and made available
> -# under the terms and conditions of the BSD License which accompanies this
> -# distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdN1Edge/Dsdt.asl b/Platform/ARM/SgiPkg/AcpiTables/RdN1Edge/Dsdt.asl
> index 9226229222..45316d5005 100644
> --- a/Platform/ARM/SgiPkg/AcpiTables/RdN1Edge/Dsdt.asl
> +++ b/Platform/ARM/SgiPkg/AcpiTables/RdN1Edge/Dsdt.asl
> @@ -3,13 +3,7 @@
> *
> * Copyright (c) 2018, ARM Ltd. All rights reserved.
> *
> -* This program and the accompanying materials are licensed and made available
> -* under the terms and conditions of the BSD License which accompanies this
> -* distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdN1Edge/Madt.aslc b/Platform/ARM/SgiPkg/AcpiTables/RdN1Edge/Madt.aslc
> index d29eda5960..6312743a47 100644
> --- a/Platform/ARM/SgiPkg/AcpiTables/RdN1Edge/Madt.aslc
> +++ b/Platform/ARM/SgiPkg/AcpiTables/RdN1Edge/Madt.aslc
> @@ -3,13 +3,7 @@
> *
> * Copyright (c) 2018, ARM Limited. All rights reserved.
> *
> -* This program and the accompanying materials are licensed and made available
> -* under the terms and conditions of the BSD License which accompanies this
> -* distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeAcpiTables.inf b/Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeAcpiTables.inf
> index aa9fec7822..58c33ecb8e 100644
> --- a/Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeAcpiTables.inf
> +++ b/Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeAcpiTables.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2018, ARM Ltd. All rights reserved.
> #
> -# This program and the accompanying materials are licensed and made available
> -# under the terms and conditions of the BSD License which accompanies this
> -# distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Platform/ARM/SgiPkg/AcpiTables/Sgi575/Dsdt.asl b/Platform/ARM/SgiPkg/AcpiTables/Sgi575/Dsdt.asl
> index 36bc8c3809..bf0c964b7a 100644
> --- a/Platform/ARM/SgiPkg/AcpiTables/Sgi575/Dsdt.asl
> +++ b/Platform/ARM/SgiPkg/AcpiTables/Sgi575/Dsdt.asl
> @@ -3,13 +3,7 @@
> *
> * Copyright (c) 2018, ARM Ltd. All rights reserved.
> *
> -* This program and the accompanying materials are licensed and made available
> -* under the terms and conditions of the BSD License which accompanies this
> -* distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/ARM/SgiPkg/AcpiTables/Sgi575/Madt.aslc b/Platform/ARM/SgiPkg/AcpiTables/Sgi575/Madt.aslc
> index 4f981203b2..dedabaaecd 100644
> --- a/Platform/ARM/SgiPkg/AcpiTables/Sgi575/Madt.aslc
> +++ b/Platform/ARM/SgiPkg/AcpiTables/Sgi575/Madt.aslc
> @@ -3,13 +3,7 @@
> *
> * Copyright (c) 2018, ARM Limited. All rights reserved.
> *
> -* This program and the accompanying materials are licensed and made available
> -* under the terms and conditions of the BSD License which accompanies this
> -* distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/ARM/SgiPkg/AcpiTables/Sgi575AcpiTables.inf b/Platform/ARM/SgiPkg/AcpiTables/Sgi575AcpiTables.inf
> index c666ea9d51..097ef854df 100644
> --- a/Platform/ARM/SgiPkg/AcpiTables/Sgi575AcpiTables.inf
> +++ b/Platform/ARM/SgiPkg/AcpiTables/Sgi575AcpiTables.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2018, ARM Ltd. All rights reserved.
> #
> -# This program and the accompanying materials are licensed and made available
> -# under the terms and conditions of the BSD License which accompanies this
> -# distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Platform/ARM/SgiPkg/AcpiTables/Spcr.aslc b/Platform/ARM/SgiPkg/AcpiTables/Spcr.aslc
> index 0aa1c3ec2d..6321445300 100644
> --- a/Platform/ARM/SgiPkg/AcpiTables/Spcr.aslc
> +++ b/Platform/ARM/SgiPkg/AcpiTables/Spcr.aslc
> @@ -3,13 +3,7 @@
> *
> * Copyright (c) 2018, ARM Limited. All rights reserved.
> *
> -* This program and the accompanying materials are licensed and made available
> -* under the terms and conditions of the BSD License which accompanies this
> -* distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/ARM/SgiPkg/AcpiTables/Ssdt.asl b/Platform/ARM/SgiPkg/AcpiTables/Ssdt.asl
> index 1901368d0e..49c630d531 100644
> --- a/Platform/ARM/SgiPkg/AcpiTables/Ssdt.asl
> +++ b/Platform/ARM/SgiPkg/AcpiTables/Ssdt.asl
> @@ -3,13 +3,7 @@
> *
> * Copyright (c) 2018, ARM Limited. All rights reserved.
> *
> -* This program and the accompanying materials are licensed and made available
> -* under the terms and conditions of the BSD License which accompanies this
> -* distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.c b/Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.c
> index cc9b0a6385..09e00e5d53 100644
> --- a/Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.c
> +++ b/Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.c
> @@ -2,13 +2,7 @@
> *
> * Copyright (c) 2018, ARM Limited. All rights reserved.
> *
> -* This program and the accompanying materials are licensed and made available
> -* under the terms and conditions of the BSD License which accompanies this
> -* distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.inf b/Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.inf
> index 7752256b6f..a95c0d1ddd 100644
> --- a/Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.inf
> +++ b/Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.inf
> @@ -1,13 +1,7 @@
> #
> # Copyright (c) 2018, ARM Limited. All rights reserved.
> #
> -# This program and the accompanying materials are licensed and made available
> -# under the terms and conditions of the BSD License which accompanies this
> -# distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
>
> [Defines]
> diff --git a/Platform/ARM/SgiPkg/Drivers/PlatformDxe/VirtioDevices.c b/Platform/ARM/SgiPkg/Drivers/PlatformDxe/VirtioDevices.c
> index 92ad704c61..9e5f7e704e 100644
> --- a/Platform/ARM/SgiPkg/Drivers/PlatformDxe/VirtioDevices.c
> +++ b/Platform/ARM/SgiPkg/Drivers/PlatformDxe/VirtioDevices.c
> @@ -2,13 +2,7 @@
>
> Copyright (c) 2018, ARM Ltd. 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
> - distribution. The full text of the license may be found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/ARM/SgiPkg/Include/Guid/SgiVirtioDevicesFormSet.h b/Platform/ARM/SgiPkg/Include/Guid/SgiVirtioDevicesFormSet.h
> index b7aab64d7b..78c2d2d279 100644
> --- a/Platform/ARM/SgiPkg/Include/Guid/SgiVirtioDevicesFormSet.h
> +++ b/Platform/ARM/SgiPkg/Include/Guid/SgiVirtioDevicesFormSet.h
> @@ -2,13 +2,7 @@
> *
> * Copyright (c) 2018, ARM Limited. All rights reserved.
> *
> -* This program and the accompanying materials are licensed and made available
> -* under the terms and conditions of the BSD License which accompanies this
> -* distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/ARM/SgiPkg/Include/Ppi/SgiPlatformId.h b/Platform/ARM/SgiPkg/Include/Ppi/SgiPlatformId.h
> index b830326833..01eef49d8f 100644
> --- a/Platform/ARM/SgiPkg/Include/Ppi/SgiPlatformId.h
> +++ b/Platform/ARM/SgiPkg/Include/Ppi/SgiPlatformId.h
> @@ -2,13 +2,7 @@
> *
> * Copyright (c) 2018, ARM Limited. All rights reserved.
> *
> -* This program and the accompanying materials are licensed and made available
> -* under the terms and conditions of the BSD License which accompanies this
> -* distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/ARM/SgiPkg/Include/SgiAcpiHeader.h b/Platform/ARM/SgiPkg/Include/SgiAcpiHeader.h
> index 30352b06a6..5083dde15d 100644
> --- a/Platform/ARM/SgiPkg/Include/SgiAcpiHeader.h
> +++ b/Platform/ARM/SgiPkg/Include/SgiAcpiHeader.h
> @@ -2,13 +2,7 @@
> *
> * Copyright (c) 2018, ARM Limited. All rights reserved.
> *
> -* This program and the accompanying materials are licensed and made available
> -* under the terms and conditions of the BSD License which accompanies this
> -* distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/ARM/SgiPkg/Include/SgiPlatform.h b/Platform/ARM/SgiPkg/Include/SgiPlatform.h
> index e89a5083b3..e4a2e8cc09 100644
> --- a/Platform/ARM/SgiPkg/Include/SgiPlatform.h
> +++ b/Platform/ARM/SgiPkg/Include/SgiPlatform.h
> @@ -2,13 +2,7 @@
> *
> * Copyright (c) 2018, ARM Limited. All rights reserved.
> *
> -* This program and the accompanying materials are licensed and made available
> -* under the terms and conditions of the BSD License which accompanies this
> -* distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/ARM/SgiPkg/Library/HdLcdArmSgiLib/HdLcdArmSgi.c b/Platform/ARM/SgiPkg/Library/HdLcdArmSgiLib/HdLcdArmSgi.c
> index 55f10f4eb7..6f747d2545 100644
> --- a/Platform/ARM/SgiPkg/Library/HdLcdArmSgiLib/HdLcdArmSgi.c
> +++ b/Platform/ARM/SgiPkg/Library/HdLcdArmSgiLib/HdLcdArmSgi.c
> @@ -2,13 +2,7 @@
> *
> * Copyright (c) 2018, ARM Limited. All rights reserved.
> *
> -* This program and the accompanying materials are licensed and made available
> -* under the terms and conditions of the BSD License which accompanies this
> -* distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/ARM/SgiPkg/Library/HdLcdArmSgiLib/HdLcdArmSgiLib.inf b/Platform/ARM/SgiPkg/Library/HdLcdArmSgiLib/HdLcdArmSgiLib.inf
> index 751f0d9288..75a6ba2ae6 100644
> --- a/Platform/ARM/SgiPkg/Library/HdLcdArmSgiLib/HdLcdArmSgiLib.inf
> +++ b/Platform/ARM/SgiPkg/Library/HdLcdArmSgiLib/HdLcdArmSgiLib.inf
> @@ -1,13 +1,7 @@
> #
> # Copyright (c) 2018, ARM Limited. All rights reserved.
> #
> -# This program and the accompanying materials are licensed and made available
> -# under the terms and conditions of the BSD License which accompanies this
> -# distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
>
> [Defines]
> diff --git a/Platform/ARM/SgiPkg/Library/NorFlashLib/NorFlashLib.c b/Platform/ARM/SgiPkg/Library/NorFlashLib/NorFlashLib.c
> index 04e9710bf2..e3bf2726b5 100644
> --- a/Platform/ARM/SgiPkg/Library/NorFlashLib/NorFlashLib.c
> +++ b/Platform/ARM/SgiPkg/Library/NorFlashLib/NorFlashLib.c
> @@ -2,13 +2,7 @@
>
> Copyright (c) 2018, ARM Ltd. All rights reserved.
>
> - This program and the accompanying materials are licensed and made available
> - under the terms and conditions of the BSD License which accompanies this
> - distribution. The full text of the license may be found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/ARM/SgiPkg/Library/NorFlashLib/NorFlashLib.inf b/Platform/ARM/SgiPkg/Library/NorFlashLib/NorFlashLib.inf
> index 3a6b33b538..a1439c10d1 100644
> --- a/Platform/ARM/SgiPkg/Library/NorFlashLib/NorFlashLib.inf
> +++ b/Platform/ARM/SgiPkg/Library/NorFlashLib/NorFlashLib.inf
> @@ -2,13 +2,7 @@
> #
> # Copyright (c) 2018, ARM Ltd. All rights reserved.
>
> -# This program and the accompanying materials are licensed and made available
> -# under the terms and conditions of the BSD License which accompanies this
> -# distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> #**/
>
> diff --git a/Platform/ARM/SgiPkg/Library/PciHostBridgeLib/PciHostBridgeLib.c b/Platform/ARM/SgiPkg/Library/PciHostBridgeLib/PciHostBridgeLib.c
> index ddda194224..e53aab58f8 100644
> --- a/Platform/ARM/SgiPkg/Library/PciHostBridgeLib/PciHostBridgeLib.c
> +++ b/Platform/ARM/SgiPkg/Library/PciHostBridgeLib/PciHostBridgeLib.c
> @@ -3,13 +3,7 @@
> *
> * Copyright (c) 2018, ARM Limited. All rights reserved.
> *
> -* This program and the accompanying materials are licensed and made available
> -* under the terms and conditions of the BSD License which accompanies this
> -* distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/ARM/SgiPkg/Library/PciHostBridgeLib/PciHostBridgeLib.inf b/Platform/ARM/SgiPkg/Library/PciHostBridgeLib/PciHostBridgeLib.inf
> index 16c2295f75..a9fdd874d0 100644
> --- a/Platform/ARM/SgiPkg/Library/PciHostBridgeLib/PciHostBridgeLib.inf
> +++ b/Platform/ARM/SgiPkg/Library/PciHostBridgeLib/PciHostBridgeLib.inf
> @@ -4,13 +4,7 @@
> # Copyright (c) 2016, Intel Corporation. All rights reserved.
> # Copyright (c) 2017, ARM Limited. All rights reserved.
> #
> -# This program and the accompanying materials are licensed and made available
> -# under the terms and conditions of the BSD License which accompanies this
> -# distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> -# IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Platform/ARM/SgiPkg/Library/PlatformLib/AArch64/Helper.S b/Platform/ARM/SgiPkg/Library/PlatformLib/AArch64/Helper.S
> index 5dc64316ce..e2572b51e9 100644
> --- a/Platform/ARM/SgiPkg/Library/PlatformLib/AArch64/Helper.S
> +++ b/Platform/ARM/SgiPkg/Library/PlatformLib/AArch64/Helper.S
> @@ -2,13 +2,7 @@
> *
> * Copyright (c) 2018, ARM Limited. All rights reserved.
> *
> -* This program and the accompanying materials are licensed and made available
> -* under the terms and conditions of the BSD License which accompanies this
> -* distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLib.c b/Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLib.c
> index d264292216..9731d7ccce 100644
> --- a/Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLib.c
> +++ b/Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLib.c
> @@ -2,13 +2,7 @@
> *
> * Copyright (c) 2018, ARM Limited. All rights reserved.
> *
> -* This program and the accompanying materials are licensed and made available
> -* under the terms and conditions of the BSD License which accompanies this
> -* distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLib.inf b/Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLib.inf
> index c0fcc81982..3db70e900d 100644
> --- a/Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLib.inf
> +++ b/Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLib.inf
> @@ -1,13 +1,7 @@
> #
> # Copyright (c) 2018, ARM Limited. All rights reserved.
> #
> -# This program and the accompanying materials are licensed and made available
> -# under the terms and conditions of the BSD License which accompanies this
> -# distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
>
> [Defines]
> diff --git a/Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLibMem.c b/Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLibMem.c
> index 60729e3c71..845aeaf4dd 100644
> --- a/Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLibMem.c
> +++ b/Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLibMem.c
> @@ -2,13 +2,7 @@
> *
> * Copyright (c) 2018, ARM Limited. All rights reserved.
> *
> -* This program and the accompanying materials are licensed and made available
> -* under the terms and conditions of the BSD License which accompanies this
> -* distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/ARM/SgiPkg/Library/SgiPlatformPei/SgiPlatformPei.inf b/Platform/ARM/SgiPkg/Library/SgiPlatformPei/SgiPlatformPei.inf
> index a9173cc572..407160c075 100644
> --- a/Platform/ARM/SgiPkg/Library/SgiPlatformPei/SgiPlatformPei.inf
> +++ b/Platform/ARM/SgiPkg/Library/SgiPlatformPei/SgiPlatformPei.inf
> @@ -1,13 +1,7 @@
> #
> # Copyright (c) 2018, ARM Limited. All rights reserved.
> #
> -# This program and the accompanying materials are licensed and made available
> -# under the terms and conditions of the BSD License which accompanies this
> -# distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
>
> [Defines]
> diff --git a/Platform/ARM/SgiPkg/Library/SgiPlatformPei/SgiPlatformPeim.c b/Platform/ARM/SgiPkg/Library/SgiPlatformPei/SgiPlatformPeim.c
> index d133921f23..4daa1832df 100644
> --- a/Platform/ARM/SgiPkg/Library/SgiPlatformPei/SgiPlatformPeim.c
> +++ b/Platform/ARM/SgiPkg/Library/SgiPlatformPei/SgiPlatformPeim.c
> @@ -2,13 +2,7 @@
> *
> * Copyright (c) 2018, ARM Limited. All rights reserved.
> *
> -* This program and the accompanying materials are licensed and made available
> -* under the terms and conditions of the BSD License which accompanies this
> -* distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc b/Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc
> index 49fc91944d..7ae19560ea 100644
> --- a/Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc
> +++ b/Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc
> @@ -1,13 +1,7 @@
> #
> # Copyright (c) 2018, ARM Limited. All rights reserved.
> #
> -# This program and the accompanying materials are licensed and made available
> -# under the terms and conditions of the BSD License which accompanies this
> -# distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
>
> ################################################################################
> diff --git a/Platform/ARM/SgiPkg/PlatformStandaloneMm.fdf b/Platform/ARM/SgiPkg/PlatformStandaloneMm.fdf
> index 810460ca98..5a0772cd85 100644
> --- a/Platform/ARM/SgiPkg/PlatformStandaloneMm.fdf
> +++ b/Platform/ARM/SgiPkg/PlatformStandaloneMm.fdf
> @@ -1,13 +1,7 @@
> #
> # Copyright (c) 2018, ARM Limited. All rights reserved.
> #
> -# This program and the accompanying materials are licensed and made available
> -# under the terms and conditions of the BSD License which accompanies this
> -# distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
>
> ################################################################################
> diff --git a/Platform/ARM/SgiPkg/SgiPlatform.dec b/Platform/ARM/SgiPkg/SgiPlatform.dec
> index 612c494c2d..229552ea78 100644
> --- a/Platform/ARM/SgiPkg/SgiPlatform.dec
> +++ b/Platform/ARM/SgiPkg/SgiPlatform.dec
> @@ -1,13 +1,7 @@
> #
> # Copyright (c) 2018, ARM Limited. All rights reserved.
> #
> -# This program and the accompanying materials are licensed and made available
> -# under the terms and conditions of the BSD License which accompanies this
> -# distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
>
> [Defines]
> diff --git a/Platform/ARM/SgiPkg/SgiPlatform.dsc b/Platform/ARM/SgiPkg/SgiPlatform.dsc
> index ae55139175..a5b7eea1d3 100644
> --- a/Platform/ARM/SgiPkg/SgiPlatform.dsc
> +++ b/Platform/ARM/SgiPkg/SgiPlatform.dsc
> @@ -1,13 +1,7 @@
> #
> # Copyright (c) 2018, ARM Limited. All rights reserved.
> #
> -# This program and the accompanying materials are licensed and made available
> -# under the terms and conditions of the BSD License which accompanies this
> -# distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
>
> ################################################################################
> diff --git a/Platform/ARM/SgiPkg/SgiPlatform.fdf b/Platform/ARM/SgiPkg/SgiPlatform.fdf
> index b163dab5c3..527bbd825d 100644
> --- a/Platform/ARM/SgiPkg/SgiPlatform.fdf
> +++ b/Platform/ARM/SgiPkg/SgiPlatform.fdf
> @@ -1,13 +1,7 @@
> #
> # Copyright (c) 2018, ARM Limited. All rights reserved.
> #
> -# This program and the accompanying materials are licensed and made available
> -# under the terms and conditions of the BSD License which accompanies this
> -# distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
>
> ################################################################################
> diff --git a/Platform/ARM/VExpressPkg/AcpiTables/AcpiTables.inf b/Platform/ARM/VExpressPkg/AcpiTables/AcpiTables.inf
> index 35685274a0..bca1d21de7 100644
> --- a/Platform/ARM/VExpressPkg/AcpiTables/AcpiTables.inf
> +++ b/Platform/ARM/VExpressPkg/AcpiTables/AcpiTables.inf
> @@ -4,13 +4,7 @@
> #
> # Copyright (c) 2014-2017, ARM Ltd. All rights reserved.
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD License
> -# which accompanies this distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Platform/ARM/VExpressPkg/AcpiTables/Dsdt.asl b/Platform/ARM/VExpressPkg/AcpiTables/Dsdt.asl
> index 7e81ab7ea1..f9b44bb25f 100644
> --- a/Platform/ARM/VExpressPkg/AcpiTables/Dsdt.asl
> +++ b/Platform/ARM/VExpressPkg/AcpiTables/Dsdt.asl
> @@ -2,28 +2,7 @@
> * Copyright (c) 2013, Al Stone <al.stone@linaro.org>
> * All rights reserved.
> *
> -* Redistribution and use in source and binary forms, with or without
> -* modification, are permitted provided that the following conditions
> -* are met:
> -*
> -* 1. Redistributions of source code must retain the above copyright
> -* notice, this list of conditions and the following disclaimer.
> -*
> -* 2. Redistributions in binary form must reproduce the above copyright
> -* notice, this list of conditions and the following disclaimer in the
> -* documentation and/or other materials provided with the distribution.
> -*
> -* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
> -* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
> -* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
> -* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
> -* HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
> -* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
> -* TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
> -* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
> -* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
> -* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
> -* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> *
> * NB: This License is also known as the "BSD 2-Clause License".
> diff --git a/Platform/ARM/VExpressPkg/AcpiTables/Fadt.aslc b/Platform/ARM/VExpressPkg/AcpiTables/Fadt.aslc
> index 087c191ecd..4eaec61b32 100644
> --- a/Platform/ARM/VExpressPkg/AcpiTables/Fadt.aslc
> +++ b/Platform/ARM/VExpressPkg/AcpiTables/Fadt.aslc
> @@ -3,13 +3,7 @@
> *
> * Copyright (c) 2012 - 2016, ARM Limited. All rights reserved.
> *
> -* This program and the accompanying materials
> -* are licensed and made available under the terms and conditions of the BSD License
> -* which accompanies this distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/ARM/VExpressPkg/AcpiTables/FvpPlatform.h b/Platform/ARM/VExpressPkg/AcpiTables/FvpPlatform.h
> index e3582bfe33..21df93f6ee 100644
> --- a/Platform/ARM/VExpressPkg/AcpiTables/FvpPlatform.h
> +++ b/Platform/ARM/VExpressPkg/AcpiTables/FvpPlatform.h
> @@ -4,13 +4,7 @@
> * Copyright (c) 2015, Hisilicon Limited. All rights reserved.
> * Copyright (c) 2015, Linaro Limited. All rights reserved.
> *
> -* This program and the accompanying materials
> -* are licensed and made available under the terms and conditions of the BSD License
> -* which accompanies this distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> * Based on the files under ArmPlatformPkg/ArmJunoPkg/AcpiTables/
> *
> diff --git a/Platform/ARM/VExpressPkg/AcpiTables/Gtdt.aslc b/Platform/ARM/VExpressPkg/AcpiTables/Gtdt.aslc
> index 7a0b2b686e..9007fc936c 100644
> --- a/Platform/ARM/VExpressPkg/AcpiTables/Gtdt.aslc
> +++ b/Platform/ARM/VExpressPkg/AcpiTables/Gtdt.aslc
> @@ -4,13 +4,7 @@
> * Copyright (c) 2012 - 2018, ARM Limited. All rights reserved.
> * Copyright (c) 2016, Linaro Ltd. All rights reserved
> *
> -* This program and the accompanying materials
> -* are licensed and made available under the terms and conditions of the BSD License
> -* which accompanies this distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/ARM/VExpressPkg/AcpiTables/Madt.aslc b/Platform/ARM/VExpressPkg/AcpiTables/Madt.aslc
> index bf90a9f5a9..b34422e13f 100644
> --- a/Platform/ARM/VExpressPkg/AcpiTables/Madt.aslc
> +++ b/Platform/ARM/VExpressPkg/AcpiTables/Madt.aslc
> @@ -4,13 +4,7 @@
> * Copyright (c) 2012 - 2015, ARM Limited. All rights reserved.
> * Copyright (c) 2016 Linaro Ltd. All rights reserved.
> *
> -* This program and the accompanying materials
> -* are licensed and made available under the terms and conditions of the BSD License
> -* which accompanies this distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/ARM/VExpressPkg/AcpiTables/Spcr.aslc b/Platform/ARM/VExpressPkg/AcpiTables/Spcr.aslc
> index 68caa24567..7a6b635ac7 100644
> --- a/Platform/ARM/VExpressPkg/AcpiTables/Spcr.aslc
> +++ b/Platform/ARM/VExpressPkg/AcpiTables/Spcr.aslc
> @@ -4,13 +4,7 @@
> * Copyright (c) 2014 - 2016, ARM Limited. All rights reserved.
> * Copyright (c) 2016, Linaro Ltd. All rights reserved.
> *
> -* This program and the accompanying materials are licensed and made available
> -* under the terms and conditions of the BSD License which accompanies this
> -* distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc
> index 3a3b4e3dbb..2f8021d3ea 100644
> --- a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc
> +++ b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc
> @@ -2,13 +2,7 @@
> # Copyright (c) 2012-2018, ARM Limited. All rights reserved.
> # Copyright (c) 2015, 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 distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> #
>
> diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.fdf b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.fdf
> index ecd57f3a3e..082f80d999 100644
> --- a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.fdf
> +++ b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.fdf
> @@ -2,13 +2,7 @@
> # Copyright (c) 2012-2015, ARM Limited. All rights reserved.
> # Copyright (c) 2015, 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 distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
>
> ################################################################################
> diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc b/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc
> index 1cf2ebb58f..63d79a4885 100644
> --- a/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc
> +++ b/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc
> @@ -1,13 +1,7 @@
> #
> # Copyright (c) 2011-2018, ARM Limited. All rights reserved.
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD License
> -# which accompanies this distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> #
>
> diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.fdf b/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.fdf
> index fc998ec746..8f49ed3dba 100644
> --- a/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.fdf
> +++ b/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.fdf
> @@ -1,13 +1,7 @@
> #
> # Copyright (c) 2011 - 2018, ARM Limited. All rights reserved.
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD License
> -# which accompanies this distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
>
> ################################################################################
> diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-networking.fdf.inc b/Platform/ARM/VExpressPkg/ArmVExpress-networking.fdf.inc
> index b647f65ad1..6d060303b9 100644
> --- a/Platform/ARM/VExpressPkg/ArmVExpress-networking.fdf.inc
> +++ b/Platform/ARM/VExpressPkg/ArmVExpress-networking.fdf.inc
> @@ -1,14 +1,7 @@
> #
> # Copyright (c) 2012-2014, ARM Limited. All rights reserved.
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions
> -# of the BSD License which accompanies this distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
>
> #
> diff --git a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc
> index e7a77c0ad9..7b5dc93a70 100644
> --- a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc
> +++ b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc
> @@ -1,13 +1,7 @@
> #
> # Copyright (c) 2011-2018, ARM Limited. All rights reserved.
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD License
> -# which accompanies this distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> #
>
> diff --git a/Platform/ARM/VExpressPkg/ArmVExpressPkg.dec b/Platform/ARM/VExpressPkg/ArmVExpressPkg.dec
> index ac77540362..a659cda2e4 100644
> --- a/Platform/ARM/VExpressPkg/ArmVExpressPkg.dec
> +++ b/Platform/ARM/VExpressPkg/ArmVExpressPkg.dec
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2012-2018, ARM Limited. All rights reserved.
> #
> -# This program and the accompanying materials are licensed and made available
> -# under the terms and conditions of the BSD License which accompanies this
> -# distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> #**/
>
> diff --git a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManager.dsc.inc b/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManager.dsc.inc
> index 788b145b27..9b044bba5d 100644
> --- a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManager.dsc.inc
> +++ b/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManager.dsc.inc
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017 - 2018, ARM Limited. All rights reserved.
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD License
> -# which accompanies this distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> ##
>
> [Defines]
> diff --git a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c b/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
> index eb8c77cf46..010702ae1d 100644
> --- a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
> +++ b/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
> @@ -3,13 +3,7 @@
>
> Copyright (c) 2017 - 2019, ARM Limited. All rights reserved.
>
> - This program and the accompanying materials
> - are licensed and made available under the terms and conditions of the BSD License
> - which accompanies this distribution. The full text of the license may be found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> @par Glossary:
> - Cm or CM - Configuration Manager
> diff --git a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h b/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
> index eb1938badc..c61750dc55 100644
> --- a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
> +++ b/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
> @@ -2,13 +2,7 @@
>
> Copyright (c) 2017 - 2019, ARM Limited. All rights reserved.
>
> - This program and the accompanying materials
> - are licensed and made available under the terms and conditions of the BSD License
> - which accompanies this distribution. The full text of the license may be found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> @par Glossary:
> - Cm or CM - Configuration Manager
> diff --git a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf b/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf
> index b9e7a8620b..14f4323f00 100644
> --- a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf
> +++ b/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017 - 2019, ARM Limited. All rights reserved.
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD License
> -# which accompanies this distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> ##
>
> [Defines]
> diff --git a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/Platform.h b/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/Platform.h
> index 676cb22d27..426d5a7737 100644
> --- a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/Platform.h
> +++ b/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/Platform.h
> @@ -2,13 +2,7 @@
>
> Copyright (c) 2017 - 2019, ARM Limited. All rights reserved.
>
> - This program and the accompanying materials
> - are licensed and made available under the terms and conditions of the BSD License
> - which accompanies this distribution. The full text of the license may be found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/ARM/VExpressPkg/ConfigurationManager/PlatformASLTablesLib/Dsdt.asl b/Platform/ARM/VExpressPkg/ConfigurationManager/PlatformASLTablesLib/Dsdt.asl
> index 625930db4d..9192a00707 100644
> --- a/Platform/ARM/VExpressPkg/ConfigurationManager/PlatformASLTablesLib/Dsdt.asl
> +++ b/Platform/ARM/VExpressPkg/ConfigurationManager/PlatformASLTablesLib/Dsdt.asl
> @@ -2,13 +2,7 @@
> Differentiated System Description Table Fields (DSDT)
>
> Copyright (c) 2014-2017, ARM Ltd. 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 distribution. The full text of the license may be found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/ARM/VExpressPkg/ConfigurationManager/PlatformASLTablesLib/PlatformASLTablesLib.inf b/Platform/ARM/VExpressPkg/ConfigurationManager/PlatformASLTablesLib/PlatformASLTablesLib.inf
> index 49482b1852..23a71c365b 100644
> --- a/Platform/ARM/VExpressPkg/ConfigurationManager/PlatformASLTablesLib/PlatformASLTablesLib.inf
> +++ b/Platform/ARM/VExpressPkg/ConfigurationManager/PlatformASLTablesLib/PlatformASLTablesLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017 - 2019, ARM Limited. All rights reserved.
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD License
> -# which accompanies this distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> ##
>
> [Defines]
> diff --git a/Platform/ARM/VExpressPkg/Drivers/ArmVExpressDxe/ArmFvpDxe.c b/Platform/ARM/VExpressPkg/Drivers/ArmVExpressDxe/ArmFvpDxe.c
> index 7827c50d8b..189069484b 100644
> --- a/Platform/ARM/VExpressPkg/Drivers/ArmVExpressDxe/ArmFvpDxe.c
> +++ b/Platform/ARM/VExpressPkg/Drivers/ArmVExpressDxe/ArmFvpDxe.c
> @@ -2,13 +2,7 @@
>
> Copyright (c) 2013-2015, ARM Ltd. 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 distribution. The full text of the license may be found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/ARM/VExpressPkg/Drivers/ArmVExpressDxe/ArmFvpDxe.inf b/Platform/ARM/VExpressPkg/Drivers/ArmVExpressDxe/ArmFvpDxe.inf
> index 3b19028dd9..a4021c2d9e 100644
> --- a/Platform/ARM/VExpressPkg/Drivers/ArmVExpressDxe/ArmFvpDxe.inf
> +++ b/Platform/ARM/VExpressPkg/Drivers/ArmVExpressDxe/ArmFvpDxe.inf
> @@ -2,13 +2,7 @@
> #
> # Copyright (c) 2013-2015, ARM Ltd. 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 distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> #**/
>
> diff --git a/Platform/ARM/VExpressPkg/Drivers/ArmVExpressDxe/ArmHwDxe.c b/Platform/ARM/VExpressPkg/Drivers/ArmVExpressDxe/ArmHwDxe.c
> index 19efa3c23d..dbb34cd19e 100644
> --- a/Platform/ARM/VExpressPkg/Drivers/ArmVExpressDxe/ArmHwDxe.c
> +++ b/Platform/ARM/VExpressPkg/Drivers/ArmVExpressDxe/ArmHwDxe.c
> @@ -2,13 +2,7 @@
>
> Copyright (c) 2013-2015, ARM Ltd. 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 distribution. The full text of the license may be found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/ARM/VExpressPkg/Drivers/ArmVExpressDxe/ArmHwDxe.inf b/Platform/ARM/VExpressPkg/Drivers/ArmVExpressDxe/ArmHwDxe.inf
> index 8bf289f8da..ddaa3f52cc 100644
> --- a/Platform/ARM/VExpressPkg/Drivers/ArmVExpressDxe/ArmHwDxe.inf
> +++ b/Platform/ARM/VExpressPkg/Drivers/ArmVExpressDxe/ArmHwDxe.inf
> @@ -2,13 +2,7 @@
> #
> # Copyright (c) 2013-2015, ARM Ltd. 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 distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> #**/
>
> diff --git a/Platform/ARM/VExpressPkg/Drivers/ArmVExpressFastBootDxe/ArmVExpressFastBoot.c b/Platform/ARM/VExpressPkg/Drivers/ArmVExpressFastBootDxe/ArmVExpressFastBoot.c
> index 9a4a6c7007..e7cf64b745 100644
> --- a/Platform/ARM/VExpressPkg/Drivers/ArmVExpressFastBootDxe/ArmVExpressFastBoot.c
> +++ b/Platform/ARM/VExpressPkg/Drivers/ArmVExpressFastBootDxe/ArmVExpressFastBoot.c
> @@ -3,13 +3,7 @@
> Copyright (c) 2014, ARM Ltd. All rights reserved.<BR>
> Copyright (c) 2016, Linaro Ltd. 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 distribution. The full text of the license may be found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/ARM/VExpressPkg/Drivers/ArmVExpressFastBootDxe/ArmVExpressFastBootDxe.inf b/Platform/ARM/VExpressPkg/Drivers/ArmVExpressFastBootDxe/ArmVExpressFastBootDxe.inf
> index c5b32d88f1..d95dc0268e 100644
> --- a/Platform/ARM/VExpressPkg/Drivers/ArmVExpressFastBootDxe/ArmVExpressFastBootDxe.inf
> +++ b/Platform/ARM/VExpressPkg/Drivers/ArmVExpressFastBootDxe/ArmVExpressFastBootDxe.inf
> @@ -2,12 +2,7 @@
> #
> # Copyright (c) 2014, ARM Ltd. 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 distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> #
> #**/
> diff --git a/Platform/ARM/VExpressPkg/Include/Library/ArmPlatformSysConfigLib.h b/Platform/ARM/VExpressPkg/Include/Library/ArmPlatformSysConfigLib.h
> index 39a0cc7f73..f9e9052fa9 100644
> --- a/Platform/ARM/VExpressPkg/Include/Library/ArmPlatformSysConfigLib.h
> +++ b/Platform/ARM/VExpressPkg/Include/Library/ArmPlatformSysConfigLib.h
> @@ -2,13 +2,7 @@
>
> Copyright (c) 2011-2012, ARM Ltd. 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 distribution. The full text of the license may be found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/ARM/VExpressPkg/Include/Library/LcdPlatformLib.h b/Platform/ARM/VExpressPkg/Include/Library/LcdPlatformLib.h
> index b9bdf471e2..5591147313 100644
> --- a/Platform/ARM/VExpressPkg/Include/Library/LcdPlatformLib.h
> +++ b/Platform/ARM/VExpressPkg/Include/Library/LcdPlatformLib.h
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2011, ARM Ltd. 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 distribution. The full text of the license may be found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/ARM/VExpressPkg/Include/Platform/CTA15-A7/ArmPlatform.h b/Platform/ARM/VExpressPkg/Include/Platform/CTA15-A7/ArmPlatform.h
> index b52f89a5cb..db6303a05f 100644
> --- a/Platform/ARM/VExpressPkg/Include/Platform/CTA15-A7/ArmPlatform.h
> +++ b/Platform/ARM/VExpressPkg/Include/Platform/CTA15-A7/ArmPlatform.h
> @@ -3,13 +3,7 @@
> *
> * Copyright (c) 2012, ARM Limited. All rights reserved.
> *
> -* This program and the accompanying materials
> -* are licensed and made available under the terms and conditions of the BSD License
> -* which accompanies this distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/ARM/VExpressPkg/Include/Platform/RTSM/ArmPlatform.h b/Platform/ARM/VExpressPkg/Include/Platform/RTSM/ArmPlatform.h
> index e267912ef5..499f62b2dc 100644
> --- a/Platform/ARM/VExpressPkg/Include/Platform/RTSM/ArmPlatform.h
> +++ b/Platform/ARM/VExpressPkg/Include/Platform/RTSM/ArmPlatform.h
> @@ -3,13 +3,7 @@
> *
> * Copyright (c) 2011, ARM Limited. All rights reserved.
> *
> -* This program and the accompanying materials
> -* are licensed and made available under the terms and conditions of the BSD License
> -* which accompanies this distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/ARM/VExpressPkg/Include/VExpressMotherBoard.h b/Platform/ARM/VExpressPkg/Include/VExpressMotherBoard.h
> index 38691c3582..c06adb159e 100644
> --- a/Platform/ARM/VExpressPkg/Include/VExpressMotherBoard.h
> +++ b/Platform/ARM/VExpressPkg/Include/VExpressMotherBoard.h
> @@ -3,13 +3,7 @@
> *
> * Copyright (c) 2011-2015, ARM Limited. All rights reserved.
> *
> -* This program and the accompanying materials
> -* are licensed and made available under the terms and conditions of the BSD License
> -* which accompanies this distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/ARM/VExpressPkg/Library/ArmMaliDpLib/ArmMaliDpLib.c b/Platform/ARM/VExpressPkg/Library/ArmMaliDpLib/ArmMaliDpLib.c
> index 04ad341d14..aa55bc2e5b 100644
> --- a/Platform/ARM/VExpressPkg/Library/ArmMaliDpLib/ArmMaliDpLib.c
> +++ b/Platform/ARM/VExpressPkg/Library/ArmMaliDpLib/ArmMaliDpLib.c
> @@ -4,13 +4,7 @@
>
> Copyright (c) 2017-2018, Arm Limited. All rights reserved.
>
> - This program and the accompanying materials
> - are licensed and made available under the terms and conditions of the BSD License
> - which accompanies this distribution. The full text of the license may be found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/ARM/VExpressPkg/Library/ArmMaliDpLib/ArmMaliDpLib.inf b/Platform/ARM/VExpressPkg/Library/ArmMaliDpLib/ArmMaliDpLib.inf
> index 78f7d307b7..784e84bd92 100644
> --- a/Platform/ARM/VExpressPkg/Library/ArmMaliDpLib/ArmMaliDpLib.inf
> +++ b/Platform/ARM/VExpressPkg/Library/ArmMaliDpLib/ArmMaliDpLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017-2018, Arm Limited. All rights reserved.
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD License
> -# which accompanies this distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #**/
>
> [Defines]
> diff --git a/Platform/ARM/VExpressPkg/Library/ArmVExpressDtPlatformDtbLoaderLib/ArmVExpressDtPlatformDtbLoaderLib.c b/Platform/ARM/VExpressPkg/Library/ArmVExpressDtPlatformDtbLoaderLib/ArmVExpressDtPlatformDtbLoaderLib.c
> index 3a5613c837..5734145bb0 100644
> --- a/Platform/ARM/VExpressPkg/Library/ArmVExpressDtPlatformDtbLoaderLib/ArmVExpressDtPlatformDtbLoaderLib.c
> +++ b/Platform/ARM/VExpressPkg/Library/ArmVExpressDtPlatformDtbLoaderLib/ArmVExpressDtPlatformDtbLoaderLib.c
> @@ -2,13 +2,7 @@
> *
> * Copyright (c) 2017, Linaro, Ltd. All rights reserved.
> *
> -* This program and the accompanying materials
> -* are licensed and made available under the terms and conditions of the BSD License
> -* which accompanies this distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/ARM/VExpressPkg/Library/ArmVExpressDtPlatformDtbLoaderLib/ArmVExpressDtPlatformDtbLoaderLib.inf b/Platform/ARM/VExpressPkg/Library/ArmVExpressDtPlatformDtbLoaderLib/ArmVExpressDtPlatformDtbLoaderLib.inf
> index 6218aba9d0..7992ffa22c 100644
> --- a/Platform/ARM/VExpressPkg/Library/ArmVExpressDtPlatformDtbLoaderLib/ArmVExpressDtPlatformDtbLoaderLib.inf
> +++ b/Platform/ARM/VExpressPkg/Library/ArmVExpressDtPlatformDtbLoaderLib/ArmVExpressDtPlatformDtbLoaderLib.inf
> @@ -2,13 +2,7 @@
> *
> * Copyright (c) 2017, Linaro, Ltd. All rights reserved.
> *
> -* This program and the accompanying materials
> -* are licensed and made available under the terms and conditions of the BSD License
> -* which accompanies this distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/ArmVExpressLib.inf b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/ArmVExpressLib.inf
> index 329f80dcfe..e585fe6c18 100644
> --- a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/ArmVExpressLib.inf
> +++ b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/ArmVExpressLib.inf
> @@ -2,13 +2,7 @@
> #
> # Copyright (c) 2011-2012, ARM Limited. All rights reserved.
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD License
> -# which accompanies this distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> #*/
>
> diff --git a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/CTA15-A7.c b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/CTA15-A7.c
> index a6ddd1b792..09521bdf00 100644
> --- a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/CTA15-A7.c
> +++ b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/CTA15-A7.c
> @@ -2,13 +2,7 @@
> *
> * Copyright (c) 2012, ARM Limited. All rights reserved.
> *
> -* This program and the accompanying materials
> -* are licensed and made available under the terms and conditions of the BSD License
> -* which accompanies this distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/CTA15-A7Helper.S b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/CTA15-A7Helper.S
> index 3719a5ace6..b7ee78aa09 100644
> --- a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/CTA15-A7Helper.S
> +++ b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/CTA15-A7Helper.S
> @@ -1,13 +1,7 @@
> //
> // Copyright (c) 2012-2013, ARM Limited. All rights reserved.
> //
> -// This program and the accompanying materials
> -// are licensed and made available under the terms and conditions of the BSD License
> -// which accompanies this distribution. The full text of the license may be found at
> -// http://opensource.org/licenses/bsd-license.php
> -//
> -// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +// SPDX-License-Identifier: BSD-2-Clause-Patent
> //
> //
>
> diff --git a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/CTA15-A7Helper.asm b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/CTA15-A7Helper.asm
> index c035843da0..9fb06ea009 100644
> --- a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/CTA15-A7Helper.asm
> +++ b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/CTA15-A7Helper.asm
> @@ -1,13 +1,7 @@
> //
> // Copyright (c) 2012-2013, ARM Limited. All rights reserved.
> //
> -// This program and the accompanying materials
> -// are licensed and made available under the terms and conditions of the BSD License
> -// which accompanies this distribution. The full text of the license may be found at
> -// http://opensource.org/licenses/bsd-license.php
> -//
> -// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +// SPDX-License-Identifier: BSD-2-Clause-Patent
> //
> //
>
> diff --git a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/CTA15-A7Mem.c b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/CTA15-A7Mem.c
> index 05e9abc572..66dfda660f 100644
> --- a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/CTA15-A7Mem.c
> +++ b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/CTA15-A7Mem.c
> @@ -2,13 +2,7 @@
> *
> * Copyright (c) 2012, ARM Limited. All rights reserved.
> *
> -* This program and the accompanying materials
> -* are licensed and made available under the terms and conditions of the BSD License
> -* which accompanies this distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/AArch64/RTSMHelper.S b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/AArch64/RTSMHelper.S
> index db6d83c3cc..65ecf2d94a 100644
> --- a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/AArch64/RTSMHelper.S
> +++ b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/AArch64/RTSMHelper.S
> @@ -1,13 +1,7 @@
> #
> # Copyright (c) 2011-2013, ARM Limited. All rights reserved.
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD License
> -# which accompanies this distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> #
>
> diff --git a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/Arm/RTSMHelper.S b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/Arm/RTSMHelper.S
> index 35743b08dc..08eb9ad091 100644
> --- a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/Arm/RTSMHelper.S
> +++ b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/Arm/RTSMHelper.S
> @@ -1,13 +1,7 @@
> #
> # Copyright (c) 2011-2013, ARM Limited. All rights reserved.
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD License
> -# which accompanies this distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> #
>
> diff --git a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/Arm/RTSMHelper.asm b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/Arm/RTSMHelper.asm
> index 66068e6595..5ae6f9eab8 100644
> --- a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/Arm/RTSMHelper.asm
> +++ b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/Arm/RTSMHelper.asm
> @@ -1,13 +1,7 @@
> //
> // Copyright (c) 2011-2013, ARM Limited. All rights reserved.
> //
> -// This program and the accompanying materials
> -// are licensed and made available under the terms and conditions of the BSD License
> -// which accompanies this distribution. The full text of the license may be found at
> -// http://opensource.org/licenses/bsd-license.php
> -//
> -// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +// SPDX-License-Identifier: BSD-2-Clause-Patent
> //
> //
>
> diff --git a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLib.inf b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLib.inf
> index 53898c5e95..d3441b0852 100644
> --- a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLib.inf
> +++ b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLib.inf
> @@ -1,13 +1,7 @@
> #/* @file
> # Copyright (c) 2011-2018, ARM Limited. All rights reserved.
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD License
> -# which accompanies this distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> #*/
>
> diff --git a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLibSec.inf b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLibSec.inf
> index ec29d99835..ede7ab0a32 100644
> --- a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLibSec.inf
> +++ b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLibSec.inf
> @@ -1,13 +1,7 @@
> #/* @file
> # Copyright (c) 2011-2018, ARM Limited. All rights reserved.
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD License
> -# which accompanies this distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> #*/
>
> diff --git a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/RTSM.c b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/RTSM.c
> index 7760e82521..e7a8c1dbbd 100644
> --- a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/RTSM.c
> +++ b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/RTSM.c
> @@ -2,13 +2,7 @@
> *
> * Copyright (c) 2011-2013, ARM Limited. All rights reserved.
> *
> -* This program and the accompanying materials
> -* are licensed and made available under the terms and conditions of the BSD License
> -* which accompanies this distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/RTSMMem.c b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/RTSMMem.c
> index eb8f6a48cd..21ffd64fb6 100644
> --- a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/RTSMMem.c
> +++ b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/RTSMMem.c
> @@ -2,13 +2,7 @@
> *
> * Copyright (c) 2011-2018, ARM Limited. All rights reserved.
> *
> -* This program and the accompanying materials
> -* are licensed and made available under the terms and conditions of the BSD License
> -* which accompanies this distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/ARM/VExpressPkg/Library/ArmVExpressSysConfigLib/ArmVExpressSysConfig.c b/Platform/ARM/VExpressPkg/Library/ArmVExpressSysConfigLib/ArmVExpressSysConfig.c
> index 6dfbacd117..e50a551a39 100644
> --- a/Platform/ARM/VExpressPkg/Library/ArmVExpressSysConfigLib/ArmVExpressSysConfig.c
> +++ b/Platform/ARM/VExpressPkg/Library/ArmVExpressSysConfigLib/ArmVExpressSysConfig.c
> @@ -2,13 +2,7 @@
>
> Copyright (c) 2011-2012, ARM Ltd. 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 distribution. The full text of the license may be found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/ARM/VExpressPkg/Library/ArmVExpressSysConfigLib/ArmVExpressSysConfigLib.inf b/Platform/ARM/VExpressPkg/Library/ArmVExpressSysConfigLib/ArmVExpressSysConfigLib.inf
> index c400ab831a..36f447ee79 100644
> --- a/Platform/ARM/VExpressPkg/Library/ArmVExpressSysConfigLib/ArmVExpressSysConfigLib.inf
> +++ b/Platform/ARM/VExpressPkg/Library/ArmVExpressSysConfigLib/ArmVExpressSysConfigLib.inf
> @@ -4,13 +4,7 @@
> #
> # Copyright (c) 2011-2012, ARM Ltd. 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 distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> #**/
>
> diff --git a/Platform/ARM/VExpressPkg/Library/ArmVExpressSysConfigRuntimeLib/ArmVExpressSysConfigRuntimeLib.c b/Platform/ARM/VExpressPkg/Library/ArmVExpressSysConfigRuntimeLib/ArmVExpressSysConfigRuntimeLib.c
> index 1f915e3b02..2a5bd4dd38 100644
> --- a/Platform/ARM/VExpressPkg/Library/ArmVExpressSysConfigRuntimeLib/ArmVExpressSysConfigRuntimeLib.c
> +++ b/Platform/ARM/VExpressPkg/Library/ArmVExpressSysConfigRuntimeLib/ArmVExpressSysConfigRuntimeLib.c
> @@ -2,13 +2,7 @@
>
> Copyright (c) 2011-2012, ARM Ltd. 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 distribution. The full text of the license may be found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/ARM/VExpressPkg/Library/ArmVExpressSysConfigRuntimeLib/ArmVExpressSysConfigRuntimeLib.inf b/Platform/ARM/VExpressPkg/Library/ArmVExpressSysConfigRuntimeLib/ArmVExpressSysConfigRuntimeLib.inf
> index cce8b9096f..5179165f98 100644
> --- a/Platform/ARM/VExpressPkg/Library/ArmVExpressSysConfigRuntimeLib/ArmVExpressSysConfigRuntimeLib.inf
> +++ b/Platform/ARM/VExpressPkg/Library/ArmVExpressSysConfigRuntimeLib/ArmVExpressSysConfigRuntimeLib.inf
> @@ -5,13 +5,7 @@
> # Copyright (c) 2011-2012, ARM Ltd. All rights reserved.<BR>
> # Copyright (c) 2015, Linaro Ltd. 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 distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> #**/
>
> diff --git a/Platform/ARM/VExpressPkg/Library/HdLcdArmVExpressLib/HdLcdArmVExpress.c b/Platform/ARM/VExpressPkg/Library/HdLcdArmVExpressLib/HdLcdArmVExpress.c
> index 711f036d74..c4b163d35f 100644
> --- a/Platform/ARM/VExpressPkg/Library/HdLcdArmVExpressLib/HdLcdArmVExpress.c
> +++ b/Platform/ARM/VExpressPkg/Library/HdLcdArmVExpressLib/HdLcdArmVExpress.c
> @@ -2,13 +2,7 @@
>
> Copyright (c) 2012-2018, ARM Ltd. All rights reserved.
>
> - This program and the accompanying materials
> - are licensed and made available under the terms and conditions of the BSD License
> - which accompanies this distribution. The full text of the license may be found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/ARM/VExpressPkg/Library/HdLcdArmVExpressLib/HdLcdArmVExpressLib.inf b/Platform/ARM/VExpressPkg/Library/HdLcdArmVExpressLib/HdLcdArmVExpressLib.inf
> index c7b1b7fae7..191261d062 100644
> --- a/Platform/ARM/VExpressPkg/Library/HdLcdArmVExpressLib/HdLcdArmVExpressLib.inf
> +++ b/Platform/ARM/VExpressPkg/Library/HdLcdArmVExpressLib/HdLcdArmVExpressLib.inf
> @@ -4,13 +4,7 @@
> #
> # Copyright (c) 2011-2018, ARM Ltd. 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 distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> #**/
>
> diff --git a/Platform/ARM/VExpressPkg/Library/NorFlashArmVExpressLib/NorFlashArmVExpress.c b/Platform/ARM/VExpressPkg/Library/NorFlashArmVExpressLib/NorFlashArmVExpress.c
> index ac270dc3a6..ec5ac8cc62 100644
> --- a/Platform/ARM/VExpressPkg/Library/NorFlashArmVExpressLib/NorFlashArmVExpress.c
> +++ b/Platform/ARM/VExpressPkg/Library/NorFlashArmVExpressLib/NorFlashArmVExpress.c
> @@ -2,13 +2,7 @@
>
> Copyright (c) 2011-2014, ARM Ltd. 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 distribution. The full text of the license may be found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/ARM/VExpressPkg/Library/NorFlashArmVExpressLib/NorFlashArmVExpressLib.inf b/Platform/ARM/VExpressPkg/Library/NorFlashArmVExpressLib/NorFlashArmVExpressLib.inf
> index 6c0ca97c99..a411ba4d00 100644
> --- a/Platform/ARM/VExpressPkg/Library/NorFlashArmVExpressLib/NorFlashArmVExpressLib.inf
> +++ b/Platform/ARM/VExpressPkg/Library/NorFlashArmVExpressLib/NorFlashArmVExpressLib.inf
> @@ -1,13 +1,7 @@
> #/** @file
> #
> # Copyright (c) 2011, ARM Ltd. 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 distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> #**/
>
> diff --git a/Platform/ARM/VExpressPkg/Library/PL111LcdArmVExpressLib/PL111LcdArmVExpress.c b/Platform/ARM/VExpressPkg/Library/PL111LcdArmVExpressLib/PL111LcdArmVExpress.c
> index bcf4f6593c..b7396a87bd 100644
> --- a/Platform/ARM/VExpressPkg/Library/PL111LcdArmVExpressLib/PL111LcdArmVExpress.c
> +++ b/Platform/ARM/VExpressPkg/Library/PL111LcdArmVExpressLib/PL111LcdArmVExpress.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2011-2018, ARM Ltd. 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 distribution. The full text of the license may be found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/ARM/VExpressPkg/Library/PL111LcdArmVExpressLib/PL111LcdArmVExpressLib.inf b/Platform/ARM/VExpressPkg/Library/PL111LcdArmVExpressLib/PL111LcdArmVExpressLib.inf
> index b1fa100def..999a0814f5 100644
> --- a/Platform/ARM/VExpressPkg/Library/PL111LcdArmVExpressLib/PL111LcdArmVExpressLib.inf
> +++ b/Platform/ARM/VExpressPkg/Library/PL111LcdArmVExpressLib/PL111LcdArmVExpressLib.inf
> @@ -4,13 +4,7 @@
> #
> # Copyright (c) 2011-2018, ARM Ltd. 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 distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> #**/
>
> diff --git a/Platform/ARM/VExpressPkg/Library/ResetSystemLib/ResetSystemLib.c b/Platform/ARM/VExpressPkg/Library/ResetSystemLib/ResetSystemLib.c
> index 85f8baa2b7..b12b1c2f8a 100644
> --- a/Platform/ARM/VExpressPkg/Library/ResetSystemLib/ResetSystemLib.c
> +++ b/Platform/ARM/VExpressPkg/Library/ResetSystemLib/ResetSystemLib.c
> @@ -8,13 +8,7 @@
> Copyright (c) 2017, Linaro Ltd. All rights reserved.<BR>
> Copyright (c) 2019, 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 distribution. The full text of the license may be found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/ARM/VExpressPkg/Library/ResetSystemLib/ResetSystemLib.inf b/Platform/ARM/VExpressPkg/Library/ResetSystemLib/ResetSystemLib.inf
> index e7caf04f7f..e18df3c0ba 100644
> --- a/Platform/ARM/VExpressPkg/Library/ResetSystemLib/ResetSystemLib.inf
> +++ b/Platform/ARM/VExpressPkg/Library/ResetSystemLib/ResetSystemLib.inf
> @@ -4,12 +4,7 @@
> # Copyright (c) 2008, Apple Inc. All rights reserved.<BR>
> # Copyright (c) 2017, Linaro Ltd. 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 distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> #
> #**/
> --
> 2.21.0.windows.1
>
^ permalink raw reply [flat|nested] 63+ messages in thread
* [[edk2-platforms][PATCH V2] 05/30] Platform/AMD: Replace BSD License with BSD+Patent License
2019-05-15 23:09 [[edk2-platforms][PATCH V2] 00/30] Change edk2-platforms/master to BSD+Patent License Michael D Kinney
` (3 preceding siblings ...)
2019-05-15 23:09 ` [[edk2-platforms][PATCH V2] 04/30] Platform/ARM: " Michael D Kinney
@ 2019-05-15 23:09 ` Michael D Kinney
2019-05-15 23:09 ` [[edk2-platforms][PATCH V2] 06/30] Platform/Comcast: " Michael D Kinney
` (25 subsequent siblings)
30 siblings, 0 replies; 63+ messages in thread
From: Michael D Kinney @ 2019-05-15 23:09 UTC (permalink / raw)
To: devel; +Cc: Leif Lindholm, Ard Biesheuvel
https://bugzilla.tianocore.org/show_bug.cgi?id=1373
Replace BSD 2-Clause License with BSD+Patent License. This change is
based on the following emails:
https://lists.01.org/pipermail/edk2-devel/2019-February/036260.html
https://lists.01.org/pipermail/edk2-devel/2018-October/030385.html
RFCs with detailed process for the license change:
V3: https://lists.01.org/pipermail/edk2-devel/2019-March/038116.html
V2: https://lists.01.org/pipermail/edk2-devel/2019-March/037669.html
V1: https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
.../AMD/OverdriveBoard/DeviceTree/OverdriveBoard.dts | 9 +--------
.../AMD/OverdriveBoard/DeviceTree/OverdriveBoard.inf | 8 +-------
Platform/AMD/OverdriveBoard/OverdriveBoard.dsc | 8 +-------
Platform/AMD/OverdriveBoard/OverdriveBoard.fdf | 8 +-------
.../SystemFirmwareDescriptor.aslc | 8 +-------
.../SystemFirmwareDescriptor.inf | 8 +-------
.../SystemFirmwareDescriptorPei.c | 8 +-------
.../SystemFirmwareUpdateConfig.ini | 8 +-------
8 files changed, 8 insertions(+), 57 deletions(-)
diff --git a/Platform/AMD/OverdriveBoard/DeviceTree/OverdriveBoard.dts b/Platform/AMD/OverdriveBoard/DeviceTree/OverdriveBoard.dts
index 3ae323a9f0..1ba0d403ea 100644
--- a/Platform/AMD/OverdriveBoard/DeviceTree/OverdriveBoard.dts
+++ b/Platform/AMD/OverdriveBoard/DeviceTree/OverdriveBoard.dts
@@ -3,14 +3,7 @@
*
* Copyright 2015 - 2016 ADVANCED MICRO DEVICES, INC. All Rights Reserved.
*
- * This program and the accompanying materials are licensed and made available
- * under the terms and conditions of the BSD License which accompanies this
- * distribution. The full text of the license may be found at
- * http://opensource.org/licenses/bsd-license.php
- *
- * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
- * IMPLIED.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*
*/
diff --git a/Platform/AMD/OverdriveBoard/DeviceTree/OverdriveBoard.inf b/Platform/AMD/OverdriveBoard/DeviceTree/OverdriveBoard.inf
index d908ff03fd..a2e4b7df68 100644
--- a/Platform/AMD/OverdriveBoard/DeviceTree/OverdriveBoard.inf
+++ b/Platform/AMD/OverdriveBoard/DeviceTree/OverdriveBoard.inf
@@ -4,13 +4,7 @@
#
# Copyright (c) 2018, Linaro Ltd. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc
index 39b5dad154..5ba8e16a5a 100644
--- a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc
+++ b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc
@@ -1,13 +1,7 @@
#
# Copyright (c) 2014 - 2016, AMD Incorporated. All rights reserved.
#
-# This program and the accompanying materials are licensed and made
-# available under the terms and conditions of the BSD License which
-# accompanies this distribution. The full text of the license may
-# be found at http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
################################################################################
diff --git a/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf b/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf
index 2aaf83084e..b823cb1b46 100644
--- a/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf
+++ b/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf
@@ -1,13 +1,7 @@
#
# Copyright (c) 2014 - 2016, AMD Incorporated. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
################################################################################
diff --git a/Platform/AMD/OverdriveBoard/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc b/Platform/AMD/OverdriveBoard/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc
index 8737c02fa0..516b4b915b 100644
--- a/Platform/AMD/OverdriveBoard/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc
+++ b/Platform/AMD/OverdriveBoard/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc
@@ -4,13 +4,7 @@
Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2017, Linaro, Ltd. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/AMD/OverdriveBoard/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf b/Platform/AMD/OverdriveBoard/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf
index c36cc9e0f2..fbed0a291c 100644
--- a/Platform/AMD/OverdriveBoard/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf
+++ b/Platform/AMD/OverdriveBoard/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf
@@ -2,13 +2,7 @@
# System Firmware descriptor.
#
# Copyright (c) 2016, 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 distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/AMD/OverdriveBoard/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c b/Platform/AMD/OverdriveBoard/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c
index f89d9f4842..7b894a9e87 100644
--- a/Platform/AMD/OverdriveBoard/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c
+++ b/Platform/AMD/OverdriveBoard/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c
@@ -2,13 +2,7 @@
System Firmware descriptor producer.
Copyright (c) 2016, 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/AMD/OverdriveBoard/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini b/Platform/AMD/OverdriveBoard/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini
index 49b6480b4e..93d02ad9fa 100644
--- a/Platform/AMD/OverdriveBoard/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini
+++ b/Platform/AMD/OverdriveBoard/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini
@@ -1,13 +1,7 @@
## @file
#
# Copyright (c) 2016, 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 distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
--
2.21.0.windows.1
^ permalink raw reply related [flat|nested] 63+ messages in thread* [[edk2-platforms][PATCH V2] 06/30] Platform/Comcast: Replace BSD License with BSD+Patent License
2019-05-15 23:09 [[edk2-platforms][PATCH V2] 00/30] Change edk2-platforms/master to BSD+Patent License Michael D Kinney
` (4 preceding siblings ...)
2019-05-15 23:09 ` [[edk2-platforms][PATCH V2] 05/30] Platform/AMD: " Michael D Kinney
@ 2019-05-15 23:09 ` Michael D Kinney
2019-05-15 23:09 ` [[edk2-platforms][PATCH V2] 07/30] Platform/Hisilicon: " Michael D Kinney
` (24 subsequent siblings)
30 siblings, 0 replies; 63+ messages in thread
From: Michael D Kinney @ 2019-05-15 23:09 UTC (permalink / raw)
To: devel; +Cc: Leif Lindholm, Ard Biesheuvel
https://bugzilla.tianocore.org/show_bug.cgi?id=1373
Replace BSD 2-Clause License with BSD+Patent License. This change is
based on the following emails:
https://lists.01.org/pipermail/edk2-devel/2019-February/036260.html
https://lists.01.org/pipermail/edk2-devel/2018-October/030385.html
RFCs with detailed process for the license change:
V3: https://lists.01.org/pipermail/edk2-devel/2019-March/038116.html
V2: https://lists.01.org/pipermail/edk2-devel/2019-March/037669.html
V1: https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
Platform/Comcast/Application/Dri/Dri.c | 8 +-------
Platform/Comcast/Application/Dri/Dri.inf | 8 +-------
.../Comcast/Application/DriSecureBoot/DriSecureBoot.c | 8 +-------
.../Comcast/Application/DriSecureBoot/DriSecureBoot.inf | 8 +-------
Platform/Comcast/Application/SecureBoot/SecureBoot.c | 8 +-------
Platform/Comcast/Application/SecureBoot/SecureBoot.inf | 8 +-------
Platform/Comcast/Library/RdkBootManagerLib/DiskIo.c | 8 +-------
Platform/Comcast/Library/RdkBootManagerLib/HttpBoot.c | 8 +-------
.../Library/RdkBootManagerLib/RdkBootManagerLib.dec | 8 +-------
.../Comcast/Library/RdkBootManagerLib/RdkBootManagerLib.h | 8 +-------
.../Library/RdkBootManagerLib/RdkBootManagerLib.inf | 8 +-------
Platform/Comcast/Library/RdkBootManagerLib/RdkFile.c | 8 +-------
Platform/Comcast/Library/RdkBootManagerLib/SecureBoot.c | 8 +-------
Platform/Comcast/RDKQemu/RDKQemu.dsc | 8 +-------
Platform/Comcast/RDKQemu/RDKQemu.fdf | 8 +-------
15 files changed, 15 insertions(+), 105 deletions(-)
diff --git a/Platform/Comcast/Application/Dri/Dri.c b/Platform/Comcast/Application/Dri/Dri.c
index 4e5ede2e0c..a958b641d8 100644
--- a/Platform/Comcast/Application/Dri/Dri.c
+++ b/Platform/Comcast/Application/Dri/Dri.c
@@ -1,13 +1,7 @@
/*
# Copyright (c) 2014-2018, Linaro Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
*/
#include <RdkBootManagerLib.h>
diff --git a/Platform/Comcast/Application/Dri/Dri.inf b/Platform/Comcast/Application/Dri/Dri.inf
index ba0656cbc6..518ac3d671 100644
--- a/Platform/Comcast/Application/Dri/Dri.inf
+++ b/Platform/Comcast/Application/Dri/Dri.inf
@@ -2,13 +2,7 @@
# Copyright (c) 2014-2018, Linaro Limited. All rights reserved.
# Copyright (c) 2016-2017, Comcast. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
################################################################################
diff --git a/Platform/Comcast/Application/DriSecureBoot/DriSecureBoot.c b/Platform/Comcast/Application/DriSecureBoot/DriSecureBoot.c
index 1ebead919a..b389e0e87b 100644
--- a/Platform/Comcast/Application/DriSecureBoot/DriSecureBoot.c
+++ b/Platform/Comcast/Application/DriSecureBoot/DriSecureBoot.c
@@ -1,13 +1,7 @@
/*
# Copyright (c) 2014-2018, Linaro Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
*/
#include <RdkBootManagerLib.h>
diff --git a/Platform/Comcast/Application/DriSecureBoot/DriSecureBoot.inf b/Platform/Comcast/Application/DriSecureBoot/DriSecureBoot.inf
index 39d25e5028..208daaef21 100644
--- a/Platform/Comcast/Application/DriSecureBoot/DriSecureBoot.inf
+++ b/Platform/Comcast/Application/DriSecureBoot/DriSecureBoot.inf
@@ -2,13 +2,7 @@
# Copyright (c) 2014-2018, Linaro Limited. All rights reserved.
# Copyright (c) 2016-2017, Comcast. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
################################################################################
diff --git a/Platform/Comcast/Application/SecureBoot/SecureBoot.c b/Platform/Comcast/Application/SecureBoot/SecureBoot.c
index d26d982fe1..c1463f69ef 100644
--- a/Platform/Comcast/Application/SecureBoot/SecureBoot.c
+++ b/Platform/Comcast/Application/SecureBoot/SecureBoot.c
@@ -1,13 +1,7 @@
/*
# Copyright (c) 2014-2018, Linaro Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
*/
#include <RdkBootManagerLib.h>
diff --git a/Platform/Comcast/Application/SecureBoot/SecureBoot.inf b/Platform/Comcast/Application/SecureBoot/SecureBoot.inf
index ad4b6ad1f6..79028da2b1 100644
--- a/Platform/Comcast/Application/SecureBoot/SecureBoot.inf
+++ b/Platform/Comcast/Application/SecureBoot/SecureBoot.inf
@@ -2,13 +2,7 @@
# Copyright (c) 2014-2018, Linaro Limited. All rights reserved.
# Copyright (c) 2016-2017, Comcast. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
################################################################################
diff --git a/Platform/Comcast/Library/RdkBootManagerLib/DiskIo.c b/Platform/Comcast/Library/RdkBootManagerLib/DiskIo.c
index 1e009e88d1..ed893bd5af 100644
--- a/Platform/Comcast/Library/RdkBootManagerLib/DiskIo.c
+++ b/Platform/Comcast/Library/RdkBootManagerLib/DiskIo.c
@@ -1,13 +1,7 @@
/*
# Copyright (c) 2014-2018, Linaro Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
*/
#include <RdkBootManagerLib.h>
diff --git a/Platform/Comcast/Library/RdkBootManagerLib/HttpBoot.c b/Platform/Comcast/Library/RdkBootManagerLib/HttpBoot.c
index 85f7104045..e98b338e6d 100644
--- a/Platform/Comcast/Library/RdkBootManagerLib/HttpBoot.c
+++ b/Platform/Comcast/Library/RdkBootManagerLib/HttpBoot.c
@@ -1,13 +1,7 @@
/*
# Copyright (c) 2014-2018, Linaro Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
*/
#include <RdkBootManagerLib.h>
diff --git a/Platform/Comcast/Library/RdkBootManagerLib/RdkBootManagerLib.dec b/Platform/Comcast/Library/RdkBootManagerLib/RdkBootManagerLib.dec
index c30ec61f6e..e83fc0e556 100644
--- a/Platform/Comcast/Library/RdkBootManagerLib/RdkBootManagerLib.dec
+++ b/Platform/Comcast/Library/RdkBootManagerLib/RdkBootManagerLib.dec
@@ -1,13 +1,7 @@
#
# Copyright (c) 2014-2018, Linaro Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
[Defines]
diff --git a/Platform/Comcast/Library/RdkBootManagerLib/RdkBootManagerLib.h b/Platform/Comcast/Library/RdkBootManagerLib/RdkBootManagerLib.h
index 6a18e95c1c..5af19e5041 100644
--- a/Platform/Comcast/Library/RdkBootManagerLib/RdkBootManagerLib.h
+++ b/Platform/Comcast/Library/RdkBootManagerLib/RdkBootManagerLib.h
@@ -1,13 +1,7 @@
/*
# Copyright (c) 2014-2018, Linaro Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
*/
#ifndef __RDK_BOOT_MANAGER_LIB_H__
diff --git a/Platform/Comcast/Library/RdkBootManagerLib/RdkBootManagerLib.inf b/Platform/Comcast/Library/RdkBootManagerLib/RdkBootManagerLib.inf
index 9f20d447f4..286a773dd6 100644
--- a/Platform/Comcast/Library/RdkBootManagerLib/RdkBootManagerLib.inf
+++ b/Platform/Comcast/Library/RdkBootManagerLib/RdkBootManagerLib.inf
@@ -2,13 +2,7 @@
# Copyright (c) 2014-2018, Linaro Limited. All rights reserved.
# Copyright (c) 2016-2017, Comcast. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
################################################################################
diff --git a/Platform/Comcast/Library/RdkBootManagerLib/RdkFile.c b/Platform/Comcast/Library/RdkBootManagerLib/RdkFile.c
index c398d4b499..dd69565102 100644
--- a/Platform/Comcast/Library/RdkBootManagerLib/RdkFile.c
+++ b/Platform/Comcast/Library/RdkBootManagerLib/RdkFile.c
@@ -1,13 +1,7 @@
/*
# Copyright (c) 2014-2018, Linaro Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
*/
#include <RdkBootManagerLib.h>
diff --git a/Platform/Comcast/Library/RdkBootManagerLib/SecureBoot.c b/Platform/Comcast/Library/RdkBootManagerLib/SecureBoot.c
index f063ccfbeb..d2410ada94 100644
--- a/Platform/Comcast/Library/RdkBootManagerLib/SecureBoot.c
+++ b/Platform/Comcast/Library/RdkBootManagerLib/SecureBoot.c
@@ -1,13 +1,7 @@
/*
# Copyright (c) 2014-2018, Linaro Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
*/
#include <RdkBootManagerLib.h>
diff --git a/Platform/Comcast/RDKQemu/RDKQemu.dsc b/Platform/Comcast/RDKQemu/RDKQemu.dsc
index f22f14aed9..75b835ce60 100644
--- a/Platform/Comcast/RDKQemu/RDKQemu.dsc
+++ b/Platform/Comcast/RDKQemu/RDKQemu.dsc
@@ -3,13 +3,7 @@
# Copyright (c) 2014 - 2018, Linaro Limited. All rights reserved.
# Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#
diff --git a/Platform/Comcast/RDKQemu/RDKQemu.fdf b/Platform/Comcast/RDKQemu/RDKQemu.fdf
index 2ff7bef08a..953a72c955 100644
--- a/Platform/Comcast/RDKQemu/RDKQemu.fdf
+++ b/Platform/Comcast/RDKQemu/RDKQemu.fdf
@@ -3,13 +3,7 @@
# Copyright (c) 2014 - 2018, Linaro Limited. All rights reserved.
# Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
################################################################################
--
2.21.0.windows.1
^ permalink raw reply related [flat|nested] 63+ messages in thread* [[edk2-platforms][PATCH V2] 07/30] Platform/Hisilicon: Replace BSD License with BSD+Patent License
2019-05-15 23:09 [[edk2-platforms][PATCH V2] 00/30] Change edk2-platforms/master to BSD+Patent License Michael D Kinney
` (5 preceding siblings ...)
2019-05-15 23:09 ` [[edk2-platforms][PATCH V2] 06/30] Platform/Comcast: " Michael D Kinney
@ 2019-05-15 23:09 ` Michael D Kinney
2019-05-17 10:59 ` [edk2-devel] " Leif Lindholm
2019-05-15 23:09 ` [[edk2-platforms][PATCH V2] 08/30] Platform/Intel/AdvancedFeaturePkg: " Michael D Kinney
` (23 subsequent siblings)
30 siblings, 1 reply; 63+ messages in thread
From: Michael D Kinney @ 2019-05-15 23:09 UTC (permalink / raw)
To: devel; +Cc: Leif Lindholm, Ard Biesheuvel
https://bugzilla.tianocore.org/show_bug.cgi?id=1373
Replace BSD 2-Clause License with BSD+Patent License. This change is
based on the following emails:
https://lists.01.org/pipermail/edk2-devel/2019-February/036260.html
https://lists.01.org/pipermail/edk2-devel/2018-October/030385.html
RFCs with detailed process for the license change:
V3: https://lists.01.org/pipermail/edk2-devel/2019-March/038116.html
V2: https://lists.01.org/pipermail/edk2-devel/2019-March/037669.html
V1: https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
.../SystemFirmwareUpdateConfig.ini | 8 +-------
Platform/Hisilicon/D03/D03.dec | 8 +-------
Platform/Hisilicon/D03/D03.dsc | 8 +-------
Platform/Hisilicon/D03/D03.fdf | 8 +-------
.../OemNicConfig2PHi1610/OemNicConfig.h | 8 +-------
.../OemNicConfig2PHi1610/OemNicConfig2P.c | 8 +-------
.../OemNicConfig2PHi1610/OemNicConfig2P.inf | 8 +-------
.../SystemFirmwareDescriptor.aslc | 8 +-------
.../SystemFirmwareDescriptor.inf | 8 +-------
.../SystemFirmwareDescriptorPei.c | 8 +-------
.../D03/EarlyConfigPeim/EarlyConfigPeimD03.c | 8 +-------
.../EarlyConfigPeim/EarlyConfigPeimD03.inf | 8 +-------
.../Hisilicon/D03/Include/Library/CpldD03.h | 8 +-------
.../DS3231RealTimeClock.h | 8 +-------
.../DS3231RealTimeClockLib.c | 8 +-------
.../DS3231RealTimeClockLib.inf | 7 +------
.../D03/Library/FdtUpdateLib/FdtUpdateLib.c | 8 +-------
.../D03/Library/FdtUpdateLib/FdtUpdateLib.inf | 8 +-------
.../OemMiscLib2P/BoardFeature2PHi1610.c | 8 +-------
.../BoardFeature2PHi1610Strings.uni | Bin 4292 -> 3538 bytes
.../Library/OemMiscLib2P/OemMiscLib2PHi1610.c | 8 +-------
.../OemMiscLib2P/OemMiscLib2PHi1610.inf | 8 +-------
.../Library/PlatformPciLib/PlatformPciLib.c | 8 +-------
.../Library/PlatformPciLib/PlatformPciLib.inf | 7 +------
.../SystemFirmwareUpdateConfig.ini | 8 +-------
Platform/Hisilicon/D05/D05.dsc | 8 +-------
Platform/Hisilicon/D05/D05.fdf | 8 +-------
.../SystemFirmwareDescriptor.aslc | 8 +-------
.../SystemFirmwareDescriptor.inf | 8 +-------
.../SystemFirmwareDescriptorPei.c | 8 +-------
.../D05/EarlyConfigPeim/EarlyConfigPeimD05.c | 8 +-------
.../EarlyConfigPeim/EarlyConfigPeimD05.inf | 8 +-------
.../Library/OemMiscLibD05/BoardFeatureD05.c | 8 +-------
.../OemMiscLibD05/BoardFeatureD05Strings.uni | 8 +-------
.../D05/Library/OemMiscLibD05/OemMiscLibD05.c | 8 +-------
.../Library/OemMiscLibD05/OemMiscLibD05.inf | 8 +-------
.../Library/PlatformPciLib/PlatformPciLib.c | 8 +-------
.../Library/PlatformPciLib/PlatformPciLib.inf | 7 +------
.../SystemFirmwareUpdateConfig.ini | 8 +-------
Platform/Hisilicon/D06/D06.dec | 8 +-------
Platform/Hisilicon/D06/D06.dsc | 8 +-------
Platform/Hisilicon/D06/D06.fdf | 8 +-------
.../OemNicConfig2PHi1620/OemNicConfig.h | 8 +-------
.../OemNicConfig2PHi1620/OemNicConfig2P.c | 8 +-------
.../OemNicConfig2PHi1620/OemNicConfig2P.inf | 8 +-------
.../SystemFirmwareDescriptor.aslc | 8 +-------
.../SystemFirmwareDescriptor.inf | 8 +-------
.../SystemFirmwareDescriptorPei.c | 8 +-------
.../D06/EarlyConfigPeim/EarlyConfigPeimD06.c | 8 +-------
.../EarlyConfigPeim/EarlyConfigPeimD06.inf | 8 +-------
.../Hisilicon/D06/Include/Library/CpldD06.h | 8 +-------
.../Library/OemMiscLibD06/BoardFeatureD06.c | 8 +-------
.../OemMiscLibD06/BoardFeatureD06Strings.uni | 8 +-------
.../D06/Library/OemMiscLibD06/OemMiscLibD06.c | 8 +-------
.../Library/OemMiscLibD06/OemMiscLibD06.inf | 8 +-------
.../D06/Library/OemNicLib/OemNicLib.c | 8 +-------
.../D06/Library/OemNicLib/OemNicLib.inf | 8 +-------
.../PciHostBridgeLib/PciHostBridgeLib.c | 8 +-------
.../PciHostBridgeLib/PciHostBridgeLib.inf | 7 +------
Platform/Hisilicon/HiKey/HiKey.dec | 8 +-------
Platform/Hisilicon/HiKey/HiKey.dsc | 8 +-------
Platform/Hisilicon/HiKey/HiKey.fdf | 8 +-------
Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.c | 8 +-------
Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.h | 8 +-------
.../Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.inf | 8 +-------
.../HiKey/HiKeyGpioDxe/HiKeyGpioDxe.c | 8 +-------
.../HiKey/HiKeyGpioDxe/HiKeyGpioDxe.inf | 8 +-------
.../Hisilicon/HiKey/Include/ArmPlatform.h | 8 +-------
.../Hisilicon/HiKey/Library/HiKeyLib/HiKey.c | 8 +-------
.../HiKey/Library/HiKeyLib/HiKeyHelper.S | 8 +-------
.../HiKey/Library/HiKeyLib/HiKeyLib.inf | 8 +-------
.../HiKey/Library/HiKeyLib/HiKeyMem.c | 8 +-------
Platform/Hisilicon/HiKey960/HiKey960.dec | 8 +-------
Platform/Hisilicon/HiKey960/HiKey960.dsc | 8 +-------
Platform/Hisilicon/HiKey960/HiKey960.fdf | 8 +-------
.../HiKey960/HiKey960Dxe/HiKey960Dxe.c | 8 +-------
.../HiKey960/HiKey960Dxe/HiKey960Dxe.h | 8 +-------
.../HiKey960/HiKey960Dxe/HiKey960Dxe.inf | 8 +-------
.../HiKey960GpioDxe/HiKey960GpioDxe.c | 8 +-------
.../HiKey960GpioDxe/HiKey960GpioDxe.inf | 8 +-------
.../HiKey960/Library/HiKey960Lib/HiKey960.c | 8 +-------
.../Library/HiKey960Lib/HiKey960Helper.S | 8 +-------
.../Library/HiKey960Lib/HiKey960Lib.inf | 8 +-------
.../Library/HiKey960Lib/HiKey960Mem.c | 8 +-------
.../PciHostBridgeLib/PciHostBridgeLib.c | 8 +-------
.../PciHostBridgeLib/PciHostBridgeLib.inf | 8 +-------
86 files changed, 85 insertions(+), 591 deletions(-)
diff --git a/Platform/Hisilicon/D03/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini b/Platform/Hisilicon/D03/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini
index fc834d9c7c..dd575965c6 100644
--- a/Platform/Hisilicon/D03/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini
+++ b/Platform/Hisilicon/D03/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini
@@ -3,13 +3,7 @@
# Copyright (c) 2018, Linaro Limited. All rights reserved.
# Copyright (c) 2016, 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 distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Hisilicon/D03/D03.dec b/Platform/Hisilicon/D03/D03.dec
index 8b08a32773..206a632d5b 100644
--- a/Platform/Hisilicon/D03/D03.dec
+++ b/Platform/Hisilicon/D03/D03.dec
@@ -3,13 +3,7 @@
# Copyright (c) 2015, Hisilicon Limited. All rights reserved.
# Copyright (c) 2015, Linaro Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
diff --git a/Platform/Hisilicon/D03/D03.dsc b/Platform/Hisilicon/D03/D03.dsc
index 07ff461277..60b0d6393e 100644
--- a/Platform/Hisilicon/D03/D03.dsc
+++ b/Platform/Hisilicon/D03/D03.dsc
@@ -3,13 +3,7 @@
# Copyright (c) 2015, Hisilicon Limited. All rights reserved.
# Copyright (c) 2015, Linaro Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#
diff --git a/Platform/Hisilicon/D03/D03.fdf b/Platform/Hisilicon/D03/D03.fdf
index 3f07b2e577..f5d0c66f63 100644
--- a/Platform/Hisilicon/D03/D03.fdf
+++ b/Platform/Hisilicon/D03/D03.fdf
@@ -3,13 +3,7 @@
# Copyright (c) 2015, Hisilicon Limited. All rights reserved.
# Copyright (c) 2015, Linaro Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
[DEFINES]
diff --git a/Platform/Hisilicon/D03/Drivers/OemNicConfig2PHi1610/OemNicConfig.h b/Platform/Hisilicon/D03/Drivers/OemNicConfig2PHi1610/OemNicConfig.h
index 46c77d3061..94d904c35f 100644
--- a/Platform/Hisilicon/D03/Drivers/OemNicConfig2PHi1610/OemNicConfig.h
+++ b/Platform/Hisilicon/D03/Drivers/OemNicConfig2PHi1610/OemNicConfig.h
@@ -3,13 +3,7 @@
* Copyright (c) 2016, Hisilicon Limited. All rights reserved.
* Copyright (c) 2016, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/Hisilicon/D03/Drivers/OemNicConfig2PHi1610/OemNicConfig2P.c b/Platform/Hisilicon/D03/Drivers/OemNicConfig2PHi1610/OemNicConfig2P.c
index dcaf3aa827..814378b39b 100644
--- a/Platform/Hisilicon/D03/Drivers/OemNicConfig2PHi1610/OemNicConfig2P.c
+++ b/Platform/Hisilicon/D03/Drivers/OemNicConfig2PHi1610/OemNicConfig2P.c
@@ -3,13 +3,7 @@
* Copyright (c) 2016, Hisilicon Limited. All rights reserved.
* Copyright (c) 2016, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/Hisilicon/D03/Drivers/OemNicConfig2PHi1610/OemNicConfig2P.inf b/Platform/Hisilicon/D03/Drivers/OemNicConfig2PHi1610/OemNicConfig2P.inf
index ee5596a4ce..1071f5d651 100644
--- a/Platform/Hisilicon/D03/Drivers/OemNicConfig2PHi1610/OemNicConfig2P.inf
+++ b/Platform/Hisilicon/D03/Drivers/OemNicConfig2PHi1610/OemNicConfig2P.inf
@@ -3,13 +3,7 @@
# Copyright (c) 2016, Hisilicon Limited. All rights reserved.
# Copyright (c) 2016, Linaro Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
diff --git a/Platform/Hisilicon/D03/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc b/Platform/Hisilicon/D03/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc
index 2589e20a43..52149b1ed0 100644
--- a/Platform/Hisilicon/D03/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc
+++ b/Platform/Hisilicon/D03/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc
@@ -5,13 +5,7 @@
Copyright (c) 2018, Linaro Limited. All rights reserved.
Copyright (c) 2016, 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Hisilicon/D03/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf b/Platform/Hisilicon/D03/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf
index fc1832fa5f..6756814574 100644
--- a/Platform/Hisilicon/D03/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf
+++ b/Platform/Hisilicon/D03/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf
@@ -5,13 +5,7 @@
# Copyright (c) 2018, Linaro Limited. All rights reserved.
# Copyright (c) 2016, 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 distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Hisilicon/D03/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c b/Platform/Hisilicon/D03/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c
index 27c0a718f8..77f631d5d6 100644
--- a/Platform/Hisilicon/D03/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c
+++ b/Platform/Hisilicon/D03/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c
@@ -5,13 +5,7 @@
Copyright (c) 2018, Linaro Limited. All rights reserved.
Copyright (c) 2016, 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Hisilicon/D03/EarlyConfigPeim/EarlyConfigPeimD03.c b/Platform/Hisilicon/D03/EarlyConfigPeim/EarlyConfigPeimD03.c
index dacd9e871f..75b6dec34b 100644
--- a/Platform/Hisilicon/D03/EarlyConfigPeim/EarlyConfigPeimD03.c
+++ b/Platform/Hisilicon/D03/EarlyConfigPeim/EarlyConfigPeimD03.c
@@ -3,13 +3,7 @@
* Copyright (c) 2016, Hisilicon Limited. All rights reserved.
* Copyright (c) 2016, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/Hisilicon/D03/EarlyConfigPeim/EarlyConfigPeimD03.inf b/Platform/Hisilicon/D03/EarlyConfigPeim/EarlyConfigPeimD03.inf
index 90e40ae2b3..1f992024ac 100644
--- a/Platform/Hisilicon/D03/EarlyConfigPeim/EarlyConfigPeimD03.inf
+++ b/Platform/Hisilicon/D03/EarlyConfigPeim/EarlyConfigPeimD03.inf
@@ -3,13 +3,7 @@
# Copyright (c) 2016, Hisilicon Limited. All rights reserved.
# Copyright (c) 2016, Linaro Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
diff --git a/Platform/Hisilicon/D03/Include/Library/CpldD03.h b/Platform/Hisilicon/D03/Include/Library/CpldD03.h
index 456bf4b5c9..fce3319c44 100644
--- a/Platform/Hisilicon/D03/Include/Library/CpldD03.h
+++ b/Platform/Hisilicon/D03/Include/Library/CpldD03.h
@@ -3,13 +3,7 @@
* Copyright (c) 2015, Hisilicon Limited. All rights reserved.
* Copyright (c) 2015, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/Hisilicon/D03/Library/DS3231RealTimeClockLib/DS3231RealTimeClock.h b/Platform/Hisilicon/D03/Library/DS3231RealTimeClockLib/DS3231RealTimeClock.h
index d1e6c41dd7..da18d0f558 100644
--- a/Platform/Hisilicon/D03/Library/DS3231RealTimeClockLib/DS3231RealTimeClock.h
+++ b/Platform/Hisilicon/D03/Library/DS3231RealTimeClockLib/DS3231RealTimeClock.h
@@ -4,13 +4,7 @@
* Copyright (c) 2015, Hisilicon Limited. All rights reserved.
* Copyright (c) 2015, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
* Based on the files under ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.inf
**/
diff --git a/Platform/Hisilicon/D03/Library/DS3231RealTimeClockLib/DS3231RealTimeClockLib.c b/Platform/Hisilicon/D03/Library/DS3231RealTimeClockLib/DS3231RealTimeClockLib.c
index f6dbcf6b75..898335a7b7 100644
--- a/Platform/Hisilicon/D03/Library/DS3231RealTimeClockLib/DS3231RealTimeClockLib.c
+++ b/Platform/Hisilicon/D03/Library/DS3231RealTimeClockLib/DS3231RealTimeClockLib.c
@@ -8,13 +8,7 @@
Copyright (c) 2015, Hisilicon Limited. All rights reserved.<BR>
Copyright (c) 2015, Linaro Limited. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
Based on the files under ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.inf
diff --git a/Platform/Hisilicon/D03/Library/DS3231RealTimeClockLib/DS3231RealTimeClockLib.inf b/Platform/Hisilicon/D03/Library/DS3231RealTimeClockLib/DS3231RealTimeClockLib.inf
index ae7116dc31..29c6ecf98b 100644
--- a/Platform/Hisilicon/D03/Library/DS3231RealTimeClockLib/DS3231RealTimeClockLib.inf
+++ b/Platform/Hisilicon/D03/Library/DS3231RealTimeClockLib/DS3231RealTimeClockLib.inf
@@ -5,12 +5,7 @@
# Copyright (c) 2016, Hisilicon Limited. All rights reserved.<BR>
# Copyright (c) 2016, Linaro Limited. 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 distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#
#**/
diff --git a/Platform/Hisilicon/D03/Library/FdtUpdateLib/FdtUpdateLib.c b/Platform/Hisilicon/D03/Library/FdtUpdateLib/FdtUpdateLib.c
index d00cb9b2ab..a242e4bd9a 100755
--- a/Platform/Hisilicon/D03/Library/FdtUpdateLib/FdtUpdateLib.c
+++ b/Platform/Hisilicon/D03/Library/FdtUpdateLib/FdtUpdateLib.c
@@ -3,13 +3,7 @@
* Copyright (c) 2016, Hisilicon Limited. All rights reserved.
* Copyright (c) 2016, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/Hisilicon/D03/Library/FdtUpdateLib/FdtUpdateLib.inf b/Platform/Hisilicon/D03/Library/FdtUpdateLib/FdtUpdateLib.inf
index 2d9d53d149..e02c7b229a 100755
--- a/Platform/Hisilicon/D03/Library/FdtUpdateLib/FdtUpdateLib.inf
+++ b/Platform/Hisilicon/D03/Library/FdtUpdateLib/FdtUpdateLib.inf
@@ -3,13 +3,7 @@
# Copyright (c) 2016, Hisilicon Limited. All rights reserved.
# Copyright (c) 2016, Linaro Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
diff --git a/Platform/Hisilicon/D03/Library/OemMiscLib2P/BoardFeature2PHi1610.c b/Platform/Hisilicon/D03/Library/OemMiscLib2P/BoardFeature2PHi1610.c
index 218b3540eb..1670cac1d4 100644
--- a/Platform/Hisilicon/D03/Library/OemMiscLib2P/BoardFeature2PHi1610.c
+++ b/Platform/Hisilicon/D03/Library/OemMiscLib2P/BoardFeature2PHi1610.c
@@ -3,13 +3,7 @@
* Copyright (c) 2015, Hisilicon Limited. All rights reserved.
* Copyright (c) 2015, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/Hisilicon/D03/Library/OemMiscLib2P/BoardFeature2PHi1610Strings.uni b/Platform/Hisilicon/D03/Library/OemMiscLib2P/BoardFeature2PHi1610Strings.uni
index 38def406b9485966b67944d615b8908c250dc2c6..3e321f98848ef80ad178dde66ea72366306d73e4 100644
GIT binary patch
delta 99
zcmX@2cu9J~w(wwv00tL^2nJmSABIeZWQJ6RJceQ*smtKWkOJnF0L9aQIF+G@!HPkF
j!HFRls6&^*2#B2-au^aBN})Oefb0^8p3VQ6kMaNjEm9Q<
delta 859
zcmZ9KO->t85QHmRl$?Oggf%hy>~NSQqksq5MkLFzJ;WpVC$gOoR&xdJg2V~n0-Pvc
z_4qGn<oCK?S6A1o=a<8$_xF!=Ut?8TD$y@3G}lkoLR0cWGmY3+Aj-&x8iJUDbnTA5
z8Tf>g0#r$7MKpo!Kqq|WSVZrH%8+PAtqj&RdmYWA02TT}Lj^&h0jr1p4iTo_328=6
zL-a<Zg;{QekSbzdX|9{SzP5TgBR}60Q<qz<x8cN))w=(`YlRpS+Ka|5k6M!Z&I4p_
z#<oBuva6PVLuJC}&QgC_Ux}(I?pxECc?WE;CYY~1u&C8m?3j4PLwpRQ=R}RUMlZtZ
z7PnvUJSVRvEIAn<eWVXm>iyv@XvX}S*W0{dUtg6X=u%zf`oemu3-Sy*6Abm<=QLAW
zS43%;e5DS1%DLTW7<Lbk=@Ye%dUa6egbB1>kJwFY+9URM<j#(_x4))p(mVzxx(3q?
zVI9shIL(m9@GhC9`^+QzV2$z2o^r!J1NQJA?B6I^`7v?29@E?+)%PvYjy}VSOa4+G
NdZyOHyEo5o{{i*wj{pDw
diff --git a/Platform/Hisilicon/D03/Library/OemMiscLib2P/OemMiscLib2PHi1610.c b/Platform/Hisilicon/D03/Library/OemMiscLib2P/OemMiscLib2PHi1610.c
index c8a9da73bb..1d9c3dfd49 100644
--- a/Platform/Hisilicon/D03/Library/OemMiscLib2P/OemMiscLib2PHi1610.c
+++ b/Platform/Hisilicon/D03/Library/OemMiscLib2P/OemMiscLib2PHi1610.c
@@ -3,13 +3,7 @@
* Copyright (c) 2015, Hisilicon Limited. All rights reserved.
* Copyright (c) 2015, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/Hisilicon/D03/Library/OemMiscLib2P/OemMiscLib2PHi1610.inf b/Platform/Hisilicon/D03/Library/OemMiscLib2P/OemMiscLib2PHi1610.inf
index c0195b2fa9..ab14597d8b 100644
--- a/Platform/Hisilicon/D03/Library/OemMiscLib2P/OemMiscLib2PHi1610.inf
+++ b/Platform/Hisilicon/D03/Library/OemMiscLib2P/OemMiscLib2PHi1610.inf
@@ -3,13 +3,7 @@
# Copyright (c) 2015, Hisilicon Limited. All rights reserved.
# Copyright (c) 2015, Linaro Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
diff --git a/Platform/Hisilicon/D03/Library/PlatformPciLib/PlatformPciLib.c b/Platform/Hisilicon/D03/Library/PlatformPciLib/PlatformPciLib.c
index 59c468ac4b..419eb878f3 100644
--- a/Platform/Hisilicon/D03/Library/PlatformPciLib/PlatformPciLib.c
+++ b/Platform/Hisilicon/D03/Library/PlatformPciLib/PlatformPciLib.c
@@ -3,13 +3,7 @@
Copyright (c) 2016, Hisilicon Limited. All rights reserved.<BR>
Copyright (c) 2016, Linaro Limited. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Hisilicon/D03/Library/PlatformPciLib/PlatformPciLib.inf b/Platform/Hisilicon/D03/Library/PlatformPciLib/PlatformPciLib.inf
index 4d2dbbaf0d..63d57ec46d 100644
--- a/Platform/Hisilicon/D03/Library/PlatformPciLib/PlatformPciLib.inf
+++ b/Platform/Hisilicon/D03/Library/PlatformPciLib/PlatformPciLib.inf
@@ -3,12 +3,7 @@
# Copyright (c) 2016, Hisilicon Limited. All rights reserved.<BR>
# Copyright (c) 2016, Linaro Limited. 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 distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#
##
diff --git a/Platform/Hisilicon/D05/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini b/Platform/Hisilicon/D05/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini
index fc834d9c7c..dd575965c6 100644
--- a/Platform/Hisilicon/D05/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini
+++ b/Platform/Hisilicon/D05/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini
@@ -3,13 +3,7 @@
# Copyright (c) 2018, Linaro Limited. All rights reserved.
# Copyright (c) 2016, 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 distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Hisilicon/D05/D05.dsc b/Platform/Hisilicon/D05/D05.dsc
index 70b044c7e3..dc9e1407ba 100644
--- a/Platform/Hisilicon/D05/D05.dsc
+++ b/Platform/Hisilicon/D05/D05.dsc
@@ -3,13 +3,7 @@
# Copyright (c) 2015-2016, Hisilicon Limited. All rights reserved.
# Copyright (c) 2015-2016, Linaro Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#
diff --git a/Platform/Hisilicon/D05/D05.fdf b/Platform/Hisilicon/D05/D05.fdf
index 9632aea4b0..812f7f2690 100644
--- a/Platform/Hisilicon/D05/D05.fdf
+++ b/Platform/Hisilicon/D05/D05.fdf
@@ -3,13 +3,7 @@
# Copyright (c) 2015-2016, Hisilicon Limited. All rights reserved.
# Copyright (c) 2015-2016, Linaro Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
[DEFINES]
diff --git a/Platform/Hisilicon/D05/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc b/Platform/Hisilicon/D05/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc
index 5091c7a25d..210141d019 100644
--- a/Platform/Hisilicon/D05/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc
+++ b/Platform/Hisilicon/D05/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc
@@ -5,13 +5,7 @@
Copyright (c) 2018, Linaro Limited. All rights reserved.
Copyright (c) 2016, 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Hisilicon/D05/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf b/Platform/Hisilicon/D05/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf
index fc1832fa5f..6756814574 100644
--- a/Platform/Hisilicon/D05/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf
+++ b/Platform/Hisilicon/D05/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf
@@ -5,13 +5,7 @@
# Copyright (c) 2018, Linaro Limited. All rights reserved.
# Copyright (c) 2016, 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 distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Hisilicon/D05/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c b/Platform/Hisilicon/D05/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c
index 27c0a718f8..77f631d5d6 100644
--- a/Platform/Hisilicon/D05/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c
+++ b/Platform/Hisilicon/D05/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c
@@ -5,13 +5,7 @@
Copyright (c) 2018, Linaro Limited. All rights reserved.
Copyright (c) 2016, 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Hisilicon/D05/EarlyConfigPeim/EarlyConfigPeimD05.c b/Platform/Hisilicon/D05/EarlyConfigPeim/EarlyConfigPeimD05.c
index b374347e5c..05aefc90f7 100644
--- a/Platform/Hisilicon/D05/EarlyConfigPeim/EarlyConfigPeimD05.c
+++ b/Platform/Hisilicon/D05/EarlyConfigPeim/EarlyConfigPeimD05.c
@@ -3,13 +3,7 @@
* Copyright (c) 2016, Hisilicon Limited. All rights reserved.
* Copyright (c) 2016, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/Hisilicon/D05/EarlyConfigPeim/EarlyConfigPeimD05.inf b/Platform/Hisilicon/D05/EarlyConfigPeim/EarlyConfigPeimD05.inf
index e82c9204d5..c42d0dd6cd 100644
--- a/Platform/Hisilicon/D05/EarlyConfigPeim/EarlyConfigPeimD05.inf
+++ b/Platform/Hisilicon/D05/EarlyConfigPeim/EarlyConfigPeimD05.inf
@@ -3,13 +3,7 @@
# Copyright (c) 2016, Hisilicon Limited. All rights reserved.
# Copyright (c) 2016, Linaro Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
diff --git a/Platform/Hisilicon/D05/Library/OemMiscLibD05/BoardFeatureD05.c b/Platform/Hisilicon/D05/Library/OemMiscLibD05/BoardFeatureD05.c
index 1a9ed620c8..ac013ca308 100644
--- a/Platform/Hisilicon/D05/Library/OemMiscLibD05/BoardFeatureD05.c
+++ b/Platform/Hisilicon/D05/Library/OemMiscLibD05/BoardFeatureD05.c
@@ -3,13 +3,7 @@
* Copyright (c) 2016, Hisilicon Limited. All rights reserved.
* Copyright (c) 2016, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/Hisilicon/D05/Library/OemMiscLibD05/BoardFeatureD05Strings.uni b/Platform/Hisilicon/D05/Library/OemMiscLibD05/BoardFeatureD05Strings.uni
index 9f5be02d8a..8b36905f0f 100644
--- a/Platform/Hisilicon/D05/Library/OemMiscLibD05/BoardFeatureD05Strings.uni
+++ b/Platform/Hisilicon/D05/Library/OemMiscLibD05/BoardFeatureD05Strings.uni
@@ -3,13 +3,7 @@
// Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
// Copyright (c) 2016, Hisilicon Limited. All rights reserved.
//
-// This program and the accompanying materials
-// are licensed and made available under the terms and conditions of the BSD License
-// which accompanies this distribution. The full text of the license may be found at
-// http://opensource.org/licenses/bsd-license.php
-//
-// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+// SPDX-License-Identifier: BSD-2-Clause-Patent
//
// --*/
diff --git a/Platform/Hisilicon/D05/Library/OemMiscLibD05/OemMiscLibD05.c b/Platform/Hisilicon/D05/Library/OemMiscLibD05/OemMiscLibD05.c
index a1458da7f0..2ee15dbc7b 100644
--- a/Platform/Hisilicon/D05/Library/OemMiscLibD05/OemMiscLibD05.c
+++ b/Platform/Hisilicon/D05/Library/OemMiscLibD05/OemMiscLibD05.c
@@ -3,13 +3,7 @@
* Copyright (c) 2016 - 2018, Hisilicon Limited. All rights reserved.
* Copyright (c) 2016 - 2018, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/Hisilicon/D05/Library/OemMiscLibD05/OemMiscLibD05.inf b/Platform/Hisilicon/D05/Library/OemMiscLibD05/OemMiscLibD05.inf
index 7ec5775306..d471102199 100644
--- a/Platform/Hisilicon/D05/Library/OemMiscLibD05/OemMiscLibD05.inf
+++ b/Platform/Hisilicon/D05/Library/OemMiscLibD05/OemMiscLibD05.inf
@@ -3,13 +3,7 @@
# Copyright (c) 2016, Hisilicon Limited. All rights reserved.
# Copyright (c) 2016, Linaro Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
diff --git a/Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.c b/Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.c
index 0dc988a1d3..18d2bf2f98 100644
--- a/Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.c
+++ b/Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.c
@@ -3,13 +3,7 @@
Copyright (c) 2016, Hisilicon Limited. All rights reserved.<BR>
Copyright (c) 2016, Linaro Limited. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.inf b/Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.inf
index 21bb33a318..e20d350cd5 100644
--- a/Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.inf
+++ b/Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.inf
@@ -3,12 +3,7 @@
# Copyright (c) 2016, Hisilicon Limited. All rights reserved.<BR>
# Copyright (c) 2016, Linaro Limited. 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 distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#
##
diff --git a/Platform/Hisilicon/D06/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini b/Platform/Hisilicon/D06/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini
index 80f253b235..af7d57fd6e 100644
--- a/Platform/Hisilicon/D06/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini
+++ b/Platform/Hisilicon/D06/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini
@@ -3,13 +3,7 @@
# Copyright (c) 2018, Linaro Limited. All rights reserved.
# Copyright (c) 2016, 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 distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Hisilicon/D06/D06.dec b/Platform/Hisilicon/D06/D06.dec
index 710f083eee..64607fed0e 100644
--- a/Platform/Hisilicon/D06/D06.dec
+++ b/Platform/Hisilicon/D06/D06.dec
@@ -3,13 +3,7 @@
# Copyright (c) 2018, Hisilicon Limited. All rights reserved.
# Copyright (c) 2018, Linaro Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
diff --git a/Platform/Hisilicon/D06/D06.dsc b/Platform/Hisilicon/D06/D06.dsc
index 73bea728b0..5387daf553 100644
--- a/Platform/Hisilicon/D06/D06.dsc
+++ b/Platform/Hisilicon/D06/D06.dsc
@@ -3,13 +3,7 @@
# Copyright (c) 2018, Hisilicon Limited. All rights reserved.
# Copyright (c) 2018, Linaro Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#
diff --git a/Platform/Hisilicon/D06/D06.fdf b/Platform/Hisilicon/D06/D06.fdf
index e402628a1b..976b597647 100644
--- a/Platform/Hisilicon/D06/D06.fdf
+++ b/Platform/Hisilicon/D06/D06.fdf
@@ -3,13 +3,7 @@
# Copyright (c) 2017 - 2018, Hisilicon Limited. All rights reserved.
# Copyright (c) 2017 - 2018, Linaro Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
[DEFINES]
diff --git a/Platform/Hisilicon/D06/Drivers/OemNicConfig2PHi1620/OemNicConfig.h b/Platform/Hisilicon/D06/Drivers/OemNicConfig2PHi1620/OemNicConfig.h
index 35228fdf1d..40bd87e5c8 100644
--- a/Platform/Hisilicon/D06/Drivers/OemNicConfig2PHi1620/OemNicConfig.h
+++ b/Platform/Hisilicon/D06/Drivers/OemNicConfig2PHi1620/OemNicConfig.h
@@ -3,13 +3,7 @@
* Copyright (c) 2016-2018, Hisilicon Limited. All rights reserved.
* Copyright (c) 2016-2018, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/Hisilicon/D06/Drivers/OemNicConfig2PHi1620/OemNicConfig2P.c b/Platform/Hisilicon/D06/Drivers/OemNicConfig2PHi1620/OemNicConfig2P.c
index c01c49150a..c5c3290130 100644
--- a/Platform/Hisilicon/D06/Drivers/OemNicConfig2PHi1620/OemNicConfig2P.c
+++ b/Platform/Hisilicon/D06/Drivers/OemNicConfig2PHi1620/OemNicConfig2P.c
@@ -3,13 +3,7 @@
* Copyright (c) 2016-2018, Hisilicon Limited. All rights reserved.
* Copyright (c) 2016-2018, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/Hisilicon/D06/Drivers/OemNicConfig2PHi1620/OemNicConfig2P.inf b/Platform/Hisilicon/D06/Drivers/OemNicConfig2PHi1620/OemNicConfig2P.inf
index a91f2b6005..ebc7e7791e 100644
--- a/Platform/Hisilicon/D06/Drivers/OemNicConfig2PHi1620/OemNicConfig2P.inf
+++ b/Platform/Hisilicon/D06/Drivers/OemNicConfig2PHi1620/OemNicConfig2P.inf
@@ -3,13 +3,7 @@
# Copyright (c) 2016-2018, Hisilicon Limited. All rights reserved.
# Copyright (c) 2016-2018, Linaro Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
diff --git a/Platform/Hisilicon/D06/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc b/Platform/Hisilicon/D06/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc
index 1287dfd834..63ce447292 100644
--- a/Platform/Hisilicon/D06/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc
+++ b/Platform/Hisilicon/D06/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc
@@ -5,13 +5,7 @@
Copyright (c) 2018, Linaro Limited. All rights reserved.
Copyright (c) 2016, 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Hisilicon/D06/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf b/Platform/Hisilicon/D06/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf
index fc1832fa5f..6756814574 100644
--- a/Platform/Hisilicon/D06/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf
+++ b/Platform/Hisilicon/D06/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf
@@ -5,13 +5,7 @@
# Copyright (c) 2018, Linaro Limited. All rights reserved.
# Copyright (c) 2016, 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 distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Hisilicon/D06/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c b/Platform/Hisilicon/D06/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c
index 27c0a718f8..77f631d5d6 100644
--- a/Platform/Hisilicon/D06/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c
+++ b/Platform/Hisilicon/D06/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c
@@ -5,13 +5,7 @@
Copyright (c) 2018, Linaro Limited. All rights reserved.
Copyright (c) 2016, 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Hisilicon/D06/EarlyConfigPeim/EarlyConfigPeimD06.c b/Platform/Hisilicon/D06/EarlyConfigPeim/EarlyConfigPeimD06.c
index a8261d3706..72f30ff075 100644
--- a/Platform/Hisilicon/D06/EarlyConfigPeim/EarlyConfigPeimD06.c
+++ b/Platform/Hisilicon/D06/EarlyConfigPeim/EarlyConfigPeimD06.c
@@ -3,13 +3,7 @@
* Copyright (c) 2018, Hisilicon Limited. All rights reserved.
* Copyright (c) 2018, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/Hisilicon/D06/EarlyConfigPeim/EarlyConfigPeimD06.inf b/Platform/Hisilicon/D06/EarlyConfigPeim/EarlyConfigPeimD06.inf
index 715a4efadd..8eaec842c8 100644
--- a/Platform/Hisilicon/D06/EarlyConfigPeim/EarlyConfigPeimD06.inf
+++ b/Platform/Hisilicon/D06/EarlyConfigPeim/EarlyConfigPeimD06.inf
@@ -3,13 +3,7 @@
# Copyright (c) 2018, Hisilicon Limited. All rights reserved.
# Copyright (c) 2017, Linaro Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
diff --git a/Platform/Hisilicon/D06/Include/Library/CpldD06.h b/Platform/Hisilicon/D06/Include/Library/CpldD06.h
index 8eb333de52..e5adfb316f 100644
--- a/Platform/Hisilicon/D06/Include/Library/CpldD06.h
+++ b/Platform/Hisilicon/D06/Include/Library/CpldD06.h
@@ -3,13 +3,7 @@
Copyright (c) 2018, Hisilicon Limited. All rights reserved.<BR>
Copyright (c) 2018, Linaro Limited. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Hisilicon/D06/Library/OemMiscLibD06/BoardFeatureD06.c b/Platform/Hisilicon/D06/Library/OemMiscLibD06/BoardFeatureD06.c
index c28ac6266f..980eabfe33 100644
--- a/Platform/Hisilicon/D06/Library/OemMiscLibD06/BoardFeatureD06.c
+++ b/Platform/Hisilicon/D06/Library/OemMiscLibD06/BoardFeatureD06.c
@@ -3,13 +3,7 @@
* Copyright (c) 2018, Hisilicon Limited. All rights reserved.
* Copyright (c) 2018, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/Hisilicon/D06/Library/OemMiscLibD06/BoardFeatureD06Strings.uni b/Platform/Hisilicon/D06/Library/OemMiscLibD06/BoardFeatureD06Strings.uni
index e3fa5fa5ab..3696d1f11e 100644
--- a/Platform/Hisilicon/D06/Library/OemMiscLibD06/BoardFeatureD06Strings.uni
+++ b/Platform/Hisilicon/D06/Library/OemMiscLibD06/BoardFeatureD06Strings.uni
@@ -4,13 +4,7 @@
* Copyright (c) 2018, Hisilicon Limited. All rights reserved.
* Copyright (c) 2018, Linaro Limited. All rights reserved.
//
-// This program and the accompanying materials
-// are licensed and made available under the terms and conditions of the BSD License
-// which accompanies this distribution. The full text of the license may be found at
-// http://opensource.org/licenses/bsd-license.php
-//
-// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+// SPDX-License-Identifier: BSD-2-Clause-Patent
//
// --*/
diff --git a/Platform/Hisilicon/D06/Library/OemMiscLibD06/OemMiscLibD06.c b/Platform/Hisilicon/D06/Library/OemMiscLibD06/OemMiscLibD06.c
index 758157525f..1b0a2180c1 100644
--- a/Platform/Hisilicon/D06/Library/OemMiscLibD06/OemMiscLibD06.c
+++ b/Platform/Hisilicon/D06/Library/OemMiscLibD06/OemMiscLibD06.c
@@ -3,13 +3,7 @@
* Copyright (c) 2018, Hisilicon Limited. All rights reserved.
* Copyright (c) 2018, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/Hisilicon/D06/Library/OemMiscLibD06/OemMiscLibD06.inf b/Platform/Hisilicon/D06/Library/OemMiscLibD06/OemMiscLibD06.inf
index 9bc6eb549c..59373a9685 100644
--- a/Platform/Hisilicon/D06/Library/OemMiscLibD06/OemMiscLibD06.inf
+++ b/Platform/Hisilicon/D06/Library/OemMiscLibD06/OemMiscLibD06.inf
@@ -3,13 +3,7 @@
# Copyright (c) 2018, Hisilicon Limited. All rights reserved.
# Copyright (c) 2018, Linaro Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
diff --git a/Platform/Hisilicon/D06/Library/OemNicLib/OemNicLib.c b/Platform/Hisilicon/D06/Library/OemNicLib/OemNicLib.c
index 678c2107bd..42a5a08077 100644
--- a/Platform/Hisilicon/D06/Library/OemNicLib/OemNicLib.c
+++ b/Platform/Hisilicon/D06/Library/OemNicLib/OemNicLib.c
@@ -3,13 +3,7 @@
* Copyright (c) 2018, Hisilicon Limited. All rights reserved.
* Copyright (c) 2017, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/Hisilicon/D06/Library/OemNicLib/OemNicLib.inf b/Platform/Hisilicon/D06/Library/OemNicLib/OemNicLib.inf
index 3b0bd2d60c..c42f5d6e6a 100644
--- a/Platform/Hisilicon/D06/Library/OemNicLib/OemNicLib.inf
+++ b/Platform/Hisilicon/D06/Library/OemNicLib/OemNicLib.inf
@@ -3,13 +3,7 @@
# Copyright (c) 2018, Hisilicon Limited. All rights reserved.
# Copyright (c) 2017, Linaro Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
diff --git a/Platform/Hisilicon/D06/Library/PciHostBridgeLib/PciHostBridgeLib.c b/Platform/Hisilicon/D06/Library/PciHostBridgeLib/PciHostBridgeLib.c
index d13178e925..c44959b7f1 100644
--- a/Platform/Hisilicon/D06/Library/PciHostBridgeLib/PciHostBridgeLib.c
+++ b/Platform/Hisilicon/D06/Library/PciHostBridgeLib/PciHostBridgeLib.c
@@ -3,13 +3,7 @@
Copyright (c) 2018, Hisilicon Limited. All rights reserved.<BR>
Copyright (c) 2018, Linaro Limited. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include <PiDxe.h>
diff --git a/Platform/Hisilicon/D06/Library/PciHostBridgeLib/PciHostBridgeLib.inf b/Platform/Hisilicon/D06/Library/PciHostBridgeLib/PciHostBridgeLib.inf
index 8a998681a3..d8d2940344 100644
--- a/Platform/Hisilicon/D06/Library/PciHostBridgeLib/PciHostBridgeLib.inf
+++ b/Platform/Hisilicon/D06/Library/PciHostBridgeLib/PciHostBridgeLib.inf
@@ -3,12 +3,7 @@
# Copyright (c) 2018, Hisilicon Limited. All rights reserved.<BR>
# Copyright (c) 2018, Linaro Limited. 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 distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#
##
diff --git a/Platform/Hisilicon/HiKey/HiKey.dec b/Platform/Hisilicon/HiKey/HiKey.dec
index d5de1a1659..3164c4c223 100644
--- a/Platform/Hisilicon/HiKey/HiKey.dec
+++ b/Platform/Hisilicon/HiKey/HiKey.dec
@@ -1,13 +1,7 @@
#
# Copyright (c) 2014-2018, Linaro Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
[Defines]
diff --git a/Platform/Hisilicon/HiKey/HiKey.dsc b/Platform/Hisilicon/HiKey/HiKey.dsc
index 7e05babb6c..44f21700dd 100644
--- a/Platform/Hisilicon/HiKey/HiKey.dsc
+++ b/Platform/Hisilicon/HiKey/HiKey.dsc
@@ -1,13 +1,7 @@
#
# Copyright (c) 2014-2018, Linaro Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
################################################################################
diff --git a/Platform/Hisilicon/HiKey/HiKey.fdf b/Platform/Hisilicon/HiKey/HiKey.fdf
index 7e6c8083bb..3d85f01eca 100644
--- a/Platform/Hisilicon/HiKey/HiKey.fdf
+++ b/Platform/Hisilicon/HiKey/HiKey.fdf
@@ -1,13 +1,7 @@
#
# Copyright (c) 2014-2018, Linaro Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
################################################################################
diff --git a/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.c b/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.c
index 2162b68529..47fbe02e53 100644
--- a/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.c
+++ b/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.c
@@ -2,13 +2,7 @@
*
* Copyright (c) 2018, Linaro Ltd. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.h b/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.h
index 0ababfa32e..954f31e461 100644
--- a/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.h
+++ b/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.h
@@ -2,13 +2,7 @@
*
* Copyright (c) 2018, Linaro Ltd. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.inf b/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.inf
index 4c4644a0fe..0181999a3b 100644
--- a/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.inf
+++ b/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.inf
@@ -2,13 +2,7 @@
# Copyright (c) 2013 - 2014, ARM Ltd. All rights reserved.
# Copyright (c) 2018, Linaro Ltd. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
[Defines]
diff --git a/Platform/Hisilicon/HiKey/HiKeyGpioDxe/HiKeyGpioDxe.c b/Platform/Hisilicon/HiKey/HiKeyGpioDxe/HiKeyGpioDxe.c
index be535f8f19..efdd76768b 100644
--- a/Platform/Hisilicon/HiKey/HiKeyGpioDxe/HiKeyGpioDxe.c
+++ b/Platform/Hisilicon/HiKey/HiKeyGpioDxe/HiKeyGpioDxe.c
@@ -2,13 +2,7 @@
*
* Copyright (c) 2018, Linaro. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/Hisilicon/HiKey/HiKeyGpioDxe/HiKeyGpioDxe.inf b/Platform/Hisilicon/HiKey/HiKeyGpioDxe/HiKeyGpioDxe.inf
index 2791b9f44c..3564b07633 100644
--- a/Platform/Hisilicon/HiKey/HiKeyGpioDxe/HiKeyGpioDxe.inf
+++ b/Platform/Hisilicon/HiKey/HiKeyGpioDxe/HiKeyGpioDxe.inf
@@ -1,13 +1,7 @@
#
# Copyright (c) 2018, Linaro. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
[Defines]
diff --git a/Platform/Hisilicon/HiKey/Include/ArmPlatform.h b/Platform/Hisilicon/HiKey/Include/ArmPlatform.h
index e60478f6b7..6962da30a3 100644
--- a/Platform/Hisilicon/HiKey/Include/ArmPlatform.h
+++ b/Platform/Hisilicon/HiKey/Include/ArmPlatform.h
@@ -2,13 +2,7 @@
*
* Copyright (c) 2014-2017, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKey.c b/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKey.c
index 6bf0d39bd4..801d633985 100644
--- a/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKey.c
+++ b/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKey.c
@@ -2,13 +2,7 @@
*
* Copyright (c) 2014-2017, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyHelper.S b/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyHelper.S
index 0e8f1bbacd..253b7c6e70 100644
--- a/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyHelper.S
+++ b/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyHelper.S
@@ -1,13 +1,7 @@
#
# Copyright (c) 2014-2017, Linaro Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#
diff --git a/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyLib.inf b/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyLib.inf
index 6a47a4501e..18b74bc42e 100644
--- a/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyLib.inf
+++ b/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyLib.inf
@@ -1,13 +1,7 @@
#
# Copyright (c) 2014-2017, Linaro Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
[Defines]
diff --git a/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyMem.c b/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyMem.c
index 0f6ad89a02..118c66942e 100644
--- a/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyMem.c
+++ b/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyMem.c
@@ -2,13 +2,7 @@
*
* Copyright (c) 2014-2017, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/Hisilicon/HiKey960/HiKey960.dec b/Platform/Hisilicon/HiKey960/HiKey960.dec
index aa5a0caf52..1273c28ed0 100644
--- a/Platform/Hisilicon/HiKey960/HiKey960.dec
+++ b/Platform/Hisilicon/HiKey960/HiKey960.dec
@@ -1,13 +1,7 @@
#
# Copyright (c) 2018, Linaro Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
[Defines]
diff --git a/Platform/Hisilicon/HiKey960/HiKey960.dsc b/Platform/Hisilicon/HiKey960/HiKey960.dsc
index a4a1a371de..db6e5b918d 100644
--- a/Platform/Hisilicon/HiKey960/HiKey960.dsc
+++ b/Platform/Hisilicon/HiKey960/HiKey960.dsc
@@ -1,13 +1,7 @@
#
# Copyright (c) 2018, Linaro Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
################################################################################
diff --git a/Platform/Hisilicon/HiKey960/HiKey960.fdf b/Platform/Hisilicon/HiKey960/HiKey960.fdf
index 1b07284dc8..01ae18499f 100644
--- a/Platform/Hisilicon/HiKey960/HiKey960.fdf
+++ b/Platform/Hisilicon/HiKey960/HiKey960.fdf
@@ -1,13 +1,7 @@
#
# Copyright (c) 2018, Linaro Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
################################################################################
diff --git a/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.c b/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.c
index 47ec879861..8e94bec41c 100644
--- a/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.c
+++ b/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.c
@@ -2,13 +2,7 @@
*
* Copyright (c) 2018, Linaro Ltd. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.h b/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.h
index 630aabcb23..0629fa4a81 100644
--- a/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.h
+++ b/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.h
@@ -2,13 +2,7 @@
*
* Copyright (c) 2018, Linaro Ltd. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.inf b/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.inf
index 54105bdb3c..5e1c52b84b 100644
--- a/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.inf
+++ b/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.inf
@@ -1,13 +1,7 @@
#
# Copyright (c) 2018, Linaro Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
[Defines]
diff --git a/Platform/Hisilicon/HiKey960/HiKey960GpioDxe/HiKey960GpioDxe.c b/Platform/Hisilicon/HiKey960/HiKey960GpioDxe/HiKey960GpioDxe.c
index b196455072..74f10bf9e6 100644
--- a/Platform/Hisilicon/HiKey960/HiKey960GpioDxe/HiKey960GpioDxe.c
+++ b/Platform/Hisilicon/HiKey960/HiKey960GpioDxe/HiKey960GpioDxe.c
@@ -2,13 +2,7 @@
*
* Copyright (c) 2018, Linaro. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/Hisilicon/HiKey960/HiKey960GpioDxe/HiKey960GpioDxe.inf b/Platform/Hisilicon/HiKey960/HiKey960GpioDxe/HiKey960GpioDxe.inf
index 5ea3747321..9fe2d2fe52 100644
--- a/Platform/Hisilicon/HiKey960/HiKey960GpioDxe/HiKey960GpioDxe.inf
+++ b/Platform/Hisilicon/HiKey960/HiKey960GpioDxe/HiKey960GpioDxe.inf
@@ -1,13 +1,7 @@
#
# Copyright (c) 2018, Linaro. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
[Defines]
diff --git a/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960.c b/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960.c
index 9ae4610a29..89cca920ad 100644
--- a/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960.c
+++ b/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960.c
@@ -2,13 +2,7 @@
*
* Copyright (c) 2018, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960Helper.S b/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960Helper.S
index eb85f67520..a3638cef4d 100644
--- a/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960Helper.S
+++ b/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960Helper.S
@@ -1,13 +1,7 @@
#
# Copyright (c) 2018, Linaro Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#
diff --git a/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960Lib.inf b/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960Lib.inf
index e16e5a623b..81167c76f9 100644
--- a/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960Lib.inf
+++ b/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960Lib.inf
@@ -1,13 +1,7 @@
#
# Copyright (c) 2018, Linaro Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
[Defines]
diff --git a/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960Mem.c b/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960Mem.c
index 0c37c3791a..68ca76688e 100644
--- a/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960Mem.c
+++ b/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960Mem.c
@@ -2,13 +2,7 @@
*
* Copyright (c) 2018, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/Hisilicon/Library/PciHostBridgeLib/PciHostBridgeLib.c b/Platform/Hisilicon/Library/PciHostBridgeLib/PciHostBridgeLib.c
index 6aff5cdd3d..1be7de5ccf 100644
--- a/Platform/Hisilicon/Library/PciHostBridgeLib/PciHostBridgeLib.c
+++ b/Platform/Hisilicon/Library/PciHostBridgeLib/PciHostBridgeLib.c
@@ -4,13 +4,7 @@
Copyright (c) 2018, Hisilicon Limited. All rights reserved.<BR>
Copyright (c) 2017 - 2018, Linaro Ltd. 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
- distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php.
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT
- WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include <PiDxe.h>
diff --git a/Platform/Hisilicon/Library/PciHostBridgeLib/PciHostBridgeLib.inf b/Platform/Hisilicon/Library/PciHostBridgeLib/PciHostBridgeLib.inf
index dd451cff33..6f2576c61c 100644
--- a/Platform/Hisilicon/Library/PciHostBridgeLib/PciHostBridgeLib.inf
+++ b/Platform/Hisilicon/Library/PciHostBridgeLib/PciHostBridgeLib.inf
@@ -4,13 +4,7 @@
# Copyright (c) 2018, Hisilicon Limited. All rights reserved.<BR>
# Copyright (c) 2017 - 2018, Linaro Ltd. 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
-# distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
-# IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#
##
--
2.21.0.windows.1
^ permalink raw reply related [flat|nested] 63+ messages in thread* Re: [edk2-devel] [[edk2-platforms][PATCH V2] 07/30] Platform/Hisilicon: Replace BSD License with BSD+Patent License
2019-05-15 23:09 ` [[edk2-platforms][PATCH V2] 07/30] Platform/Hisilicon: " Michael D Kinney
@ 2019-05-17 10:59 ` Leif Lindholm
2019-05-19 7:31 ` Ming Huang
0 siblings, 1 reply; 63+ messages in thread
From: Leif Lindholm @ 2019-05-17 10:59 UTC (permalink / raw)
To: devel, michael.d.kinney, Ming Huang, Heyi Guo; +Cc: Ard Biesheuvel
On Wed, May 15, 2019 at 04:09:48PM -0700, Michael D Kinney wrote:
> https://bugzilla.tianocore.org/show_bug.cgi?id=1373
>
> Replace BSD 2-Clause License with BSD+Patent License. This change is
> based on the following emails:
>
> https://lists.01.org/pipermail/edk2-devel/2019-February/036260.html
> https://lists.01.org/pipermail/edk2-devel/2018-October/030385.html
>
> RFCs with detailed process for the license change:
>
> V3: https://lists.01.org/pipermail/edk2-devel/2019-March/038116.html
> V2: https://lists.01.org/pipermail/edk2-devel/2019-March/037669.html
> V1: https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html
As far as I can tell, this excludes 4 (iasl generated) .asl files
currently not displaying any explicit license at all.
This is correct, and as discussed offline, but it would be worth
pointing it out explicitly in the commit message.
Ming, Heyi - can you confirm that:
Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/D03Iort.asl
Silicon/Hisilicon/Hi1616/D05AcpiTables/D05Iort.asl
Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620Iort.asl
Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620IortNoSmmu.asl
were intended to be contributed with a 2-clause BSD license and under
TianoCore Contribution Agreement 1.1?
Other than that, looks good to me.
/
Leif
> Cc: Leif Lindholm <leif.lindholm@linaro.org>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
> ---
> .../SystemFirmwareUpdateConfig.ini | 8 +-------
> Platform/Hisilicon/D03/D03.dec | 8 +-------
> Platform/Hisilicon/D03/D03.dsc | 8 +-------
> Platform/Hisilicon/D03/D03.fdf | 8 +-------
> .../OemNicConfig2PHi1610/OemNicConfig.h | 8 +-------
> .../OemNicConfig2PHi1610/OemNicConfig2P.c | 8 +-------
> .../OemNicConfig2PHi1610/OemNicConfig2P.inf | 8 +-------
> .../SystemFirmwareDescriptor.aslc | 8 +-------
> .../SystemFirmwareDescriptor.inf | 8 +-------
> .../SystemFirmwareDescriptorPei.c | 8 +-------
> .../D03/EarlyConfigPeim/EarlyConfigPeimD03.c | 8 +-------
> .../EarlyConfigPeim/EarlyConfigPeimD03.inf | 8 +-------
> .../Hisilicon/D03/Include/Library/CpldD03.h | 8 +-------
> .../DS3231RealTimeClock.h | 8 +-------
> .../DS3231RealTimeClockLib.c | 8 +-------
> .../DS3231RealTimeClockLib.inf | 7 +------
> .../D03/Library/FdtUpdateLib/FdtUpdateLib.c | 8 +-------
> .../D03/Library/FdtUpdateLib/FdtUpdateLib.inf | 8 +-------
> .../OemMiscLib2P/BoardFeature2PHi1610.c | 8 +-------
> .../BoardFeature2PHi1610Strings.uni | Bin 4292 -> 3538 bytes
> .../Library/OemMiscLib2P/OemMiscLib2PHi1610.c | 8 +-------
> .../OemMiscLib2P/OemMiscLib2PHi1610.inf | 8 +-------
> .../Library/PlatformPciLib/PlatformPciLib.c | 8 +-------
> .../Library/PlatformPciLib/PlatformPciLib.inf | 7 +------
> .../SystemFirmwareUpdateConfig.ini | 8 +-------
> Platform/Hisilicon/D05/D05.dsc | 8 +-------
> Platform/Hisilicon/D05/D05.fdf | 8 +-------
> .../SystemFirmwareDescriptor.aslc | 8 +-------
> .../SystemFirmwareDescriptor.inf | 8 +-------
> .../SystemFirmwareDescriptorPei.c | 8 +-------
> .../D05/EarlyConfigPeim/EarlyConfigPeimD05.c | 8 +-------
> .../EarlyConfigPeim/EarlyConfigPeimD05.inf | 8 +-------
> .../Library/OemMiscLibD05/BoardFeatureD05.c | 8 +-------
> .../OemMiscLibD05/BoardFeatureD05Strings.uni | 8 +-------
> .../D05/Library/OemMiscLibD05/OemMiscLibD05.c | 8 +-------
> .../Library/OemMiscLibD05/OemMiscLibD05.inf | 8 +-------
> .../Library/PlatformPciLib/PlatformPciLib.c | 8 +-------
> .../Library/PlatformPciLib/PlatformPciLib.inf | 7 +------
> .../SystemFirmwareUpdateConfig.ini | 8 +-------
> Platform/Hisilicon/D06/D06.dec | 8 +-------
> Platform/Hisilicon/D06/D06.dsc | 8 +-------
> Platform/Hisilicon/D06/D06.fdf | 8 +-------
> .../OemNicConfig2PHi1620/OemNicConfig.h | 8 +-------
> .../OemNicConfig2PHi1620/OemNicConfig2P.c | 8 +-------
> .../OemNicConfig2PHi1620/OemNicConfig2P.inf | 8 +-------
> .../SystemFirmwareDescriptor.aslc | 8 +-------
> .../SystemFirmwareDescriptor.inf | 8 +-------
> .../SystemFirmwareDescriptorPei.c | 8 +-------
> .../D06/EarlyConfigPeim/EarlyConfigPeimD06.c | 8 +-------
> .../EarlyConfigPeim/EarlyConfigPeimD06.inf | 8 +-------
> .../Hisilicon/D06/Include/Library/CpldD06.h | 8 +-------
> .../Library/OemMiscLibD06/BoardFeatureD06.c | 8 +-------
> .../OemMiscLibD06/BoardFeatureD06Strings.uni | 8 +-------
> .../D06/Library/OemMiscLibD06/OemMiscLibD06.c | 8 +-------
> .../Library/OemMiscLibD06/OemMiscLibD06.inf | 8 +-------
> .../D06/Library/OemNicLib/OemNicLib.c | 8 +-------
> .../D06/Library/OemNicLib/OemNicLib.inf | 8 +-------
> .../PciHostBridgeLib/PciHostBridgeLib.c | 8 +-------
> .../PciHostBridgeLib/PciHostBridgeLib.inf | 7 +------
> Platform/Hisilicon/HiKey/HiKey.dec | 8 +-------
> Platform/Hisilicon/HiKey/HiKey.dsc | 8 +-------
> Platform/Hisilicon/HiKey/HiKey.fdf | 8 +-------
> Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.c | 8 +-------
> Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.h | 8 +-------
> .../Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.inf | 8 +-------
> .../HiKey/HiKeyGpioDxe/HiKeyGpioDxe.c | 8 +-------
> .../HiKey/HiKeyGpioDxe/HiKeyGpioDxe.inf | 8 +-------
> .../Hisilicon/HiKey/Include/ArmPlatform.h | 8 +-------
> .../Hisilicon/HiKey/Library/HiKeyLib/HiKey.c | 8 +-------
> .../HiKey/Library/HiKeyLib/HiKeyHelper.S | 8 +-------
> .../HiKey/Library/HiKeyLib/HiKeyLib.inf | 8 +-------
> .../HiKey/Library/HiKeyLib/HiKeyMem.c | 8 +-------
> Platform/Hisilicon/HiKey960/HiKey960.dec | 8 +-------
> Platform/Hisilicon/HiKey960/HiKey960.dsc | 8 +-------
> Platform/Hisilicon/HiKey960/HiKey960.fdf | 8 +-------
> .../HiKey960/HiKey960Dxe/HiKey960Dxe.c | 8 +-------
> .../HiKey960/HiKey960Dxe/HiKey960Dxe.h | 8 +-------
> .../HiKey960/HiKey960Dxe/HiKey960Dxe.inf | 8 +-------
> .../HiKey960GpioDxe/HiKey960GpioDxe.c | 8 +-------
> .../HiKey960GpioDxe/HiKey960GpioDxe.inf | 8 +-------
> .../HiKey960/Library/HiKey960Lib/HiKey960.c | 8 +-------
> .../Library/HiKey960Lib/HiKey960Helper.S | 8 +-------
> .../Library/HiKey960Lib/HiKey960Lib.inf | 8 +-------
> .../Library/HiKey960Lib/HiKey960Mem.c | 8 +-------
> .../PciHostBridgeLib/PciHostBridgeLib.c | 8 +-------
> .../PciHostBridgeLib/PciHostBridgeLib.inf | 8 +-------
> 86 files changed, 85 insertions(+), 591 deletions(-)
>
> diff --git a/Platform/Hisilicon/D03/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini b/Platform/Hisilicon/D03/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini
> index fc834d9c7c..dd575965c6 100644
> --- a/Platform/Hisilicon/D03/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini
> +++ b/Platform/Hisilicon/D03/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini
> @@ -3,13 +3,7 @@
> # Copyright (c) 2018, Linaro Limited. All rights reserved.
> # Copyright (c) 2016, 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 distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Platform/Hisilicon/D03/D03.dec b/Platform/Hisilicon/D03/D03.dec
> index 8b08a32773..206a632d5b 100644
> --- a/Platform/Hisilicon/D03/D03.dec
> +++ b/Platform/Hisilicon/D03/D03.dec
> @@ -3,13 +3,7 @@
> # Copyright (c) 2015, Hisilicon Limited. All rights reserved.
> # Copyright (c) 2015, Linaro Limited. All rights reserved.
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD License
> -# which accompanies this distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> #**/
>
> diff --git a/Platform/Hisilicon/D03/D03.dsc b/Platform/Hisilicon/D03/D03.dsc
> index 07ff461277..60b0d6393e 100644
> --- a/Platform/Hisilicon/D03/D03.dsc
> +++ b/Platform/Hisilicon/D03/D03.dsc
> @@ -3,13 +3,7 @@
> # Copyright (c) 2015, Hisilicon Limited. All rights reserved.
> # Copyright (c) 2015, Linaro Limited. All rights reserved.
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD License
> -# which accompanies this distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> #
>
> diff --git a/Platform/Hisilicon/D03/D03.fdf b/Platform/Hisilicon/D03/D03.fdf
> index 3f07b2e577..f5d0c66f63 100644
> --- a/Platform/Hisilicon/D03/D03.fdf
> +++ b/Platform/Hisilicon/D03/D03.fdf
> @@ -3,13 +3,7 @@
> # Copyright (c) 2015, Hisilicon Limited. All rights reserved.
> # Copyright (c) 2015, Linaro Limited. All rights reserved.
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD License
> -# which accompanies this distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
>
> [DEFINES]
> diff --git a/Platform/Hisilicon/D03/Drivers/OemNicConfig2PHi1610/OemNicConfig.h b/Platform/Hisilicon/D03/Drivers/OemNicConfig2PHi1610/OemNicConfig.h
> index 46c77d3061..94d904c35f 100644
> --- a/Platform/Hisilicon/D03/Drivers/OemNicConfig2PHi1610/OemNicConfig.h
> +++ b/Platform/Hisilicon/D03/Drivers/OemNicConfig2PHi1610/OemNicConfig.h
> @@ -3,13 +3,7 @@
> * Copyright (c) 2016, Hisilicon Limited. All rights reserved.
> * Copyright (c) 2016, Linaro Limited. All rights reserved.
> *
> -* This program and the accompanying materials
> -* are licensed and made available under the terms and conditions of the BSD License
> -* which accompanies this distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/Hisilicon/D03/Drivers/OemNicConfig2PHi1610/OemNicConfig2P.c b/Platform/Hisilicon/D03/Drivers/OemNicConfig2PHi1610/OemNicConfig2P.c
> index dcaf3aa827..814378b39b 100644
> --- a/Platform/Hisilicon/D03/Drivers/OemNicConfig2PHi1610/OemNicConfig2P.c
> +++ b/Platform/Hisilicon/D03/Drivers/OemNicConfig2PHi1610/OemNicConfig2P.c
> @@ -3,13 +3,7 @@
> * Copyright (c) 2016, Hisilicon Limited. All rights reserved.
> * Copyright (c) 2016, Linaro Limited. All rights reserved.
> *
> -* This program and the accompanying materials
> -* are licensed and made available under the terms and conditions of the BSD License
> -* which accompanies this distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/Hisilicon/D03/Drivers/OemNicConfig2PHi1610/OemNicConfig2P.inf b/Platform/Hisilicon/D03/Drivers/OemNicConfig2PHi1610/OemNicConfig2P.inf
> index ee5596a4ce..1071f5d651 100644
> --- a/Platform/Hisilicon/D03/Drivers/OemNicConfig2PHi1610/OemNicConfig2P.inf
> +++ b/Platform/Hisilicon/D03/Drivers/OemNicConfig2PHi1610/OemNicConfig2P.inf
> @@ -3,13 +3,7 @@
> # Copyright (c) 2016, Hisilicon Limited. All rights reserved.
> # Copyright (c) 2016, Linaro Limited. All rights reserved.
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD License
> -# which accompanies this distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> #**/
>
> diff --git a/Platform/Hisilicon/D03/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc b/Platform/Hisilicon/D03/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc
> index 2589e20a43..52149b1ed0 100644
> --- a/Platform/Hisilicon/D03/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc
> +++ b/Platform/Hisilicon/D03/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc
> @@ -5,13 +5,7 @@
> Copyright (c) 2018, Linaro Limited. All rights reserved.
> Copyright (c) 2016, 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 distribution. The full text of the license may be found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/Hisilicon/D03/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf b/Platform/Hisilicon/D03/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf
> index fc1832fa5f..6756814574 100644
> --- a/Platform/Hisilicon/D03/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf
> +++ b/Platform/Hisilicon/D03/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf
> @@ -5,13 +5,7 @@
> # Copyright (c) 2018, Linaro Limited. All rights reserved.
> # Copyright (c) 2016, 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 distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Platform/Hisilicon/D03/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c b/Platform/Hisilicon/D03/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c
> index 27c0a718f8..77f631d5d6 100644
> --- a/Platform/Hisilicon/D03/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c
> +++ b/Platform/Hisilicon/D03/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c
> @@ -5,13 +5,7 @@
> Copyright (c) 2018, Linaro Limited. All rights reserved.
> Copyright (c) 2016, 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 distribution. The full text of the license may be found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/Hisilicon/D03/EarlyConfigPeim/EarlyConfigPeimD03.c b/Platform/Hisilicon/D03/EarlyConfigPeim/EarlyConfigPeimD03.c
> index dacd9e871f..75b6dec34b 100644
> --- a/Platform/Hisilicon/D03/EarlyConfigPeim/EarlyConfigPeimD03.c
> +++ b/Platform/Hisilicon/D03/EarlyConfigPeim/EarlyConfigPeimD03.c
> @@ -3,13 +3,7 @@
> * Copyright (c) 2016, Hisilicon Limited. All rights reserved.
> * Copyright (c) 2016, Linaro Limited. All rights reserved.
> *
> -* This program and the accompanying materials
> -* are licensed and made available under the terms and conditions of the BSD License
> -* which accompanies this distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/Hisilicon/D03/EarlyConfigPeim/EarlyConfigPeimD03.inf b/Platform/Hisilicon/D03/EarlyConfigPeim/EarlyConfigPeimD03.inf
> index 90e40ae2b3..1f992024ac 100644
> --- a/Platform/Hisilicon/D03/EarlyConfigPeim/EarlyConfigPeimD03.inf
> +++ b/Platform/Hisilicon/D03/EarlyConfigPeim/EarlyConfigPeimD03.inf
> @@ -3,13 +3,7 @@
> # Copyright (c) 2016, Hisilicon Limited. All rights reserved.
> # Copyright (c) 2016, Linaro Limited. All rights reserved.
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD License
> -# which accompanies this distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> #**/
>
> diff --git a/Platform/Hisilicon/D03/Include/Library/CpldD03.h b/Platform/Hisilicon/D03/Include/Library/CpldD03.h
> index 456bf4b5c9..fce3319c44 100644
> --- a/Platform/Hisilicon/D03/Include/Library/CpldD03.h
> +++ b/Platform/Hisilicon/D03/Include/Library/CpldD03.h
> @@ -3,13 +3,7 @@
> * Copyright (c) 2015, Hisilicon Limited. All rights reserved.
> * Copyright (c) 2015, Linaro Limited. All rights reserved.
> *
> -* This program and the accompanying materials
> -* are licensed and made available under the terms and conditions of the BSD License
> -* which accompanies this distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/Hisilicon/D03/Library/DS3231RealTimeClockLib/DS3231RealTimeClock.h b/Platform/Hisilicon/D03/Library/DS3231RealTimeClockLib/DS3231RealTimeClock.h
> index d1e6c41dd7..da18d0f558 100644
> --- a/Platform/Hisilicon/D03/Library/DS3231RealTimeClockLib/DS3231RealTimeClock.h
> +++ b/Platform/Hisilicon/D03/Library/DS3231RealTimeClockLib/DS3231RealTimeClock.h
> @@ -4,13 +4,7 @@
> * Copyright (c) 2015, Hisilicon Limited. All rights reserved.
> * Copyright (c) 2015, Linaro Limited. All rights reserved.
> *
> -* This program and the accompanying materials
> -* are licensed and made available under the terms and conditions of the BSD License
> -* which accompanies this distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> * Based on the files under ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.inf
> **/
> diff --git a/Platform/Hisilicon/D03/Library/DS3231RealTimeClockLib/DS3231RealTimeClockLib.c b/Platform/Hisilicon/D03/Library/DS3231RealTimeClockLib/DS3231RealTimeClockLib.c
> index f6dbcf6b75..898335a7b7 100644
> --- a/Platform/Hisilicon/D03/Library/DS3231RealTimeClockLib/DS3231RealTimeClockLib.c
> +++ b/Platform/Hisilicon/D03/Library/DS3231RealTimeClockLib/DS3231RealTimeClockLib.c
> @@ -8,13 +8,7 @@
> Copyright (c) 2015, Hisilicon Limited. All rights reserved.<BR>
> Copyright (c) 2015, Linaro Limited. 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 distribution. The full text of the license may be found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> Based on the files under ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.inf
>
> diff --git a/Platform/Hisilicon/D03/Library/DS3231RealTimeClockLib/DS3231RealTimeClockLib.inf b/Platform/Hisilicon/D03/Library/DS3231RealTimeClockLib/DS3231RealTimeClockLib.inf
> index ae7116dc31..29c6ecf98b 100644
> --- a/Platform/Hisilicon/D03/Library/DS3231RealTimeClockLib/DS3231RealTimeClockLib.inf
> +++ b/Platform/Hisilicon/D03/Library/DS3231RealTimeClockLib/DS3231RealTimeClockLib.inf
> @@ -5,12 +5,7 @@
> # Copyright (c) 2016, Hisilicon Limited. All rights reserved.<BR>
> # Copyright (c) 2016, Linaro Limited. 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 distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> #
> #**/
> diff --git a/Platform/Hisilicon/D03/Library/FdtUpdateLib/FdtUpdateLib.c b/Platform/Hisilicon/D03/Library/FdtUpdateLib/FdtUpdateLib.c
> index d00cb9b2ab..a242e4bd9a 100755
> --- a/Platform/Hisilicon/D03/Library/FdtUpdateLib/FdtUpdateLib.c
> +++ b/Platform/Hisilicon/D03/Library/FdtUpdateLib/FdtUpdateLib.c
> @@ -3,13 +3,7 @@
> * Copyright (c) 2016, Hisilicon Limited. All rights reserved.
> * Copyright (c) 2016, Linaro Limited. All rights reserved.
> *
> -* This program and the accompanying materials
> -* are licensed and made available under the terms and conditions of the BSD License
> -* which accompanies this distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/Hisilicon/D03/Library/FdtUpdateLib/FdtUpdateLib.inf b/Platform/Hisilicon/D03/Library/FdtUpdateLib/FdtUpdateLib.inf
> index 2d9d53d149..e02c7b229a 100755
> --- a/Platform/Hisilicon/D03/Library/FdtUpdateLib/FdtUpdateLib.inf
> +++ b/Platform/Hisilicon/D03/Library/FdtUpdateLib/FdtUpdateLib.inf
> @@ -3,13 +3,7 @@
> # Copyright (c) 2016, Hisilicon Limited. All rights reserved.
> # Copyright (c) 2016, Linaro Limited. All rights reserved.
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD License
> -# which accompanies this distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> #**/
>
> diff --git a/Platform/Hisilicon/D03/Library/OemMiscLib2P/BoardFeature2PHi1610.c b/Platform/Hisilicon/D03/Library/OemMiscLib2P/BoardFeature2PHi1610.c
> index 218b3540eb..1670cac1d4 100644
> --- a/Platform/Hisilicon/D03/Library/OemMiscLib2P/BoardFeature2PHi1610.c
> +++ b/Platform/Hisilicon/D03/Library/OemMiscLib2P/BoardFeature2PHi1610.c
> @@ -3,13 +3,7 @@
> * Copyright (c) 2015, Hisilicon Limited. All rights reserved.
> * Copyright (c) 2015, Linaro Limited. All rights reserved.
> *
> -* This program and the accompanying materials
> -* are licensed and made available under the terms and conditions of the BSD License
> -* which accompanies this distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/Hisilicon/D03/Library/OemMiscLib2P/BoardFeature2PHi1610Strings.uni b/Platform/Hisilicon/D03/Library/OemMiscLib2P/BoardFeature2PHi1610Strings.uni
> index 38def406b9485966b67944d615b8908c250dc2c6..3e321f98848ef80ad178dde66ea72366306d73e4 100644
> GIT binary patch
> delta 99
> zcmX@2cu9J~w(wwv00tL^2nJmSABIeZWQJ6RJceQ*smtKWkOJnF0L9aQIF+G@!HPkF
> j!HFRls6&^*2#B2-au^aBN})Oefb0^8p3VQ6kMaNjEm9Q<
>
> delta 859
> zcmZ9KO->t85QHmRl$?Oggf%hy>~NSQqksq5MkLFzJ;WpVC$gOoR&xdJg2V~n0-Pvc
> z_4qGn<oCK?S6A1o=a<8$_xF!=Ut?8TD$y@3G}lkoLR0cWGmY3+Aj-&x8iJUDbnTA5
> z8Tf>g0#r$7MKpo!Kqq|WSVZrH%8+PAtqj&RdmYWA02TT}Lj^&h0jr1p4iTo_328=6
> zL-a<Zg;{QekSbzdX|9{SzP5TgBR}60Q<qz<x8cN))w=(`YlRpS+Ka|5k6M!Z&I4p_
> z#<oBuva6PVLuJC}&QgC_Ux}(I?pxECc?WE;CYY~1u&C8m?3j4PLwpRQ=R}RUMlZtZ
> z7PnvUJSVRvEIAn<eWVXm>iyv@XvX}S*W0{dUtg6X=u%zf`oemu3-Sy*6Abm<=QLAW
> zS43%;e5DS1%DLTW7<Lbk=@Ye%dUa6egbB1>kJwFY+9URM<j#(_x4))p(mVzxx(3q?
> zVI9shIL(m9@GhC9`^+QzV2$z2o^r!J1NQJA?B6I^`7v?29@E?+)%PvYjy}VSOa4+G
> NdZyOHyEo5o{{i*wj{pDw
>
> diff --git a/Platform/Hisilicon/D03/Library/OemMiscLib2P/OemMiscLib2PHi1610.c b/Platform/Hisilicon/D03/Library/OemMiscLib2P/OemMiscLib2PHi1610.c
> index c8a9da73bb..1d9c3dfd49 100644
> --- a/Platform/Hisilicon/D03/Library/OemMiscLib2P/OemMiscLib2PHi1610.c
> +++ b/Platform/Hisilicon/D03/Library/OemMiscLib2P/OemMiscLib2PHi1610.c
> @@ -3,13 +3,7 @@
> * Copyright (c) 2015, Hisilicon Limited. All rights reserved.
> * Copyright (c) 2015, Linaro Limited. All rights reserved.
> *
> -* This program and the accompanying materials
> -* are licensed and made available under the terms and conditions of the BSD License
> -* which accompanies this distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/Hisilicon/D03/Library/OemMiscLib2P/OemMiscLib2PHi1610.inf b/Platform/Hisilicon/D03/Library/OemMiscLib2P/OemMiscLib2PHi1610.inf
> index c0195b2fa9..ab14597d8b 100644
> --- a/Platform/Hisilicon/D03/Library/OemMiscLib2P/OemMiscLib2PHi1610.inf
> +++ b/Platform/Hisilicon/D03/Library/OemMiscLib2P/OemMiscLib2PHi1610.inf
> @@ -3,13 +3,7 @@
> # Copyright (c) 2015, Hisilicon Limited. All rights reserved.
> # Copyright (c) 2015, Linaro Limited. All rights reserved.
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD License
> -# which accompanies this distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> #**/
>
> diff --git a/Platform/Hisilicon/D03/Library/PlatformPciLib/PlatformPciLib.c b/Platform/Hisilicon/D03/Library/PlatformPciLib/PlatformPciLib.c
> index 59c468ac4b..419eb878f3 100644
> --- a/Platform/Hisilicon/D03/Library/PlatformPciLib/PlatformPciLib.c
> +++ b/Platform/Hisilicon/D03/Library/PlatformPciLib/PlatformPciLib.c
> @@ -3,13 +3,7 @@
> Copyright (c) 2016, Hisilicon Limited. All rights reserved.<BR>
> Copyright (c) 2016, Linaro Limited. 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 distribution. The full text of the license may be found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/Hisilicon/D03/Library/PlatformPciLib/PlatformPciLib.inf b/Platform/Hisilicon/D03/Library/PlatformPciLib/PlatformPciLib.inf
> index 4d2dbbaf0d..63d57ec46d 100644
> --- a/Platform/Hisilicon/D03/Library/PlatformPciLib/PlatformPciLib.inf
> +++ b/Platform/Hisilicon/D03/Library/PlatformPciLib/PlatformPciLib.inf
> @@ -3,12 +3,7 @@
> # Copyright (c) 2016, Hisilicon Limited. All rights reserved.<BR>
> # Copyright (c) 2016, Linaro Limited. 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 distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> #
> ##
> diff --git a/Platform/Hisilicon/D05/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini b/Platform/Hisilicon/D05/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini
> index fc834d9c7c..dd575965c6 100644
> --- a/Platform/Hisilicon/D05/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini
> +++ b/Platform/Hisilicon/D05/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini
> @@ -3,13 +3,7 @@
> # Copyright (c) 2018, Linaro Limited. All rights reserved.
> # Copyright (c) 2016, 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 distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Platform/Hisilicon/D05/D05.dsc b/Platform/Hisilicon/D05/D05.dsc
> index 70b044c7e3..dc9e1407ba 100644
> --- a/Platform/Hisilicon/D05/D05.dsc
> +++ b/Platform/Hisilicon/D05/D05.dsc
> @@ -3,13 +3,7 @@
> # Copyright (c) 2015-2016, Hisilicon Limited. All rights reserved.
> # Copyright (c) 2015-2016, Linaro Limited. All rights reserved.
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD License
> -# which accompanies this distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> #
>
> diff --git a/Platform/Hisilicon/D05/D05.fdf b/Platform/Hisilicon/D05/D05.fdf
> index 9632aea4b0..812f7f2690 100644
> --- a/Platform/Hisilicon/D05/D05.fdf
> +++ b/Platform/Hisilicon/D05/D05.fdf
> @@ -3,13 +3,7 @@
> # Copyright (c) 2015-2016, Hisilicon Limited. All rights reserved.
> # Copyright (c) 2015-2016, Linaro Limited. All rights reserved.
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD License
> -# which accompanies this distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
>
> [DEFINES]
> diff --git a/Platform/Hisilicon/D05/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc b/Platform/Hisilicon/D05/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc
> index 5091c7a25d..210141d019 100644
> --- a/Platform/Hisilicon/D05/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc
> +++ b/Platform/Hisilicon/D05/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc
> @@ -5,13 +5,7 @@
> Copyright (c) 2018, Linaro Limited. All rights reserved.
> Copyright (c) 2016, 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 distribution. The full text of the license may be found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/Hisilicon/D05/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf b/Platform/Hisilicon/D05/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf
> index fc1832fa5f..6756814574 100644
> --- a/Platform/Hisilicon/D05/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf
> +++ b/Platform/Hisilicon/D05/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf
> @@ -5,13 +5,7 @@
> # Copyright (c) 2018, Linaro Limited. All rights reserved.
> # Copyright (c) 2016, 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 distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Platform/Hisilicon/D05/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c b/Platform/Hisilicon/D05/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c
> index 27c0a718f8..77f631d5d6 100644
> --- a/Platform/Hisilicon/D05/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c
> +++ b/Platform/Hisilicon/D05/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c
> @@ -5,13 +5,7 @@
> Copyright (c) 2018, Linaro Limited. All rights reserved.
> Copyright (c) 2016, 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 distribution. The full text of the license may be found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/Hisilicon/D05/EarlyConfigPeim/EarlyConfigPeimD05.c b/Platform/Hisilicon/D05/EarlyConfigPeim/EarlyConfigPeimD05.c
> index b374347e5c..05aefc90f7 100644
> --- a/Platform/Hisilicon/D05/EarlyConfigPeim/EarlyConfigPeimD05.c
> +++ b/Platform/Hisilicon/D05/EarlyConfigPeim/EarlyConfigPeimD05.c
> @@ -3,13 +3,7 @@
> * Copyright (c) 2016, Hisilicon Limited. All rights reserved.
> * Copyright (c) 2016, Linaro Limited. All rights reserved.
> *
> -* This program and the accompanying materials
> -* are licensed and made available under the terms and conditions of the BSD License
> -* which accompanies this distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/Hisilicon/D05/EarlyConfigPeim/EarlyConfigPeimD05.inf b/Platform/Hisilicon/D05/EarlyConfigPeim/EarlyConfigPeimD05.inf
> index e82c9204d5..c42d0dd6cd 100644
> --- a/Platform/Hisilicon/D05/EarlyConfigPeim/EarlyConfigPeimD05.inf
> +++ b/Platform/Hisilicon/D05/EarlyConfigPeim/EarlyConfigPeimD05.inf
> @@ -3,13 +3,7 @@
> # Copyright (c) 2016, Hisilicon Limited. All rights reserved.
> # Copyright (c) 2016, Linaro Limited. All rights reserved.
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD License
> -# which accompanies this distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> #**/
>
> diff --git a/Platform/Hisilicon/D05/Library/OemMiscLibD05/BoardFeatureD05.c b/Platform/Hisilicon/D05/Library/OemMiscLibD05/BoardFeatureD05.c
> index 1a9ed620c8..ac013ca308 100644
> --- a/Platform/Hisilicon/D05/Library/OemMiscLibD05/BoardFeatureD05.c
> +++ b/Platform/Hisilicon/D05/Library/OemMiscLibD05/BoardFeatureD05.c
> @@ -3,13 +3,7 @@
> * Copyright (c) 2016, Hisilicon Limited. All rights reserved.
> * Copyright (c) 2016, Linaro Limited. All rights reserved.
> *
> -* This program and the accompanying materials
> -* are licensed and made available under the terms and conditions of the BSD License
> -* which accompanies this distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/Hisilicon/D05/Library/OemMiscLibD05/BoardFeatureD05Strings.uni b/Platform/Hisilicon/D05/Library/OemMiscLibD05/BoardFeatureD05Strings.uni
> index 9f5be02d8a..8b36905f0f 100644
> --- a/Platform/Hisilicon/D05/Library/OemMiscLibD05/BoardFeatureD05Strings.uni
> +++ b/Platform/Hisilicon/D05/Library/OemMiscLibD05/BoardFeatureD05Strings.uni
> @@ -3,13 +3,7 @@
> // Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
> // Copyright (c) 2016, Hisilicon Limited. All rights reserved.
> //
> -// This program and the accompanying materials
> -// are licensed and made available under the terms and conditions of the BSD License
> -// which accompanies this distribution. The full text of the license may be found at
> -// http://opensource.org/licenses/bsd-license.php
> -//
> -// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +// SPDX-License-Identifier: BSD-2-Clause-Patent
> //
> // --*/
>
> diff --git a/Platform/Hisilicon/D05/Library/OemMiscLibD05/OemMiscLibD05.c b/Platform/Hisilicon/D05/Library/OemMiscLibD05/OemMiscLibD05.c
> index a1458da7f0..2ee15dbc7b 100644
> --- a/Platform/Hisilicon/D05/Library/OemMiscLibD05/OemMiscLibD05.c
> +++ b/Platform/Hisilicon/D05/Library/OemMiscLibD05/OemMiscLibD05.c
> @@ -3,13 +3,7 @@
> * Copyright (c) 2016 - 2018, Hisilicon Limited. All rights reserved.
> * Copyright (c) 2016 - 2018, Linaro Limited. All rights reserved.
> *
> -* This program and the accompanying materials
> -* are licensed and made available under the terms and conditions of the BSD License
> -* which accompanies this distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/Hisilicon/D05/Library/OemMiscLibD05/OemMiscLibD05.inf b/Platform/Hisilicon/D05/Library/OemMiscLibD05/OemMiscLibD05.inf
> index 7ec5775306..d471102199 100644
> --- a/Platform/Hisilicon/D05/Library/OemMiscLibD05/OemMiscLibD05.inf
> +++ b/Platform/Hisilicon/D05/Library/OemMiscLibD05/OemMiscLibD05.inf
> @@ -3,13 +3,7 @@
> # Copyright (c) 2016, Hisilicon Limited. All rights reserved.
> # Copyright (c) 2016, Linaro Limited. All rights reserved.
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD License
> -# which accompanies this distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> #**/
>
> diff --git a/Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.c b/Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.c
> index 0dc988a1d3..18d2bf2f98 100644
> --- a/Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.c
> +++ b/Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.c
> @@ -3,13 +3,7 @@
> Copyright (c) 2016, Hisilicon Limited. All rights reserved.<BR>
> Copyright (c) 2016, Linaro Limited. 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 distribution. The full text of the license may be found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.inf b/Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.inf
> index 21bb33a318..e20d350cd5 100644
> --- a/Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.inf
> +++ b/Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.inf
> @@ -3,12 +3,7 @@
> # Copyright (c) 2016, Hisilicon Limited. All rights reserved.<BR>
> # Copyright (c) 2016, Linaro Limited. 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 distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> #
> ##
> diff --git a/Platform/Hisilicon/D06/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini b/Platform/Hisilicon/D06/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini
> index 80f253b235..af7d57fd6e 100644
> --- a/Platform/Hisilicon/D06/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini
> +++ b/Platform/Hisilicon/D06/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini
> @@ -3,13 +3,7 @@
> # Copyright (c) 2018, Linaro Limited. All rights reserved.
> # Copyright (c) 2016, 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 distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Platform/Hisilicon/D06/D06.dec b/Platform/Hisilicon/D06/D06.dec
> index 710f083eee..64607fed0e 100644
> --- a/Platform/Hisilicon/D06/D06.dec
> +++ b/Platform/Hisilicon/D06/D06.dec
> @@ -3,13 +3,7 @@
> # Copyright (c) 2018, Hisilicon Limited. All rights reserved.
> # Copyright (c) 2018, Linaro Limited. All rights reserved.
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD License
> -# which accompanies this distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> #**/
>
> diff --git a/Platform/Hisilicon/D06/D06.dsc b/Platform/Hisilicon/D06/D06.dsc
> index 73bea728b0..5387daf553 100644
> --- a/Platform/Hisilicon/D06/D06.dsc
> +++ b/Platform/Hisilicon/D06/D06.dsc
> @@ -3,13 +3,7 @@
> # Copyright (c) 2018, Hisilicon Limited. All rights reserved.
> # Copyright (c) 2018, Linaro Limited. All rights reserved.
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD License
> -# which accompanies this distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> #
>
> diff --git a/Platform/Hisilicon/D06/D06.fdf b/Platform/Hisilicon/D06/D06.fdf
> index e402628a1b..976b597647 100644
> --- a/Platform/Hisilicon/D06/D06.fdf
> +++ b/Platform/Hisilicon/D06/D06.fdf
> @@ -3,13 +3,7 @@
> # Copyright (c) 2017 - 2018, Hisilicon Limited. All rights reserved.
> # Copyright (c) 2017 - 2018, Linaro Limited. All rights reserved.
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD License
> -# which accompanies this distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
>
> [DEFINES]
> diff --git a/Platform/Hisilicon/D06/Drivers/OemNicConfig2PHi1620/OemNicConfig.h b/Platform/Hisilicon/D06/Drivers/OemNicConfig2PHi1620/OemNicConfig.h
> index 35228fdf1d..40bd87e5c8 100644
> --- a/Platform/Hisilicon/D06/Drivers/OemNicConfig2PHi1620/OemNicConfig.h
> +++ b/Platform/Hisilicon/D06/Drivers/OemNicConfig2PHi1620/OemNicConfig.h
> @@ -3,13 +3,7 @@
> * Copyright (c) 2016-2018, Hisilicon Limited. All rights reserved.
> * Copyright (c) 2016-2018, Linaro Limited. All rights reserved.
> *
> -* This program and the accompanying materials
> -* are licensed and made available under the terms and conditions of the BSD License
> -* which accompanies this distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/Hisilicon/D06/Drivers/OemNicConfig2PHi1620/OemNicConfig2P.c b/Platform/Hisilicon/D06/Drivers/OemNicConfig2PHi1620/OemNicConfig2P.c
> index c01c49150a..c5c3290130 100644
> --- a/Platform/Hisilicon/D06/Drivers/OemNicConfig2PHi1620/OemNicConfig2P.c
> +++ b/Platform/Hisilicon/D06/Drivers/OemNicConfig2PHi1620/OemNicConfig2P.c
> @@ -3,13 +3,7 @@
> * Copyright (c) 2016-2018, Hisilicon Limited. All rights reserved.
> * Copyright (c) 2016-2018, Linaro Limited. All rights reserved.
> *
> -* This program and the accompanying materials
> -* are licensed and made available under the terms and conditions of the BSD License
> -* which accompanies this distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/Hisilicon/D06/Drivers/OemNicConfig2PHi1620/OemNicConfig2P.inf b/Platform/Hisilicon/D06/Drivers/OemNicConfig2PHi1620/OemNicConfig2P.inf
> index a91f2b6005..ebc7e7791e 100644
> --- a/Platform/Hisilicon/D06/Drivers/OemNicConfig2PHi1620/OemNicConfig2P.inf
> +++ b/Platform/Hisilicon/D06/Drivers/OemNicConfig2PHi1620/OemNicConfig2P.inf
> @@ -3,13 +3,7 @@
> # Copyright (c) 2016-2018, Hisilicon Limited. All rights reserved.
> # Copyright (c) 2016-2018, Linaro Limited. All rights reserved.
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD License
> -# which accompanies this distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> #**/
>
> diff --git a/Platform/Hisilicon/D06/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc b/Platform/Hisilicon/D06/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc
> index 1287dfd834..63ce447292 100644
> --- a/Platform/Hisilicon/D06/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc
> +++ b/Platform/Hisilicon/D06/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc
> @@ -5,13 +5,7 @@
> Copyright (c) 2018, Linaro Limited. All rights reserved.
> Copyright (c) 2016, 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 distribution. The full text of the license may be found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/Hisilicon/D06/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf b/Platform/Hisilicon/D06/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf
> index fc1832fa5f..6756814574 100644
> --- a/Platform/Hisilicon/D06/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf
> +++ b/Platform/Hisilicon/D06/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf
> @@ -5,13 +5,7 @@
> # Copyright (c) 2018, Linaro Limited. All rights reserved.
> # Copyright (c) 2016, 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 distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Platform/Hisilicon/D06/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c b/Platform/Hisilicon/D06/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c
> index 27c0a718f8..77f631d5d6 100644
> --- a/Platform/Hisilicon/D06/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c
> +++ b/Platform/Hisilicon/D06/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c
> @@ -5,13 +5,7 @@
> Copyright (c) 2018, Linaro Limited. All rights reserved.
> Copyright (c) 2016, 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 distribution. The full text of the license may be found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/Hisilicon/D06/EarlyConfigPeim/EarlyConfigPeimD06.c b/Platform/Hisilicon/D06/EarlyConfigPeim/EarlyConfigPeimD06.c
> index a8261d3706..72f30ff075 100644
> --- a/Platform/Hisilicon/D06/EarlyConfigPeim/EarlyConfigPeimD06.c
> +++ b/Platform/Hisilicon/D06/EarlyConfigPeim/EarlyConfigPeimD06.c
> @@ -3,13 +3,7 @@
> * Copyright (c) 2018, Hisilicon Limited. All rights reserved.
> * Copyright (c) 2018, Linaro Limited. All rights reserved.
> *
> -* This program and the accompanying materials
> -* are licensed and made available under the terms and conditions of the BSD License
> -* which accompanies this distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/Hisilicon/D06/EarlyConfigPeim/EarlyConfigPeimD06.inf b/Platform/Hisilicon/D06/EarlyConfigPeim/EarlyConfigPeimD06.inf
> index 715a4efadd..8eaec842c8 100644
> --- a/Platform/Hisilicon/D06/EarlyConfigPeim/EarlyConfigPeimD06.inf
> +++ b/Platform/Hisilicon/D06/EarlyConfigPeim/EarlyConfigPeimD06.inf
> @@ -3,13 +3,7 @@
> # Copyright (c) 2018, Hisilicon Limited. All rights reserved.
> # Copyright (c) 2017, Linaro Limited. All rights reserved.
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD License
> -# which accompanies this distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> #**/
>
> diff --git a/Platform/Hisilicon/D06/Include/Library/CpldD06.h b/Platform/Hisilicon/D06/Include/Library/CpldD06.h
> index 8eb333de52..e5adfb316f 100644
> --- a/Platform/Hisilicon/D06/Include/Library/CpldD06.h
> +++ b/Platform/Hisilicon/D06/Include/Library/CpldD06.h
> @@ -3,13 +3,7 @@
> Copyright (c) 2018, Hisilicon Limited. All rights reserved.<BR>
> Copyright (c) 2018, Linaro Limited. 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 distribution. The full text of the license may be found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/Hisilicon/D06/Library/OemMiscLibD06/BoardFeatureD06.c b/Platform/Hisilicon/D06/Library/OemMiscLibD06/BoardFeatureD06.c
> index c28ac6266f..980eabfe33 100644
> --- a/Platform/Hisilicon/D06/Library/OemMiscLibD06/BoardFeatureD06.c
> +++ b/Platform/Hisilicon/D06/Library/OemMiscLibD06/BoardFeatureD06.c
> @@ -3,13 +3,7 @@
> * Copyright (c) 2018, Hisilicon Limited. All rights reserved.
> * Copyright (c) 2018, Linaro Limited. All rights reserved.
> *
> -* This program and the accompanying materials
> -* are licensed and made available under the terms and conditions of the BSD License
> -* which accompanies this distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/Hisilicon/D06/Library/OemMiscLibD06/BoardFeatureD06Strings.uni b/Platform/Hisilicon/D06/Library/OemMiscLibD06/BoardFeatureD06Strings.uni
> index e3fa5fa5ab..3696d1f11e 100644
> --- a/Platform/Hisilicon/D06/Library/OemMiscLibD06/BoardFeatureD06Strings.uni
> +++ b/Platform/Hisilicon/D06/Library/OemMiscLibD06/BoardFeatureD06Strings.uni
> @@ -4,13 +4,7 @@
> * Copyright (c) 2018, Hisilicon Limited. All rights reserved.
> * Copyright (c) 2018, Linaro Limited. All rights reserved.
> //
> -// This program and the accompanying materials
> -// are licensed and made available under the terms and conditions of the BSD License
> -// which accompanies this distribution. The full text of the license may be found at
> -// http://opensource.org/licenses/bsd-license.php
> -//
> -// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +// SPDX-License-Identifier: BSD-2-Clause-Patent
> //
> // --*/
>
> diff --git a/Platform/Hisilicon/D06/Library/OemMiscLibD06/OemMiscLibD06.c b/Platform/Hisilicon/D06/Library/OemMiscLibD06/OemMiscLibD06.c
> index 758157525f..1b0a2180c1 100644
> --- a/Platform/Hisilicon/D06/Library/OemMiscLibD06/OemMiscLibD06.c
> +++ b/Platform/Hisilicon/D06/Library/OemMiscLibD06/OemMiscLibD06.c
> @@ -3,13 +3,7 @@
> * Copyright (c) 2018, Hisilicon Limited. All rights reserved.
> * Copyright (c) 2018, Linaro Limited. All rights reserved.
> *
> -* This program and the accompanying materials
> -* are licensed and made available under the terms and conditions of the BSD License
> -* which accompanies this distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/Hisilicon/D06/Library/OemMiscLibD06/OemMiscLibD06.inf b/Platform/Hisilicon/D06/Library/OemMiscLibD06/OemMiscLibD06.inf
> index 9bc6eb549c..59373a9685 100644
> --- a/Platform/Hisilicon/D06/Library/OemMiscLibD06/OemMiscLibD06.inf
> +++ b/Platform/Hisilicon/D06/Library/OemMiscLibD06/OemMiscLibD06.inf
> @@ -3,13 +3,7 @@
> # Copyright (c) 2018, Hisilicon Limited. All rights reserved.
> # Copyright (c) 2018, Linaro Limited. All rights reserved.
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD License
> -# which accompanies this distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> #**/
>
> diff --git a/Platform/Hisilicon/D06/Library/OemNicLib/OemNicLib.c b/Platform/Hisilicon/D06/Library/OemNicLib/OemNicLib.c
> index 678c2107bd..42a5a08077 100644
> --- a/Platform/Hisilicon/D06/Library/OemNicLib/OemNicLib.c
> +++ b/Platform/Hisilicon/D06/Library/OemNicLib/OemNicLib.c
> @@ -3,13 +3,7 @@
> * Copyright (c) 2018, Hisilicon Limited. All rights reserved.
> * Copyright (c) 2017, Linaro Limited. All rights reserved.
> *
> -* This program and the accompanying materials
> -* are licensed and made available under the terms and conditions of the BSD License
> -* which accompanies this distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/Hisilicon/D06/Library/OemNicLib/OemNicLib.inf b/Platform/Hisilicon/D06/Library/OemNicLib/OemNicLib.inf
> index 3b0bd2d60c..c42f5d6e6a 100644
> --- a/Platform/Hisilicon/D06/Library/OemNicLib/OemNicLib.inf
> +++ b/Platform/Hisilicon/D06/Library/OemNicLib/OemNicLib.inf
> @@ -3,13 +3,7 @@
> # Copyright (c) 2018, Hisilicon Limited. All rights reserved.
> # Copyright (c) 2017, Linaro Limited. All rights reserved.
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD License
> -# which accompanies this distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> #**/
>
> diff --git a/Platform/Hisilicon/D06/Library/PciHostBridgeLib/PciHostBridgeLib.c b/Platform/Hisilicon/D06/Library/PciHostBridgeLib/PciHostBridgeLib.c
> index d13178e925..c44959b7f1 100644
> --- a/Platform/Hisilicon/D06/Library/PciHostBridgeLib/PciHostBridgeLib.c
> +++ b/Platform/Hisilicon/D06/Library/PciHostBridgeLib/PciHostBridgeLib.c
> @@ -3,13 +3,7 @@
> Copyright (c) 2018, Hisilicon Limited. All rights reserved.<BR>
> Copyright (c) 2018, Linaro Limited. 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 distribution. The full text of the license may be found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include <PiDxe.h>
> diff --git a/Platform/Hisilicon/D06/Library/PciHostBridgeLib/PciHostBridgeLib.inf b/Platform/Hisilicon/D06/Library/PciHostBridgeLib/PciHostBridgeLib.inf
> index 8a998681a3..d8d2940344 100644
> --- a/Platform/Hisilicon/D06/Library/PciHostBridgeLib/PciHostBridgeLib.inf
> +++ b/Platform/Hisilicon/D06/Library/PciHostBridgeLib/PciHostBridgeLib.inf
> @@ -3,12 +3,7 @@
> # Copyright (c) 2018, Hisilicon Limited. All rights reserved.<BR>
> # Copyright (c) 2018, Linaro Limited. 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 distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> #
> ##
> diff --git a/Platform/Hisilicon/HiKey/HiKey.dec b/Platform/Hisilicon/HiKey/HiKey.dec
> index d5de1a1659..3164c4c223 100644
> --- a/Platform/Hisilicon/HiKey/HiKey.dec
> +++ b/Platform/Hisilicon/HiKey/HiKey.dec
> @@ -1,13 +1,7 @@
> #
> # Copyright (c) 2014-2018, Linaro Limited. All rights reserved.
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD License
> -# which accompanies this distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
>
> [Defines]
> diff --git a/Platform/Hisilicon/HiKey/HiKey.dsc b/Platform/Hisilicon/HiKey/HiKey.dsc
> index 7e05babb6c..44f21700dd 100644
> --- a/Platform/Hisilicon/HiKey/HiKey.dsc
> +++ b/Platform/Hisilicon/HiKey/HiKey.dsc
> @@ -1,13 +1,7 @@
> #
> # Copyright (c) 2014-2018, Linaro Limited. All rights reserved.
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD License
> -# which accompanies this distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
>
> ################################################################################
> diff --git a/Platform/Hisilicon/HiKey/HiKey.fdf b/Platform/Hisilicon/HiKey/HiKey.fdf
> index 7e6c8083bb..3d85f01eca 100644
> --- a/Platform/Hisilicon/HiKey/HiKey.fdf
> +++ b/Platform/Hisilicon/HiKey/HiKey.fdf
> @@ -1,13 +1,7 @@
> #
> # Copyright (c) 2014-2018, Linaro Limited. All rights reserved.
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD License
> -# which accompanies this distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
>
> ################################################################################
> diff --git a/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.c b/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.c
> index 2162b68529..47fbe02e53 100644
> --- a/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.c
> +++ b/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.c
> @@ -2,13 +2,7 @@
> *
> * Copyright (c) 2018, Linaro Ltd. All rights reserved.
> *
> -* This program and the accompanying materials
> -* are licensed and made available under the terms and conditions of the BSD License
> -* which accompanies this distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.h b/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.h
> index 0ababfa32e..954f31e461 100644
> --- a/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.h
> +++ b/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.h
> @@ -2,13 +2,7 @@
> *
> * Copyright (c) 2018, Linaro Ltd. All rights reserved.
> *
> -* This program and the accompanying materials
> -* are licensed and made available under the terms and conditions of the BSD License
> -* which accompanies this distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.inf b/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.inf
> index 4c4644a0fe..0181999a3b 100644
> --- a/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.inf
> +++ b/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.inf
> @@ -2,13 +2,7 @@
> # Copyright (c) 2013 - 2014, ARM Ltd. All rights reserved.
> # Copyright (c) 2018, Linaro Ltd. All rights reserved.
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD License
> -# which accompanies this distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
>
> [Defines]
> diff --git a/Platform/Hisilicon/HiKey/HiKeyGpioDxe/HiKeyGpioDxe.c b/Platform/Hisilicon/HiKey/HiKeyGpioDxe/HiKeyGpioDxe.c
> index be535f8f19..efdd76768b 100644
> --- a/Platform/Hisilicon/HiKey/HiKeyGpioDxe/HiKeyGpioDxe.c
> +++ b/Platform/Hisilicon/HiKey/HiKeyGpioDxe/HiKeyGpioDxe.c
> @@ -2,13 +2,7 @@
> *
> * Copyright (c) 2018, Linaro. All rights reserved.
> *
> -* This program and the accompanying materials
> -* are licensed and made available under the terms and conditions of the BSD License
> -* which accompanies this distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/Hisilicon/HiKey/HiKeyGpioDxe/HiKeyGpioDxe.inf b/Platform/Hisilicon/HiKey/HiKeyGpioDxe/HiKeyGpioDxe.inf
> index 2791b9f44c..3564b07633 100644
> --- a/Platform/Hisilicon/HiKey/HiKeyGpioDxe/HiKeyGpioDxe.inf
> +++ b/Platform/Hisilicon/HiKey/HiKeyGpioDxe/HiKeyGpioDxe.inf
> @@ -1,13 +1,7 @@
> #
> # Copyright (c) 2018, Linaro. All rights reserved.
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD License
> -# which accompanies this distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
>
> [Defines]
> diff --git a/Platform/Hisilicon/HiKey/Include/ArmPlatform.h b/Platform/Hisilicon/HiKey/Include/ArmPlatform.h
> index e60478f6b7..6962da30a3 100644
> --- a/Platform/Hisilicon/HiKey/Include/ArmPlatform.h
> +++ b/Platform/Hisilicon/HiKey/Include/ArmPlatform.h
> @@ -2,13 +2,7 @@
> *
> * Copyright (c) 2014-2017, Linaro Limited. All rights reserved.
> *
> -* This program and the accompanying materials
> -* are licensed and made available under the terms and conditions of the BSD License
> -* which accompanies this distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKey.c b/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKey.c
> index 6bf0d39bd4..801d633985 100644
> --- a/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKey.c
> +++ b/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKey.c
> @@ -2,13 +2,7 @@
> *
> * Copyright (c) 2014-2017, Linaro Limited. All rights reserved.
> *
> -* This program and the accompanying materials
> -* are licensed and made available under the terms and conditions of the BSD License
> -* which accompanies this distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyHelper.S b/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyHelper.S
> index 0e8f1bbacd..253b7c6e70 100644
> --- a/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyHelper.S
> +++ b/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyHelper.S
> @@ -1,13 +1,7 @@
> #
> # Copyright (c) 2014-2017, Linaro Limited. All rights reserved.
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD License
> -# which accompanies this distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> #
>
> diff --git a/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyLib.inf b/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyLib.inf
> index 6a47a4501e..18b74bc42e 100644
> --- a/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyLib.inf
> +++ b/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyLib.inf
> @@ -1,13 +1,7 @@
> #
> # Copyright (c) 2014-2017, Linaro Limited. All rights reserved.
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD License
> -# which accompanies this distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
>
> [Defines]
> diff --git a/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyMem.c b/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyMem.c
> index 0f6ad89a02..118c66942e 100644
> --- a/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyMem.c
> +++ b/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyMem.c
> @@ -2,13 +2,7 @@
> *
> * Copyright (c) 2014-2017, Linaro Limited. All rights reserved.
> *
> -* This program and the accompanying materials
> -* are licensed and made available under the terms and conditions of the BSD License
> -* which accompanies this distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/Hisilicon/HiKey960/HiKey960.dec b/Platform/Hisilicon/HiKey960/HiKey960.dec
> index aa5a0caf52..1273c28ed0 100644
> --- a/Platform/Hisilicon/HiKey960/HiKey960.dec
> +++ b/Platform/Hisilicon/HiKey960/HiKey960.dec
> @@ -1,13 +1,7 @@
> #
> # Copyright (c) 2018, Linaro Limited. All rights reserved.
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD License
> -# which accompanies this distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
>
> [Defines]
> diff --git a/Platform/Hisilicon/HiKey960/HiKey960.dsc b/Platform/Hisilicon/HiKey960/HiKey960.dsc
> index a4a1a371de..db6e5b918d 100644
> --- a/Platform/Hisilicon/HiKey960/HiKey960.dsc
> +++ b/Platform/Hisilicon/HiKey960/HiKey960.dsc
> @@ -1,13 +1,7 @@
> #
> # Copyright (c) 2018, Linaro Limited. All rights reserved.
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD License
> -# which accompanies this distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
>
> ################################################################################
> diff --git a/Platform/Hisilicon/HiKey960/HiKey960.fdf b/Platform/Hisilicon/HiKey960/HiKey960.fdf
> index 1b07284dc8..01ae18499f 100644
> --- a/Platform/Hisilicon/HiKey960/HiKey960.fdf
> +++ b/Platform/Hisilicon/HiKey960/HiKey960.fdf
> @@ -1,13 +1,7 @@
> #
> # Copyright (c) 2018, Linaro Limited. All rights reserved.
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD License
> -# which accompanies this distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
>
> ################################################################################
> diff --git a/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.c b/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.c
> index 47ec879861..8e94bec41c 100644
> --- a/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.c
> +++ b/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.c
> @@ -2,13 +2,7 @@
> *
> * Copyright (c) 2018, Linaro Ltd. All rights reserved.
> *
> -* This program and the accompanying materials
> -* are licensed and made available under the terms and conditions of the BSD License
> -* which accompanies this distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.h b/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.h
> index 630aabcb23..0629fa4a81 100644
> --- a/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.h
> +++ b/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.h
> @@ -2,13 +2,7 @@
> *
> * Copyright (c) 2018, Linaro Ltd. All rights reserved.
> *
> -* This program and the accompanying materials
> -* are licensed and made available under the terms and conditions of the BSD License
> -* which accompanies this distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.inf b/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.inf
> index 54105bdb3c..5e1c52b84b 100644
> --- a/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.inf
> +++ b/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.inf
> @@ -1,13 +1,7 @@
> #
> # Copyright (c) 2018, Linaro Limited. All rights reserved.
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD License
> -# which accompanies this distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
>
> [Defines]
> diff --git a/Platform/Hisilicon/HiKey960/HiKey960GpioDxe/HiKey960GpioDxe.c b/Platform/Hisilicon/HiKey960/HiKey960GpioDxe/HiKey960GpioDxe.c
> index b196455072..74f10bf9e6 100644
> --- a/Platform/Hisilicon/HiKey960/HiKey960GpioDxe/HiKey960GpioDxe.c
> +++ b/Platform/Hisilicon/HiKey960/HiKey960GpioDxe/HiKey960GpioDxe.c
> @@ -2,13 +2,7 @@
> *
> * Copyright (c) 2018, Linaro. All rights reserved.
> *
> -* This program and the accompanying materials
> -* are licensed and made available under the terms and conditions of the BSD License
> -* which accompanies this distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/Hisilicon/HiKey960/HiKey960GpioDxe/HiKey960GpioDxe.inf b/Platform/Hisilicon/HiKey960/HiKey960GpioDxe/HiKey960GpioDxe.inf
> index 5ea3747321..9fe2d2fe52 100644
> --- a/Platform/Hisilicon/HiKey960/HiKey960GpioDxe/HiKey960GpioDxe.inf
> +++ b/Platform/Hisilicon/HiKey960/HiKey960GpioDxe/HiKey960GpioDxe.inf
> @@ -1,13 +1,7 @@
> #
> # Copyright (c) 2018, Linaro. All rights reserved.
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD License
> -# which accompanies this distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
>
> [Defines]
> diff --git a/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960.c b/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960.c
> index 9ae4610a29..89cca920ad 100644
> --- a/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960.c
> +++ b/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960.c
> @@ -2,13 +2,7 @@
> *
> * Copyright (c) 2018, Linaro Limited. All rights reserved.
> *
> -* This program and the accompanying materials
> -* are licensed and made available under the terms and conditions of the BSD License
> -* which accompanies this distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960Helper.S b/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960Helper.S
> index eb85f67520..a3638cef4d 100644
> --- a/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960Helper.S
> +++ b/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960Helper.S
> @@ -1,13 +1,7 @@
> #
> # Copyright (c) 2018, Linaro Limited. All rights reserved.
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD License
> -# which accompanies this distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> #
>
> diff --git a/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960Lib.inf b/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960Lib.inf
> index e16e5a623b..81167c76f9 100644
> --- a/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960Lib.inf
> +++ b/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960Lib.inf
> @@ -1,13 +1,7 @@
> #
> # Copyright (c) 2018, Linaro Limited. All rights reserved.
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD License
> -# which accompanies this distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
>
> [Defines]
> diff --git a/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960Mem.c b/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960Mem.c
> index 0c37c3791a..68ca76688e 100644
> --- a/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960Mem.c
> +++ b/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960Mem.c
> @@ -2,13 +2,7 @@
> *
> * Copyright (c) 2018, Linaro Limited. All rights reserved.
> *
> -* This program and the accompanying materials
> -* are licensed and made available under the terms and conditions of the BSD License
> -* which accompanies this distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/Hisilicon/Library/PciHostBridgeLib/PciHostBridgeLib.c b/Platform/Hisilicon/Library/PciHostBridgeLib/PciHostBridgeLib.c
> index 6aff5cdd3d..1be7de5ccf 100644
> --- a/Platform/Hisilicon/Library/PciHostBridgeLib/PciHostBridgeLib.c
> +++ b/Platform/Hisilicon/Library/PciHostBridgeLib/PciHostBridgeLib.c
> @@ -4,13 +4,7 @@
> Copyright (c) 2018, Hisilicon Limited. All rights reserved.<BR>
> Copyright (c) 2017 - 2018, Linaro Ltd. 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
> - distribution. The full text of the license may be found at
> - http://opensource.org/licenses/bsd-license.php.
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT
> - WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include <PiDxe.h>
> diff --git a/Platform/Hisilicon/Library/PciHostBridgeLib/PciHostBridgeLib.inf b/Platform/Hisilicon/Library/PciHostBridgeLib/PciHostBridgeLib.inf
> index dd451cff33..6f2576c61c 100644
> --- a/Platform/Hisilicon/Library/PciHostBridgeLib/PciHostBridgeLib.inf
> +++ b/Platform/Hisilicon/Library/PciHostBridgeLib/PciHostBridgeLib.inf
> @@ -4,13 +4,7 @@
> # Copyright (c) 2018, Hisilicon Limited. All rights reserved.<BR>
> # Copyright (c) 2017 - 2018, Linaro Ltd. 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
> -# distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> -# IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> #
> ##
> --
> 2.21.0.windows.1
>
>
>
>
^ permalink raw reply [flat|nested] 63+ messages in thread* Re: [edk2-devel] [[edk2-platforms][PATCH V2] 07/30] Platform/Hisilicon: Replace BSD License with BSD+Patent License
2019-05-17 10:59 ` [edk2-devel] " Leif Lindholm
@ 2019-05-19 7:31 ` Ming Huang
0 siblings, 0 replies; 63+ messages in thread
From: Ming Huang @ 2019-05-19 7:31 UTC (permalink / raw)
To: Leif Lindholm, devel, michael.d.kinney, Heyi Guo
Cc: Ard Biesheuvel, wanghuiqiang
On 5/17/2019 6:59 PM, Leif Lindholm wrote:
> On Wed, May 15, 2019 at 04:09:48PM -0700, Michael D Kinney wrote:
>> https://bugzilla.tianocore.org/show_bug.cgi?id=1373
>>
>> Replace BSD 2-Clause License with BSD+Patent License. This change is
>> based on the following emails:
>>
>> https://lists.01.org/pipermail/edk2-devel/2019-February/036260.html
>> https://lists.01.org/pipermail/edk2-devel/2018-October/030385.html
>>
>> RFCs with detailed process for the license change:
>>
>> V3: https://lists.01.org/pipermail/edk2-devel/2019-March/038116.html
>> V2: https://lists.01.org/pipermail/edk2-devel/2019-March/037669.html
>> V1: https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html
>
> As far as I can tell, this excludes 4 (iasl generated) .asl files
> currently not displaying any explicit license at all.
>
> This is correct, and as discussed offline, but it would be worth
> pointing it out explicitly in the commit message.
>
> Ming, Heyi - can you confirm that:
>
> Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/D03Iort.asl
> Silicon/Hisilicon/Hi1616/D05AcpiTables/D05Iort.asl
> Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620Iort.asl
> Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620IortNoSmmu.asl
>
> were intended to be contributed with a 2-clause BSD license and under
> TianoCore Contribution Agreement 1.1?
Yes.
Thanks
>
> Other than that, looks good to me.
>
> /
> Leif
>
>> Cc: Leif Lindholm <leif.lindholm@linaro.org>
>> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
>> Contributed-under: TianoCore Contribution Agreement 1.1
>> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
>> ---
>> .../SystemFirmwareUpdateConfig.ini | 8 +-------
>> Platform/Hisilicon/D03/D03.dec | 8 +-------
>> Platform/Hisilicon/D03/D03.dsc | 8 +-------
>> Platform/Hisilicon/D03/D03.fdf | 8 +-------
>> .../OemNicConfig2PHi1610/OemNicConfig.h | 8 +-------
>> .../OemNicConfig2PHi1610/OemNicConfig2P.c | 8 +-------
>> .../OemNicConfig2PHi1610/OemNicConfig2P.inf | 8 +-------
>> .../SystemFirmwareDescriptor.aslc | 8 +-------
>> .../SystemFirmwareDescriptor.inf | 8 +-------
>> .../SystemFirmwareDescriptorPei.c | 8 +-------
>> .../D03/EarlyConfigPeim/EarlyConfigPeimD03.c | 8 +-------
>> .../EarlyConfigPeim/EarlyConfigPeimD03.inf | 8 +-------
>> .../Hisilicon/D03/Include/Library/CpldD03.h | 8 +-------
>> .../DS3231RealTimeClock.h | 8 +-------
>> .../DS3231RealTimeClockLib.c | 8 +-------
>> .../DS3231RealTimeClockLib.inf | 7 +------
>> .../D03/Library/FdtUpdateLib/FdtUpdateLib.c | 8 +-------
>> .../D03/Library/FdtUpdateLib/FdtUpdateLib.inf | 8 +-------
>> .../OemMiscLib2P/BoardFeature2PHi1610.c | 8 +-------
>> .../BoardFeature2PHi1610Strings.uni | Bin 4292 -> 3538 bytes
>> .../Library/OemMiscLib2P/OemMiscLib2PHi1610.c | 8 +-------
>> .../OemMiscLib2P/OemMiscLib2PHi1610.inf | 8 +-------
>> .../Library/PlatformPciLib/PlatformPciLib.c | 8 +-------
>> .../Library/PlatformPciLib/PlatformPciLib.inf | 7 +------
>> .../SystemFirmwareUpdateConfig.ini | 8 +-------
>> Platform/Hisilicon/D05/D05.dsc | 8 +-------
>> Platform/Hisilicon/D05/D05.fdf | 8 +-------
>> .../SystemFirmwareDescriptor.aslc | 8 +-------
>> .../SystemFirmwareDescriptor.inf | 8 +-------
>> .../SystemFirmwareDescriptorPei.c | 8 +-------
>> .../D05/EarlyConfigPeim/EarlyConfigPeimD05.c | 8 +-------
>> .../EarlyConfigPeim/EarlyConfigPeimD05.inf | 8 +-------
>> .../Library/OemMiscLibD05/BoardFeatureD05.c | 8 +-------
>> .../OemMiscLibD05/BoardFeatureD05Strings.uni | 8 +-------
>> .../D05/Library/OemMiscLibD05/OemMiscLibD05.c | 8 +-------
>> .../Library/OemMiscLibD05/OemMiscLibD05.inf | 8 +-------
>> .../Library/PlatformPciLib/PlatformPciLib.c | 8 +-------
>> .../Library/PlatformPciLib/PlatformPciLib.inf | 7 +------
>> .../SystemFirmwareUpdateConfig.ini | 8 +-------
>> Platform/Hisilicon/D06/D06.dec | 8 +-------
>> Platform/Hisilicon/D06/D06.dsc | 8 +-------
>> Platform/Hisilicon/D06/D06.fdf | 8 +-------
>> .../OemNicConfig2PHi1620/OemNicConfig.h | 8 +-------
>> .../OemNicConfig2PHi1620/OemNicConfig2P.c | 8 +-------
>> .../OemNicConfig2PHi1620/OemNicConfig2P.inf | 8 +-------
>> .../SystemFirmwareDescriptor.aslc | 8 +-------
>> .../SystemFirmwareDescriptor.inf | 8 +-------
>> .../SystemFirmwareDescriptorPei.c | 8 +-------
>> .../D06/EarlyConfigPeim/EarlyConfigPeimD06.c | 8 +-------
>> .../EarlyConfigPeim/EarlyConfigPeimD06.inf | 8 +-------
>> .../Hisilicon/D06/Include/Library/CpldD06.h | 8 +-------
>> .../Library/OemMiscLibD06/BoardFeatureD06.c | 8 +-------
>> .../OemMiscLibD06/BoardFeatureD06Strings.uni | 8 +-------
>> .../D06/Library/OemMiscLibD06/OemMiscLibD06.c | 8 +-------
>> .../Library/OemMiscLibD06/OemMiscLibD06.inf | 8 +-------
>> .../D06/Library/OemNicLib/OemNicLib.c | 8 +-------
>> .../D06/Library/OemNicLib/OemNicLib.inf | 8 +-------
>> .../PciHostBridgeLib/PciHostBridgeLib.c | 8 +-------
>> .../PciHostBridgeLib/PciHostBridgeLib.inf | 7 +------
>> Platform/Hisilicon/HiKey/HiKey.dec | 8 +-------
>> Platform/Hisilicon/HiKey/HiKey.dsc | 8 +-------
>> Platform/Hisilicon/HiKey/HiKey.fdf | 8 +-------
>> Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.c | 8 +-------
>> Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.h | 8 +-------
>> .../Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.inf | 8 +-------
>> .../HiKey/HiKeyGpioDxe/HiKeyGpioDxe.c | 8 +-------
>> .../HiKey/HiKeyGpioDxe/HiKeyGpioDxe.inf | 8 +-------
>> .../Hisilicon/HiKey/Include/ArmPlatform.h | 8 +-------
>> .../Hisilicon/HiKey/Library/HiKeyLib/HiKey.c | 8 +-------
>> .../HiKey/Library/HiKeyLib/HiKeyHelper.S | 8 +-------
>> .../HiKey/Library/HiKeyLib/HiKeyLib.inf | 8 +-------
>> .../HiKey/Library/HiKeyLib/HiKeyMem.c | 8 +-------
>> Platform/Hisilicon/HiKey960/HiKey960.dec | 8 +-------
>> Platform/Hisilicon/HiKey960/HiKey960.dsc | 8 +-------
>> Platform/Hisilicon/HiKey960/HiKey960.fdf | 8 +-------
>> .../HiKey960/HiKey960Dxe/HiKey960Dxe.c | 8 +-------
>> .../HiKey960/HiKey960Dxe/HiKey960Dxe.h | 8 +-------
>> .../HiKey960/HiKey960Dxe/HiKey960Dxe.inf | 8 +-------
>> .../HiKey960GpioDxe/HiKey960GpioDxe.c | 8 +-------
>> .../HiKey960GpioDxe/HiKey960GpioDxe.inf | 8 +-------
>> .../HiKey960/Library/HiKey960Lib/HiKey960.c | 8 +-------
>> .../Library/HiKey960Lib/HiKey960Helper.S | 8 +-------
>> .../Library/HiKey960Lib/HiKey960Lib.inf | 8 +-------
>> .../Library/HiKey960Lib/HiKey960Mem.c | 8 +-------
>> .../PciHostBridgeLib/PciHostBridgeLib.c | 8 +-------
>> .../PciHostBridgeLib/PciHostBridgeLib.inf | 8 +-------
>> 86 files changed, 85 insertions(+), 591 deletions(-)
>>
>> diff --git a/Platform/Hisilicon/D03/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini b/Platform/Hisilicon/D03/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini
>> index fc834d9c7c..dd575965c6 100644
>> --- a/Platform/Hisilicon/D03/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini
>> +++ b/Platform/Hisilicon/D03/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini
>> @@ -3,13 +3,7 @@
>> # Copyright (c) 2018, Linaro Limited. All rights reserved.
>> # Copyright (c) 2016, 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 distribution. The full text of the license may be found at
>> -# http://opensource.org/licenses/bsd-license.php
>> -#
>> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>> #
>> ##
>>
>> diff --git a/Platform/Hisilicon/D03/D03.dec b/Platform/Hisilicon/D03/D03.dec
>> index 8b08a32773..206a632d5b 100644
>> --- a/Platform/Hisilicon/D03/D03.dec
>> +++ b/Platform/Hisilicon/D03/D03.dec
>> @@ -3,13 +3,7 @@
>> # Copyright (c) 2015, Hisilicon Limited. All rights reserved.
>> # Copyright (c) 2015, Linaro Limited. All rights reserved.
>> #
>> -# This program and the accompanying materials
>> -# are licensed and made available under the terms and conditions of the BSD License
>> -# which accompanies this distribution. The full text of the license may be found at
>> -# http://opensource.org/licenses/bsd-license.php
>> -#
>> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>> #
>> #**/
>>
>> diff --git a/Platform/Hisilicon/D03/D03.dsc b/Platform/Hisilicon/D03/D03.dsc
>> index 07ff461277..60b0d6393e 100644
>> --- a/Platform/Hisilicon/D03/D03.dsc
>> +++ b/Platform/Hisilicon/D03/D03.dsc
>> @@ -3,13 +3,7 @@
>> # Copyright (c) 2015, Hisilicon Limited. All rights reserved.
>> # Copyright (c) 2015, Linaro Limited. All rights reserved.
>> #
>> -# This program and the accompanying materials
>> -# are licensed and made available under the terms and conditions of the BSD License
>> -# which accompanies this distribution. The full text of the license may be found at
>> -# http://opensource.org/licenses/bsd-license.php
>> -#
>> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>> #
>> #
>>
>> diff --git a/Platform/Hisilicon/D03/D03.fdf b/Platform/Hisilicon/D03/D03.fdf
>> index 3f07b2e577..f5d0c66f63 100644
>> --- a/Platform/Hisilicon/D03/D03.fdf
>> +++ b/Platform/Hisilicon/D03/D03.fdf
>> @@ -3,13 +3,7 @@
>> # Copyright (c) 2015, Hisilicon Limited. All rights reserved.
>> # Copyright (c) 2015, Linaro Limited. All rights reserved.
>> #
>> -# This program and the accompanying materials
>> -# are licensed and made available under the terms and conditions of the BSD License
>> -# which accompanies this distribution. The full text of the license may be found at
>> -# http://opensource.org/licenses/bsd-license.php
>> -#
>> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>> #
>>
>> [DEFINES]
>> diff --git a/Platform/Hisilicon/D03/Drivers/OemNicConfig2PHi1610/OemNicConfig.h b/Platform/Hisilicon/D03/Drivers/OemNicConfig2PHi1610/OemNicConfig.h
>> index 46c77d3061..94d904c35f 100644
>> --- a/Platform/Hisilicon/D03/Drivers/OemNicConfig2PHi1610/OemNicConfig.h
>> +++ b/Platform/Hisilicon/D03/Drivers/OemNicConfig2PHi1610/OemNicConfig.h
>> @@ -3,13 +3,7 @@
>> * Copyright (c) 2016, Hisilicon Limited. All rights reserved.
>> * Copyright (c) 2016, Linaro Limited. All rights reserved.
>> *
>> -* This program and the accompanying materials
>> -* are licensed and made available under the terms and conditions of the BSD License
>> -* which accompanies this distribution. The full text of the license may be found at
>> -* http://opensource.org/licenses/bsd-license.php
>> -*
>> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +* SPDX-License-Identifier: BSD-2-Clause-Patent
>> *
>> **/
>>
>> diff --git a/Platform/Hisilicon/D03/Drivers/OemNicConfig2PHi1610/OemNicConfig2P.c b/Platform/Hisilicon/D03/Drivers/OemNicConfig2PHi1610/OemNicConfig2P.c
>> index dcaf3aa827..814378b39b 100644
>> --- a/Platform/Hisilicon/D03/Drivers/OemNicConfig2PHi1610/OemNicConfig2P.c
>> +++ b/Platform/Hisilicon/D03/Drivers/OemNicConfig2PHi1610/OemNicConfig2P.c
>> @@ -3,13 +3,7 @@
>> * Copyright (c) 2016, Hisilicon Limited. All rights reserved.
>> * Copyright (c) 2016, Linaro Limited. All rights reserved.
>> *
>> -* This program and the accompanying materials
>> -* are licensed and made available under the terms and conditions of the BSD License
>> -* which accompanies this distribution. The full text of the license may be found at
>> -* http://opensource.org/licenses/bsd-license.php
>> -*
>> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +* SPDX-License-Identifier: BSD-2-Clause-Patent
>> *
>> **/
>>
>> diff --git a/Platform/Hisilicon/D03/Drivers/OemNicConfig2PHi1610/OemNicConfig2P.inf b/Platform/Hisilicon/D03/Drivers/OemNicConfig2PHi1610/OemNicConfig2P.inf
>> index ee5596a4ce..1071f5d651 100644
>> --- a/Platform/Hisilicon/D03/Drivers/OemNicConfig2PHi1610/OemNicConfig2P.inf
>> +++ b/Platform/Hisilicon/D03/Drivers/OemNicConfig2PHi1610/OemNicConfig2P.inf
>> @@ -3,13 +3,7 @@
>> # Copyright (c) 2016, Hisilicon Limited. All rights reserved.
>> # Copyright (c) 2016, Linaro Limited. All rights reserved.
>> #
>> -# This program and the accompanying materials
>> -# are licensed and made available under the terms and conditions of the BSD License
>> -# which accompanies this distribution. The full text of the license may be found at
>> -# http://opensource.org/licenses/bsd-license.php
>> -#
>> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>> #
>> #**/
>>
>> diff --git a/Platform/Hisilicon/D03/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc b/Platform/Hisilicon/D03/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc
>> index 2589e20a43..52149b1ed0 100644
>> --- a/Platform/Hisilicon/D03/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc
>> +++ b/Platform/Hisilicon/D03/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc
>> @@ -5,13 +5,7 @@
>> Copyright (c) 2018, Linaro Limited. All rights reserved.
>> Copyright (c) 2016, 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 distribution. The full text of the license may be found at
>> - http://opensource.org/licenses/bsd-license.php
>> -
>> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> + SPDX-License-Identifier: BSD-2-Clause-Patent
>>
>> **/
>>
>> diff --git a/Platform/Hisilicon/D03/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf b/Platform/Hisilicon/D03/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf
>> index fc1832fa5f..6756814574 100644
>> --- a/Platform/Hisilicon/D03/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf
>> +++ b/Platform/Hisilicon/D03/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf
>> @@ -5,13 +5,7 @@
>> # Copyright (c) 2018, Linaro Limited. All rights reserved.
>> # Copyright (c) 2016, 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 distribution. The full text of the license may be found at
>> -# http://opensource.org/licenses/bsd-license.php
>> -#
>> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>> #
>> ##
>>
>> diff --git a/Platform/Hisilicon/D03/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c b/Platform/Hisilicon/D03/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c
>> index 27c0a718f8..77f631d5d6 100644
>> --- a/Platform/Hisilicon/D03/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c
>> +++ b/Platform/Hisilicon/D03/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c
>> @@ -5,13 +5,7 @@
>> Copyright (c) 2018, Linaro Limited. All rights reserved.
>> Copyright (c) 2016, 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 distribution. The full text of the license may be found at
>> - http://opensource.org/licenses/bsd-license.php
>> -
>> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> + SPDX-License-Identifier: BSD-2-Clause-Patent
>>
>> **/
>>
>> diff --git a/Platform/Hisilicon/D03/EarlyConfigPeim/EarlyConfigPeimD03.c b/Platform/Hisilicon/D03/EarlyConfigPeim/EarlyConfigPeimD03.c
>> index dacd9e871f..75b6dec34b 100644
>> --- a/Platform/Hisilicon/D03/EarlyConfigPeim/EarlyConfigPeimD03.c
>> +++ b/Platform/Hisilicon/D03/EarlyConfigPeim/EarlyConfigPeimD03.c
>> @@ -3,13 +3,7 @@
>> * Copyright (c) 2016, Hisilicon Limited. All rights reserved.
>> * Copyright (c) 2016, Linaro Limited. All rights reserved.
>> *
>> -* This program and the accompanying materials
>> -* are licensed and made available under the terms and conditions of the BSD License
>> -* which accompanies this distribution. The full text of the license may be found at
>> -* http://opensource.org/licenses/bsd-license.php
>> -*
>> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +* SPDX-License-Identifier: BSD-2-Clause-Patent
>> *
>> **/
>>
>> diff --git a/Platform/Hisilicon/D03/EarlyConfigPeim/EarlyConfigPeimD03.inf b/Platform/Hisilicon/D03/EarlyConfigPeim/EarlyConfigPeimD03.inf
>> index 90e40ae2b3..1f992024ac 100644
>> --- a/Platform/Hisilicon/D03/EarlyConfigPeim/EarlyConfigPeimD03.inf
>> +++ b/Platform/Hisilicon/D03/EarlyConfigPeim/EarlyConfigPeimD03.inf
>> @@ -3,13 +3,7 @@
>> # Copyright (c) 2016, Hisilicon Limited. All rights reserved.
>> # Copyright (c) 2016, Linaro Limited. All rights reserved.
>> #
>> -# This program and the accompanying materials
>> -# are licensed and made available under the terms and conditions of the BSD License
>> -# which accompanies this distribution. The full text of the license may be found at
>> -# http://opensource.org/licenses/bsd-license.php
>> -#
>> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>> #
>> #**/
>>
>> diff --git a/Platform/Hisilicon/D03/Include/Library/CpldD03.h b/Platform/Hisilicon/D03/Include/Library/CpldD03.h
>> index 456bf4b5c9..fce3319c44 100644
>> --- a/Platform/Hisilicon/D03/Include/Library/CpldD03.h
>> +++ b/Platform/Hisilicon/D03/Include/Library/CpldD03.h
>> @@ -3,13 +3,7 @@
>> * Copyright (c) 2015, Hisilicon Limited. All rights reserved.
>> * Copyright (c) 2015, Linaro Limited. All rights reserved.
>> *
>> -* This program and the accompanying materials
>> -* are licensed and made available under the terms and conditions of the BSD License
>> -* which accompanies this distribution. The full text of the license may be found at
>> -* http://opensource.org/licenses/bsd-license.php
>> -*
>> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +* SPDX-License-Identifier: BSD-2-Clause-Patent
>> *
>> **/
>>
>> diff --git a/Platform/Hisilicon/D03/Library/DS3231RealTimeClockLib/DS3231RealTimeClock.h b/Platform/Hisilicon/D03/Library/DS3231RealTimeClockLib/DS3231RealTimeClock.h
>> index d1e6c41dd7..da18d0f558 100644
>> --- a/Platform/Hisilicon/D03/Library/DS3231RealTimeClockLib/DS3231RealTimeClock.h
>> +++ b/Platform/Hisilicon/D03/Library/DS3231RealTimeClockLib/DS3231RealTimeClock.h
>> @@ -4,13 +4,7 @@
>> * Copyright (c) 2015, Hisilicon Limited. All rights reserved.
>> * Copyright (c) 2015, Linaro Limited. All rights reserved.
>> *
>> -* This program and the accompanying materials
>> -* are licensed and made available under the terms and conditions of the BSD License
>> -* which accompanies this distribution. The full text of the license may be found at
>> -* http://opensource.org/licenses/bsd-license.php
>> -*
>> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +* SPDX-License-Identifier: BSD-2-Clause-Patent
>> *
>> * Based on the files under ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.inf
>> **/
>> diff --git a/Platform/Hisilicon/D03/Library/DS3231RealTimeClockLib/DS3231RealTimeClockLib.c b/Platform/Hisilicon/D03/Library/DS3231RealTimeClockLib/DS3231RealTimeClockLib.c
>> index f6dbcf6b75..898335a7b7 100644
>> --- a/Platform/Hisilicon/D03/Library/DS3231RealTimeClockLib/DS3231RealTimeClockLib.c
>> +++ b/Platform/Hisilicon/D03/Library/DS3231RealTimeClockLib/DS3231RealTimeClockLib.c
>> @@ -8,13 +8,7 @@
>> Copyright (c) 2015, Hisilicon Limited. All rights reserved.<BR>
>> Copyright (c) 2015, Linaro Limited. 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 distribution. The full text of the license may be found at
>> - http://opensource.org/licenses/bsd-license.php
>> -
>> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> + SPDX-License-Identifier: BSD-2-Clause-Patent
>>
>> Based on the files under ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.inf
>>
>> diff --git a/Platform/Hisilicon/D03/Library/DS3231RealTimeClockLib/DS3231RealTimeClockLib.inf b/Platform/Hisilicon/D03/Library/DS3231RealTimeClockLib/DS3231RealTimeClockLib.inf
>> index ae7116dc31..29c6ecf98b 100644
>> --- a/Platform/Hisilicon/D03/Library/DS3231RealTimeClockLib/DS3231RealTimeClockLib.inf
>> +++ b/Platform/Hisilicon/D03/Library/DS3231RealTimeClockLib/DS3231RealTimeClockLib.inf
>> @@ -5,12 +5,7 @@
>> # Copyright (c) 2016, Hisilicon Limited. All rights reserved.<BR>
>> # Copyright (c) 2016, Linaro Limited. 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 distribution. The full text of the license may be found at
>> -# http://opensource.org/licenses/bsd-license.php
>> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>> #
>> #
>> #**/
>> diff --git a/Platform/Hisilicon/D03/Library/FdtUpdateLib/FdtUpdateLib.c b/Platform/Hisilicon/D03/Library/FdtUpdateLib/FdtUpdateLib.c
>> index d00cb9b2ab..a242e4bd9a 100755
>> --- a/Platform/Hisilicon/D03/Library/FdtUpdateLib/FdtUpdateLib.c
>> +++ b/Platform/Hisilicon/D03/Library/FdtUpdateLib/FdtUpdateLib.c
>> @@ -3,13 +3,7 @@
>> * Copyright (c) 2016, Hisilicon Limited. All rights reserved.
>> * Copyright (c) 2016, Linaro Limited. All rights reserved.
>> *
>> -* This program and the accompanying materials
>> -* are licensed and made available under the terms and conditions of the BSD License
>> -* which accompanies this distribution. The full text of the license may be found at
>> -* http://opensource.org/licenses/bsd-license.php
>> -*
>> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +* SPDX-License-Identifier: BSD-2-Clause-Patent
>> *
>> **/
>>
>> diff --git a/Platform/Hisilicon/D03/Library/FdtUpdateLib/FdtUpdateLib.inf b/Platform/Hisilicon/D03/Library/FdtUpdateLib/FdtUpdateLib.inf
>> index 2d9d53d149..e02c7b229a 100755
>> --- a/Platform/Hisilicon/D03/Library/FdtUpdateLib/FdtUpdateLib.inf
>> +++ b/Platform/Hisilicon/D03/Library/FdtUpdateLib/FdtUpdateLib.inf
>> @@ -3,13 +3,7 @@
>> # Copyright (c) 2016, Hisilicon Limited. All rights reserved.
>> # Copyright (c) 2016, Linaro Limited. All rights reserved.
>> #
>> -# This program and the accompanying materials
>> -# are licensed and made available under the terms and conditions of the BSD License
>> -# which accompanies this distribution. The full text of the license may be found at
>> -# http://opensource.org/licenses/bsd-license.php
>> -#
>> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>> #
>> #**/
>>
>> diff --git a/Platform/Hisilicon/D03/Library/OemMiscLib2P/BoardFeature2PHi1610.c b/Platform/Hisilicon/D03/Library/OemMiscLib2P/BoardFeature2PHi1610.c
>> index 218b3540eb..1670cac1d4 100644
>> --- a/Platform/Hisilicon/D03/Library/OemMiscLib2P/BoardFeature2PHi1610.c
>> +++ b/Platform/Hisilicon/D03/Library/OemMiscLib2P/BoardFeature2PHi1610.c
>> @@ -3,13 +3,7 @@
>> * Copyright (c) 2015, Hisilicon Limited. All rights reserved.
>> * Copyright (c) 2015, Linaro Limited. All rights reserved.
>> *
>> -* This program and the accompanying materials
>> -* are licensed and made available under the terms and conditions of the BSD License
>> -* which accompanies this distribution. The full text of the license may be found at
>> -* http://opensource.org/licenses/bsd-license.php
>> -*
>> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +* SPDX-License-Identifier: BSD-2-Clause-Patent
>> *
>> **/
>>
>> diff --git a/Platform/Hisilicon/D03/Library/OemMiscLib2P/BoardFeature2PHi1610Strings.uni b/Platform/Hisilicon/D03/Library/OemMiscLib2P/BoardFeature2PHi1610Strings.uni
>> index 38def406b9485966b67944d615b8908c250dc2c6..3e321f98848ef80ad178dde66ea72366306d73e4 100644
>> GIT binary patch
>> delta 99
>> zcmX@2cu9J~w(wwv00tL^2nJmSABIeZWQJ6RJceQ*smtKWkOJnF0L9aQIF+G@!HPkF
>> j!HFRls6&^*2#B2-au^aBN})Oefb0^8p3VQ6kMaNjEm9Q<
>>
>> delta 859
>> zcmZ9KO->t85QHmRl$?Oggf%hy>~NSQqksq5MkLFzJ;WpVC$gOoR&xdJg2V~n0-Pvc
>> z_4qGn<oCK?S6A1o=a<8$_xF!=Ut?8TD$y@3G}lkoLR0cWGmY3+Aj-&x8iJUDbnTA5
>> z8Tf>g0#r$7MKpo!Kqq|WSVZrH%8+PAtqj&RdmYWA02TT}Lj^&h0jr1p4iTo_328=6
>> zL-a<Zg;{QekSbzdX|9{SzP5TgBR}60Q<qz<x8cN))w=(`YlRpS+Ka|5k6M!Z&I4p_
>> z#<oBuva6PVLuJC}&QgC_Ux}(I?pxECc?WE;CYY~1u&C8m?3j4PLwpRQ=R}RUMlZtZ
>> z7PnvUJSVRvEIAn<eWVXm>iyv@XvX}S*W0{dUtg6X=u%zf`oemu3-Sy*6Abm<=QLAW
>> zS43%;e5DS1%DLTW7<Lbk=@Ye%dUa6egbB1>kJwFY+9URM<j#(_x4))p(mVzxx(3q?
>> zVI9shIL(m9@GhC9`^+QzV2$z2o^r!J1NQJA?B6I^`7v?29@E?+)%PvYjy}VSOa4+G
>> NdZyOHyEo5o{{i*wj{pDw
>>
>> diff --git a/Platform/Hisilicon/D03/Library/OemMiscLib2P/OemMiscLib2PHi1610.c b/Platform/Hisilicon/D03/Library/OemMiscLib2P/OemMiscLib2PHi1610.c
>> index c8a9da73bb..1d9c3dfd49 100644
>> --- a/Platform/Hisilicon/D03/Library/OemMiscLib2P/OemMiscLib2PHi1610.c
>> +++ b/Platform/Hisilicon/D03/Library/OemMiscLib2P/OemMiscLib2PHi1610.c
>> @@ -3,13 +3,7 @@
>> * Copyright (c) 2015, Hisilicon Limited. All rights reserved.
>> * Copyright (c) 2015, Linaro Limited. All rights reserved.
>> *
>> -* This program and the accompanying materials
>> -* are licensed and made available under the terms and conditions of the BSD License
>> -* which accompanies this distribution. The full text of the license may be found at
>> -* http://opensource.org/licenses/bsd-license.php
>> -*
>> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +* SPDX-License-Identifier: BSD-2-Clause-Patent
>> *
>> **/
>>
>> diff --git a/Platform/Hisilicon/D03/Library/OemMiscLib2P/OemMiscLib2PHi1610.inf b/Platform/Hisilicon/D03/Library/OemMiscLib2P/OemMiscLib2PHi1610.inf
>> index c0195b2fa9..ab14597d8b 100644
>> --- a/Platform/Hisilicon/D03/Library/OemMiscLib2P/OemMiscLib2PHi1610.inf
>> +++ b/Platform/Hisilicon/D03/Library/OemMiscLib2P/OemMiscLib2PHi1610.inf
>> @@ -3,13 +3,7 @@
>> # Copyright (c) 2015, Hisilicon Limited. All rights reserved.
>> # Copyright (c) 2015, Linaro Limited. All rights reserved.
>> #
>> -# This program and the accompanying materials
>> -# are licensed and made available under the terms and conditions of the BSD License
>> -# which accompanies this distribution. The full text of the license may be found at
>> -# http://opensource.org/licenses/bsd-license.php
>> -#
>> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>> #
>> #**/
>>
>> diff --git a/Platform/Hisilicon/D03/Library/PlatformPciLib/PlatformPciLib.c b/Platform/Hisilicon/D03/Library/PlatformPciLib/PlatformPciLib.c
>> index 59c468ac4b..419eb878f3 100644
>> --- a/Platform/Hisilicon/D03/Library/PlatformPciLib/PlatformPciLib.c
>> +++ b/Platform/Hisilicon/D03/Library/PlatformPciLib/PlatformPciLib.c
>> @@ -3,13 +3,7 @@
>> Copyright (c) 2016, Hisilicon Limited. All rights reserved.<BR>
>> Copyright (c) 2016, Linaro Limited. 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 distribution. The full text of the license may be found at
>> - http://opensource.org/licenses/bsd-license.php
>> -
>> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> + SPDX-License-Identifier: BSD-2-Clause-Patent
>>
>> **/
>>
>> diff --git a/Platform/Hisilicon/D03/Library/PlatformPciLib/PlatformPciLib.inf b/Platform/Hisilicon/D03/Library/PlatformPciLib/PlatformPciLib.inf
>> index 4d2dbbaf0d..63d57ec46d 100644
>> --- a/Platform/Hisilicon/D03/Library/PlatformPciLib/PlatformPciLib.inf
>> +++ b/Platform/Hisilicon/D03/Library/PlatformPciLib/PlatformPciLib.inf
>> @@ -3,12 +3,7 @@
>> # Copyright (c) 2016, Hisilicon Limited. All rights reserved.<BR>
>> # Copyright (c) 2016, Linaro Limited. 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 distribution. The full text of the license may be found at
>> -# http://opensource.org/licenses/bsd-license.php
>> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>> #
>> #
>> ##
>> diff --git a/Platform/Hisilicon/D05/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini b/Platform/Hisilicon/D05/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini
>> index fc834d9c7c..dd575965c6 100644
>> --- a/Platform/Hisilicon/D05/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini
>> +++ b/Platform/Hisilicon/D05/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini
>> @@ -3,13 +3,7 @@
>> # Copyright (c) 2018, Linaro Limited. All rights reserved.
>> # Copyright (c) 2016, 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 distribution. The full text of the license may be found at
>> -# http://opensource.org/licenses/bsd-license.php
>> -#
>> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>> #
>> ##
>>
>> diff --git a/Platform/Hisilicon/D05/D05.dsc b/Platform/Hisilicon/D05/D05.dsc
>> index 70b044c7e3..dc9e1407ba 100644
>> --- a/Platform/Hisilicon/D05/D05.dsc
>> +++ b/Platform/Hisilicon/D05/D05.dsc
>> @@ -3,13 +3,7 @@
>> # Copyright (c) 2015-2016, Hisilicon Limited. All rights reserved.
>> # Copyright (c) 2015-2016, Linaro Limited. All rights reserved.
>> #
>> -# This program and the accompanying materials
>> -# are licensed and made available under the terms and conditions of the BSD License
>> -# which accompanies this distribution. The full text of the license may be found at
>> -# http://opensource.org/licenses/bsd-license.php
>> -#
>> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>> #
>> #
>>
>> diff --git a/Platform/Hisilicon/D05/D05.fdf b/Platform/Hisilicon/D05/D05.fdf
>> index 9632aea4b0..812f7f2690 100644
>> --- a/Platform/Hisilicon/D05/D05.fdf
>> +++ b/Platform/Hisilicon/D05/D05.fdf
>> @@ -3,13 +3,7 @@
>> # Copyright (c) 2015-2016, Hisilicon Limited. All rights reserved.
>> # Copyright (c) 2015-2016, Linaro Limited. All rights reserved.
>> #
>> -# This program and the accompanying materials
>> -# are licensed and made available under the terms and conditions of the BSD License
>> -# which accompanies this distribution. The full text of the license may be found at
>> -# http://opensource.org/licenses/bsd-license.php
>> -#
>> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>> #
>>
>> [DEFINES]
>> diff --git a/Platform/Hisilicon/D05/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc b/Platform/Hisilicon/D05/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc
>> index 5091c7a25d..210141d019 100644
>> --- a/Platform/Hisilicon/D05/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc
>> +++ b/Platform/Hisilicon/D05/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc
>> @@ -5,13 +5,7 @@
>> Copyright (c) 2018, Linaro Limited. All rights reserved.
>> Copyright (c) 2016, 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 distribution. The full text of the license may be found at
>> - http://opensource.org/licenses/bsd-license.php
>> -
>> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> + SPDX-License-Identifier: BSD-2-Clause-Patent
>>
>> **/
>>
>> diff --git a/Platform/Hisilicon/D05/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf b/Platform/Hisilicon/D05/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf
>> index fc1832fa5f..6756814574 100644
>> --- a/Platform/Hisilicon/D05/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf
>> +++ b/Platform/Hisilicon/D05/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf
>> @@ -5,13 +5,7 @@
>> # Copyright (c) 2018, Linaro Limited. All rights reserved.
>> # Copyright (c) 2016, 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 distribution. The full text of the license may be found at
>> -# http://opensource.org/licenses/bsd-license.php
>> -#
>> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>> #
>> ##
>>
>> diff --git a/Platform/Hisilicon/D05/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c b/Platform/Hisilicon/D05/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c
>> index 27c0a718f8..77f631d5d6 100644
>> --- a/Platform/Hisilicon/D05/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c
>> +++ b/Platform/Hisilicon/D05/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c
>> @@ -5,13 +5,7 @@
>> Copyright (c) 2018, Linaro Limited. All rights reserved.
>> Copyright (c) 2016, 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 distribution. The full text of the license may be found at
>> - http://opensource.org/licenses/bsd-license.php
>> -
>> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> + SPDX-License-Identifier: BSD-2-Clause-Patent
>>
>> **/
>>
>> diff --git a/Platform/Hisilicon/D05/EarlyConfigPeim/EarlyConfigPeimD05.c b/Platform/Hisilicon/D05/EarlyConfigPeim/EarlyConfigPeimD05.c
>> index b374347e5c..05aefc90f7 100644
>> --- a/Platform/Hisilicon/D05/EarlyConfigPeim/EarlyConfigPeimD05.c
>> +++ b/Platform/Hisilicon/D05/EarlyConfigPeim/EarlyConfigPeimD05.c
>> @@ -3,13 +3,7 @@
>> * Copyright (c) 2016, Hisilicon Limited. All rights reserved.
>> * Copyright (c) 2016, Linaro Limited. All rights reserved.
>> *
>> -* This program and the accompanying materials
>> -* are licensed and made available under the terms and conditions of the BSD License
>> -* which accompanies this distribution. The full text of the license may be found at
>> -* http://opensource.org/licenses/bsd-license.php
>> -*
>> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +* SPDX-License-Identifier: BSD-2-Clause-Patent
>> *
>> **/
>>
>> diff --git a/Platform/Hisilicon/D05/EarlyConfigPeim/EarlyConfigPeimD05.inf b/Platform/Hisilicon/D05/EarlyConfigPeim/EarlyConfigPeimD05.inf
>> index e82c9204d5..c42d0dd6cd 100644
>> --- a/Platform/Hisilicon/D05/EarlyConfigPeim/EarlyConfigPeimD05.inf
>> +++ b/Platform/Hisilicon/D05/EarlyConfigPeim/EarlyConfigPeimD05.inf
>> @@ -3,13 +3,7 @@
>> # Copyright (c) 2016, Hisilicon Limited. All rights reserved.
>> # Copyright (c) 2016, Linaro Limited. All rights reserved.
>> #
>> -# This program and the accompanying materials
>> -# are licensed and made available under the terms and conditions of the BSD License
>> -# which accompanies this distribution. The full text of the license may be found at
>> -# http://opensource.org/licenses/bsd-license.php
>> -#
>> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>> #
>> #**/
>>
>> diff --git a/Platform/Hisilicon/D05/Library/OemMiscLibD05/BoardFeatureD05.c b/Platform/Hisilicon/D05/Library/OemMiscLibD05/BoardFeatureD05.c
>> index 1a9ed620c8..ac013ca308 100644
>> --- a/Platform/Hisilicon/D05/Library/OemMiscLibD05/BoardFeatureD05.c
>> +++ b/Platform/Hisilicon/D05/Library/OemMiscLibD05/BoardFeatureD05.c
>> @@ -3,13 +3,7 @@
>> * Copyright (c) 2016, Hisilicon Limited. All rights reserved.
>> * Copyright (c) 2016, Linaro Limited. All rights reserved.
>> *
>> -* This program and the accompanying materials
>> -* are licensed and made available under the terms and conditions of the BSD License
>> -* which accompanies this distribution. The full text of the license may be found at
>> -* http://opensource.org/licenses/bsd-license.php
>> -*
>> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +* SPDX-License-Identifier: BSD-2-Clause-Patent
>> *
>> **/
>>
>> diff --git a/Platform/Hisilicon/D05/Library/OemMiscLibD05/BoardFeatureD05Strings.uni b/Platform/Hisilicon/D05/Library/OemMiscLibD05/BoardFeatureD05Strings.uni
>> index 9f5be02d8a..8b36905f0f 100644
>> --- a/Platform/Hisilicon/D05/Library/OemMiscLibD05/BoardFeatureD05Strings.uni
>> +++ b/Platform/Hisilicon/D05/Library/OemMiscLibD05/BoardFeatureD05Strings.uni
>> @@ -3,13 +3,7 @@
>> // Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
>> // Copyright (c) 2016, Hisilicon Limited. All rights reserved.
>> //
>> -// This program and the accompanying materials
>> -// are licensed and made available under the terms and conditions of the BSD License
>> -// which accompanies this distribution. The full text of the license may be found at
>> -// http://opensource.org/licenses/bsd-license.php
>> -//
>> -// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +// SPDX-License-Identifier: BSD-2-Clause-Patent
>> //
>> // --*/
>>
>> diff --git a/Platform/Hisilicon/D05/Library/OemMiscLibD05/OemMiscLibD05.c b/Platform/Hisilicon/D05/Library/OemMiscLibD05/OemMiscLibD05.c
>> index a1458da7f0..2ee15dbc7b 100644
>> --- a/Platform/Hisilicon/D05/Library/OemMiscLibD05/OemMiscLibD05.c
>> +++ b/Platform/Hisilicon/D05/Library/OemMiscLibD05/OemMiscLibD05.c
>> @@ -3,13 +3,7 @@
>> * Copyright (c) 2016 - 2018, Hisilicon Limited. All rights reserved.
>> * Copyright (c) 2016 - 2018, Linaro Limited. All rights reserved.
>> *
>> -* This program and the accompanying materials
>> -* are licensed and made available under the terms and conditions of the BSD License
>> -* which accompanies this distribution. The full text of the license may be found at
>> -* http://opensource.org/licenses/bsd-license.php
>> -*
>> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +* SPDX-License-Identifier: BSD-2-Clause-Patent
>> *
>> **/
>>
>> diff --git a/Platform/Hisilicon/D05/Library/OemMiscLibD05/OemMiscLibD05.inf b/Platform/Hisilicon/D05/Library/OemMiscLibD05/OemMiscLibD05.inf
>> index 7ec5775306..d471102199 100644
>> --- a/Platform/Hisilicon/D05/Library/OemMiscLibD05/OemMiscLibD05.inf
>> +++ b/Platform/Hisilicon/D05/Library/OemMiscLibD05/OemMiscLibD05.inf
>> @@ -3,13 +3,7 @@
>> # Copyright (c) 2016, Hisilicon Limited. All rights reserved.
>> # Copyright (c) 2016, Linaro Limited. All rights reserved.
>> #
>> -# This program and the accompanying materials
>> -# are licensed and made available under the terms and conditions of the BSD License
>> -# which accompanies this distribution. The full text of the license may be found at
>> -# http://opensource.org/licenses/bsd-license.php
>> -#
>> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>> #
>> #**/
>>
>> diff --git a/Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.c b/Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.c
>> index 0dc988a1d3..18d2bf2f98 100644
>> --- a/Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.c
>> +++ b/Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.c
>> @@ -3,13 +3,7 @@
>> Copyright (c) 2016, Hisilicon Limited. All rights reserved.<BR>
>> Copyright (c) 2016, Linaro Limited. 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 distribution. The full text of the license may be found at
>> - http://opensource.org/licenses/bsd-license.php
>> -
>> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> + SPDX-License-Identifier: BSD-2-Clause-Patent
>>
>> **/
>>
>> diff --git a/Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.inf b/Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.inf
>> index 21bb33a318..e20d350cd5 100644
>> --- a/Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.inf
>> +++ b/Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.inf
>> @@ -3,12 +3,7 @@
>> # Copyright (c) 2016, Hisilicon Limited. All rights reserved.<BR>
>> # Copyright (c) 2016, Linaro Limited. 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 distribution. The full text of the license may be found at
>> -# http://opensource.org/licenses/bsd-license.php
>> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>> #
>> #
>> ##
>> diff --git a/Platform/Hisilicon/D06/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini b/Platform/Hisilicon/D06/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini
>> index 80f253b235..af7d57fd6e 100644
>> --- a/Platform/Hisilicon/D06/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini
>> +++ b/Platform/Hisilicon/D06/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini
>> @@ -3,13 +3,7 @@
>> # Copyright (c) 2018, Linaro Limited. All rights reserved.
>> # Copyright (c) 2016, 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 distribution. The full text of the license may be found at
>> -# http://opensource.org/licenses/bsd-license.php
>> -#
>> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>> #
>> ##
>>
>> diff --git a/Platform/Hisilicon/D06/D06.dec b/Platform/Hisilicon/D06/D06.dec
>> index 710f083eee..64607fed0e 100644
>> --- a/Platform/Hisilicon/D06/D06.dec
>> +++ b/Platform/Hisilicon/D06/D06.dec
>> @@ -3,13 +3,7 @@
>> # Copyright (c) 2018, Hisilicon Limited. All rights reserved.
>> # Copyright (c) 2018, Linaro Limited. All rights reserved.
>> #
>> -# This program and the accompanying materials
>> -# are licensed and made available under the terms and conditions of the BSD License
>> -# which accompanies this distribution. The full text of the license may be found at
>> -# http://opensource.org/licenses/bsd-license.php
>> -#
>> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>> #
>> #**/
>>
>> diff --git a/Platform/Hisilicon/D06/D06.dsc b/Platform/Hisilicon/D06/D06.dsc
>> index 73bea728b0..5387daf553 100644
>> --- a/Platform/Hisilicon/D06/D06.dsc
>> +++ b/Platform/Hisilicon/D06/D06.dsc
>> @@ -3,13 +3,7 @@
>> # Copyright (c) 2018, Hisilicon Limited. All rights reserved.
>> # Copyright (c) 2018, Linaro Limited. All rights reserved.
>> #
>> -# This program and the accompanying materials
>> -# are licensed and made available under the terms and conditions of the BSD License
>> -# which accompanies this distribution. The full text of the license may be found at
>> -# http://opensource.org/licenses/bsd-license.php
>> -#
>> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>> #
>> #
>>
>> diff --git a/Platform/Hisilicon/D06/D06.fdf b/Platform/Hisilicon/D06/D06.fdf
>> index e402628a1b..976b597647 100644
>> --- a/Platform/Hisilicon/D06/D06.fdf
>> +++ b/Platform/Hisilicon/D06/D06.fdf
>> @@ -3,13 +3,7 @@
>> # Copyright (c) 2017 - 2018, Hisilicon Limited. All rights reserved.
>> # Copyright (c) 2017 - 2018, Linaro Limited. All rights reserved.
>> #
>> -# This program and the accompanying materials
>> -# are licensed and made available under the terms and conditions of the BSD License
>> -# which accompanies this distribution. The full text of the license may be found at
>> -# http://opensource.org/licenses/bsd-license.php
>> -#
>> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>> #
>>
>> [DEFINES]
>> diff --git a/Platform/Hisilicon/D06/Drivers/OemNicConfig2PHi1620/OemNicConfig.h b/Platform/Hisilicon/D06/Drivers/OemNicConfig2PHi1620/OemNicConfig.h
>> index 35228fdf1d..40bd87e5c8 100644
>> --- a/Platform/Hisilicon/D06/Drivers/OemNicConfig2PHi1620/OemNicConfig.h
>> +++ b/Platform/Hisilicon/D06/Drivers/OemNicConfig2PHi1620/OemNicConfig.h
>> @@ -3,13 +3,7 @@
>> * Copyright (c) 2016-2018, Hisilicon Limited. All rights reserved.
>> * Copyright (c) 2016-2018, Linaro Limited. All rights reserved.
>> *
>> -* This program and the accompanying materials
>> -* are licensed and made available under the terms and conditions of the BSD License
>> -* which accompanies this distribution. The full text of the license may be found at
>> -* http://opensource.org/licenses/bsd-license.php
>> -*
>> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +* SPDX-License-Identifier: BSD-2-Clause-Patent
>> *
>> **/
>>
>> diff --git a/Platform/Hisilicon/D06/Drivers/OemNicConfig2PHi1620/OemNicConfig2P.c b/Platform/Hisilicon/D06/Drivers/OemNicConfig2PHi1620/OemNicConfig2P.c
>> index c01c49150a..c5c3290130 100644
>> --- a/Platform/Hisilicon/D06/Drivers/OemNicConfig2PHi1620/OemNicConfig2P.c
>> +++ b/Platform/Hisilicon/D06/Drivers/OemNicConfig2PHi1620/OemNicConfig2P.c
>> @@ -3,13 +3,7 @@
>> * Copyright (c) 2016-2018, Hisilicon Limited. All rights reserved.
>> * Copyright (c) 2016-2018, Linaro Limited. All rights reserved.
>> *
>> -* This program and the accompanying materials
>> -* are licensed and made available under the terms and conditions of the BSD License
>> -* which accompanies this distribution. The full text of the license may be found at
>> -* http://opensource.org/licenses/bsd-license.php
>> -*
>> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +* SPDX-License-Identifier: BSD-2-Clause-Patent
>> *
>> **/
>>
>> diff --git a/Platform/Hisilicon/D06/Drivers/OemNicConfig2PHi1620/OemNicConfig2P.inf b/Platform/Hisilicon/D06/Drivers/OemNicConfig2PHi1620/OemNicConfig2P.inf
>> index a91f2b6005..ebc7e7791e 100644
>> --- a/Platform/Hisilicon/D06/Drivers/OemNicConfig2PHi1620/OemNicConfig2P.inf
>> +++ b/Platform/Hisilicon/D06/Drivers/OemNicConfig2PHi1620/OemNicConfig2P.inf
>> @@ -3,13 +3,7 @@
>> # Copyright (c) 2016-2018, Hisilicon Limited. All rights reserved.
>> # Copyright (c) 2016-2018, Linaro Limited. All rights reserved.
>> #
>> -# This program and the accompanying materials
>> -# are licensed and made available under the terms and conditions of the BSD License
>> -# which accompanies this distribution. The full text of the license may be found at
>> -# http://opensource.org/licenses/bsd-license.php
>> -#
>> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>> #
>> #**/
>>
>> diff --git a/Platform/Hisilicon/D06/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc b/Platform/Hisilicon/D06/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc
>> index 1287dfd834..63ce447292 100644
>> --- a/Platform/Hisilicon/D06/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc
>> +++ b/Platform/Hisilicon/D06/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc
>> @@ -5,13 +5,7 @@
>> Copyright (c) 2018, Linaro Limited. All rights reserved.
>> Copyright (c) 2016, 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 distribution. The full text of the license may be found at
>> - http://opensource.org/licenses/bsd-license.php
>> -
>> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> + SPDX-License-Identifier: BSD-2-Clause-Patent
>>
>> **/
>>
>> diff --git a/Platform/Hisilicon/D06/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf b/Platform/Hisilicon/D06/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf
>> index fc1832fa5f..6756814574 100644
>> --- a/Platform/Hisilicon/D06/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf
>> +++ b/Platform/Hisilicon/D06/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf
>> @@ -5,13 +5,7 @@
>> # Copyright (c) 2018, Linaro Limited. All rights reserved.
>> # Copyright (c) 2016, 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 distribution. The full text of the license may be found at
>> -# http://opensource.org/licenses/bsd-license.php
>> -#
>> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>> #
>> ##
>>
>> diff --git a/Platform/Hisilicon/D06/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c b/Platform/Hisilicon/D06/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c
>> index 27c0a718f8..77f631d5d6 100644
>> --- a/Platform/Hisilicon/D06/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c
>> +++ b/Platform/Hisilicon/D06/Drivers/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c
>> @@ -5,13 +5,7 @@
>> Copyright (c) 2018, Linaro Limited. All rights reserved.
>> Copyright (c) 2016, 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 distribution. The full text of the license may be found at
>> - http://opensource.org/licenses/bsd-license.php
>> -
>> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> + SPDX-License-Identifier: BSD-2-Clause-Patent
>>
>> **/
>>
>> diff --git a/Platform/Hisilicon/D06/EarlyConfigPeim/EarlyConfigPeimD06.c b/Platform/Hisilicon/D06/EarlyConfigPeim/EarlyConfigPeimD06.c
>> index a8261d3706..72f30ff075 100644
>> --- a/Platform/Hisilicon/D06/EarlyConfigPeim/EarlyConfigPeimD06.c
>> +++ b/Platform/Hisilicon/D06/EarlyConfigPeim/EarlyConfigPeimD06.c
>> @@ -3,13 +3,7 @@
>> * Copyright (c) 2018, Hisilicon Limited. All rights reserved.
>> * Copyright (c) 2018, Linaro Limited. All rights reserved.
>> *
>> -* This program and the accompanying materials
>> -* are licensed and made available under the terms and conditions of the BSD License
>> -* which accompanies this distribution. The full text of the license may be found at
>> -* http://opensource.org/licenses/bsd-license.php
>> -*
>> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +* SPDX-License-Identifier: BSD-2-Clause-Patent
>> *
>> **/
>>
>> diff --git a/Platform/Hisilicon/D06/EarlyConfigPeim/EarlyConfigPeimD06.inf b/Platform/Hisilicon/D06/EarlyConfigPeim/EarlyConfigPeimD06.inf
>> index 715a4efadd..8eaec842c8 100644
>> --- a/Platform/Hisilicon/D06/EarlyConfigPeim/EarlyConfigPeimD06.inf
>> +++ b/Platform/Hisilicon/D06/EarlyConfigPeim/EarlyConfigPeimD06.inf
>> @@ -3,13 +3,7 @@
>> # Copyright (c) 2018, Hisilicon Limited. All rights reserved.
>> # Copyright (c) 2017, Linaro Limited. All rights reserved.
>> #
>> -# This program and the accompanying materials
>> -# are licensed and made available under the terms and conditions of the BSD License
>> -# which accompanies this distribution. The full text of the license may be found at
>> -# http://opensource.org/licenses/bsd-license.php
>> -#
>> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>> #
>> #**/
>>
>> diff --git a/Platform/Hisilicon/D06/Include/Library/CpldD06.h b/Platform/Hisilicon/D06/Include/Library/CpldD06.h
>> index 8eb333de52..e5adfb316f 100644
>> --- a/Platform/Hisilicon/D06/Include/Library/CpldD06.h
>> +++ b/Platform/Hisilicon/D06/Include/Library/CpldD06.h
>> @@ -3,13 +3,7 @@
>> Copyright (c) 2018, Hisilicon Limited. All rights reserved.<BR>
>> Copyright (c) 2018, Linaro Limited. 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 distribution. The full text of the license may be found at
>> - http://opensource.org/licenses/bsd-license.php
>> -
>> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> + SPDX-License-Identifier: BSD-2-Clause-Patent
>>
>> **/
>>
>> diff --git a/Platform/Hisilicon/D06/Library/OemMiscLibD06/BoardFeatureD06.c b/Platform/Hisilicon/D06/Library/OemMiscLibD06/BoardFeatureD06.c
>> index c28ac6266f..980eabfe33 100644
>> --- a/Platform/Hisilicon/D06/Library/OemMiscLibD06/BoardFeatureD06.c
>> +++ b/Platform/Hisilicon/D06/Library/OemMiscLibD06/BoardFeatureD06.c
>> @@ -3,13 +3,7 @@
>> * Copyright (c) 2018, Hisilicon Limited. All rights reserved.
>> * Copyright (c) 2018, Linaro Limited. All rights reserved.
>> *
>> -* This program and the accompanying materials
>> -* are licensed and made available under the terms and conditions of the BSD License
>> -* which accompanies this distribution. The full text of the license may be found at
>> -* http://opensource.org/licenses/bsd-license.php
>> -*
>> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +* SPDX-License-Identifier: BSD-2-Clause-Patent
>> *
>> **/
>>
>> diff --git a/Platform/Hisilicon/D06/Library/OemMiscLibD06/BoardFeatureD06Strings.uni b/Platform/Hisilicon/D06/Library/OemMiscLibD06/BoardFeatureD06Strings.uni
>> index e3fa5fa5ab..3696d1f11e 100644
>> --- a/Platform/Hisilicon/D06/Library/OemMiscLibD06/BoardFeatureD06Strings.uni
>> +++ b/Platform/Hisilicon/D06/Library/OemMiscLibD06/BoardFeatureD06Strings.uni
>> @@ -4,13 +4,7 @@
>> * Copyright (c) 2018, Hisilicon Limited. All rights reserved.
>> * Copyright (c) 2018, Linaro Limited. All rights reserved.
>> //
>> -// This program and the accompanying materials
>> -// are licensed and made available under the terms and conditions of the BSD License
>> -// which accompanies this distribution. The full text of the license may be found at
>> -// http://opensource.org/licenses/bsd-license.php
>> -//
>> -// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +// SPDX-License-Identifier: BSD-2-Clause-Patent
>> //
>> // --*/
>>
>> diff --git a/Platform/Hisilicon/D06/Library/OemMiscLibD06/OemMiscLibD06.c b/Platform/Hisilicon/D06/Library/OemMiscLibD06/OemMiscLibD06.c
>> index 758157525f..1b0a2180c1 100644
>> --- a/Platform/Hisilicon/D06/Library/OemMiscLibD06/OemMiscLibD06.c
>> +++ b/Platform/Hisilicon/D06/Library/OemMiscLibD06/OemMiscLibD06.c
>> @@ -3,13 +3,7 @@
>> * Copyright (c) 2018, Hisilicon Limited. All rights reserved.
>> * Copyright (c) 2018, Linaro Limited. All rights reserved.
>> *
>> -* This program and the accompanying materials
>> -* are licensed and made available under the terms and conditions of the BSD License
>> -* which accompanies this distribution. The full text of the license may be found at
>> -* http://opensource.org/licenses/bsd-license.php
>> -*
>> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +* SPDX-License-Identifier: BSD-2-Clause-Patent
>> *
>> **/
>>
>> diff --git a/Platform/Hisilicon/D06/Library/OemMiscLibD06/OemMiscLibD06.inf b/Platform/Hisilicon/D06/Library/OemMiscLibD06/OemMiscLibD06.inf
>> index 9bc6eb549c..59373a9685 100644
>> --- a/Platform/Hisilicon/D06/Library/OemMiscLibD06/OemMiscLibD06.inf
>> +++ b/Platform/Hisilicon/D06/Library/OemMiscLibD06/OemMiscLibD06.inf
>> @@ -3,13 +3,7 @@
>> # Copyright (c) 2018, Hisilicon Limited. All rights reserved.
>> # Copyright (c) 2018, Linaro Limited. All rights reserved.
>> #
>> -# This program and the accompanying materials
>> -# are licensed and made available under the terms and conditions of the BSD License
>> -# which accompanies this distribution. The full text of the license may be found at
>> -# http://opensource.org/licenses/bsd-license.php
>> -#
>> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>> #
>> #**/
>>
>> diff --git a/Platform/Hisilicon/D06/Library/OemNicLib/OemNicLib.c b/Platform/Hisilicon/D06/Library/OemNicLib/OemNicLib.c
>> index 678c2107bd..42a5a08077 100644
>> --- a/Platform/Hisilicon/D06/Library/OemNicLib/OemNicLib.c
>> +++ b/Platform/Hisilicon/D06/Library/OemNicLib/OemNicLib.c
>> @@ -3,13 +3,7 @@
>> * Copyright (c) 2018, Hisilicon Limited. All rights reserved.
>> * Copyright (c) 2017, Linaro Limited. All rights reserved.
>> *
>> -* This program and the accompanying materials
>> -* are licensed and made available under the terms and conditions of the BSD License
>> -* which accompanies this distribution. The full text of the license may be found at
>> -* http://opensource.org/licenses/bsd-license.php
>> -*
>> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +* SPDX-License-Identifier: BSD-2-Clause-Patent
>> *
>> **/
>>
>> diff --git a/Platform/Hisilicon/D06/Library/OemNicLib/OemNicLib.inf b/Platform/Hisilicon/D06/Library/OemNicLib/OemNicLib.inf
>> index 3b0bd2d60c..c42f5d6e6a 100644
>> --- a/Platform/Hisilicon/D06/Library/OemNicLib/OemNicLib.inf
>> +++ b/Platform/Hisilicon/D06/Library/OemNicLib/OemNicLib.inf
>> @@ -3,13 +3,7 @@
>> # Copyright (c) 2018, Hisilicon Limited. All rights reserved.
>> # Copyright (c) 2017, Linaro Limited. All rights reserved.
>> #
>> -# This program and the accompanying materials
>> -# are licensed and made available under the terms and conditions of the BSD License
>> -# which accompanies this distribution. The full text of the license may be found at
>> -# http://opensource.org/licenses/bsd-license.php
>> -#
>> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>> #
>> #**/
>>
>> diff --git a/Platform/Hisilicon/D06/Library/PciHostBridgeLib/PciHostBridgeLib.c b/Platform/Hisilicon/D06/Library/PciHostBridgeLib/PciHostBridgeLib.c
>> index d13178e925..c44959b7f1 100644
>> --- a/Platform/Hisilicon/D06/Library/PciHostBridgeLib/PciHostBridgeLib.c
>> +++ b/Platform/Hisilicon/D06/Library/PciHostBridgeLib/PciHostBridgeLib.c
>> @@ -3,13 +3,7 @@
>> Copyright (c) 2018, Hisilicon Limited. All rights reserved.<BR>
>> Copyright (c) 2018, Linaro Limited. 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 distribution. The full text of the license may be found at
>> - http://opensource.org/licenses/bsd-license.php
>> -
>> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> + SPDX-License-Identifier: BSD-2-Clause-Patent
>>
>> **/
>> #include <PiDxe.h>
>> diff --git a/Platform/Hisilicon/D06/Library/PciHostBridgeLib/PciHostBridgeLib.inf b/Platform/Hisilicon/D06/Library/PciHostBridgeLib/PciHostBridgeLib.inf
>> index 8a998681a3..d8d2940344 100644
>> --- a/Platform/Hisilicon/D06/Library/PciHostBridgeLib/PciHostBridgeLib.inf
>> +++ b/Platform/Hisilicon/D06/Library/PciHostBridgeLib/PciHostBridgeLib.inf
>> @@ -3,12 +3,7 @@
>> # Copyright (c) 2018, Hisilicon Limited. All rights reserved.<BR>
>> # Copyright (c) 2018, Linaro Limited. 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 distribution. The full text of the license may be found at
>> -# http://opensource.org/licenses/bsd-license.php
>> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>> #
>> #
>> ##
>> diff --git a/Platform/Hisilicon/HiKey/HiKey.dec b/Platform/Hisilicon/HiKey/HiKey.dec
>> index d5de1a1659..3164c4c223 100644
>> --- a/Platform/Hisilicon/HiKey/HiKey.dec
>> +++ b/Platform/Hisilicon/HiKey/HiKey.dec
>> @@ -1,13 +1,7 @@
>> #
>> # Copyright (c) 2014-2018, Linaro Limited. All rights reserved.
>> #
>> -# This program and the accompanying materials
>> -# are licensed and made available under the terms and conditions of the BSD License
>> -# which accompanies this distribution. The full text of the license may be found at
>> -# http://opensource.org/licenses/bsd-license.php
>> -#
>> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>> #
>>
>> [Defines]
>> diff --git a/Platform/Hisilicon/HiKey/HiKey.dsc b/Platform/Hisilicon/HiKey/HiKey.dsc
>> index 7e05babb6c..44f21700dd 100644
>> --- a/Platform/Hisilicon/HiKey/HiKey.dsc
>> +++ b/Platform/Hisilicon/HiKey/HiKey.dsc
>> @@ -1,13 +1,7 @@
>> #
>> # Copyright (c) 2014-2018, Linaro Limited. All rights reserved.
>> #
>> -# This program and the accompanying materials
>> -# are licensed and made available under the terms and conditions of the BSD License
>> -# which accompanies this distribution. The full text of the license may be found at
>> -# http://opensource.org/licenses/bsd-license.php
>> -#
>> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>> #
>>
>> ################################################################################
>> diff --git a/Platform/Hisilicon/HiKey/HiKey.fdf b/Platform/Hisilicon/HiKey/HiKey.fdf
>> index 7e6c8083bb..3d85f01eca 100644
>> --- a/Platform/Hisilicon/HiKey/HiKey.fdf
>> +++ b/Platform/Hisilicon/HiKey/HiKey.fdf
>> @@ -1,13 +1,7 @@
>> #
>> # Copyright (c) 2014-2018, Linaro Limited. All rights reserved.
>> #
>> -# This program and the accompanying materials
>> -# are licensed and made available under the terms and conditions of the BSD License
>> -# which accompanies this distribution. The full text of the license may be found at
>> -# http://opensource.org/licenses/bsd-license.php
>> -#
>> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>> #
>>
>> ################################################################################
>> diff --git a/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.c b/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.c
>> index 2162b68529..47fbe02e53 100644
>> --- a/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.c
>> +++ b/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.c
>> @@ -2,13 +2,7 @@
>> *
>> * Copyright (c) 2018, Linaro Ltd. All rights reserved.
>> *
>> -* This program and the accompanying materials
>> -* are licensed and made available under the terms and conditions of the BSD License
>> -* which accompanies this distribution. The full text of the license may be found at
>> -* http://opensource.org/licenses/bsd-license.php
>> -*
>> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +* SPDX-License-Identifier: BSD-2-Clause-Patent
>> *
>> **/
>>
>> diff --git a/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.h b/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.h
>> index 0ababfa32e..954f31e461 100644
>> --- a/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.h
>> +++ b/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.h
>> @@ -2,13 +2,7 @@
>> *
>> * Copyright (c) 2018, Linaro Ltd. All rights reserved.
>> *
>> -* This program and the accompanying materials
>> -* are licensed and made available under the terms and conditions of the BSD License
>> -* which accompanies this distribution. The full text of the license may be found at
>> -* http://opensource.org/licenses/bsd-license.php
>> -*
>> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +* SPDX-License-Identifier: BSD-2-Clause-Patent
>> *
>> **/
>>
>> diff --git a/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.inf b/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.inf
>> index 4c4644a0fe..0181999a3b 100644
>> --- a/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.inf
>> +++ b/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.inf
>> @@ -2,13 +2,7 @@
>> # Copyright (c) 2013 - 2014, ARM Ltd. All rights reserved.
>> # Copyright (c) 2018, Linaro Ltd. All rights reserved.
>> #
>> -# This program and the accompanying materials
>> -# are licensed and made available under the terms and conditions of the BSD License
>> -# which accompanies this distribution. The full text of the license may be found at
>> -# http://opensource.org/licenses/bsd-license.php
>> -#
>> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>> #
>>
>> [Defines]
>> diff --git a/Platform/Hisilicon/HiKey/HiKeyGpioDxe/HiKeyGpioDxe.c b/Platform/Hisilicon/HiKey/HiKeyGpioDxe/HiKeyGpioDxe.c
>> index be535f8f19..efdd76768b 100644
>> --- a/Platform/Hisilicon/HiKey/HiKeyGpioDxe/HiKeyGpioDxe.c
>> +++ b/Platform/Hisilicon/HiKey/HiKeyGpioDxe/HiKeyGpioDxe.c
>> @@ -2,13 +2,7 @@
>> *
>> * Copyright (c) 2018, Linaro. All rights reserved.
>> *
>> -* This program and the accompanying materials
>> -* are licensed and made available under the terms and conditions of the BSD License
>> -* which accompanies this distribution. The full text of the license may be found at
>> -* http://opensource.org/licenses/bsd-license.php
>> -*
>> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +* SPDX-License-Identifier: BSD-2-Clause-Patent
>> *
>> **/
>>
>> diff --git a/Platform/Hisilicon/HiKey/HiKeyGpioDxe/HiKeyGpioDxe.inf b/Platform/Hisilicon/HiKey/HiKeyGpioDxe/HiKeyGpioDxe.inf
>> index 2791b9f44c..3564b07633 100644
>> --- a/Platform/Hisilicon/HiKey/HiKeyGpioDxe/HiKeyGpioDxe.inf
>> +++ b/Platform/Hisilicon/HiKey/HiKeyGpioDxe/HiKeyGpioDxe.inf
>> @@ -1,13 +1,7 @@
>> #
>> # Copyright (c) 2018, Linaro. All rights reserved.
>> #
>> -# This program and the accompanying materials
>> -# are licensed and made available under the terms and conditions of the BSD License
>> -# which accompanies this distribution. The full text of the license may be found at
>> -# http://opensource.org/licenses/bsd-license.php
>> -#
>> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>> #
>>
>> [Defines]
>> diff --git a/Platform/Hisilicon/HiKey/Include/ArmPlatform.h b/Platform/Hisilicon/HiKey/Include/ArmPlatform.h
>> index e60478f6b7..6962da30a3 100644
>> --- a/Platform/Hisilicon/HiKey/Include/ArmPlatform.h
>> +++ b/Platform/Hisilicon/HiKey/Include/ArmPlatform.h
>> @@ -2,13 +2,7 @@
>> *
>> * Copyright (c) 2014-2017, Linaro Limited. All rights reserved.
>> *
>> -* This program and the accompanying materials
>> -* are licensed and made available under the terms and conditions of the BSD License
>> -* which accompanies this distribution. The full text of the license may be found at
>> -* http://opensource.org/licenses/bsd-license.php
>> -*
>> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +* SPDX-License-Identifier: BSD-2-Clause-Patent
>> *
>> **/
>>
>> diff --git a/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKey.c b/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKey.c
>> index 6bf0d39bd4..801d633985 100644
>> --- a/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKey.c
>> +++ b/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKey.c
>> @@ -2,13 +2,7 @@
>> *
>> * Copyright (c) 2014-2017, Linaro Limited. All rights reserved.
>> *
>> -* This program and the accompanying materials
>> -* are licensed and made available under the terms and conditions of the BSD License
>> -* which accompanies this distribution. The full text of the license may be found at
>> -* http://opensource.org/licenses/bsd-license.php
>> -*
>> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +* SPDX-License-Identifier: BSD-2-Clause-Patent
>> *
>> **/
>>
>> diff --git a/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyHelper.S b/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyHelper.S
>> index 0e8f1bbacd..253b7c6e70 100644
>> --- a/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyHelper.S
>> +++ b/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyHelper.S
>> @@ -1,13 +1,7 @@
>> #
>> # Copyright (c) 2014-2017, Linaro Limited. All rights reserved.
>> #
>> -# This program and the accompanying materials
>> -# are licensed and made available under the terms and conditions of the BSD License
>> -# which accompanies this distribution. The full text of the license may be found at
>> -# http://opensource.org/licenses/bsd-license.php
>> -#
>> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>> #
>> #
>>
>> diff --git a/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyLib.inf b/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyLib.inf
>> index 6a47a4501e..18b74bc42e 100644
>> --- a/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyLib.inf
>> +++ b/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyLib.inf
>> @@ -1,13 +1,7 @@
>> #
>> # Copyright (c) 2014-2017, Linaro Limited. All rights reserved.
>> #
>> -# This program and the accompanying materials
>> -# are licensed and made available under the terms and conditions of the BSD License
>> -# which accompanies this distribution. The full text of the license may be found at
>> -# http://opensource.org/licenses/bsd-license.php
>> -#
>> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>> #
>>
>> [Defines]
>> diff --git a/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyMem.c b/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyMem.c
>> index 0f6ad89a02..118c66942e 100644
>> --- a/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyMem.c
>> +++ b/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyMem.c
>> @@ -2,13 +2,7 @@
>> *
>> * Copyright (c) 2014-2017, Linaro Limited. All rights reserved.
>> *
>> -* This program and the accompanying materials
>> -* are licensed and made available under the terms and conditions of the BSD License
>> -* which accompanies this distribution. The full text of the license may be found at
>> -* http://opensource.org/licenses/bsd-license.php
>> -*
>> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +* SPDX-License-Identifier: BSD-2-Clause-Patent
>> *
>> **/
>>
>> diff --git a/Platform/Hisilicon/HiKey960/HiKey960.dec b/Platform/Hisilicon/HiKey960/HiKey960.dec
>> index aa5a0caf52..1273c28ed0 100644
>> --- a/Platform/Hisilicon/HiKey960/HiKey960.dec
>> +++ b/Platform/Hisilicon/HiKey960/HiKey960.dec
>> @@ -1,13 +1,7 @@
>> #
>> # Copyright (c) 2018, Linaro Limited. All rights reserved.
>> #
>> -# This program and the accompanying materials
>> -# are licensed and made available under the terms and conditions of the BSD License
>> -# which accompanies this distribution. The full text of the license may be found at
>> -# http://opensource.org/licenses/bsd-license.php
>> -#
>> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>> #
>>
>> [Defines]
>> diff --git a/Platform/Hisilicon/HiKey960/HiKey960.dsc b/Platform/Hisilicon/HiKey960/HiKey960.dsc
>> index a4a1a371de..db6e5b918d 100644
>> --- a/Platform/Hisilicon/HiKey960/HiKey960.dsc
>> +++ b/Platform/Hisilicon/HiKey960/HiKey960.dsc
>> @@ -1,13 +1,7 @@
>> #
>> # Copyright (c) 2018, Linaro Limited. All rights reserved.
>> #
>> -# This program and the accompanying materials
>> -# are licensed and made available under the terms and conditions of the BSD License
>> -# which accompanies this distribution. The full text of the license may be found at
>> -# http://opensource.org/licenses/bsd-license.php
>> -#
>> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>> #
>>
>> ################################################################################
>> diff --git a/Platform/Hisilicon/HiKey960/HiKey960.fdf b/Platform/Hisilicon/HiKey960/HiKey960.fdf
>> index 1b07284dc8..01ae18499f 100644
>> --- a/Platform/Hisilicon/HiKey960/HiKey960.fdf
>> +++ b/Platform/Hisilicon/HiKey960/HiKey960.fdf
>> @@ -1,13 +1,7 @@
>> #
>> # Copyright (c) 2018, Linaro Limited. All rights reserved.
>> #
>> -# This program and the accompanying materials
>> -# are licensed and made available under the terms and conditions of the BSD License
>> -# which accompanies this distribution. The full text of the license may be found at
>> -# http://opensource.org/licenses/bsd-license.php
>> -#
>> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>> #
>>
>> ################################################################################
>> diff --git a/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.c b/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.c
>> index 47ec879861..8e94bec41c 100644
>> --- a/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.c
>> +++ b/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.c
>> @@ -2,13 +2,7 @@
>> *
>> * Copyright (c) 2018, Linaro Ltd. All rights reserved.
>> *
>> -* This program and the accompanying materials
>> -* are licensed and made available under the terms and conditions of the BSD License
>> -* which accompanies this distribution. The full text of the license may be found at
>> -* http://opensource.org/licenses/bsd-license.php
>> -*
>> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +* SPDX-License-Identifier: BSD-2-Clause-Patent
>> *
>> **/
>>
>> diff --git a/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.h b/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.h
>> index 630aabcb23..0629fa4a81 100644
>> --- a/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.h
>> +++ b/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.h
>> @@ -2,13 +2,7 @@
>> *
>> * Copyright (c) 2018, Linaro Ltd. All rights reserved.
>> *
>> -* This program and the accompanying materials
>> -* are licensed and made available under the terms and conditions of the BSD License
>> -* which accompanies this distribution. The full text of the license may be found at
>> -* http://opensource.org/licenses/bsd-license.php
>> -*
>> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +* SPDX-License-Identifier: BSD-2-Clause-Patent
>> *
>> **/
>>
>> diff --git a/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.inf b/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.inf
>> index 54105bdb3c..5e1c52b84b 100644
>> --- a/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.inf
>> +++ b/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.inf
>> @@ -1,13 +1,7 @@
>> #
>> # Copyright (c) 2018, Linaro Limited. All rights reserved.
>> #
>> -# This program and the accompanying materials
>> -# are licensed and made available under the terms and conditions of the BSD License
>> -# which accompanies this distribution. The full text of the license may be found at
>> -# http://opensource.org/licenses/bsd-license.php
>> -#
>> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>> #
>>
>> [Defines]
>> diff --git a/Platform/Hisilicon/HiKey960/HiKey960GpioDxe/HiKey960GpioDxe.c b/Platform/Hisilicon/HiKey960/HiKey960GpioDxe/HiKey960GpioDxe.c
>> index b196455072..74f10bf9e6 100644
>> --- a/Platform/Hisilicon/HiKey960/HiKey960GpioDxe/HiKey960GpioDxe.c
>> +++ b/Platform/Hisilicon/HiKey960/HiKey960GpioDxe/HiKey960GpioDxe.c
>> @@ -2,13 +2,7 @@
>> *
>> * Copyright (c) 2018, Linaro. All rights reserved.
>> *
>> -* This program and the accompanying materials
>> -* are licensed and made available under the terms and conditions of the BSD License
>> -* which accompanies this distribution. The full text of the license may be found at
>> -* http://opensource.org/licenses/bsd-license.php
>> -*
>> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +* SPDX-License-Identifier: BSD-2-Clause-Patent
>> *
>> **/
>>
>> diff --git a/Platform/Hisilicon/HiKey960/HiKey960GpioDxe/HiKey960GpioDxe.inf b/Platform/Hisilicon/HiKey960/HiKey960GpioDxe/HiKey960GpioDxe.inf
>> index 5ea3747321..9fe2d2fe52 100644
>> --- a/Platform/Hisilicon/HiKey960/HiKey960GpioDxe/HiKey960GpioDxe.inf
>> +++ b/Platform/Hisilicon/HiKey960/HiKey960GpioDxe/HiKey960GpioDxe.inf
>> @@ -1,13 +1,7 @@
>> #
>> # Copyright (c) 2018, Linaro. All rights reserved.
>> #
>> -# This program and the accompanying materials
>> -# are licensed and made available under the terms and conditions of the BSD License
>> -# which accompanies this distribution. The full text of the license may be found at
>> -# http://opensource.org/licenses/bsd-license.php
>> -#
>> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>> #
>>
>> [Defines]
>> diff --git a/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960.c b/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960.c
>> index 9ae4610a29..89cca920ad 100644
>> --- a/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960.c
>> +++ b/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960.c
>> @@ -2,13 +2,7 @@
>> *
>> * Copyright (c) 2018, Linaro Limited. All rights reserved.
>> *
>> -* This program and the accompanying materials
>> -* are licensed and made available under the terms and conditions of the BSD License
>> -* which accompanies this distribution. The full text of the license may be found at
>> -* http://opensource.org/licenses/bsd-license.php
>> -*
>> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +* SPDX-License-Identifier: BSD-2-Clause-Patent
>> *
>> **/
>>
>> diff --git a/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960Helper.S b/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960Helper.S
>> index eb85f67520..a3638cef4d 100644
>> --- a/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960Helper.S
>> +++ b/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960Helper.S
>> @@ -1,13 +1,7 @@
>> #
>> # Copyright (c) 2018, Linaro Limited. All rights reserved.
>> #
>> -# This program and the accompanying materials
>> -# are licensed and made available under the terms and conditions of the BSD License
>> -# which accompanies this distribution. The full text of the license may be found at
>> -# http://opensource.org/licenses/bsd-license.php
>> -#
>> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>> #
>> #
>>
>> diff --git a/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960Lib.inf b/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960Lib.inf
>> index e16e5a623b..81167c76f9 100644
>> --- a/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960Lib.inf
>> +++ b/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960Lib.inf
>> @@ -1,13 +1,7 @@
>> #
>> # Copyright (c) 2018, Linaro Limited. All rights reserved.
>> #
>> -# This program and the accompanying materials
>> -# are licensed and made available under the terms and conditions of the BSD License
>> -# which accompanies this distribution. The full text of the license may be found at
>> -# http://opensource.org/licenses/bsd-license.php
>> -#
>> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>> #
>>
>> [Defines]
>> diff --git a/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960Mem.c b/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960Mem.c
>> index 0c37c3791a..68ca76688e 100644
>> --- a/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960Mem.c
>> +++ b/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960Mem.c
>> @@ -2,13 +2,7 @@
>> *
>> * Copyright (c) 2018, Linaro Limited. All rights reserved.
>> *
>> -* This program and the accompanying materials
>> -* are licensed and made available under the terms and conditions of the BSD License
>> -* which accompanies this distribution. The full text of the license may be found at
>> -* http://opensource.org/licenses/bsd-license.php
>> -*
>> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +* SPDX-License-Identifier: BSD-2-Clause-Patent
>> *
>> **/
>>
>> diff --git a/Platform/Hisilicon/Library/PciHostBridgeLib/PciHostBridgeLib.c b/Platform/Hisilicon/Library/PciHostBridgeLib/PciHostBridgeLib.c
>> index 6aff5cdd3d..1be7de5ccf 100644
>> --- a/Platform/Hisilicon/Library/PciHostBridgeLib/PciHostBridgeLib.c
>> +++ b/Platform/Hisilicon/Library/PciHostBridgeLib/PciHostBridgeLib.c
>> @@ -4,13 +4,7 @@
>> Copyright (c) 2018, Hisilicon Limited. All rights reserved.<BR>
>> Copyright (c) 2017 - 2018, Linaro Ltd. 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
>> - distribution. The full text of the license may be found at
>> - http://opensource.org/licenses/bsd-license.php.
>> -
>> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT
>> - WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> + SPDX-License-Identifier: BSD-2-Clause-Patent
>>
>> **/
>> #include <PiDxe.h>
>> diff --git a/Platform/Hisilicon/Library/PciHostBridgeLib/PciHostBridgeLib.inf b/Platform/Hisilicon/Library/PciHostBridgeLib/PciHostBridgeLib.inf
>> index dd451cff33..6f2576c61c 100644
>> --- a/Platform/Hisilicon/Library/PciHostBridgeLib/PciHostBridgeLib.inf
>> +++ b/Platform/Hisilicon/Library/PciHostBridgeLib/PciHostBridgeLib.inf
>> @@ -4,13 +4,7 @@
>> # Copyright (c) 2018, Hisilicon Limited. All rights reserved.<BR>
>> # Copyright (c) 2017 - 2018, Linaro Ltd. 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
>> -# distribution. The full text of the license may be found at
>> -# http://opensource.org/licenses/bsd-license.php
>> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
>> -# IMPLIED.
>> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>> #
>> #
>> ##
>> --
>> 2.21.0.windows.1
>>
>>
>>
>>
^ permalink raw reply [flat|nested] 63+ messages in thread
* [[edk2-platforms][PATCH V2] 08/30] Platform/Intel/AdvancedFeaturePkg: Replace BSD License with BSD+Patent License
2019-05-15 23:09 [[edk2-platforms][PATCH V2] 00/30] Change edk2-platforms/master to BSD+Patent License Michael D Kinney
` (6 preceding siblings ...)
2019-05-15 23:09 ` [[edk2-platforms][PATCH V2] 07/30] Platform/Hisilicon: " Michael D Kinney
@ 2019-05-15 23:09 ` Michael D Kinney
2019-05-17 6:50 ` Kubacki, Michael A
2019-05-17 7:11 ` Chaganty, Rangasai V
2019-05-15 23:09 ` [[edk2-platforms][PATCH V2] 09/30] Platform/Intel/ClevoOpenBoardPkg: " Michael D Kinney
` (22 subsequent siblings)
30 siblings, 2 replies; 63+ messages in thread
From: Michael D Kinney @ 2019-05-15 23:09 UTC (permalink / raw)
To: devel; +Cc: Michael Kubacki, Sai Chaganty
https://bugzilla.tianocore.org/show_bug.cgi?id=1373
Replace BSD 2-Clause License with BSD+Patent License. This change is
based on the following emails:
https://lists.01.org/pipermail/edk2-devel/2019-February/036260.html
https://lists.01.org/pipermail/edk2-devel/2018-October/030385.html
RFCs with detailed process for the license change:
V3: https://lists.01.org/pipermail/edk2-devel/2019-March/038116.html
V2: https://lists.01.org/pipermail/edk2-devel/2019-March/037669.html
V1: https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html
Cc: Michael Kubacki <michael.a.kubacki@intel.com>
Cc: Sai Chaganty <rangasai.v.chaganty@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
Platform/Intel/AdvancedFeaturePkg/AcpiDebug/AcpiDebug.asl | 8 +-------
Platform/Intel/AdvancedFeaturePkg/AcpiDebug/AcpiDebug.c | 8 +-------
.../Intel/AdvancedFeaturePkg/AcpiDebug/AcpiDebugDxe.inf | 8 +-------
.../Intel/AdvancedFeaturePkg/AcpiDebug/AcpiDebugSmm.inf | 8 +-------
Platform/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dec | 8 +-------
Platform/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc | 8 +-------
.../Include/Dsc/CoreAdvancedDxeInclude.dsc | 8 +-------
.../Include/Dsc/CoreAdvancedPeiInclude.dsc | 8 +-------
.../Include/Fdf/CoreAdvancedLateInclude.fdf | 8 +-------
.../Include/Fdf/CoreAdvancedPostMemoryInclude.fdf | 8 +-------
.../Include/Fdf/CoreAdvancedPreMemoryInclude.fdf | 8 +-------
Platform/Intel/AdvancedFeaturePkg/Ipmi/BmcAcpi/BmcAcpi.c | 8 +-------
.../Intel/AdvancedFeaturePkg/Ipmi/BmcAcpi/BmcAcpi.inf | 8 +-------
.../AdvancedFeaturePkg/Ipmi/BmcAcpi/BmcSsdt/BmcSsdt.asl | 8 +-------
.../Ipmi/BmcAcpi/BmcSsdt/IpmiOprRegions.asi | 8 +-------
Platform/Intel/AdvancedFeaturePkg/Ipmi/BmcElog/BmcElog.c | 8 +-------
.../Intel/AdvancedFeaturePkg/Ipmi/BmcElog/BmcElog.inf | 8 +-------
Platform/Intel/AdvancedFeaturePkg/Ipmi/Frb/FrbDxe.c | 8 +-------
Platform/Intel/AdvancedFeaturePkg/Ipmi/Frb/FrbDxe.inf | 8 +-------
Platform/Intel/AdvancedFeaturePkg/Ipmi/Frb/FrbPei.c | 8 +-------
Platform/Intel/AdvancedFeaturePkg/Ipmi/Frb/FrbPei.inf | 8 +-------
.../Ipmi/Include/Library/IpmiCommandLib.h | 8 +-------
.../Ipmi/Include/Library/IpmiPlatformHookLib.h | 8 +-------
Platform/Intel/AdvancedFeaturePkg/Ipmi/IpmiFru/IpmiFru.c | 8 +-------
.../Intel/AdvancedFeaturePkg/Ipmi/IpmiFru/IpmiFru.inf | 8 +-------
.../Intel/AdvancedFeaturePkg/Ipmi/IpmiInit/DxeIpmiInit.c | 8 +-------
.../AdvancedFeaturePkg/Ipmi/IpmiInit/DxeIpmiInit.inf | 8 +-------
.../Intel/AdvancedFeaturePkg/Ipmi/IpmiInit/PeiIpmiInit.c | 8 +-------
.../AdvancedFeaturePkg/Ipmi/IpmiInit/PeiIpmiInit.inf | 8 +-------
.../Ipmi/Library/IpmiCommandLib/IpmiCommandLib.inf | 8 +-------
.../Ipmi/Library/IpmiCommandLib/IpmiCommandLibNetFnApp.c | 8 +-------
.../Library/IpmiCommandLib/IpmiCommandLibNetFnChassis.c | 8 +-------
.../Library/IpmiCommandLib/IpmiCommandLibNetFnStorage.c | 8 +-------
.../Library/IpmiCommandLib/IpmiCommandLibNetFnTransport.c | 8 +-------
.../Ipmi/Library/IpmiLibNull/IpmiLibNull.c | 8 +-------
.../Ipmi/Library/IpmiLibNull/IpmiLibNull.inf | 8 +-------
.../IpmiPlatformHookLibNull/IpmiPlatformHookLibNull.c | 8 +-------
.../IpmiPlatformHookLibNull/IpmiPlatformHookLibNull.inf | 8 +-------
Platform/Intel/AdvancedFeaturePkg/Ipmi/OsWdt/OsWdt.c | 8 +-------
Platform/Intel/AdvancedFeaturePkg/Ipmi/OsWdt/OsWdt.inf | 8 +-------
.../Intel/AdvancedFeaturePkg/Ipmi/SolStatus/SolStatus.c | 8 +-------
.../Intel/AdvancedFeaturePkg/Ipmi/SolStatus/SolStatus.inf | 8 +-------
.../Smbios/SmbiosBasicDxe/SmbiosBasic.h | 8 +-------
.../Smbios/SmbiosBasicDxe/SmbiosBasicDxe.inf | 8 +-------
.../Smbios/SmbiosBasicDxe/SmbiosBasicEntryPoint.c | 8 +-------
.../Smbios/SmbiosBasicDxe/Type0BiosVendorFunction.c | 8 +-------
.../SmbiosBasicDxe/Type1SystemManufacturerFunction.c | 8 +-------
.../SmbiosBasicDxe/Type2BaseBoardManufacturerFunction.c | 8 +-------
.../Smbios/SmbiosBasicDxe/Type32BootInformationFunction.c | 8 +-------
.../SmbiosBasicDxe/Type3ChassisManufacturerFunction.c | 8 +-------
50 files changed, 50 insertions(+), 350 deletions(-)
diff --git a/Platform/Intel/AdvancedFeaturePkg/AcpiDebug/AcpiDebug.asl b/Platform/Intel/AdvancedFeaturePkg/AcpiDebug/AcpiDebug.asl
index 7e05db17be..cbfe085b56 100644
--- a/Platform/Intel/AdvancedFeaturePkg/AcpiDebug/AcpiDebug.asl
+++ b/Platform/Intel/AdvancedFeaturePkg/AcpiDebug/AcpiDebug.asl
@@ -2,13 +2,7 @@
Acpi Debug ASL code.
Copyright (c) 2019, 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 distribution. The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/AdvancedFeaturePkg/AcpiDebug/AcpiDebug.c b/Platform/Intel/AdvancedFeaturePkg/AcpiDebug/AcpiDebug.c
index be3b36547e..f9cd8bcbb1 100644
--- a/Platform/Intel/AdvancedFeaturePkg/AcpiDebug/AcpiDebug.c
+++ b/Platform/Intel/AdvancedFeaturePkg/AcpiDebug/AcpiDebug.c
@@ -2,13 +2,7 @@
Acpi Debug driver code.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/AdvancedFeaturePkg/AcpiDebug/AcpiDebugDxe.inf b/Platform/Intel/AdvancedFeaturePkg/AcpiDebug/AcpiDebugDxe.inf
index 210fcd811b..fd701df3af 100644
--- a/Platform/Intel/AdvancedFeaturePkg/AcpiDebug/AcpiDebugDxe.inf
+++ b/Platform/Intel/AdvancedFeaturePkg/AcpiDebug/AcpiDebugDxe.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2019, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/AdvancedFeaturePkg/AcpiDebug/AcpiDebugSmm.inf b/Platform/Intel/AdvancedFeaturePkg/AcpiDebug/AcpiDebugSmm.inf
index 8cc0a6c938..26122abc6c 100644
--- a/Platform/Intel/AdvancedFeaturePkg/AcpiDebug/AcpiDebugSmm.inf
+++ b/Platform/Intel/AdvancedFeaturePkg/AcpiDebug/AcpiDebugSmm.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2019, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dec b/Platform/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dec
index de80ae7ec3..b18f81ba39 100644
--- a/Platform/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dec
+++ b/Platform/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dec
@@ -8,13 +8,7 @@
#
# Copyright (c) 2017 - 2019, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc b/Platform/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc
index df09eb51dd..909e566445 100644
--- a/Platform/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc
+++ b/Platform/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017 - 2019, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/AdvancedFeaturePkg/Include/Dsc/CoreAdvancedDxeInclude.dsc b/Platform/Intel/AdvancedFeaturePkg/Include/Dsc/CoreAdvancedDxeInclude.dsc
index 6764d46131..b9bb33eb7e 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Include/Dsc/CoreAdvancedDxeInclude.dsc
+++ b/Platform/Intel/AdvancedFeaturePkg/Include/Dsc/CoreAdvancedDxeInclude.dsc
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017 - 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/AdvancedFeaturePkg/Include/Dsc/CoreAdvancedPeiInclude.dsc b/Platform/Intel/AdvancedFeaturePkg/Include/Dsc/CoreAdvancedPeiInclude.dsc
index 30f37cfc24..86b1ebfed0 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Include/Dsc/CoreAdvancedPeiInclude.dsc
+++ b/Platform/Intel/AdvancedFeaturePkg/Include/Dsc/CoreAdvancedPeiInclude.dsc
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/AdvancedFeaturePkg/Include/Fdf/CoreAdvancedLateInclude.fdf b/Platform/Intel/AdvancedFeaturePkg/Include/Fdf/CoreAdvancedLateInclude.fdf
index 64f1dd5872..66bf64f2c3 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Include/Fdf/CoreAdvancedLateInclude.fdf
+++ b/Platform/Intel/AdvancedFeaturePkg/Include/Fdf/CoreAdvancedLateInclude.fdf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017 - 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/AdvancedFeaturePkg/Include/Fdf/CoreAdvancedPostMemoryInclude.fdf b/Platform/Intel/AdvancedFeaturePkg/Include/Fdf/CoreAdvancedPostMemoryInclude.fdf
index 013c10146b..3c2716d672 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Include/Fdf/CoreAdvancedPostMemoryInclude.fdf
+++ b/Platform/Intel/AdvancedFeaturePkg/Include/Fdf/CoreAdvancedPostMemoryInclude.fdf
@@ -3,12 +3,6 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/AdvancedFeaturePkg/Include/Fdf/CoreAdvancedPreMemoryInclude.fdf b/Platform/Intel/AdvancedFeaturePkg/Include/Fdf/CoreAdvancedPreMemoryInclude.fdf
index 95fe1e875e..5b21f781a7 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Include/Fdf/CoreAdvancedPreMemoryInclude.fdf
+++ b/Platform/Intel/AdvancedFeaturePkg/Include/Fdf/CoreAdvancedPreMemoryInclude.fdf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/AdvancedFeaturePkg/Ipmi/BmcAcpi/BmcAcpi.c b/Platform/Intel/AdvancedFeaturePkg/Ipmi/BmcAcpi/BmcAcpi.c
index 5df9513dfb..3b330da160 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Ipmi/BmcAcpi/BmcAcpi.c
+++ b/Platform/Intel/AdvancedFeaturePkg/Ipmi/BmcAcpi/BmcAcpi.c
@@ -2,13 +2,7 @@
BMC ACPI.
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/AdvancedFeaturePkg/Ipmi/BmcAcpi/BmcAcpi.inf b/Platform/Intel/AdvancedFeaturePkg/Ipmi/BmcAcpi/BmcAcpi.inf
index 8a87991f19..17b75dfbcc 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Ipmi/BmcAcpi/BmcAcpi.inf
+++ b/Platform/Intel/AdvancedFeaturePkg/Ipmi/BmcAcpi/BmcAcpi.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/AdvancedFeaturePkg/Ipmi/BmcAcpi/BmcSsdt/BmcSsdt.asl b/Platform/Intel/AdvancedFeaturePkg/Ipmi/BmcAcpi/BmcSsdt/BmcSsdt.asl
index 98c015df0b..0daa175205 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Ipmi/BmcAcpi/BmcSsdt/BmcSsdt.asl
+++ b/Platform/Intel/AdvancedFeaturePkg/Ipmi/BmcAcpi/BmcSsdt/BmcSsdt.asl
@@ -2,13 +2,7 @@
BMC ACPI SSDT.
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/AdvancedFeaturePkg/Ipmi/BmcAcpi/BmcSsdt/IpmiOprRegions.asi b/Platform/Intel/AdvancedFeaturePkg/Ipmi/BmcAcpi/BmcSsdt/IpmiOprRegions.asi
index 7d01f74f01..d2ae5fc40a 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Ipmi/BmcAcpi/BmcSsdt/IpmiOprRegions.asi
+++ b/Platform/Intel/AdvancedFeaturePkg/Ipmi/BmcAcpi/BmcSsdt/IpmiOprRegions.asi
@@ -2,13 +2,7 @@
IPMI ACPI SSDT.
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/AdvancedFeaturePkg/Ipmi/BmcElog/BmcElog.c b/Platform/Intel/AdvancedFeaturePkg/Ipmi/BmcElog/BmcElog.c
index 6125e2bd94..421fbdecb8 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Ipmi/BmcElog/BmcElog.c
+++ b/Platform/Intel/AdvancedFeaturePkg/Ipmi/BmcElog/BmcElog.c
@@ -2,13 +2,7 @@
BMC Event Log functions.
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/AdvancedFeaturePkg/Ipmi/BmcElog/BmcElog.inf b/Platform/Intel/AdvancedFeaturePkg/Ipmi/BmcElog/BmcElog.inf
index 93b30d665b..85591efb5d 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Ipmi/BmcElog/BmcElog.inf
+++ b/Platform/Intel/AdvancedFeaturePkg/Ipmi/BmcElog/BmcElog.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Frb/FrbDxe.c b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Frb/FrbDxe.c
index 719d968b5a..74c52a74eb 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Frb/FrbDxe.c
+++ b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Frb/FrbDxe.c
@@ -2,13 +2,7 @@
IPMI FRB Driver.
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Frb/FrbDxe.inf b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Frb/FrbDxe.inf
index 6709bc5746..3aa29889b1 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Frb/FrbDxe.inf
+++ b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Frb/FrbDxe.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Frb/FrbPei.c b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Frb/FrbPei.c
index 2a077bc3b9..962cd7cc9b 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Frb/FrbPei.c
+++ b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Frb/FrbPei.c
@@ -2,13 +2,7 @@
IPMI FRB PEIM.
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Frb/FrbPei.inf b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Frb/FrbPei.inf
index 3c4771ef9c..1882453ffe 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Frb/FrbPei.inf
+++ b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Frb/FrbPei.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Include/Library/IpmiCommandLib.h b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Include/Library/IpmiCommandLib.h
index 592d9c6846..9b761717d4 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Include/Library/IpmiCommandLib.h
+++ b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Include/Library/IpmiCommandLib.h
@@ -2,13 +2,7 @@
This library abstract how to send/receive IPMI command.
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Include/Library/IpmiPlatformHookLib.h b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Include/Library/IpmiPlatformHookLib.h
index 404233e4b8..8359e3f38b 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Include/Library/IpmiPlatformHookLib.h
+++ b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Include/Library/IpmiPlatformHookLib.h
@@ -2,13 +2,7 @@
This library abstract the platform specific hook for IPMI.
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/AdvancedFeaturePkg/Ipmi/IpmiFru/IpmiFru.c b/Platform/Intel/AdvancedFeaturePkg/Ipmi/IpmiFru/IpmiFru.c
index 1be62a882b..663983fd68 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Ipmi/IpmiFru/IpmiFru.c
+++ b/Platform/Intel/AdvancedFeaturePkg/Ipmi/IpmiFru/IpmiFru.c
@@ -2,13 +2,7 @@
IPMI FRU Driver.
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/AdvancedFeaturePkg/Ipmi/IpmiFru/IpmiFru.inf b/Platform/Intel/AdvancedFeaturePkg/Ipmi/IpmiFru/IpmiFru.inf
index 755aa7025d..a2556e92d2 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Ipmi/IpmiFru/IpmiFru.inf
+++ b/Platform/Intel/AdvancedFeaturePkg/Ipmi/IpmiFru/IpmiFru.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/AdvancedFeaturePkg/Ipmi/IpmiInit/DxeIpmiInit.c b/Platform/Intel/AdvancedFeaturePkg/Ipmi/IpmiInit/DxeIpmiInit.c
index 5c5079d7fb..fccbb3b5dc 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Ipmi/IpmiInit/DxeIpmiInit.c
+++ b/Platform/Intel/AdvancedFeaturePkg/Ipmi/IpmiInit/DxeIpmiInit.c
@@ -2,13 +2,7 @@
IPMI stack initialization.
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/AdvancedFeaturePkg/Ipmi/IpmiInit/DxeIpmiInit.inf b/Platform/Intel/AdvancedFeaturePkg/Ipmi/IpmiInit/DxeIpmiInit.inf
index 7c0b222187..2e544270a3 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Ipmi/IpmiInit/DxeIpmiInit.inf
+++ b/Platform/Intel/AdvancedFeaturePkg/Ipmi/IpmiInit/DxeIpmiInit.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/AdvancedFeaturePkg/Ipmi/IpmiInit/PeiIpmiInit.c b/Platform/Intel/AdvancedFeaturePkg/Ipmi/IpmiInit/PeiIpmiInit.c
index 85dfcf77e0..8245aac8e9 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Ipmi/IpmiInit/PeiIpmiInit.c
+++ b/Platform/Intel/AdvancedFeaturePkg/Ipmi/IpmiInit/PeiIpmiInit.c
@@ -2,13 +2,7 @@
IPMI stack initialization in PEI.
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/AdvancedFeaturePkg/Ipmi/IpmiInit/PeiIpmiInit.inf b/Platform/Intel/AdvancedFeaturePkg/Ipmi/IpmiInit/PeiIpmiInit.inf
index 4565701c1a..5e00f4bd33 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Ipmi/IpmiInit/PeiIpmiInit.inf
+++ b/Platform/Intel/AdvancedFeaturePkg/Ipmi/IpmiInit/PeiIpmiInit.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiCommandLib/IpmiCommandLib.inf b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiCommandLib/IpmiCommandLib.inf
index 5c8b19c4df..89e7a66f60 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiCommandLib/IpmiCommandLib.inf
+++ b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiCommandLib/IpmiCommandLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiCommandLib/IpmiCommandLibNetFnApp.c b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiCommandLib/IpmiCommandLibNetFnApp.c
index 4280f8805a..b57db50610 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiCommandLib/IpmiCommandLibNetFnApp.c
+++ b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiCommandLib/IpmiCommandLibNetFnApp.c
@@ -2,13 +2,7 @@
IPMI Command - NetFnApp.
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiCommandLib/IpmiCommandLibNetFnChassis.c b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiCommandLib/IpmiCommandLibNetFnChassis.c
index 1f50ca1834..1b86aa888e 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiCommandLib/IpmiCommandLibNetFnChassis.c
+++ b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiCommandLib/IpmiCommandLibNetFnChassis.c
@@ -2,13 +2,7 @@
IPMI Command - NetFnChassis.
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiCommandLib/IpmiCommandLibNetFnStorage.c b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiCommandLib/IpmiCommandLibNetFnStorage.c
index c7af988bd8..8e892c5f84 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiCommandLib/IpmiCommandLibNetFnStorage.c
+++ b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiCommandLib/IpmiCommandLibNetFnStorage.c
@@ -2,13 +2,7 @@
IPMI Command - NetFnStorage.
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiCommandLib/IpmiCommandLibNetFnTransport.c b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiCommandLib/IpmiCommandLibNetFnTransport.c
index 309cea819f..3b9b17b909 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiCommandLib/IpmiCommandLibNetFnTransport.c
+++ b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiCommandLib/IpmiCommandLibNetFnTransport.c
@@ -2,13 +2,7 @@
IPMI Command - NetFnTransport.
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiLibNull/IpmiLibNull.c b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiLibNull/IpmiLibNull.c
index 13b7e0b5a7..db4c7ada7e 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiLibNull/IpmiLibNull.c
+++ b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiLibNull/IpmiLibNull.c
@@ -2,13 +2,7 @@
IPMI library.
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiLibNull/IpmiLibNull.inf b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiLibNull/IpmiLibNull.inf
index c1860fbcae..c042b8beed 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiLibNull/IpmiLibNull.inf
+++ b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiLibNull/IpmiLibNull.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiPlatformHookLibNull/IpmiPlatformHookLibNull.c b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiPlatformHookLibNull/IpmiPlatformHookLibNull.c
index 4c8cb2af23..bdc8d23827 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiPlatformHookLibNull/IpmiPlatformHookLibNull.c
+++ b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiPlatformHookLibNull/IpmiPlatformHookLibNull.c
@@ -2,13 +2,7 @@
IPMI platform hook library.
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiPlatformHookLibNull/IpmiPlatformHookLibNull.inf b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiPlatformHookLibNull/IpmiPlatformHookLibNull.inf
index bc4ad96690..458b40f626 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiPlatformHookLibNull/IpmiPlatformHookLibNull.inf
+++ b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiPlatformHookLibNull/IpmiPlatformHookLibNull.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/AdvancedFeaturePkg/Ipmi/OsWdt/OsWdt.c b/Platform/Intel/AdvancedFeaturePkg/Ipmi/OsWdt/OsWdt.c
index 1001cb0192..c5612d4b6d 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Ipmi/OsWdt/OsWdt.c
+++ b/Platform/Intel/AdvancedFeaturePkg/Ipmi/OsWdt/OsWdt.c
@@ -2,13 +2,7 @@
IPMI Os watchdog timer Driver.
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/AdvancedFeaturePkg/Ipmi/OsWdt/OsWdt.inf b/Platform/Intel/AdvancedFeaturePkg/Ipmi/OsWdt/OsWdt.inf
index 31e78ccc30..e49942c198 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Ipmi/OsWdt/OsWdt.inf
+++ b/Platform/Intel/AdvancedFeaturePkg/Ipmi/OsWdt/OsWdt.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/AdvancedFeaturePkg/Ipmi/SolStatus/SolStatus.c b/Platform/Intel/AdvancedFeaturePkg/Ipmi/SolStatus/SolStatus.c
index 4163fa1229..69479bdbf5 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Ipmi/SolStatus/SolStatus.c
+++ b/Platform/Intel/AdvancedFeaturePkg/Ipmi/SolStatus/SolStatus.c
@@ -2,13 +2,7 @@
IPMI Serial Over Lan Driver.
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/AdvancedFeaturePkg/Ipmi/SolStatus/SolStatus.inf b/Platform/Intel/AdvancedFeaturePkg/Ipmi/SolStatus/SolStatus.inf
index 886f6412ff..07f2c03f6a 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Ipmi/SolStatus/SolStatus.inf
+++ b/Platform/Intel/AdvancedFeaturePkg/Ipmi/SolStatus/SolStatus.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/SmbiosBasic.h b/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/SmbiosBasic.h
index 01d4a83b78..e278a4ed18 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/SmbiosBasic.h
+++ b/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/SmbiosBasic.h
@@ -2,13 +2,7 @@
Smbios basic header file.
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/SmbiosBasicDxe.inf b/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/SmbiosBasicDxe.inf
index 68d6957ab4..69e930ddae 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/SmbiosBasicDxe.inf
+++ b/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/SmbiosBasicDxe.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/SmbiosBasicEntryPoint.c b/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/SmbiosBasicEntryPoint.c
index 515921a7ff..8e68629ef6 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/SmbiosBasicEntryPoint.c
+++ b/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/SmbiosBasicEntryPoint.c
@@ -2,13 +2,7 @@
Smbios basic entry point.
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/Type0BiosVendorFunction.c b/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/Type0BiosVendorFunction.c
index 11c72339f1..331efc8614 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/Type0BiosVendorFunction.c
+++ b/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/Type0BiosVendorFunction.c
@@ -2,13 +2,7 @@
Smbios type 0.
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/Type1SystemManufacturerFunction.c b/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/Type1SystemManufacturerFunction.c
index 716031e17b..2314d09695 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/Type1SystemManufacturerFunction.c
+++ b/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/Type1SystemManufacturerFunction.c
@@ -2,13 +2,7 @@
Smbios type 1.
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/Type2BaseBoardManufacturerFunction.c b/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/Type2BaseBoardManufacturerFunction.c
index 1f2d6abb59..9193cb0be7 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/Type2BaseBoardManufacturerFunction.c
+++ b/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/Type2BaseBoardManufacturerFunction.c
@@ -2,13 +2,7 @@
Smbios type 2.
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/Type32BootInformationFunction.c b/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/Type32BootInformationFunction.c
index 44ff5b72eb..87bfd045da 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/Type32BootInformationFunction.c
+++ b/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/Type32BootInformationFunction.c
@@ -2,13 +2,7 @@
Smbios type 32.
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/Type3ChassisManufacturerFunction.c b/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/Type3ChassisManufacturerFunction.c
index 5399207cbd..33732bc9ca 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/Type3ChassisManufacturerFunction.c
+++ b/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/Type3ChassisManufacturerFunction.c
@@ -2,13 +2,7 @@
Smbios type 3.
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
--
2.21.0.windows.1
^ permalink raw reply related [flat|nested] 63+ messages in thread* Re: [[edk2-platforms][PATCH V2] 08/30] Platform/Intel/AdvancedFeaturePkg: Replace BSD License with BSD+Patent License
2019-05-15 23:09 ` [[edk2-platforms][PATCH V2] 08/30] Platform/Intel/AdvancedFeaturePkg: " Michael D Kinney
@ 2019-05-17 6:50 ` Kubacki, Michael A
2019-05-17 7:11 ` Chaganty, Rangasai V
1 sibling, 0 replies; 63+ messages in thread
From: Kubacki, Michael A @ 2019-05-17 6:50 UTC (permalink / raw)
To: Kinney, Michael D, devel@edk2.groups.io; +Cc: Chaganty, Rangasai V
Reviewed-by: Michael Kubacki <michael.a.kubacki@intel.com>
> -----Original Message-----
> From: Kinney, Michael D
> Sent: Wednesday, May 15, 2019 4:10 PM
> To: devel@edk2.groups.io
> Cc: Kubacki, Michael A <michael.a.kubacki@intel.com>; Chaganty, Rangasai
> V <rangasai.v.chaganty@intel.com>
> Subject: [[edk2-platforms][PATCH V2] 08/30]
> Platform/Intel/AdvancedFeaturePkg: Replace BSD License with BSD+Patent
> License
>
> https://bugzilla.tianocore.org/show_bug.cgi?id=1373
>
> Replace BSD 2-Clause License with BSD+Patent License. This change is
> based on the following emails:
>
> https://lists.01.org/pipermail/edk2-devel/2019-February/036260.html
> https://lists.01.org/pipermail/edk2-devel/2018-October/030385.html
>
> RFCs with detailed process for the license change:
>
> V3: https://lists.01.org/pipermail/edk2-devel/2019-March/038116.html
> V2: https://lists.01.org/pipermail/edk2-devel/2019-March/037669.html
> V1: https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html
>
> Cc: Michael Kubacki <michael.a.kubacki@intel.com>
> Cc: Sai Chaganty <rangasai.v.chaganty@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
> ---
> Platform/Intel/AdvancedFeaturePkg/AcpiDebug/AcpiDebug.asl | 8 +-------
> Platform/Intel/AdvancedFeaturePkg/AcpiDebug/AcpiDebug.c | 8 +-------
> .../Intel/AdvancedFeaturePkg/AcpiDebug/AcpiDebugDxe.inf | 8 +-------
> .../Intel/AdvancedFeaturePkg/AcpiDebug/AcpiDebugSmm.inf | 8 +-------
> Platform/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dec | 8 +-------
> Platform/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc | 8 +-------
> .../Include/Dsc/CoreAdvancedDxeInclude.dsc | 8 +-------
> .../Include/Dsc/CoreAdvancedPeiInclude.dsc | 8 +-------
> .../Include/Fdf/CoreAdvancedLateInclude.fdf | 8 +-------
> .../Include/Fdf/CoreAdvancedPostMemoryInclude.fdf | 8 +-------
> .../Include/Fdf/CoreAdvancedPreMemoryInclude.fdf | 8 +-------
> Platform/Intel/AdvancedFeaturePkg/Ipmi/BmcAcpi/BmcAcpi.c | 8 +-------
> .../Intel/AdvancedFeaturePkg/Ipmi/BmcAcpi/BmcAcpi.inf | 8 +-------
> .../AdvancedFeaturePkg/Ipmi/BmcAcpi/BmcSsdt/BmcSsdt.asl | 8 +-------
> .../Ipmi/BmcAcpi/BmcSsdt/IpmiOprRegions.asi | 8 +-------
> Platform/Intel/AdvancedFeaturePkg/Ipmi/BmcElog/BmcElog.c | 8 +-------
> .../Intel/AdvancedFeaturePkg/Ipmi/BmcElog/BmcElog.inf | 8 +-------
> Platform/Intel/AdvancedFeaturePkg/Ipmi/Frb/FrbDxe.c | 8 +-------
> Platform/Intel/AdvancedFeaturePkg/Ipmi/Frb/FrbDxe.inf | 8 +-------
> Platform/Intel/AdvancedFeaturePkg/Ipmi/Frb/FrbPei.c | 8 +-------
> Platform/Intel/AdvancedFeaturePkg/Ipmi/Frb/FrbPei.inf | 8 +-------
> .../Ipmi/Include/Library/IpmiCommandLib.h | 8 +-------
> .../Ipmi/Include/Library/IpmiPlatformHookLib.h | 8 +-------
> Platform/Intel/AdvancedFeaturePkg/Ipmi/IpmiFru/IpmiFru.c | 8 +-------
> .../Intel/AdvancedFeaturePkg/Ipmi/IpmiFru/IpmiFru.inf | 8 +-------
> .../Intel/AdvancedFeaturePkg/Ipmi/IpmiInit/DxeIpmiInit.c | 8 +-------
> .../AdvancedFeaturePkg/Ipmi/IpmiInit/DxeIpmiInit.inf | 8 +-------
> .../Intel/AdvancedFeaturePkg/Ipmi/IpmiInit/PeiIpmiInit.c | 8 +-------
> .../AdvancedFeaturePkg/Ipmi/IpmiInit/PeiIpmiInit.inf | 8 +-------
> .../Ipmi/Library/IpmiCommandLib/IpmiCommandLib.inf | 8 +-------
> .../Ipmi/Library/IpmiCommandLib/IpmiCommandLibNetFnApp.c | 8 +-------
> .../Library/IpmiCommandLib/IpmiCommandLibNetFnChassis.c | 8 +-------
> .../Library/IpmiCommandLib/IpmiCommandLibNetFnStorage.c | 8 +-------
> .../Library/IpmiCommandLib/IpmiCommandLibNetFnTransport.c | 8 +-------
> .../Ipmi/Library/IpmiLibNull/IpmiLibNull.c | 8 +-------
> .../Ipmi/Library/IpmiLibNull/IpmiLibNull.inf | 8 +-------
> .../IpmiPlatformHookLibNull/IpmiPlatformHookLibNull.c | 8 +-------
> .../IpmiPlatformHookLibNull/IpmiPlatformHookLibNull.inf | 8 +-------
> Platform/Intel/AdvancedFeaturePkg/Ipmi/OsWdt/OsWdt.c | 8 +-------
> Platform/Intel/AdvancedFeaturePkg/Ipmi/OsWdt/OsWdt.inf | 8 +-------
> .../Intel/AdvancedFeaturePkg/Ipmi/SolStatus/SolStatus.c | 8 +-------
> .../Intel/AdvancedFeaturePkg/Ipmi/SolStatus/SolStatus.inf | 8 +-------
> .../Smbios/SmbiosBasicDxe/SmbiosBasic.h | 8 +-------
> .../Smbios/SmbiosBasicDxe/SmbiosBasicDxe.inf | 8 +-------
> .../Smbios/SmbiosBasicDxe/SmbiosBasicEntryPoint.c | 8 +-------
> .../Smbios/SmbiosBasicDxe/Type0BiosVendorFunction.c | 8 +-------
> .../SmbiosBasicDxe/Type1SystemManufacturerFunction.c | 8 +-------
> .../SmbiosBasicDxe/Type2BaseBoardManufacturerFunction.c | 8 +-------
> .../Smbios/SmbiosBasicDxe/Type32BootInformationFunction.c | 8 +-------
> .../SmbiosBasicDxe/Type3ChassisManufacturerFunction.c | 8 +-------
> 50 files changed, 50 insertions(+), 350 deletions(-)
>
> diff --git a/Platform/Intel/AdvancedFeaturePkg/AcpiDebug/AcpiDebug.asl
> b/Platform/Intel/AdvancedFeaturePkg/AcpiDebug/AcpiDebug.asl
> index 7e05db17be..cbfe085b56 100644
> --- a/Platform/Intel/AdvancedFeaturePkg/AcpiDebug/AcpiDebug.asl
> +++ b/Platform/Intel/AdvancedFeaturePkg/AcpiDebug/AcpiDebug.asl
> @@ -2,13 +2,7 @@
> Acpi Debug ASL code.
>
> Copyright (c) 2019, 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 distribution. The full text of the license may be
> found at
> -http://opensource.org/licenses/bsd-license.php
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/Intel/AdvancedFeaturePkg/AcpiDebug/AcpiDebug.c
> b/Platform/Intel/AdvancedFeaturePkg/AcpiDebug/AcpiDebug.c
> index be3b36547e..f9cd8bcbb1 100644
> --- a/Platform/Intel/AdvancedFeaturePkg/AcpiDebug/AcpiDebug.c
> +++ b/Platform/Intel/AdvancedFeaturePkg/AcpiDebug/AcpiDebug.c
> @@ -2,13 +2,7 @@
> Acpi Debug driver code.
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/AdvancedFeaturePkg/AcpiDebug/AcpiDebugDxe.inf
> b/Platform/Intel/AdvancedFeaturePkg/AcpiDebug/AcpiDebugDxe.inf
> index 210fcd811b..fd701df3af 100644
> --- a/Platform/Intel/AdvancedFeaturePkg/AcpiDebug/AcpiDebugDxe.inf
> +++ b/Platform/Intel/AdvancedFeaturePkg/AcpiDebug/AcpiDebugDxe.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2019, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git
> a/Platform/Intel/AdvancedFeaturePkg/AcpiDebug/AcpiDebugSmm.inf
> b/Platform/Intel/AdvancedFeaturePkg/AcpiDebug/AcpiDebugSmm.inf
> index 8cc0a6c938..26122abc6c 100644
> --- a/Platform/Intel/AdvancedFeaturePkg/AcpiDebug/AcpiDebugSmm.inf
> +++ b/Platform/Intel/AdvancedFeaturePkg/AcpiDebug/AcpiDebugSmm.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2019, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git a/Platform/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dec
> b/Platform/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dec
> index de80ae7ec3..b18f81ba39 100644
> --- a/Platform/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dec
> +++ b/Platform/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dec
> @@ -8,13 +8,7 @@
> #
> # Copyright (c) 2017 - 2019, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Platform/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc
> b/Platform/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc
> index df09eb51dd..909e566445 100644
> --- a/Platform/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc
> +++ b/Platform/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017 - 2019, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/AdvancedFeaturePkg/Include/Dsc/CoreAdvancedDxeInclud
> e.dsc
> b/Platform/Intel/AdvancedFeaturePkg/Include/Dsc/CoreAdvancedDxeInclud
> e.dsc
> index 6764d46131..b9bb33eb7e 100644
> ---
> a/Platform/Intel/AdvancedFeaturePkg/Include/Dsc/CoreAdvancedDxeInclud
> e.dsc
> +++
> b/Platform/Intel/AdvancedFeaturePkg/Include/Dsc/CoreAdvancedDxeInclud
> e.dsc
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017 - 2018, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/AdvancedFeaturePkg/Include/Dsc/CoreAdvancedPeiInclude
> .dsc
> b/Platform/Intel/AdvancedFeaturePkg/Include/Dsc/CoreAdvancedPeiInclude
> .dsc
> index 30f37cfc24..86b1ebfed0 100644
> ---
> a/Platform/Intel/AdvancedFeaturePkg/Include/Dsc/CoreAdvancedPeiInclude
> .dsc
> +++
> b/Platform/Intel/AdvancedFeaturePkg/Include/Dsc/CoreAdvancedPeiInclude
> .dsc
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/AdvancedFeaturePkg/Include/Fdf/CoreAdvancedLateInclud
> e.fdf
> b/Platform/Intel/AdvancedFeaturePkg/Include/Fdf/CoreAdvancedLateInclud
> e.fdf
> index 64f1dd5872..66bf64f2c3 100644
> ---
> a/Platform/Intel/AdvancedFeaturePkg/Include/Fdf/CoreAdvancedLateInclud
> e.fdf
> +++
> b/Platform/Intel/AdvancedFeaturePkg/Include/Fdf/CoreAdvancedLateInclud
> e.fdf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017 - 2018, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/AdvancedFeaturePkg/Include/Fdf/CoreAdvancedPostMemo
> ryInclude.fdf
> b/Platform/Intel/AdvancedFeaturePkg/Include/Fdf/CoreAdvancedPostMemo
> ryInclude.fdf
> index 013c10146b..3c2716d672 100644
> ---
> a/Platform/Intel/AdvancedFeaturePkg/Include/Fdf/CoreAdvancedPostMemo
> ryInclude.fdf
> +++
> b/Platform/Intel/AdvancedFeaturePkg/Include/Fdf/CoreAdvancedPostMemo
> ryInclude.fdf
> @@ -3,12 +3,6 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
> diff --git
> a/Platform/Intel/AdvancedFeaturePkg/Include/Fdf/CoreAdvancedPreMemor
> yInclude.fdf
> b/Platform/Intel/AdvancedFeaturePkg/Include/Fdf/CoreAdvancedPreMemor
> yInclude.fdf
> index 95fe1e875e..5b21f781a7 100644
> ---
> a/Platform/Intel/AdvancedFeaturePkg/Include/Fdf/CoreAdvancedPreMemor
> yInclude.fdf
> +++
> b/Platform/Intel/AdvancedFeaturePkg/Include/Fdf/CoreAdvancedPreMemor
> yInclude.fdf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Platform/Intel/AdvancedFeaturePkg/Ipmi/BmcAcpi/BmcAcpi.c
> b/Platform/Intel/AdvancedFeaturePkg/Ipmi/BmcAcpi/BmcAcpi.c
> index 5df9513dfb..3b330da160 100644
> --- a/Platform/Intel/AdvancedFeaturePkg/Ipmi/BmcAcpi/BmcAcpi.c
> +++ b/Platform/Intel/AdvancedFeaturePkg/Ipmi/BmcAcpi/BmcAcpi.c
> @@ -2,13 +2,7 @@
> BMC ACPI.
>
> Copyright (c) 2018, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/Intel/AdvancedFeaturePkg/Ipmi/BmcAcpi/BmcAcpi.inf
> b/Platform/Intel/AdvancedFeaturePkg/Ipmi/BmcAcpi/BmcAcpi.inf
> index 8a87991f19..17b75dfbcc 100644
> --- a/Platform/Intel/AdvancedFeaturePkg/Ipmi/BmcAcpi/BmcAcpi.inf
> +++ b/Platform/Intel/AdvancedFeaturePkg/Ipmi/BmcAcpi/BmcAcpi.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2018, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git
> a/Platform/Intel/AdvancedFeaturePkg/Ipmi/BmcAcpi/BmcSsdt/BmcSsdt.asl
> b/Platform/Intel/AdvancedFeaturePkg/Ipmi/BmcAcpi/BmcSsdt/BmcSsdt.asl
> index 98c015df0b..0daa175205 100644
> ---
> a/Platform/Intel/AdvancedFeaturePkg/Ipmi/BmcAcpi/BmcSsdt/BmcSsdt.asl
> +++
> b/Platform/Intel/AdvancedFeaturePkg/Ipmi/BmcAcpi/BmcSsdt/BmcSsdt.asl
> @@ -2,13 +2,7 @@
> BMC ACPI SSDT.
>
> Copyright (c) 2018, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/AdvancedFeaturePkg/Ipmi/BmcAcpi/BmcSsdt/IpmiOprRegi
> ons.asi
> b/Platform/Intel/AdvancedFeaturePkg/Ipmi/BmcAcpi/BmcSsdt/IpmiOprRegi
> ons.asi
> index 7d01f74f01..d2ae5fc40a 100644
> ---
> a/Platform/Intel/AdvancedFeaturePkg/Ipmi/BmcAcpi/BmcSsdt/IpmiOprRegi
> ons.asi
> +++
> b/Platform/Intel/AdvancedFeaturePkg/Ipmi/BmcAcpi/BmcSsdt/IpmiOprRegi
> ons.asi
> @@ -2,13 +2,7 @@
> IPMI ACPI SSDT.
>
> Copyright (c) 2018, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/Intel/AdvancedFeaturePkg/Ipmi/BmcElog/BmcElog.c
> b/Platform/Intel/AdvancedFeaturePkg/Ipmi/BmcElog/BmcElog.c
> index 6125e2bd94..421fbdecb8 100644
> --- a/Platform/Intel/AdvancedFeaturePkg/Ipmi/BmcElog/BmcElog.c
> +++ b/Platform/Intel/AdvancedFeaturePkg/Ipmi/BmcElog/BmcElog.c
> @@ -2,13 +2,7 @@
> BMC Event Log functions.
>
> Copyright (c) 2018, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/Intel/AdvancedFeaturePkg/Ipmi/BmcElog/BmcElog.inf
> b/Platform/Intel/AdvancedFeaturePkg/Ipmi/BmcElog/BmcElog.inf
> index 93b30d665b..85591efb5d 100644
> --- a/Platform/Intel/AdvancedFeaturePkg/Ipmi/BmcElog/BmcElog.inf
> +++ b/Platform/Intel/AdvancedFeaturePkg/Ipmi/BmcElog/BmcElog.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2018, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Frb/FrbDxe.c
> b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Frb/FrbDxe.c
> index 719d968b5a..74c52a74eb 100644
> --- a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Frb/FrbDxe.c
> +++ b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Frb/FrbDxe.c
> @@ -2,13 +2,7 @@
> IPMI FRB Driver.
>
> Copyright (c) 2018, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Frb/FrbDxe.inf
> b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Frb/FrbDxe.inf
> index 6709bc5746..3aa29889b1 100644
> --- a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Frb/FrbDxe.inf
> +++ b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Frb/FrbDxe.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2018, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Frb/FrbPei.c
> b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Frb/FrbPei.c
> index 2a077bc3b9..962cd7cc9b 100644
> --- a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Frb/FrbPei.c
> +++ b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Frb/FrbPei.c
> @@ -2,13 +2,7 @@
> IPMI FRB PEIM.
>
> Copyright (c) 2018, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Frb/FrbPei.inf
> b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Frb/FrbPei.inf
> index 3c4771ef9c..1882453ffe 100644
> --- a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Frb/FrbPei.inf
> +++ b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Frb/FrbPei.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2018, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git
> a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Include/Library/IpmiCommandLi
> b.h
> b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Include/Library/IpmiCommandLi
> b.h
> index 592d9c6846..9b761717d4 100644
> ---
> a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Include/Library/IpmiCommandLi
> b.h
> +++
> b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Include/Library/IpmiCommandLi
> b.h
> @@ -2,13 +2,7 @@
> This library abstract how to send/receive IPMI command.
>
> Copyright (c) 2018, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Include/Library/IpmiPlatformHo
> okLib.h
> b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Include/Library/IpmiPlatformHo
> okLib.h
> index 404233e4b8..8359e3f38b 100644
> ---
> a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Include/Library/IpmiPlatformHo
> okLib.h
> +++
> b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Include/Library/IpmiPlatformHo
> okLib.h
> @@ -2,13 +2,7 @@
> This library abstract the platform specific hook for IPMI.
>
> Copyright (c) 2018, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/Intel/AdvancedFeaturePkg/Ipmi/IpmiFru/IpmiFru.c
> b/Platform/Intel/AdvancedFeaturePkg/Ipmi/IpmiFru/IpmiFru.c
> index 1be62a882b..663983fd68 100644
> --- a/Platform/Intel/AdvancedFeaturePkg/Ipmi/IpmiFru/IpmiFru.c
> +++ b/Platform/Intel/AdvancedFeaturePkg/Ipmi/IpmiFru/IpmiFru.c
> @@ -2,13 +2,7 @@
> IPMI FRU Driver.
>
> Copyright (c) 2018, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/Intel/AdvancedFeaturePkg/Ipmi/IpmiFru/IpmiFru.inf
> b/Platform/Intel/AdvancedFeaturePkg/Ipmi/IpmiFru/IpmiFru.inf
> index 755aa7025d..a2556e92d2 100644
> --- a/Platform/Intel/AdvancedFeaturePkg/Ipmi/IpmiFru/IpmiFru.inf
> +++ b/Platform/Intel/AdvancedFeaturePkg/Ipmi/IpmiFru/IpmiFru.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2018, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git a/Platform/Intel/AdvancedFeaturePkg/Ipmi/IpmiInit/DxeIpmiInit.c
> b/Platform/Intel/AdvancedFeaturePkg/Ipmi/IpmiInit/DxeIpmiInit.c
> index 5c5079d7fb..fccbb3b5dc 100644
> --- a/Platform/Intel/AdvancedFeaturePkg/Ipmi/IpmiInit/DxeIpmiInit.c
> +++ b/Platform/Intel/AdvancedFeaturePkg/Ipmi/IpmiInit/DxeIpmiInit.c
> @@ -2,13 +2,7 @@
> IPMI stack initialization.
>
> Copyright (c) 2018, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/Intel/AdvancedFeaturePkg/Ipmi/IpmiInit/DxeIpmiInit.inf
> b/Platform/Intel/AdvancedFeaturePkg/Ipmi/IpmiInit/DxeIpmiInit.inf
> index 7c0b222187..2e544270a3 100644
> --- a/Platform/Intel/AdvancedFeaturePkg/Ipmi/IpmiInit/DxeIpmiInit.inf
> +++ b/Platform/Intel/AdvancedFeaturePkg/Ipmi/IpmiInit/DxeIpmiInit.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2018, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git a/Platform/Intel/AdvancedFeaturePkg/Ipmi/IpmiInit/PeiIpmiInit.c
> b/Platform/Intel/AdvancedFeaturePkg/Ipmi/IpmiInit/PeiIpmiInit.c
> index 85dfcf77e0..8245aac8e9 100644
> --- a/Platform/Intel/AdvancedFeaturePkg/Ipmi/IpmiInit/PeiIpmiInit.c
> +++ b/Platform/Intel/AdvancedFeaturePkg/Ipmi/IpmiInit/PeiIpmiInit.c
> @@ -2,13 +2,7 @@
> IPMI stack initialization in PEI.
>
> Copyright (c) 2018, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/Intel/AdvancedFeaturePkg/Ipmi/IpmiInit/PeiIpmiInit.inf
> b/Platform/Intel/AdvancedFeaturePkg/Ipmi/IpmiInit/PeiIpmiInit.inf
> index 4565701c1a..5e00f4bd33 100644
> --- a/Platform/Intel/AdvancedFeaturePkg/Ipmi/IpmiInit/PeiIpmiInit.inf
> +++ b/Platform/Intel/AdvancedFeaturePkg/Ipmi/IpmiInit/PeiIpmiInit.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2018, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git
> a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiCommandLib/IpmiC
> ommandLib.inf
> b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiCommandLib/IpmiC
> ommandLib.inf
> index 5c8b19c4df..89e7a66f60 100644
> ---
> a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiCommandLib/IpmiC
> ommandLib.inf
> +++
> b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiCommandLib/IpmiC
> ommandLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2018, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git
> a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiCommandLib/IpmiC
> ommandLibNetFnApp.c
> b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiCommandLib/IpmiC
> ommandLibNetFnApp.c
> index 4280f8805a..b57db50610 100644
> ---
> a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiCommandLib/IpmiC
> ommandLibNetFnApp.c
> +++
> b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiCommandLib/IpmiC
> ommandLibNetFnApp.c
> @@ -2,13 +2,7 @@
> IPMI Command - NetFnApp.
>
> Copyright (c) 2018, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiCommandLib/IpmiC
> ommandLibNetFnChassis.c
> b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiCommandLib/IpmiC
> ommandLibNetFnChassis.c
> index 1f50ca1834..1b86aa888e 100644
> ---
> a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiCommandLib/IpmiC
> ommandLibNetFnChassis.c
> +++
> b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiCommandLib/IpmiC
> ommandLibNetFnChassis.c
> @@ -2,13 +2,7 @@
> IPMI Command - NetFnChassis.
>
> Copyright (c) 2018, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiCommandLib/IpmiC
> ommandLibNetFnStorage.c
> b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiCommandLib/IpmiC
> ommandLibNetFnStorage.c
> index c7af988bd8..8e892c5f84 100644
> ---
> a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiCommandLib/IpmiC
> ommandLibNetFnStorage.c
> +++
> b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiCommandLib/IpmiC
> ommandLibNetFnStorage.c
> @@ -2,13 +2,7 @@
> IPMI Command - NetFnStorage.
>
> Copyright (c) 2018, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiCommandLib/IpmiC
> ommandLibNetFnTransport.c
> b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiCommandLib/IpmiC
> ommandLibNetFnTransport.c
> index 309cea819f..3b9b17b909 100644
> ---
> a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiCommandLib/IpmiC
> ommandLibNetFnTransport.c
> +++
> b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiCommandLib/IpmiC
> ommandLibNetFnTransport.c
> @@ -2,13 +2,7 @@
> IPMI Command - NetFnTransport.
>
> Copyright (c) 2018, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiLibNull/IpmiLibNull.
> c
> b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiLibNull/IpmiLibNull.
> c
> index 13b7e0b5a7..db4c7ada7e 100644
> ---
> a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiLibNull/IpmiLibNull.
> c
> +++
> b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiLibNull/IpmiLibNull.
> c
> @@ -2,13 +2,7 @@
> IPMI library.
>
> Copyright (c) 2018, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiLibNull/IpmiLibNull.i
> nf
> b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiLibNull/IpmiLibNull.i
> nf
> index c1860fbcae..c042b8beed 100644
> ---
> a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiLibNull/IpmiLibNull.i
> nf
> +++
> b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiLibNull/IpmiLibNull.i
> nf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2018, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git
> a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiPlatformHookLibNu
> ll/IpmiPlatformHookLibNull.c
> b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiPlatformHookLibNu
> ll/IpmiPlatformHookLibNull.c
> index 4c8cb2af23..bdc8d23827 100644
> ---
> a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiPlatformHookLibNu
> ll/IpmiPlatformHookLibNull.c
> +++
> b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiPlatformHookLibNu
> ll/IpmiPlatformHookLibNull.c
> @@ -2,13 +2,7 @@
> IPMI platform hook library.
>
> Copyright (c) 2018, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiPlatformHookLibNu
> ll/IpmiPlatformHookLibNull.inf
> b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiPlatformHookLibNu
> ll/IpmiPlatformHookLibNull.inf
> index bc4ad96690..458b40f626 100644
> ---
> a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiPlatformHookLibNu
> ll/IpmiPlatformHookLibNull.inf
> +++
> b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiPlatformHookLibNu
> ll/IpmiPlatformHookLibNull.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2018, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git a/Platform/Intel/AdvancedFeaturePkg/Ipmi/OsWdt/OsWdt.c
> b/Platform/Intel/AdvancedFeaturePkg/Ipmi/OsWdt/OsWdt.c
> index 1001cb0192..c5612d4b6d 100644
> --- a/Platform/Intel/AdvancedFeaturePkg/Ipmi/OsWdt/OsWdt.c
> +++ b/Platform/Intel/AdvancedFeaturePkg/Ipmi/OsWdt/OsWdt.c
> @@ -2,13 +2,7 @@
> IPMI Os watchdog timer Driver.
>
> Copyright (c) 2018, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/Intel/AdvancedFeaturePkg/Ipmi/OsWdt/OsWdt.inf
> b/Platform/Intel/AdvancedFeaturePkg/Ipmi/OsWdt/OsWdt.inf
> index 31e78ccc30..e49942c198 100644
> --- a/Platform/Intel/AdvancedFeaturePkg/Ipmi/OsWdt/OsWdt.inf
> +++ b/Platform/Intel/AdvancedFeaturePkg/Ipmi/OsWdt/OsWdt.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2018, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git a/Platform/Intel/AdvancedFeaturePkg/Ipmi/SolStatus/SolStatus.c
> b/Platform/Intel/AdvancedFeaturePkg/Ipmi/SolStatus/SolStatus.c
> index 4163fa1229..69479bdbf5 100644
> --- a/Platform/Intel/AdvancedFeaturePkg/Ipmi/SolStatus/SolStatus.c
> +++ b/Platform/Intel/AdvancedFeaturePkg/Ipmi/SolStatus/SolStatus.c
> @@ -2,13 +2,7 @@
> IPMI Serial Over Lan Driver.
>
> Copyright (c) 2018, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/Intel/AdvancedFeaturePkg/Ipmi/SolStatus/SolStatus.inf
> b/Platform/Intel/AdvancedFeaturePkg/Ipmi/SolStatus/SolStatus.inf
> index 886f6412ff..07f2c03f6a 100644
> --- a/Platform/Intel/AdvancedFeaturePkg/Ipmi/SolStatus/SolStatus.inf
> +++ b/Platform/Intel/AdvancedFeaturePkg/Ipmi/SolStatus/SolStatus.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2018, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git
> a/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/SmbiosBasic
> .h
> b/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/SmbiosBasic
> .h
> index 01d4a83b78..e278a4ed18 100644
> ---
> a/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/SmbiosBasic
> .h
> +++
> b/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/SmbiosBasic
> .h
> @@ -2,13 +2,7 @@
> Smbios basic header file.
>
> Copyright (c) 2018, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/SmbiosBasic
> Dxe.inf
> b/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/SmbiosBasic
> Dxe.inf
> index 68d6957ab4..69e930ddae 100644
> ---
> a/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/SmbiosBasic
> Dxe.inf
> +++
> b/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/SmbiosBasic
> Dxe.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2018, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git
> a/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/SmbiosBasic
> EntryPoint.c
> b/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/SmbiosBasic
> EntryPoint.c
> index 515921a7ff..8e68629ef6 100644
> ---
> a/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/SmbiosBasic
> EntryPoint.c
> +++
> b/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/SmbiosBasic
> EntryPoint.c
> @@ -2,13 +2,7 @@
> Smbios basic entry point.
>
> Copyright (c) 2018, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/Type0BiosV
> endorFunction.c
> b/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/Type0BiosV
> endorFunction.c
> index 11c72339f1..331efc8614 100644
> ---
> a/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/Type0BiosV
> endorFunction.c
> +++
> b/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/Type0BiosV
> endorFunction.c
> @@ -2,13 +2,7 @@
> Smbios type 0.
>
> Copyright (c) 2018, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/Type1Syste
> mManufacturerFunction.c
> b/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/Type1Syste
> mManufacturerFunction.c
> index 716031e17b..2314d09695 100644
> ---
> a/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/Type1Syste
> mManufacturerFunction.c
> +++
> b/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/Type1Syste
> mManufacturerFunction.c
> @@ -2,13 +2,7 @@
> Smbios type 1.
>
> Copyright (c) 2018, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/Type2BaseB
> oardManufacturerFunction.c
> b/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/Type2BaseB
> oardManufacturerFunction.c
> index 1f2d6abb59..9193cb0be7 100644
> ---
> a/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/Type2BaseB
> oardManufacturerFunction.c
> +++
> b/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/Type2BaseB
> oardManufacturerFunction.c
> @@ -2,13 +2,7 @@
> Smbios type 2.
>
> Copyright (c) 2018, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/Type32Boot
> InformationFunction.c
> b/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/Type32Boot
> InformationFunction.c
> index 44ff5b72eb..87bfd045da 100644
> ---
> a/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/Type32Boot
> InformationFunction.c
> +++
> b/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/Type32Boot
> InformationFunction.c
> @@ -2,13 +2,7 @@
> Smbios type 32.
>
> Copyright (c) 2018, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/Type3Chassi
> sManufacturerFunction.c
> b/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/Type3Chassi
> sManufacturerFunction.c
> index 5399207cbd..33732bc9ca 100644
> ---
> a/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/Type3Chassi
> sManufacturerFunction.c
> +++
> b/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/Type3Chassi
> sManufacturerFunction.c
> @@ -2,13 +2,7 @@
> Smbios type 3.
>
> Copyright (c) 2018, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> --
> 2.21.0.windows.1
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: [[edk2-platforms][PATCH V2] 08/30] Platform/Intel/AdvancedFeaturePkg: Replace BSD License with BSD+Patent License
2019-05-15 23:09 ` [[edk2-platforms][PATCH V2] 08/30] Platform/Intel/AdvancedFeaturePkg: " Michael D Kinney
2019-05-17 6:50 ` Kubacki, Michael A
@ 2019-05-17 7:11 ` Chaganty, Rangasai V
1 sibling, 0 replies; 63+ messages in thread
From: Chaganty, Rangasai V @ 2019-05-17 7:11 UTC (permalink / raw)
To: Kinney, Michael D, devel@edk2.groups.io; +Cc: Kubacki, Michael A
Reviewed-by: Rangasai V Chaganty <rangasai.v.chaganty@intel.com>
-----Original Message-----
From: Kinney, Michael D
Sent: Wednesday, May 15, 2019 4:10 PM
To: devel@edk2.groups.io
Cc: Kubacki, Michael A <michael.a.kubacki@intel.com>; Chaganty, Rangasai V <rangasai.v.chaganty@intel.com>
Subject: [[edk2-platforms][PATCH V2] 08/30] Platform/Intel/AdvancedFeaturePkg: Replace BSD License with BSD+Patent License
https://bugzilla.tianocore.org/show_bug.cgi?id=1373
Replace BSD 2-Clause License with BSD+Patent License. This change is
based on the following emails:
https://lists.01.org/pipermail/edk2-devel/2019-February/036260.html
https://lists.01.org/pipermail/edk2-devel/2018-October/030385.html
RFCs with detailed process for the license change:
V3: https://lists.01.org/pipermail/edk2-devel/2019-March/038116.html
V2: https://lists.01.org/pipermail/edk2-devel/2019-March/037669.html
V1: https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html
Cc: Michael Kubacki <michael.a.kubacki@intel.com>
Cc: Sai Chaganty <rangasai.v.chaganty@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
Platform/Intel/AdvancedFeaturePkg/AcpiDebug/AcpiDebug.asl | 8 +-------
Platform/Intel/AdvancedFeaturePkg/AcpiDebug/AcpiDebug.c | 8 +-------
.../Intel/AdvancedFeaturePkg/AcpiDebug/AcpiDebugDxe.inf | 8 +-------
.../Intel/AdvancedFeaturePkg/AcpiDebug/AcpiDebugSmm.inf | 8 +-------
Platform/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dec | 8 +-------
Platform/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc | 8 +-------
.../Include/Dsc/CoreAdvancedDxeInclude.dsc | 8 +-------
.../Include/Dsc/CoreAdvancedPeiInclude.dsc | 8 +-------
.../Include/Fdf/CoreAdvancedLateInclude.fdf | 8 +-------
.../Include/Fdf/CoreAdvancedPostMemoryInclude.fdf | 8 +-------
.../Include/Fdf/CoreAdvancedPreMemoryInclude.fdf | 8 +-------
Platform/Intel/AdvancedFeaturePkg/Ipmi/BmcAcpi/BmcAcpi.c | 8 +-------
.../Intel/AdvancedFeaturePkg/Ipmi/BmcAcpi/BmcAcpi.inf | 8 +-------
.../AdvancedFeaturePkg/Ipmi/BmcAcpi/BmcSsdt/BmcSsdt.asl | 8 +-------
.../Ipmi/BmcAcpi/BmcSsdt/IpmiOprRegions.asi | 8 +-------
Platform/Intel/AdvancedFeaturePkg/Ipmi/BmcElog/BmcElog.c | 8 +-------
.../Intel/AdvancedFeaturePkg/Ipmi/BmcElog/BmcElog.inf | 8 +-------
Platform/Intel/AdvancedFeaturePkg/Ipmi/Frb/FrbDxe.c | 8 +-------
Platform/Intel/AdvancedFeaturePkg/Ipmi/Frb/FrbDxe.inf | 8 +-------
Platform/Intel/AdvancedFeaturePkg/Ipmi/Frb/FrbPei.c | 8 +-------
Platform/Intel/AdvancedFeaturePkg/Ipmi/Frb/FrbPei.inf | 8 +-------
.../Ipmi/Include/Library/IpmiCommandLib.h | 8 +-------
.../Ipmi/Include/Library/IpmiPlatformHookLib.h | 8 +-------
Platform/Intel/AdvancedFeaturePkg/Ipmi/IpmiFru/IpmiFru.c | 8 +-------
.../Intel/AdvancedFeaturePkg/Ipmi/IpmiFru/IpmiFru.inf | 8 +-------
.../Intel/AdvancedFeaturePkg/Ipmi/IpmiInit/DxeIpmiInit.c | 8 +-------
.../AdvancedFeaturePkg/Ipmi/IpmiInit/DxeIpmiInit.inf | 8 +-------
.../Intel/AdvancedFeaturePkg/Ipmi/IpmiInit/PeiIpmiInit.c | 8 +-------
.../AdvancedFeaturePkg/Ipmi/IpmiInit/PeiIpmiInit.inf | 8 +-------
.../Ipmi/Library/IpmiCommandLib/IpmiCommandLib.inf | 8 +-------
.../Ipmi/Library/IpmiCommandLib/IpmiCommandLibNetFnApp.c | 8 +-------
.../Library/IpmiCommandLib/IpmiCommandLibNetFnChassis.c | 8 +-------
.../Library/IpmiCommandLib/IpmiCommandLibNetFnStorage.c | 8 +-------
.../Library/IpmiCommandLib/IpmiCommandLibNetFnTransport.c | 8 +-------
.../Ipmi/Library/IpmiLibNull/IpmiLibNull.c | 8 +-------
.../Ipmi/Library/IpmiLibNull/IpmiLibNull.inf | 8 +-------
.../IpmiPlatformHookLibNull/IpmiPlatformHookLibNull.c | 8 +-------
.../IpmiPlatformHookLibNull/IpmiPlatformHookLibNull.inf | 8 +-------
Platform/Intel/AdvancedFeaturePkg/Ipmi/OsWdt/OsWdt.c | 8 +-------
Platform/Intel/AdvancedFeaturePkg/Ipmi/OsWdt/OsWdt.inf | 8 +-------
.../Intel/AdvancedFeaturePkg/Ipmi/SolStatus/SolStatus.c | 8 +-------
.../Intel/AdvancedFeaturePkg/Ipmi/SolStatus/SolStatus.inf | 8 +-------
.../Smbios/SmbiosBasicDxe/SmbiosBasic.h | 8 +-------
.../Smbios/SmbiosBasicDxe/SmbiosBasicDxe.inf | 8 +-------
.../Smbios/SmbiosBasicDxe/SmbiosBasicEntryPoint.c | 8 +-------
.../Smbios/SmbiosBasicDxe/Type0BiosVendorFunction.c | 8 +-------
.../SmbiosBasicDxe/Type1SystemManufacturerFunction.c | 8 +-------
.../SmbiosBasicDxe/Type2BaseBoardManufacturerFunction.c | 8 +-------
.../Smbios/SmbiosBasicDxe/Type32BootInformationFunction.c | 8 +-------
.../SmbiosBasicDxe/Type3ChassisManufacturerFunction.c | 8 +-------
50 files changed, 50 insertions(+), 350 deletions(-)
diff --git a/Platform/Intel/AdvancedFeaturePkg/AcpiDebug/AcpiDebug.asl b/Platform/Intel/AdvancedFeaturePkg/AcpiDebug/AcpiDebug.asl
index 7e05db17be..cbfe085b56 100644
--- a/Platform/Intel/AdvancedFeaturePkg/AcpiDebug/AcpiDebug.asl
+++ b/Platform/Intel/AdvancedFeaturePkg/AcpiDebug/AcpiDebug.asl
@@ -2,13 +2,7 @@
Acpi Debug ASL code.
Copyright (c) 2019, 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 distribution. The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/AdvancedFeaturePkg/AcpiDebug/AcpiDebug.c b/Platform/Intel/AdvancedFeaturePkg/AcpiDebug/AcpiDebug.c
index be3b36547e..f9cd8bcbb1 100644
--- a/Platform/Intel/AdvancedFeaturePkg/AcpiDebug/AcpiDebug.c
+++ b/Platform/Intel/AdvancedFeaturePkg/AcpiDebug/AcpiDebug.c
@@ -2,13 +2,7 @@
Acpi Debug driver code.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/AdvancedFeaturePkg/AcpiDebug/AcpiDebugDxe.inf b/Platform/Intel/AdvancedFeaturePkg/AcpiDebug/AcpiDebugDxe.inf
index 210fcd811b..fd701df3af 100644
--- a/Platform/Intel/AdvancedFeaturePkg/AcpiDebug/AcpiDebugDxe.inf
+++ b/Platform/Intel/AdvancedFeaturePkg/AcpiDebug/AcpiDebugDxe.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2019, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/AdvancedFeaturePkg/AcpiDebug/AcpiDebugSmm.inf b/Platform/Intel/AdvancedFeaturePkg/AcpiDebug/AcpiDebugSmm.inf
index 8cc0a6c938..26122abc6c 100644
--- a/Platform/Intel/AdvancedFeaturePkg/AcpiDebug/AcpiDebugSmm.inf
+++ b/Platform/Intel/AdvancedFeaturePkg/AcpiDebug/AcpiDebugSmm.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2019, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dec b/Platform/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dec
index de80ae7ec3..b18f81ba39 100644
--- a/Platform/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dec
+++ b/Platform/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dec
@@ -8,13 +8,7 @@
#
# Copyright (c) 2017 - 2019, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc b/Platform/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc
index df09eb51dd..909e566445 100644
--- a/Platform/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc
+++ b/Platform/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017 - 2019, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/AdvancedFeaturePkg/Include/Dsc/CoreAdvancedDxeInclude.dsc b/Platform/Intel/AdvancedFeaturePkg/Include/Dsc/CoreAdvancedDxeInclude.dsc
index 6764d46131..b9bb33eb7e 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Include/Dsc/CoreAdvancedDxeInclude.dsc
+++ b/Platform/Intel/AdvancedFeaturePkg/Include/Dsc/CoreAdvancedDxeInclude.dsc
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017 - 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/AdvancedFeaturePkg/Include/Dsc/CoreAdvancedPeiInclude.dsc b/Platform/Intel/AdvancedFeaturePkg/Include/Dsc/CoreAdvancedPeiInclude.dsc
index 30f37cfc24..86b1ebfed0 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Include/Dsc/CoreAdvancedPeiInclude.dsc
+++ b/Platform/Intel/AdvancedFeaturePkg/Include/Dsc/CoreAdvancedPeiInclude.dsc
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/AdvancedFeaturePkg/Include/Fdf/CoreAdvancedLateInclude.fdf b/Platform/Intel/AdvancedFeaturePkg/Include/Fdf/CoreAdvancedLateInclude.fdf
index 64f1dd5872..66bf64f2c3 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Include/Fdf/CoreAdvancedLateInclude.fdf
+++ b/Platform/Intel/AdvancedFeaturePkg/Include/Fdf/CoreAdvancedLateInclude.fdf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017 - 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/AdvancedFeaturePkg/Include/Fdf/CoreAdvancedPostMemoryInclude.fdf b/Platform/Intel/AdvancedFeaturePkg/Include/Fdf/CoreAdvancedPostMemoryInclude.fdf
index 013c10146b..3c2716d672 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Include/Fdf/CoreAdvancedPostMemoryInclude.fdf
+++ b/Platform/Intel/AdvancedFeaturePkg/Include/Fdf/CoreAdvancedPostMemoryInclude.fdf
@@ -3,12 +3,6 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/AdvancedFeaturePkg/Include/Fdf/CoreAdvancedPreMemoryInclude.fdf b/Platform/Intel/AdvancedFeaturePkg/Include/Fdf/CoreAdvancedPreMemoryInclude.fdf
index 95fe1e875e..5b21f781a7 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Include/Fdf/CoreAdvancedPreMemoryInclude.fdf
+++ b/Platform/Intel/AdvancedFeaturePkg/Include/Fdf/CoreAdvancedPreMemoryInclude.fdf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/AdvancedFeaturePkg/Ipmi/BmcAcpi/BmcAcpi.c b/Platform/Intel/AdvancedFeaturePkg/Ipmi/BmcAcpi/BmcAcpi.c
index 5df9513dfb..3b330da160 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Ipmi/BmcAcpi/BmcAcpi.c
+++ b/Platform/Intel/AdvancedFeaturePkg/Ipmi/BmcAcpi/BmcAcpi.c
@@ -2,13 +2,7 @@
BMC ACPI.
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/AdvancedFeaturePkg/Ipmi/BmcAcpi/BmcAcpi.inf b/Platform/Intel/AdvancedFeaturePkg/Ipmi/BmcAcpi/BmcAcpi.inf
index 8a87991f19..17b75dfbcc 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Ipmi/BmcAcpi/BmcAcpi.inf
+++ b/Platform/Intel/AdvancedFeaturePkg/Ipmi/BmcAcpi/BmcAcpi.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/AdvancedFeaturePkg/Ipmi/BmcAcpi/BmcSsdt/BmcSsdt.asl b/Platform/Intel/AdvancedFeaturePkg/Ipmi/BmcAcpi/BmcSsdt/BmcSsdt.asl
index 98c015df0b..0daa175205 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Ipmi/BmcAcpi/BmcSsdt/BmcSsdt.asl
+++ b/Platform/Intel/AdvancedFeaturePkg/Ipmi/BmcAcpi/BmcSsdt/BmcSsdt.asl
@@ -2,13 +2,7 @@
BMC ACPI SSDT.
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/AdvancedFeaturePkg/Ipmi/BmcAcpi/BmcSsdt/IpmiOprRegions.asi b/Platform/Intel/AdvancedFeaturePkg/Ipmi/BmcAcpi/BmcSsdt/IpmiOprRegions.asi
index 7d01f74f01..d2ae5fc40a 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Ipmi/BmcAcpi/BmcSsdt/IpmiOprRegions.asi
+++ b/Platform/Intel/AdvancedFeaturePkg/Ipmi/BmcAcpi/BmcSsdt/IpmiOprRegions.asi
@@ -2,13 +2,7 @@
IPMI ACPI SSDT.
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/AdvancedFeaturePkg/Ipmi/BmcElog/BmcElog.c b/Platform/Intel/AdvancedFeaturePkg/Ipmi/BmcElog/BmcElog.c
index 6125e2bd94..421fbdecb8 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Ipmi/BmcElog/BmcElog.c
+++ b/Platform/Intel/AdvancedFeaturePkg/Ipmi/BmcElog/BmcElog.c
@@ -2,13 +2,7 @@
BMC Event Log functions.
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/AdvancedFeaturePkg/Ipmi/BmcElog/BmcElog.inf b/Platform/Intel/AdvancedFeaturePkg/Ipmi/BmcElog/BmcElog.inf
index 93b30d665b..85591efb5d 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Ipmi/BmcElog/BmcElog.inf
+++ b/Platform/Intel/AdvancedFeaturePkg/Ipmi/BmcElog/BmcElog.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Frb/FrbDxe.c b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Frb/FrbDxe.c
index 719d968b5a..74c52a74eb 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Frb/FrbDxe.c
+++ b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Frb/FrbDxe.c
@@ -2,13 +2,7 @@
IPMI FRB Driver.
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Frb/FrbDxe.inf b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Frb/FrbDxe.inf
index 6709bc5746..3aa29889b1 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Frb/FrbDxe.inf
+++ b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Frb/FrbDxe.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Frb/FrbPei.c b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Frb/FrbPei.c
index 2a077bc3b9..962cd7cc9b 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Frb/FrbPei.c
+++ b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Frb/FrbPei.c
@@ -2,13 +2,7 @@
IPMI FRB PEIM.
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Frb/FrbPei.inf b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Frb/FrbPei.inf
index 3c4771ef9c..1882453ffe 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Frb/FrbPei.inf
+++ b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Frb/FrbPei.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Include/Library/IpmiCommandLib.h b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Include/Library/IpmiCommandLib.h
index 592d9c6846..9b761717d4 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Include/Library/IpmiCommandLib.h
+++ b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Include/Library/IpmiCommandLib.h
@@ -2,13 +2,7 @@
This library abstract how to send/receive IPMI command.
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Include/Library/IpmiPlatformHookLib.h b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Include/Library/IpmiPlatformHookLib.h
index 404233e4b8..8359e3f38b 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Include/Library/IpmiPlatformHookLib.h
+++ b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Include/Library/IpmiPlatformHookLib.h
@@ -2,13 +2,7 @@
This library abstract the platform specific hook for IPMI.
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/AdvancedFeaturePkg/Ipmi/IpmiFru/IpmiFru.c b/Platform/Intel/AdvancedFeaturePkg/Ipmi/IpmiFru/IpmiFru.c
index 1be62a882b..663983fd68 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Ipmi/IpmiFru/IpmiFru.c
+++ b/Platform/Intel/AdvancedFeaturePkg/Ipmi/IpmiFru/IpmiFru.c
@@ -2,13 +2,7 @@
IPMI FRU Driver.
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/AdvancedFeaturePkg/Ipmi/IpmiFru/IpmiFru.inf b/Platform/Intel/AdvancedFeaturePkg/Ipmi/IpmiFru/IpmiFru.inf
index 755aa7025d..a2556e92d2 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Ipmi/IpmiFru/IpmiFru.inf
+++ b/Platform/Intel/AdvancedFeaturePkg/Ipmi/IpmiFru/IpmiFru.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/AdvancedFeaturePkg/Ipmi/IpmiInit/DxeIpmiInit.c b/Platform/Intel/AdvancedFeaturePkg/Ipmi/IpmiInit/DxeIpmiInit.c
index 5c5079d7fb..fccbb3b5dc 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Ipmi/IpmiInit/DxeIpmiInit.c
+++ b/Platform/Intel/AdvancedFeaturePkg/Ipmi/IpmiInit/DxeIpmiInit.c
@@ -2,13 +2,7 @@
IPMI stack initialization.
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/AdvancedFeaturePkg/Ipmi/IpmiInit/DxeIpmiInit.inf b/Platform/Intel/AdvancedFeaturePkg/Ipmi/IpmiInit/DxeIpmiInit.inf
index 7c0b222187..2e544270a3 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Ipmi/IpmiInit/DxeIpmiInit.inf
+++ b/Platform/Intel/AdvancedFeaturePkg/Ipmi/IpmiInit/DxeIpmiInit.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/AdvancedFeaturePkg/Ipmi/IpmiInit/PeiIpmiInit.c b/Platform/Intel/AdvancedFeaturePkg/Ipmi/IpmiInit/PeiIpmiInit.c
index 85dfcf77e0..8245aac8e9 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Ipmi/IpmiInit/PeiIpmiInit.c
+++ b/Platform/Intel/AdvancedFeaturePkg/Ipmi/IpmiInit/PeiIpmiInit.c
@@ -2,13 +2,7 @@
IPMI stack initialization in PEI.
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/AdvancedFeaturePkg/Ipmi/IpmiInit/PeiIpmiInit.inf b/Platform/Intel/AdvancedFeaturePkg/Ipmi/IpmiInit/PeiIpmiInit.inf
index 4565701c1a..5e00f4bd33 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Ipmi/IpmiInit/PeiIpmiInit.inf
+++ b/Platform/Intel/AdvancedFeaturePkg/Ipmi/IpmiInit/PeiIpmiInit.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiCommandLib/IpmiCommandLib.inf b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiCommandLib/IpmiCommandLib.inf
index 5c8b19c4df..89e7a66f60 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiCommandLib/IpmiCommandLib.inf
+++ b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiCommandLib/IpmiCommandLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiCommandLib/IpmiCommandLibNetFnApp.c b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiCommandLib/IpmiCommandLibNetFnApp.c
index 4280f8805a..b57db50610 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiCommandLib/IpmiCommandLibNetFnApp.c
+++ b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiCommandLib/IpmiCommandLibNetFnApp.c
@@ -2,13 +2,7 @@
IPMI Command - NetFnApp.
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiCommandLib/IpmiCommandLibNetFnChassis.c b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiCommandLib/IpmiCommandLibNetFnChassis.c
index 1f50ca1834..1b86aa888e 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiCommandLib/IpmiCommandLibNetFnChassis.c
+++ b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiCommandLib/IpmiCommandLibNetFnChassis.c
@@ -2,13 +2,7 @@
IPMI Command - NetFnChassis.
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiCommandLib/IpmiCommandLibNetFnStorage.c b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiCommandLib/IpmiCommandLibNetFnStorage.c
index c7af988bd8..8e892c5f84 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiCommandLib/IpmiCommandLibNetFnStorage.c
+++ b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiCommandLib/IpmiCommandLibNetFnStorage.c
@@ -2,13 +2,7 @@
IPMI Command - NetFnStorage.
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiCommandLib/IpmiCommandLibNetFnTransport.c b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiCommandLib/IpmiCommandLibNetFnTransport.c
index 309cea819f..3b9b17b909 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiCommandLib/IpmiCommandLibNetFnTransport.c
+++ b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiCommandLib/IpmiCommandLibNetFnTransport.c
@@ -2,13 +2,7 @@
IPMI Command - NetFnTransport.
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiLibNull/IpmiLibNull.c b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiLibNull/IpmiLibNull.c
index 13b7e0b5a7..db4c7ada7e 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiLibNull/IpmiLibNull.c
+++ b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiLibNull/IpmiLibNull.c
@@ -2,13 +2,7 @@
IPMI library.
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiLibNull/IpmiLibNull.inf b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiLibNull/IpmiLibNull.inf
index c1860fbcae..c042b8beed 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiLibNull/IpmiLibNull.inf
+++ b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiLibNull/IpmiLibNull.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiPlatformHookLibNull/IpmiPlatformHookLibNull.c b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiPlatformHookLibNull/IpmiPlatformHookLibNull.c
index 4c8cb2af23..bdc8d23827 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiPlatformHookLibNull/IpmiPlatformHookLibNull.c
+++ b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiPlatformHookLibNull/IpmiPlatformHookLibNull.c
@@ -2,13 +2,7 @@
IPMI platform hook library.
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiPlatformHookLibNull/IpmiPlatformHookLibNull.inf b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiPlatformHookLibNull/IpmiPlatformHookLibNull.inf
index bc4ad96690..458b40f626 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiPlatformHookLibNull/IpmiPlatformHookLibNull.inf
+++ b/Platform/Intel/AdvancedFeaturePkg/Ipmi/Library/IpmiPlatformHookLibNull/IpmiPlatformHookLibNull.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/AdvancedFeaturePkg/Ipmi/OsWdt/OsWdt.c b/Platform/Intel/AdvancedFeaturePkg/Ipmi/OsWdt/OsWdt.c
index 1001cb0192..c5612d4b6d 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Ipmi/OsWdt/OsWdt.c
+++ b/Platform/Intel/AdvancedFeaturePkg/Ipmi/OsWdt/OsWdt.c
@@ -2,13 +2,7 @@
IPMI Os watchdog timer Driver.
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/AdvancedFeaturePkg/Ipmi/OsWdt/OsWdt.inf b/Platform/Intel/AdvancedFeaturePkg/Ipmi/OsWdt/OsWdt.inf
index 31e78ccc30..e49942c198 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Ipmi/OsWdt/OsWdt.inf
+++ b/Platform/Intel/AdvancedFeaturePkg/Ipmi/OsWdt/OsWdt.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/AdvancedFeaturePkg/Ipmi/SolStatus/SolStatus.c b/Platform/Intel/AdvancedFeaturePkg/Ipmi/SolStatus/SolStatus.c
index 4163fa1229..69479bdbf5 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Ipmi/SolStatus/SolStatus.c
+++ b/Platform/Intel/AdvancedFeaturePkg/Ipmi/SolStatus/SolStatus.c
@@ -2,13 +2,7 @@
IPMI Serial Over Lan Driver.
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/AdvancedFeaturePkg/Ipmi/SolStatus/SolStatus.inf b/Platform/Intel/AdvancedFeaturePkg/Ipmi/SolStatus/SolStatus.inf
index 886f6412ff..07f2c03f6a 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Ipmi/SolStatus/SolStatus.inf
+++ b/Platform/Intel/AdvancedFeaturePkg/Ipmi/SolStatus/SolStatus.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/SmbiosBasic.h b/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/SmbiosBasic.h
index 01d4a83b78..e278a4ed18 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/SmbiosBasic.h
+++ b/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/SmbiosBasic.h
@@ -2,13 +2,7 @@
Smbios basic header file.
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/SmbiosBasicDxe.inf b/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/SmbiosBasicDxe.inf
index 68d6957ab4..69e930ddae 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/SmbiosBasicDxe.inf
+++ b/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/SmbiosBasicDxe.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/SmbiosBasicEntryPoint.c b/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/SmbiosBasicEntryPoint.c
index 515921a7ff..8e68629ef6 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/SmbiosBasicEntryPoint.c
+++ b/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/SmbiosBasicEntryPoint.c
@@ -2,13 +2,7 @@
Smbios basic entry point.
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/Type0BiosVendorFunction.c b/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/Type0BiosVendorFunction.c
index 11c72339f1..331efc8614 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/Type0BiosVendorFunction.c
+++ b/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/Type0BiosVendorFunction.c
@@ -2,13 +2,7 @@
Smbios type 0.
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/Type1SystemManufacturerFunction.c b/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/Type1SystemManufacturerFunction.c
index 716031e17b..2314d09695 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/Type1SystemManufacturerFunction.c
+++ b/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/Type1SystemManufacturerFunction.c
@@ -2,13 +2,7 @@
Smbios type 1.
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/Type2BaseBoardManufacturerFunction.c b/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/Type2BaseBoardManufacturerFunction.c
index 1f2d6abb59..9193cb0be7 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/Type2BaseBoardManufacturerFunction.c
+++ b/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/Type2BaseBoardManufacturerFunction.c
@@ -2,13 +2,7 @@
Smbios type 2.
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/Type32BootInformationFunction.c b/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/Type32BootInformationFunction.c
index 44ff5b72eb..87bfd045da 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/Type32BootInformationFunction.c
+++ b/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/Type32BootInformationFunction.c
@@ -2,13 +2,7 @@
Smbios type 32.
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/Type3ChassisManufacturerFunction.c b/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/Type3ChassisManufacturerFunction.c
index 5399207cbd..33732bc9ca 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/Type3ChassisManufacturerFunction.c
+++ b/Platform/Intel/AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/Type3ChassisManufacturerFunction.c
@@ -2,13 +2,7 @@
Smbios type 3.
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
--
2.21.0.windows.1
^ permalink raw reply related [flat|nested] 63+ messages in thread
* [[edk2-platforms][PATCH V2] 09/30] Platform/Intel/ClevoOpenBoardPkg: Replace BSD License with BSD+Patent License
2019-05-15 23:09 [[edk2-platforms][PATCH V2] 00/30] Change edk2-platforms/master to BSD+Patent License Michael D Kinney
` (7 preceding siblings ...)
2019-05-15 23:09 ` [[edk2-platforms][PATCH V2] 08/30] Platform/Intel/AdvancedFeaturePkg: " Michael D Kinney
@ 2019-05-15 23:09 ` Michael D Kinney
2019-05-17 6:50 ` Kubacki, Michael A
2019-05-17 21:05 ` Sinha, Ankit
2019-05-15 23:09 ` [[edk2-platforms][PATCH V2] 10/30] Platform/Intel/KabylakeOpenBoardPkg: " Michael D Kinney
` (21 subsequent siblings)
30 siblings, 2 replies; 63+ messages in thread
From: Michael D Kinney @ 2019-05-15 23:09 UTC (permalink / raw)
To: devel; +Cc: Michael Kubacki, Ankit Sinha
https://bugzilla.tianocore.org/show_bug.cgi?id=1373
Replace BSD 2-Clause License with BSD+Patent License. This change is
based on the following emails:
https://lists.01.org/pipermail/edk2-devel/2019-February/036260.html
https://lists.01.org/pipermail/edk2-devel/2018-October/030385.html
RFCs with detailed process for the license change:
V3: https://lists.01.org/pipermail/edk2-devel/2019-March/038116.html
V2: https://lists.01.org/pipermail/edk2-devel/2019-March/037669.html
V1: https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html
Cc: Michael Kubacki <michael.a.kubacki@intel.com>
Cc: Ankit Sinha <ankit.sinha@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
.../ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/AcpiGnvsInit.c | 8 +-------
.../ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe.c | 8 +-------
.../ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe.inf | 8 +-------
.../ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/ALS.ASL | 8 +-------
.../ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/AMLUPD.asl | 8 +-------
.../ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/CPU.asl | 8 +-------
.../ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/DSDT.ASL | 8 +-------
.../ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Gpe.asl | 8 +-------
.../ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Itss.asl | 8 +-------
.../ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/LPC_DEV.ASL | 8 +-------
.../ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/LpcB.asl | 8 +-------
.../ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PCI_DRC.ASL | 8 +-------
.../ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PciTree.asl | 8 +-------
.../ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Platform.asl | 8 +-------
.../Acpi/BoardAcpiDxe/Dsdt/PlatformGnvs.asl | 8 +-------
.../ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Video.asl | 8 +-------
.../ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/UpdateDsdt.c | 8 +-------
.../ClevoOpenBoardPkg/Features/PciHotPlug/PciHotPlug.c | 8 +-------
.../ClevoOpenBoardPkg/Features/PciHotPlug/PciHotPlug.h | 8 +-------
.../ClevoOpenBoardPkg/Features/PciHotPlug/PciHotPlug.inf | 8 +-------
.../Features/Tbt/AcpiTables/Rtd3SptPcieTbt.asl | 8 +-------
.../ClevoOpenBoardPkg/Features/Tbt/AcpiTables/Tbt.asl | 8 +-------
.../Features/Tbt/Include/Acpi/TbtNvs.asl | 8 +-------
.../Features/Tbt/Include/Acpi/TbtNvsAreaDef.h | 8 +-------
.../Features/Tbt/Include/Library/DxeTbtPolicyLib.h | 8 +-------
.../Features/Tbt/Include/Library/PeiTbtPolicyLib.h | 8 +-------
.../Features/Tbt/Include/Library/TbtCommonLib.h | 8 +-------
.../Features/Tbt/Include/Ppi/PeiTbtPolicy.h | 8 +-------
.../Features/Tbt/Include/Private/Library/PeiDTbtInitLib.h | 8 +-------
.../Tbt/Include/Private/Library/PeiTbtCommonInitLib.h | 8 +-------
.../Features/Tbt/Include/Protocol/DxeTbtPolicy.h | 8 +-------
.../Features/Tbt/Include/Protocol/TbtNvsArea.h | 8 +-------
.../ClevoOpenBoardPkg/Features/Tbt/Include/TbtBoardInfo.h | 8 +-------
.../Features/Tbt/Include/TbtPolicyCommonDefinition.h | 8 +-------
.../Tbt/Library/DxeTbtPolicyLib/DxeTbtPolicyLib.c | 8 +-------
.../Tbt/Library/DxeTbtPolicyLib/DxeTbtPolicyLib.inf | 8 +-------
.../Tbt/Library/DxeTbtPolicyLib/DxeTbtPolicyLibrary.h | 8 +-------
.../Tbt/Library/PeiDxeSmmTbtCommonLib/TbtCommonLib.c | 8 +-------
.../Tbt/Library/PeiDxeSmmTbtCommonLib/TbtCommonLib.inf | 8 +-------
.../Tbt/Library/PeiTbtPolicyLib/PeiTbtPolicyLib.c | 8 +-------
.../Tbt/Library/PeiTbtPolicyLib/PeiTbtPolicyLib.inf | 8 +-------
.../Tbt/Library/PeiTbtPolicyLib/PeiTbtPolicyLibrary.h | 8 +-------
.../Tbt/Library/Private/PeiDTbtInitLib/PeiDTbtInitLib.c | 8 +-------
.../Tbt/Library/Private/PeiDTbtInitLib/PeiDTbtInitLib.inf | 8 +-------
.../ClevoOpenBoardPkg/Features/Tbt/TbtInit/Dxe/TbtDxe.c | 8 +-------
.../ClevoOpenBoardPkg/Features/Tbt/TbtInit/Dxe/TbtDxe.inf | 8 +-------
.../Features/Tbt/TbtInit/Pei/PeiTbtInit.c | 8 +-------
.../Features/Tbt/TbtInit/Pei/PeiTbtInit.inf | 8 +-------
.../Features/Tbt/TbtInit/Smm/TbtSmiHandler.c | 8 +-------
.../Features/Tbt/TbtInit/Smm/TbtSmiHandler.h | 8 +-------
.../ClevoOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmm.c | 8 +-------
.../ClevoOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmm.inf | 8 +-------
.../Intel/ClevoOpenBoardPkg/Include/Acpi/GlobalNvs.asl | 8 +-------
.../ClevoOpenBoardPkg/Include/Acpi/GlobalNvsAreaDef.h | 8 +-------
Platform/Intel/ClevoOpenBoardPkg/Include/IoExpander.h | 8 +-------
.../ClevoOpenBoardPkg/Include/Library/GpioExpanderLib.h | 8 +-------
.../ClevoOpenBoardPkg/Include/Library/I2cAccessLib.h | 8 +-------
.../Intel/ClevoOpenBoardPkg/Include/PchHsioPtssTables.h | 8 +-------
.../ClevoOpenBoardPkg/Include/Protocol/GlobalNvsArea.h | 8 +-------
Platform/Intel/ClevoOpenBoardPkg/Include/SioRegs.h | 8 +-------
.../Library/BaseGpioExpanderLib/BaseGpioExpanderLib.c | 8 +-------
.../Library/BaseGpioExpanderLib/BaseGpioExpanderLib.inf | 8 +-------
.../Library/PeiI2cAccessLib/PeiI2cAccessLib.c | 8 +-------
.../Library/PeiI2cAccessLib/PeiI2cAccessLib.inf | 8 +-------
.../PeiSerialPortLibSpiFlash/PeiSerialPortLibSpiFlash.c | 8 +-------
.../PeiSerialPortLibSpiFlash/PeiSerialPortLibSpiFlash.inf | 8 +-------
.../PeiSiliconPolicyUpdateLibFsp/PcieDeviceTable.c | 8 +-------
.../PeiSiliconPolicyUpdateLibFsp/PeiFspMiscUpdUpdateLib.c | 8 +-------
.../PeiSiliconPolicyUpdateLibFsp/PeiFspPolicyUpdateLib.c | 8 +-------
.../PeiSiliconPolicyUpdateLibFsp/PeiPchPolicyUpdate.c | 8 +-------
.../PeiSiliconPolicyUpdateLibFsp/PeiPchPolicyUpdate.h | 8 +-------
.../PeiPchPolicyUpdatePreMem.c | 8 +-------
.../PeiSiliconPolicyUpdateLibFsp/PeiSaPolicyUpdate.c | 8 +-------
.../PeiSiliconPolicyUpdateLibFsp/PeiSaPolicyUpdate.h | 8 +-------
.../PeiSaPolicyUpdatePreMem.c | 8 +-------
.../PeiSiliconPolicyUpdateLibFsp.inf | 8 +-------
Platform/Intel/ClevoOpenBoardPkg/N1xxWU/GitEdk2Clevo.bat | 8 +-------
.../N1xxWU/Include/Fdf/FlashMapInclude.fdf | 8 +-------
.../Intel/ClevoOpenBoardPkg/N1xxWU/Include/N1xxWUId.h | 8 +-------
.../Library/BasePlatformHookLib/BasePlatformHookLib.c | 8 +-------
.../Library/BasePlatformHookLib/BasePlatformHookLib.inf | 8 +-------
.../N1xxWU/Library/BoardAcpiLib/DxeBoardAcpiTableLib.c | 8 +-------
.../N1xxWU/Library/BoardAcpiLib/DxeBoardAcpiTableLib.inf | 8 +-------
.../Library/BoardAcpiLib/DxeMultiBoardAcpiSupportLib.c | 8 +-------
.../Library/BoardAcpiLib/DxeMultiBoardAcpiSupportLib.inf | 8 +-------
.../N1xxWU/Library/BoardAcpiLib/DxeN1xxWUAcpiTableLib.c | 8 +-------
.../N1xxWU/Library/BoardAcpiLib/SmmBoardAcpiEnableLib.c | 8 +-------
.../N1xxWU/Library/BoardAcpiLib/SmmBoardAcpiEnableLib.inf | 8 +-------
.../Library/BoardAcpiLib/SmmMultiBoardAcpiSupportLib.c | 8 +-------
.../Library/BoardAcpiLib/SmmMultiBoardAcpiSupportLib.inf | 8 +-------
.../N1xxWU/Library/BoardAcpiLib/SmmN1xxWUAcpiEnableLib.c | 8 +-------
.../N1xxWU/Library/BoardAcpiLib/SmmSiliconAcpiEnableLib.c | 8 +-------
.../N1xxWU/Library/BoardInitLib/N1xxWUGpioTable.c | 8 +-------
.../N1xxWU/Library/BoardInitLib/N1xxWUHdaVerbTables.c | 8 +-------
.../N1xxWU/Library/BoardInitLib/N1xxWUHsioPtssTables.c | 8 +-------
.../N1xxWU/Library/BoardInitLib/N1xxWUSpdTable.c | 8 +-------
.../N1xxWU/Library/BoardInitLib/PeiBoardInitPostMemLib.c | 8 +-------
.../Library/BoardInitLib/PeiBoardInitPostMemLib.inf | 8 +-------
.../N1xxWU/Library/BoardInitLib/PeiBoardInitPreMemLib.c | 8 +-------
.../N1xxWU/Library/BoardInitLib/PeiBoardInitPreMemLib.inf | 8 +-------
.../Library/BoardInitLib/PeiMultiBoardInitPostMemLib.c | 8 +-------
.../Library/BoardInitLib/PeiMultiBoardInitPostMemLib.inf | 8 +-------
.../Library/BoardInitLib/PeiMultiBoardInitPreMemLib.c | 8 +-------
.../Library/BoardInitLib/PeiMultiBoardInitPreMemLib.inf | 8 +-------
.../N1xxWU/Library/BoardInitLib/PeiN1xxWUDetect.c | 8 +-------
.../N1xxWU/Library/BoardInitLib/PeiN1xxWUInitLib.h | 8 +-------
.../N1xxWU/Library/BoardInitLib/PeiN1xxWUInitPostMemLib.c | 8 +-------
.../N1xxWU/Library/BoardInitLib/PeiN1xxWUInitPreMemLib.c | 8 +-------
Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkg.dsc | 8 +-------
Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkg.fdf | 8 +-------
.../ClevoOpenBoardPkg/N1xxWU/OpenBoardPkgBuildOption.dsc | 8 +-------
.../Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkgConfig.dsc | 8 +-------
.../Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkgPcd.dsc | 8 +-------
.../Library/DxeSiliconPolicyUpdateLib/DxeGopPolicyInit.c | 8 +-------
.../Library/DxeSiliconPolicyUpdateLib/DxeGopPolicyInit.h | 8 +-------
.../Library/DxeSiliconPolicyUpdateLib/DxeSaPolicyInit.h | 8 +-------
.../Library/DxeSiliconPolicyUpdateLib/DxeSaPolicyUpdate.c | 8 +-------
.../DxeSiliconPolicyUpdateLib/DxeSiliconPolicyUpdateLib.c | 8 +-------
.../DxeSiliconPolicyUpdateLib.inf | 8 +-------
Platform/Intel/ClevoOpenBoardPkg/N1xxWU/bld.bat | 8 +-------
Platform/Intel/ClevoOpenBoardPkg/N1xxWU/cln.bat | 8 +-------
Platform/Intel/ClevoOpenBoardPkg/N1xxWU/postbuild.bat | 8 +-------
Platform/Intel/ClevoOpenBoardPkg/N1xxWU/prebuild.bat | 8 +-------
Platform/Intel/ClevoOpenBoardPkg/N1xxWU/prep.bat | 8 +-------
Platform/Intel/ClevoOpenBoardPkg/OpenBoardPkg.dec | 8 +-------
125 files changed, 125 insertions(+), 875 deletions(-)
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/AcpiGnvsInit.c b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/AcpiGnvsInit.c
index fc2657476d..7c10cf8f73 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/AcpiGnvsInit.c
+++ b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/AcpiGnvsInit.c
@@ -2,13 +2,7 @@
Acpi Gnvs Init Library.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe.c b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe.c
index d0a2f4bc84..4f248006bf 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe.c
+++ b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe.c
@@ -2,13 +2,7 @@
Board ACPI DXE initialization.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe.inf b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe.inf
index e02a1b5587..f7f4bd2e3d 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe.inf
+++ b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2019, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/ALS.ASL b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/ALS.ASL
index 87b7448f95..bcc3405e33 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/ALS.ASL
+++ b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/ALS.ASL
@@ -2,13 +2,7 @@
ACPI DSDT table
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/AMLUPD.asl b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/AMLUPD.asl
index ef0f3a9ded..30b3e57c4b 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/AMLUPD.asl
+++ b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/AMLUPD.asl
@@ -2,13 +2,7 @@
ACPI DSDT table
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/CPU.asl b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/CPU.asl
index b229284192..84c151cbf6 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/CPU.asl
+++ b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/CPU.asl
@@ -2,13 +2,7 @@
ACPI DSDT table
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/DSDT.ASL b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/DSDT.ASL
index 3adf6996e3..93bca6827e 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/DSDT.ASL
+++ b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/DSDT.ASL
@@ -2,13 +2,7 @@
ACPI DSDT table
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Gpe.asl b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Gpe.asl
index 0218b893d1..8976c7a0ff 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Gpe.asl
+++ b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Gpe.asl
@@ -2,13 +2,7 @@
ACPI DSDT table
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Itss.asl b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Itss.asl
index 73b3de105e..827a37fbab 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Itss.asl
+++ b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Itss.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/LPC_DEV.ASL b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/LPC_DEV.ASL
index 816f83ba3d..ea09363b84 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/LPC_DEV.ASL
+++ b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/LPC_DEV.ASL
@@ -2,13 +2,7 @@
ACPI DSDT table
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/LpcB.asl b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/LpcB.asl
index 29b026a571..6fbaf3a97f 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/LpcB.asl
+++ b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/LpcB.asl
@@ -2,13 +2,7 @@
ACPI DSDT table
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PCI_DRC.ASL b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PCI_DRC.ASL
index 4304e07275..fba792642d 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PCI_DRC.ASL
+++ b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PCI_DRC.ASL
@@ -2,13 +2,7 @@
ACPI DSDT table
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PciTree.asl b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PciTree.asl
index 3bc988f619..ef65cea0af 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PciTree.asl
+++ b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PciTree.asl
@@ -2,13 +2,7 @@
ACPI DSDT table
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Platform.asl b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Platform.asl
index 90f873c8bd..063093a08c 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Platform.asl
+++ b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Platform.asl
@@ -2,13 +2,7 @@
ACPI DSDT table
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PlatformGnvs.asl b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PlatformGnvs.asl
index 97e54bdccf..788a8ec491 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PlatformGnvs.asl
+++ b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PlatformGnvs.asl
@@ -2,13 +2,7 @@
ACPI DSDT table
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Video.asl b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Video.asl
index 002a377d83..b15b754fb0 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Video.asl
+++ b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Video.asl
@@ -2,13 +2,7 @@
ACPI DSDT table
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/UpdateDsdt.c b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/UpdateDsdt.c
index 832c64cd00..41f0b8c113 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/UpdateDsdt.c
+++ b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/UpdateDsdt.c
@@ -2,13 +2,7 @@
Performs board DSDT ACPI table updates.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Features/PciHotPlug/PciHotPlug.c b/Platform/Intel/ClevoOpenBoardPkg/Features/PciHotPlug/PciHotPlug.c
index a9e616ffa4..05f128d719 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Features/PciHotPlug/PciHotPlug.c
+++ b/Platform/Intel/ClevoOpenBoardPkg/Features/PciHotPlug/PciHotPlug.c
@@ -2,13 +2,7 @@
Performs specific PCI-EXPRESS device resource configuration.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Features/PciHotPlug/PciHotPlug.h b/Platform/Intel/ClevoOpenBoardPkg/Features/PciHotPlug/PciHotPlug.h
index 4e20fa201a..53274c17c5 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Features/PciHotPlug/PciHotPlug.h
+++ b/Platform/Intel/ClevoOpenBoardPkg/Features/PciHotPlug/PciHotPlug.h
@@ -1,13 +1,7 @@
/**@file
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Features/PciHotPlug/PciHotPlug.inf b/Platform/Intel/ClevoOpenBoardPkg/Features/PciHotPlug/PciHotPlug.inf
index a1ca0ec072..e50763336b 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Features/PciHotPlug/PciHotPlug.inf
+++ b/Platform/Intel/ClevoOpenBoardPkg/Features/PciHotPlug/PciHotPlug.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2019, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/AcpiTables/Rtd3SptPcieTbt.asl b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/AcpiTables/Rtd3SptPcieTbt.asl
index 35544fb0a2..c082988fa9 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/AcpiTables/Rtd3SptPcieTbt.asl
+++ b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/AcpiTables/Rtd3SptPcieTbt.asl
@@ -2,13 +2,7 @@
ACPI RTD3 SSDT table for SPT PCIe
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#define PID_ICC 0xDC
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/AcpiTables/Tbt.asl b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/AcpiTables/Tbt.asl
index 47a97628a5..2efe1a54f3 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/AcpiTables/Tbt.asl
+++ b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/AcpiTables/Tbt.asl
@@ -2,13 +2,7 @@
Thunderbolt ACPI methods
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#define DTBT_CONTROLLER 0x00
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Acpi/TbtNvs.asl b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Acpi/TbtNvs.asl
index 257005181b..706796f8c5 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Acpi/TbtNvs.asl
+++ b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Acpi/TbtNvs.asl
@@ -1,13 +1,7 @@
/**@file
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
//
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Acpi/TbtNvsAreaDef.h b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Acpi/TbtNvsAreaDef.h
index 2c6995a20d..e988bdd712 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Acpi/TbtNvsAreaDef.h
+++ b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Acpi/TbtNvsAreaDef.h
@@ -1,13 +1,7 @@
/**@file
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
//
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Library/DxeTbtPolicyLib.h b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Library/DxeTbtPolicyLib.h
index b69a1a888e..3ac3d88a33 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Library/DxeTbtPolicyLib.h
+++ b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Library/DxeTbtPolicyLib.h
@@ -2,13 +2,7 @@
Prototype of the DxeTbtPolicyLib library.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _DXE_TBT_POLICY_LIB_H_
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Library/PeiTbtPolicyLib.h b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Library/PeiTbtPolicyLib.h
index aff0717af6..cf9ca8f0c8 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Library/PeiTbtPolicyLib.h
+++ b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Library/PeiTbtPolicyLib.h
@@ -2,13 +2,7 @@
Prototype of the PeiTbtPolicyLib library.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PEI_TBT_POLICY_LIB_H_
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Library/TbtCommonLib.h b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Library/TbtCommonLib.h
index c2df847077..90966fa4cc 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Library/TbtCommonLib.h
+++ b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Library/TbtCommonLib.h
@@ -1,13 +1,7 @@
/**@file
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _TBT_COMMON_LIB_H_
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Ppi/PeiTbtPolicy.h b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Ppi/PeiTbtPolicy.h
index a9ed0701fd..09b74df889 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Ppi/PeiTbtPolicy.h
+++ b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Ppi/PeiTbtPolicy.h
@@ -2,13 +2,7 @@
TBT PEI Policy
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PEI_TBT_POLICY_H_
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Private/Library/PeiDTbtInitLib.h b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Private/Library/PeiDTbtInitLib.h
index 659106d874..dd31099a7d 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Private/Library/PeiDTbtInitLib.h
+++ b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Private/Library/PeiDTbtInitLib.h
@@ -2,13 +2,7 @@
PEI DTBT Init Dispatch library Header file
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef __PEI_DTBT_INIT_LIB_H__
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Private/Library/PeiTbtCommonInitLib.h b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Private/Library/PeiTbtCommonInitLib.h
index 5c319debd7..718e858b70 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Private/Library/PeiTbtCommonInitLib.h
+++ b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Private/Library/PeiTbtCommonInitLib.h
@@ -2,13 +2,7 @@
PEI TBT Common Init Dispatch library Header file
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef __PEI_TBT_COMMON_INIT_LIB_H__
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Protocol/DxeTbtPolicy.h b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Protocol/DxeTbtPolicy.h
index ab5a829755..5167661c02 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Protocol/DxeTbtPolicy.h
+++ b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Protocol/DxeTbtPolicy.h
@@ -2,13 +2,7 @@
TBT DXE Policy
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _DXE_TBT_POLICY_H_
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Protocol/TbtNvsArea.h b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Protocol/TbtNvsArea.h
index 9296a05821..e57381e12c 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Protocol/TbtNvsArea.h
+++ b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Protocol/TbtNvsArea.h
@@ -2,13 +2,7 @@
This file defines the TBT NVS Area Protocol.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/TbtBoardInfo.h b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/TbtBoardInfo.h
index 8b37ab77e5..13319a9cec 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/TbtBoardInfo.h
+++ b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/TbtBoardInfo.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _TBT_INFO_GUID_H_
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/TbtPolicyCommonDefinition.h b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/TbtPolicyCommonDefinition.h
index d88e7cb7b6..eb4c79317d 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/TbtPolicyCommonDefinition.h
+++ b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/TbtPolicyCommonDefinition.h
@@ -2,13 +2,7 @@
TBT Policy Common definition.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _TBT_POLICY_COMMON_H_
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicyLib/DxeTbtPolicyLib.c b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicyLib/DxeTbtPolicyLib.c
index 1783d8c6b4..b221e26d8e 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicyLib/DxeTbtPolicyLib.c
+++ b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicyLib/DxeTbtPolicyLib.c
@@ -2,13 +2,7 @@
This file is DxeTbtPolicyLib library.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include <DxeTbtPolicyLibrary.h>
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicyLib/DxeTbtPolicyLib.inf b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicyLib/DxeTbtPolicyLib.inf
index 75a7473060..ceeca81a50 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicyLib/DxeTbtPolicyLib.inf
+++ b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicyLib/DxeTbtPolicyLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2019, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicyLib/DxeTbtPolicyLibrary.h b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicyLib/DxeTbtPolicyLibrary.h
index 6dd1015c61..75bc01e29a 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicyLib/DxeTbtPolicyLibrary.h
+++ b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicyLib/DxeTbtPolicyLibrary.h
@@ -2,13 +2,7 @@
Header file for the DxeTBTPolicy library.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _DXE_TBT_POLICY_LIBRARY_H_
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/PeiDxeSmmTbtCommonLib/TbtCommonLib.c b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/PeiDxeSmmTbtCommonLib/TbtCommonLib.c
index 52871cf447..7afdc25f67 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/PeiDxeSmmTbtCommonLib/TbtCommonLib.c
+++ b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/PeiDxeSmmTbtCommonLib/TbtCommonLib.c
@@ -2,13 +2,7 @@
Common Thunderbolt functions.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/PeiDxeSmmTbtCommonLib/TbtCommonLib.inf b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/PeiDxeSmmTbtCommonLib/TbtCommonLib.inf
index 60ea0ba6f1..b7277c1c57 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/PeiDxeSmmTbtCommonLib/TbtCommonLib.inf
+++ b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/PeiDxeSmmTbtCommonLib/TbtCommonLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2019, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/PeiTbtPolicyLib/PeiTbtPolicyLib.c b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/PeiTbtPolicyLib/PeiTbtPolicyLib.c
index 36b49f013e..d6105a0c67 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/PeiTbtPolicyLib/PeiTbtPolicyLib.c
+++ b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/PeiTbtPolicyLib/PeiTbtPolicyLib.c
@@ -2,13 +2,7 @@
This file is PeiTbtPolicyLib library.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include <Library/PeiServicesLib.h>
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/PeiTbtPolicyLib/PeiTbtPolicyLib.inf b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/PeiTbtPolicyLib/PeiTbtPolicyLib.inf
index dc9c4ea9f3..8f554c8aa7 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/PeiTbtPolicyLib/PeiTbtPolicyLib.inf
+++ b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/PeiTbtPolicyLib/PeiTbtPolicyLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2019, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/PeiTbtPolicyLib/PeiTbtPolicyLibrary.h b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/PeiTbtPolicyLib/PeiTbtPolicyLibrary.h
index b85faef320..38c5d60fab 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/PeiTbtPolicyLib/PeiTbtPolicyLibrary.h
+++ b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/PeiTbtPolicyLib/PeiTbtPolicyLibrary.h
@@ -2,13 +2,7 @@
Header file for the PeiTBTPolicy library.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PEI_TBT_POLICY_LIBRARY_H_
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/Private/PeiDTbtInitLib/PeiDTbtInitLib.c b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/Private/PeiDTbtInitLib/PeiDTbtInitLib.c
index 986a1271d8..9c4bddfc2d 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/Private/PeiDTbtInitLib/PeiDTbtInitLib.c
+++ b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/Private/PeiDTbtInitLib/PeiDTbtInitLib.c
@@ -2,13 +2,7 @@
Thunderbolt(TM) Pei Library
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include <Library/PeiServicesLib.h>
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/Private/PeiDTbtInitLib/PeiDTbtInitLib.inf b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/Private/PeiDTbtInitLib/PeiDTbtInitLib.inf
index b99fd3433c..e33601618a 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/Private/PeiDTbtInitLib/PeiDTbtInitLib.inf
+++ b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/Private/PeiDTbtInitLib/PeiDTbtInitLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2019, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Dxe/TbtDxe.c b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Dxe/TbtDxe.c
index 69162f10bf..5e8f80fa59 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Dxe/TbtDxe.c
+++ b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Dxe/TbtDxe.c
@@ -2,13 +2,7 @@
Thunderbolt initialization in DXE.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include <Uefi.h>
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Dxe/TbtDxe.inf b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Dxe/TbtDxe.inf
index ad056b69ae..6ec93bf03a 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Dxe/TbtDxe.inf
+++ b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Dxe/TbtDxe.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2019, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Pei/PeiTbtInit.c b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Pei/PeiTbtInit.c
index 5c792bf3b9..a824886697 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Pei/PeiTbtInit.c
+++ b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Pei/PeiTbtInit.c
@@ -2,13 +2,7 @@
Thunderbolt initialization in PEI.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Pei/PeiTbtInit.inf b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Pei/PeiTbtInit.inf
index 65d8c0a45d..d15c571784 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Pei/PeiTbtInit.inf
+++ b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Pei/PeiTbtInit.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2019, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmiHandler.c b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmiHandler.c
index 28de0dc793..216a7b155c 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmiHandler.c
+++ b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmiHandler.c
@@ -2,13 +2,7 @@
Thunderbolt SMI handler.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmiHandler.h b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmiHandler.h
index 095d8d44f5..7b06a037da 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmiHandler.h
+++ b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmiHandler.h
@@ -1,13 +1,7 @@
/**@file
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _TBT_SMI_HANDLER_H_
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmm.c b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmm.c
index 5bbb811e54..5810447792 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmm.c
+++ b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmm.c
@@ -2,13 +2,7 @@
Thunderbolt initialization in SMM.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmm.inf b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmm.inf
index 97322f3d57..3826cf589b 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmm.inf
+++ b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmm.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2019, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Include/Acpi/GlobalNvs.asl b/Platform/Intel/ClevoOpenBoardPkg/Include/Acpi/GlobalNvs.asl
index 651708ea70..e3b0a1da85 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Include/Acpi/GlobalNvs.asl
+++ b/Platform/Intel/ClevoOpenBoardPkg/Include/Acpi/GlobalNvs.asl
@@ -2,13 +2,7 @@
ACPI DSDT table
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Include/Acpi/GlobalNvsAreaDef.h b/Platform/Intel/ClevoOpenBoardPkg/Include/Acpi/GlobalNvsAreaDef.h
index a1fa221d76..5d096db346 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Include/Acpi/GlobalNvsAreaDef.h
+++ b/Platform/Intel/ClevoOpenBoardPkg/Include/Acpi/GlobalNvsAreaDef.h
@@ -2,13 +2,7 @@
ACPI DSDT table
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Include/IoExpander.h b/Platform/Intel/ClevoOpenBoardPkg/Include/IoExpander.h
index 3a0c628319..0f313e429a 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Include/IoExpander.h
+++ b/Platform/Intel/ClevoOpenBoardPkg/Include/IoExpander.h
@@ -2,13 +2,7 @@
GPIO definition table for N1xxWU
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Include/Library/GpioExpanderLib.h b/Platform/Intel/ClevoOpenBoardPkg/Include/Library/GpioExpanderLib.h
index 3395d631ce..dc75a7decb 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Include/Library/GpioExpanderLib.h
+++ b/Platform/Intel/ClevoOpenBoardPkg/Include/Library/GpioExpanderLib.h
@@ -2,13 +2,7 @@
Support for IO expander TCA6424.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Include/Library/I2cAccessLib.h b/Platform/Intel/ClevoOpenBoardPkg/Include/Library/I2cAccessLib.h
index 559af842a5..e36699e8e9 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Include/Library/I2cAccessLib.h
+++ b/Platform/Intel/ClevoOpenBoardPkg/Include/Library/I2cAccessLib.h
@@ -2,13 +2,7 @@
Support for IO expander TCA6424.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Include/PchHsioPtssTables.h b/Platform/Intel/ClevoOpenBoardPkg/Include/PchHsioPtssTables.h
index 412211ea2c..a2003002cf 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Include/PchHsioPtssTables.h
+++ b/Platform/Intel/ClevoOpenBoardPkg/Include/PchHsioPtssTables.h
@@ -1,13 +1,7 @@
/** @file*
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Include/Protocol/GlobalNvsArea.h b/Platform/Intel/ClevoOpenBoardPkg/Include/Protocol/GlobalNvsArea.h
index 5f72bcf1b9..b10547b6b9 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Include/Protocol/GlobalNvsArea.h
+++ b/Platform/Intel/ClevoOpenBoardPkg/Include/Protocol/GlobalNvsArea.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Include/SioRegs.h b/Platform/Intel/ClevoOpenBoardPkg/Include/SioRegs.h
index f9aa5d4f18..cf636b798c 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Include/SioRegs.h
+++ b/Platform/Intel/ClevoOpenBoardPkg/Include/SioRegs.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Library/BaseGpioExpanderLib/BaseGpioExpanderLib.c b/Platform/Intel/ClevoOpenBoardPkg/Library/BaseGpioExpanderLib/BaseGpioExpanderLib.c
index 34d52527cb..260c5bb6a2 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Library/BaseGpioExpanderLib/BaseGpioExpanderLib.c
+++ b/Platform/Intel/ClevoOpenBoardPkg/Library/BaseGpioExpanderLib/BaseGpioExpanderLib.c
@@ -2,13 +2,7 @@
Support for IO expander TCA6424.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Library/BaseGpioExpanderLib/BaseGpioExpanderLib.inf b/Platform/Intel/ClevoOpenBoardPkg/Library/BaseGpioExpanderLib/BaseGpioExpanderLib.inf
index 2750645711..4c2478155e 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Library/BaseGpioExpanderLib/BaseGpioExpanderLib.inf
+++ b/Platform/Intel/ClevoOpenBoardPkg/Library/BaseGpioExpanderLib/BaseGpioExpanderLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2019, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Library/PeiI2cAccessLib/PeiI2cAccessLib.c b/Platform/Intel/ClevoOpenBoardPkg/Library/PeiI2cAccessLib/PeiI2cAccessLib.c
index 64fccfe868..d66571bdc4 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Library/PeiI2cAccessLib/PeiI2cAccessLib.c
+++ b/Platform/Intel/ClevoOpenBoardPkg/Library/PeiI2cAccessLib/PeiI2cAccessLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Library/PeiI2cAccessLib/PeiI2cAccessLib.inf b/Platform/Intel/ClevoOpenBoardPkg/Library/PeiI2cAccessLib/PeiI2cAccessLib.inf
index 9f4c1cbb80..bbbc74cf90 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Library/PeiI2cAccessLib/PeiI2cAccessLib.inf
+++ b/Platform/Intel/ClevoOpenBoardPkg/Library/PeiI2cAccessLib/PeiI2cAccessLib.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2019, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Library/PeiSerialPortLibSpiFlash/PeiSerialPortLibSpiFlash.c b/Platform/Intel/ClevoOpenBoardPkg/Library/PeiSerialPortLibSpiFlash/PeiSerialPortLibSpiFlash.c
index e36ff8bff8..0230149a38 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Library/PeiSerialPortLibSpiFlash/PeiSerialPortLibSpiFlash.c
+++ b/Platform/Intel/ClevoOpenBoardPkg/Library/PeiSerialPortLibSpiFlash/PeiSerialPortLibSpiFlash.c
@@ -2,13 +2,7 @@
Serial I/O Port library implementation for output to SPI flash
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Library/PeiSerialPortLibSpiFlash/PeiSerialPortLibSpiFlash.inf b/Platform/Intel/ClevoOpenBoardPkg/Library/PeiSerialPortLibSpiFlash/PeiSerialPortLibSpiFlash.inf
index c22201e033..b81ce9dd7a 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Library/PeiSerialPortLibSpiFlash/PeiSerialPortLibSpiFlash.inf
+++ b/Platform/Intel/ClevoOpenBoardPkg/Library/PeiSerialPortLibSpiFlash/PeiSerialPortLibSpiFlash.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2019, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PcieDeviceTable.c b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PcieDeviceTable.c
index 40366af4cf..7898dc3592 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PcieDeviceTable.c
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PcieDeviceTable.c
@@ -2,13 +2,7 @@
Intel PCH PEI Policy initialization.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiFspMiscUpdUpdateLib.c b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiFspMiscUpdUpdateLib.c
index df5a11ab2d..9d6c0176f6 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiFspMiscUpdUpdateLib.c
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiFspMiscUpdUpdateLib.c
@@ -2,13 +2,7 @@
Implementation of Fsp Misc UPD Initialization.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiFspPolicyUpdateLib.c b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiFspPolicyUpdateLib.c
index 91d0f03191..c665f7888d 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiFspPolicyUpdateLib.c
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiFspPolicyUpdateLib.c
@@ -2,13 +2,7 @@
Provides FSP policy update functionality.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiPchPolicyUpdate.c b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiPchPolicyUpdate.c
index a50b2f2b7c..0bdd51d288 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiPchPolicyUpdate.c
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiPchPolicyUpdate.c
@@ -2,13 +2,7 @@
Intel PCH PEI Policy initialization.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiPchPolicyUpdate.h b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiPchPolicyUpdate.h
index b736111344..9f6b236e42 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiPchPolicyUpdate.h
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiPchPolicyUpdate.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiPchPolicyUpdatePreMem.c b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiPchPolicyUpdatePreMem.c
index b3661f3439..5a62f9bb72 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiPchPolicyUpdatePreMem.c
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiPchPolicyUpdatePreMem.c
@@ -2,13 +2,7 @@
Intel PCH PEI Policy initialization.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiSaPolicyUpdate.c b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiSaPolicyUpdate.c
index e445ddef72..133b8c963f 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiSaPolicyUpdate.c
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiSaPolicyUpdate.c
@@ -2,13 +2,7 @@
Intel System Agent policy initialization.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiSaPolicyUpdate.h b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiSaPolicyUpdate.h
index 10122af262..c006dbcd68 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiSaPolicyUpdate.h
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiSaPolicyUpdate.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiSaPolicyUpdatePreMem.c b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiSaPolicyUpdatePreMem.c
index c8d6fe4036..12d2b2cdb2 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiSaPolicyUpdatePreMem.c
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiSaPolicyUpdatePreMem.c
@@ -2,13 +2,7 @@
Intel System Agent policy initialization.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf
index bc938a0436..25531d3d7f 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2019, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/GitEdk2Clevo.bat b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/GitEdk2Clevo.bat
index 9a34a9a2d2..81f51b3785 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/GitEdk2Clevo.bat
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/GitEdk2Clevo.bat
@@ -1,13 +1,7 @@
@REM @file
@REM
@REM Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
-@REM This program and the accompanying materials
-@REM are licensed and made available under the terms and conditions of the BSD License
-@REM which accompanies this distribution. The full text of the license may be found at
-@REM http://opensource.org/licenses/bsd-license.php
-@REM
-@REM THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-@REM WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+@REM SPDX-License-Identifier: BSD-2-Clause-Patent
@REM
@echo off
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Include/Fdf/FlashMapInclude.fdf b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Include/Fdf/FlashMapInclude.fdf
index 423c6b18f5..d48f8c7a2a 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Include/Fdf/FlashMapInclude.fdf
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Include/Fdf/FlashMapInclude.fdf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2019, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Include/N1xxWUId.h b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Include/N1xxWUId.h
index c5cf2e3143..684b31f051 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Include/N1xxWUId.h
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Include/N1xxWUId.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BasePlatformHookLib/BasePlatformHookLib.c b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BasePlatformHookLib/BasePlatformHookLib.c
index 637f46cb46..5c5d6a25b4 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BasePlatformHookLib/BasePlatformHookLib.c
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BasePlatformHookLib/BasePlatformHookLib.c
@@ -2,13 +2,7 @@
Platform Hook Library
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BasePlatformHookLib/BasePlatformHookLib.inf b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BasePlatformHookLib/BasePlatformHookLib.inf
index 0b631a79ea..c4ea31bff2 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BasePlatformHookLib/BasePlatformHookLib.inf
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BasePlatformHookLib/BasePlatformHookLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2019, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/DxeBoardAcpiTableLib.c b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/DxeBoardAcpiTableLib.c
index 19593cfadf..c56334e82b 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/DxeBoardAcpiTableLib.c
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/DxeBoardAcpiTableLib.c
@@ -2,13 +2,7 @@
DXE board-specific ACPI functionality.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/DxeBoardAcpiTableLib.inf b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/DxeBoardAcpiTableLib.inf
index 4b2529d695..06e703e12d 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/DxeBoardAcpiTableLib.inf
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/DxeBoardAcpiTableLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2019, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/DxeMultiBoardAcpiSupportLib.c b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/DxeMultiBoardAcpiSupportLib.c
index 7eb19ba594..4171d4ad6d 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/DxeMultiBoardAcpiSupportLib.c
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/DxeMultiBoardAcpiSupportLib.c
@@ -2,13 +2,7 @@
DXE multi-board ACPI table support functionality.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/DxeMultiBoardAcpiSupportLib.inf b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/DxeMultiBoardAcpiSupportLib.inf
index f191b04eee..c505909ad3 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/DxeMultiBoardAcpiSupportLib.inf
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/DxeMultiBoardAcpiSupportLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2019, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/DxeN1xxWUAcpiTableLib.c b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/DxeN1xxWUAcpiTableLib.c
index 9137bed899..96a3232fe5 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/DxeN1xxWUAcpiTableLib.c
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/DxeN1xxWUAcpiTableLib.c
@@ -2,13 +2,7 @@
Clevo N1xxWU board DXE ACPI table functionality.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/SmmBoardAcpiEnableLib.c b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/SmmBoardAcpiEnableLib.c
index 99dae10e57..2d9e9e98da 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/SmmBoardAcpiEnableLib.c
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/SmmBoardAcpiEnableLib.c
@@ -2,13 +2,7 @@
Clevo N1xxWU board SMM ACPI table enable/disable functionality.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/SmmBoardAcpiEnableLib.inf b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/SmmBoardAcpiEnableLib.inf
index efeebff979..8752fbb43f 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/SmmBoardAcpiEnableLib.inf
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/SmmBoardAcpiEnableLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2019, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/SmmMultiBoardAcpiSupportLib.c b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/SmmMultiBoardAcpiSupportLib.c
index 19de0b842e..a06505a34a 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/SmmMultiBoardAcpiSupportLib.c
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/SmmMultiBoardAcpiSupportLib.c
@@ -2,13 +2,7 @@
SMM multi-board ACPI support functionality.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/SmmMultiBoardAcpiSupportLib.inf b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/SmmMultiBoardAcpiSupportLib.inf
index f75f8844d9..3c4cfaccd3 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/SmmMultiBoardAcpiSupportLib.inf
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/SmmMultiBoardAcpiSupportLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2019, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/SmmN1xxWUAcpiEnableLib.c b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/SmmN1xxWUAcpiEnableLib.c
index 82d5c40bf2..8c1caa1898 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/SmmN1xxWUAcpiEnableLib.c
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/SmmN1xxWUAcpiEnableLib.c
@@ -2,13 +2,7 @@
Platform Hook Library instances
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/SmmSiliconAcpiEnableLib.c b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/SmmSiliconAcpiEnableLib.c
index 93765b1ae3..1baa8daa70 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/SmmSiliconAcpiEnableLib.c
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/SmmSiliconAcpiEnableLib.c
@@ -2,13 +2,7 @@
SMM ACPI enable library.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/N1xxWUGpioTable.c b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/N1xxWUGpioTable.c
index bc7554ae2b..08a20673f0 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/N1xxWUGpioTable.c
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/N1xxWUGpioTable.c
@@ -2,13 +2,7 @@
GPIO definition table for N1xxWU
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/N1xxWUHdaVerbTables.c b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/N1xxWUHdaVerbTables.c
index 28c906e560..26d7401c6c 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/N1xxWUHdaVerbTables.c
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/N1xxWUHdaVerbTables.c
@@ -2,13 +2,7 @@
HDA Verb table for N1xxWU
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/N1xxWUHsioPtssTables.c b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/N1xxWUHsioPtssTables.c
index 5f71865469..9e52dd2671 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/N1xxWUHsioPtssTables.c
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/N1xxWUHsioPtssTables.c
@@ -2,13 +2,7 @@
N1xxWU HSIO PTSS H File
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/N1xxWUSpdTable.c b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/N1xxWUSpdTable.c
index afc7315665..18a04eba17 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/N1xxWUSpdTable.c
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/N1xxWUSpdTable.c
@@ -2,13 +2,7 @@
GPIO definition table for N1xxWU
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiBoardInitPostMemLib.c b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiBoardInitPostMemLib.c
index 1433176ca8..b7ff3062b2 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiBoardInitPostMemLib.c
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiBoardInitPostMemLib.c
@@ -2,13 +2,7 @@
Board post-memory initialization.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiBoardInitPostMemLib.inf b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiBoardInitPostMemLib.inf
index 3c8705d997..01225c9114 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiBoardInitPostMemLib.inf
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiBoardInitPostMemLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2019, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiBoardInitPreMemLib.c b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiBoardInitPreMemLib.c
index 2596880bfc..c1fe2a55c0 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiBoardInitPreMemLib.c
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiBoardInitPreMemLib.c
@@ -2,13 +2,7 @@
Board post-memory initialization.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiBoardInitPreMemLib.inf b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiBoardInitPreMemLib.inf
index 0dbbafd0f6..22797cd80f 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiBoardInitPreMemLib.inf
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiBoardInitPreMemLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2019, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiMultiBoardInitPostMemLib.c b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiMultiBoardInitPostMemLib.c
index c58842d9f4..8570039624 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiMultiBoardInitPostMemLib.c
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiMultiBoardInitPostMemLib.c
@@ -2,13 +2,7 @@
Multi-board post-memory initialization.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiMultiBoardInitPostMemLib.inf b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiMultiBoardInitPostMemLib.inf
index dc35136a0d..47efb21a79 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiMultiBoardInitPostMemLib.inf
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiMultiBoardInitPostMemLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2019, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiMultiBoardInitPreMemLib.c b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiMultiBoardInitPreMemLib.c
index 4323495c04..842316e610 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiMultiBoardInitPreMemLib.c
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiMultiBoardInitPreMemLib.c
@@ -2,13 +2,7 @@
Board pre-memory initialization.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiMultiBoardInitPreMemLib.inf b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiMultiBoardInitPreMemLib.inf
index c0df18faa3..8f73c2fa40 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiMultiBoardInitPreMemLib.inf
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiMultiBoardInitPreMemLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2019, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiN1xxWUDetect.c b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiN1xxWUDetect.c
index edda4da7a0..9e31a92926 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiN1xxWUDetect.c
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiN1xxWUDetect.c
@@ -2,13 +2,7 @@
Clevo N1xxWU board detection.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiN1xxWUInitLib.h b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiN1xxWUInitLib.h
index 34eff7d5c3..ddb873aaa2 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiN1xxWUInitLib.h
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiN1xxWUInitLib.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiN1xxWUInitPostMemLib.c b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiN1xxWUInitPostMemLib.c
index 5bd74035cb..832130e15e 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiN1xxWUInitPostMemLib.c
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiN1xxWUInitPostMemLib.c
@@ -2,13 +2,7 @@
Clevo N1xxWU board post-memory initialization.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiN1xxWUInitPreMemLib.c b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiN1xxWUInitPreMemLib.c
index d9e2e659ab..10550baf8a 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiN1xxWUInitPreMemLib.c
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiN1xxWUInitPreMemLib.c
@@ -2,13 +2,7 @@
Clevo N1xxWU board pre-memory initialization.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkg.dsc b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkg.dsc
index 4fc4c9c141..02ef06579b 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkg.dsc
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkg.dsc
@@ -3,13 +3,7 @@
#
# Copyright (c) 2019, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
[Defines]
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkg.fdf b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkg.fdf
index 6b8cb4a0b5..67aebbd547 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkg.fdf
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkg.fdf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2019, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkgBuildOption.dsc b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkgBuildOption.dsc
index 92c757190c..2cfcfdf776 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkgBuildOption.dsc
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkgBuildOption.dsc
@@ -3,13 +3,7 @@
#
# Copyright (c) 2019, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkgConfig.dsc b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkgConfig.dsc
index 2f7d386469..ea759776fb 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkgConfig.dsc
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkgConfig.dsc
@@ -3,13 +3,7 @@
#
# Copyright (c) 2019, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkgPcd.dsc b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkgPcd.dsc
index 9b6f5005eb..7bb341a1dd 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkgPcd.dsc
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkgPcd.dsc
@@ -3,13 +3,7 @@
#
# Copyright (c) 2019, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Policy/Library/DxeSiliconPolicyUpdateLib/DxeGopPolicyInit.c b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Policy/Library/DxeSiliconPolicyUpdateLib/DxeGopPolicyInit.c
index 56d2afd917..99c7d42c4e 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Policy/Library/DxeSiliconPolicyUpdateLib/DxeGopPolicyInit.c
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Policy/Library/DxeSiliconPolicyUpdateLib/DxeGopPolicyInit.c
@@ -2,13 +2,7 @@
DXE GOP policy initialization.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Policy/Library/DxeSiliconPolicyUpdateLib/DxeGopPolicyInit.h b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Policy/Library/DxeSiliconPolicyUpdateLib/DxeGopPolicyInit.h
index c7a4b73e8c..f4ab1a5bca 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Policy/Library/DxeSiliconPolicyUpdateLib/DxeGopPolicyInit.h
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Policy/Library/DxeSiliconPolicyUpdateLib/DxeGopPolicyInit.h
@@ -2,13 +2,7 @@
Header file for the GopPolicyInitDxe Driver.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _GOP_POLICY_INIT_DXE_H_
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSaPolicyInit.h b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSaPolicyInit.h
index ebf8c3967f..bb4b4369ad 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSaPolicyInit.h
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSaPolicyInit.h
@@ -2,13 +2,7 @@
Header file for the SaPolicyInitDxe Driver.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _SA_POLICY_INIT_DXE_H_
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSaPolicyUpdate.c b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSaPolicyUpdate.c
index f7fb071e2b..d140237576 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSaPolicyUpdate.c
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSaPolicyUpdate.c
@@ -2,13 +2,7 @@
This file is the library for SA DXE Policy initialization.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSiliconPolicyUpdateLib.c b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSiliconPolicyUpdateLib.c
index a7ddfcc428..5c7f388213 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSiliconPolicyUpdateLib.c
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSiliconPolicyUpdateLib.c
@@ -2,13 +2,7 @@
DXE silicon policy update library.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSiliconPolicyUpdateLib.inf b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSiliconPolicyUpdateLib.inf
index c6ffd6d40e..dd7047b9cf 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSiliconPolicyUpdateLib.inf
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSiliconPolicyUpdateLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2019, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/bld.bat b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/bld.bat
index 03c8f98d93..606ce979a7 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/bld.bat
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/bld.bat
@@ -1,13 +1,7 @@
@REM @file
@REM
@REM Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
-@REM This program and the accompanying materials
-@REM are licensed and made available under the terms and conditions of the BSD License
-@REM which accompanies this distribution. The full text of the license may be found at
-@REM http://opensource.org/licenses/bsd-license.php
-@REM
-@REM THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-@REM WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+@REM SPDX-License-Identifier: BSD-2-Clause-Patent
@REM
:: Useage: bld [/s] [/f <FEATURE_PCD_NAME> <FALSE or TRUE>] [/r]
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/cln.bat b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/cln.bat
index d4d98dd135..61c8a7d1a4 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/cln.bat
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/cln.bat
@@ -1,13 +1,7 @@
@REM @file
@REM
@REM Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
-@REM This program and the accompanying materials
-@REM are licensed and made available under the terms and conditions of the BSD License
-@REM which accompanies this distribution. The full text of the license may be found at
-@REM http://opensource.org/licenses/bsd-license.php
-@REM
-@REM THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-@REM WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+@REM SPDX-License-Identifier: BSD-2-Clause-Patent
@REM
@echo off
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/postbuild.bat b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/postbuild.bat
index 70be663897..5553645fbf 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/postbuild.bat
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/postbuild.bat
@@ -1,13 +1,7 @@
@REM @file
@REM
@REM Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
-@REM This program and the accompanying materials
-@REM are licensed and made available under the terms and conditions of the BSD License
-@REM which accompanies this distribution. The full text of the license may be found at
-@REM http://opensource.org/licenses/bsd-license.php
-@REM
-@REM THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-@REM WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+@REM SPDX-License-Identifier: BSD-2-Clause-Patent
@REM
@REM #
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/prebuild.bat b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/prebuild.bat
index c3360403f1..c18dd5e89d 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/prebuild.bat
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/prebuild.bat
@@ -2,13 +2,7 @@
@REM Pre build script.
@REM
@REM Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
-@REM This program and the accompanying materials
-@REM are licensed and made available under the terms and conditions of the BSD License
-@REM which accompanies this distribution. The full text of the license may be found at
-@REM http://opensource.org/licenses/bsd-license.php
-@REM
-@REM THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-@REM WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+@REM SPDX-License-Identifier: BSD-2-Clause-Patent
@REM
cd ..
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/prep.bat b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/prep.bat
index 46a514b9ed..cb0d44f722 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/prep.bat
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/prep.bat
@@ -1,13 +1,7 @@
@REM @file
@REM
@REM Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
-@REM This program and the accompanying materials
-@REM are licensed and made available under the terms and conditions of the BSD License
-@REM which accompanies this distribution. The full text of the license may be found at
-@REM http://opensource.org/licenses/bsd-license.php
-@REM
-@REM THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-@REM WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+@REM SPDX-License-Identifier: BSD-2-Clause-Patent
@REM
@echo OFF
diff --git a/Platform/Intel/ClevoOpenBoardPkg/OpenBoardPkg.dec b/Platform/Intel/ClevoOpenBoardPkg/OpenBoardPkg.dec
index aa457e64db..29816e3c21 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/OpenBoardPkg.dec
+++ b/Platform/Intel/ClevoOpenBoardPkg/OpenBoardPkg.dec
@@ -7,13 +7,7 @@
#
# Copyright (c) 2019, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
[Defines]
--
2.21.0.windows.1
^ permalink raw reply related [flat|nested] 63+ messages in thread* Re: [[edk2-platforms][PATCH V2] 09/30] Platform/Intel/ClevoOpenBoardPkg: Replace BSD License with BSD+Patent License
2019-05-15 23:09 ` [[edk2-platforms][PATCH V2] 09/30] Platform/Intel/ClevoOpenBoardPkg: " Michael D Kinney
@ 2019-05-17 6:50 ` Kubacki, Michael A
2019-05-17 21:05 ` Sinha, Ankit
1 sibling, 0 replies; 63+ messages in thread
From: Kubacki, Michael A @ 2019-05-17 6:50 UTC (permalink / raw)
To: Kinney, Michael D, devel@edk2.groups.io; +Cc: Sinha, Ankit
Reviewed-by: Michael Kubacki <michael.a.kubacki@intel.com>
> -----Original Message-----
> From: Kinney, Michael D
> Sent: Wednesday, May 15, 2019 4:10 PM
> To: devel@edk2.groups.io
> Cc: Kubacki, Michael A <michael.a.kubacki@intel.com>; Sinha, Ankit
> <ankit.sinha@intel.com>
> Subject: [[edk2-platforms][PATCH V2] 09/30]
> Platform/Intel/ClevoOpenBoardPkg: Replace BSD License with BSD+Patent
> License
>
> https://bugzilla.tianocore.org/show_bug.cgi?id=1373
>
> Replace BSD 2-Clause License with BSD+Patent License. This change is
> based on the following emails:
>
> https://lists.01.org/pipermail/edk2-devel/2019-February/036260.html
> https://lists.01.org/pipermail/edk2-devel/2018-October/030385.html
>
> RFCs with detailed process for the license change:
>
> V3: https://lists.01.org/pipermail/edk2-devel/2019-March/038116.html
> V2: https://lists.01.org/pipermail/edk2-devel/2019-March/037669.html
> V1: https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html
>
> Cc: Michael Kubacki <michael.a.kubacki@intel.com>
> Cc: Ankit Sinha <ankit.sinha@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
> ---
> .../ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/AcpiGnvsInit.c | 8 +-------
> .../ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe.c | 8 +-------
> .../ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe.inf | 8 +-------
> .../ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/ALS.ASL | 8 +-------
> .../ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/AMLUPD.asl | 8 +-------
> .../ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/CPU.asl | 8 +-------
> .../ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/DSDT.ASL | 8 +-------
> .../ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Gpe.asl | 8 +-------
> .../ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Itss.asl | 8 +-------
> .../ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/LPC_DEV.ASL | 8 +-------
> .../ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/LpcB.asl | 8 +-------
> .../ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PCI_DRC.ASL | 8 +-------
> .../ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PciTree.asl | 8 +-------
> .../ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Platform.asl | 8 +-------
> .../Acpi/BoardAcpiDxe/Dsdt/PlatformGnvs.asl | 8 +-------
> .../ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Video.asl | 8 +-------
> .../ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/UpdateDsdt.c | 8 +-------
> .../ClevoOpenBoardPkg/Features/PciHotPlug/PciHotPlug.c | 8 +-------
> .../ClevoOpenBoardPkg/Features/PciHotPlug/PciHotPlug.h | 8 +-------
> .../ClevoOpenBoardPkg/Features/PciHotPlug/PciHotPlug.inf | 8 +-------
> .../Features/Tbt/AcpiTables/Rtd3SptPcieTbt.asl | 8 +-------
> .../ClevoOpenBoardPkg/Features/Tbt/AcpiTables/Tbt.asl | 8 +-------
> .../Features/Tbt/Include/Acpi/TbtNvs.asl | 8 +-------
> .../Features/Tbt/Include/Acpi/TbtNvsAreaDef.h | 8 +-------
> .../Features/Tbt/Include/Library/DxeTbtPolicyLib.h | 8 +-------
> .../Features/Tbt/Include/Library/PeiTbtPolicyLib.h | 8 +-------
> .../Features/Tbt/Include/Library/TbtCommonLib.h | 8 +-------
> .../Features/Tbt/Include/Ppi/PeiTbtPolicy.h | 8 +-------
> .../Features/Tbt/Include/Private/Library/PeiDTbtInitLib.h | 8 +-------
> .../Tbt/Include/Private/Library/PeiTbtCommonInitLib.h | 8 +-------
> .../Features/Tbt/Include/Protocol/DxeTbtPolicy.h | 8 +-------
> .../Features/Tbt/Include/Protocol/TbtNvsArea.h | 8 +-------
> .../ClevoOpenBoardPkg/Features/Tbt/Include/TbtBoardInfo.h | 8 +-------
> .../Features/Tbt/Include/TbtPolicyCommonDefinition.h | 8 +-------
> .../Tbt/Library/DxeTbtPolicyLib/DxeTbtPolicyLib.c | 8 +-------
> .../Tbt/Library/DxeTbtPolicyLib/DxeTbtPolicyLib.inf | 8 +-------
> .../Tbt/Library/DxeTbtPolicyLib/DxeTbtPolicyLibrary.h | 8 +-------
> .../Tbt/Library/PeiDxeSmmTbtCommonLib/TbtCommonLib.c | 8 +-------
> .../Tbt/Library/PeiDxeSmmTbtCommonLib/TbtCommonLib.inf | 8 +-------
> .../Tbt/Library/PeiTbtPolicyLib/PeiTbtPolicyLib.c | 8 +-------
> .../Tbt/Library/PeiTbtPolicyLib/PeiTbtPolicyLib.inf | 8 +-------
> .../Tbt/Library/PeiTbtPolicyLib/PeiTbtPolicyLibrary.h | 8 +-------
> .../Tbt/Library/Private/PeiDTbtInitLib/PeiDTbtInitLib.c | 8 +-------
> .../Tbt/Library/Private/PeiDTbtInitLib/PeiDTbtInitLib.inf | 8 +-------
> .../ClevoOpenBoardPkg/Features/Tbt/TbtInit/Dxe/TbtDxe.c | 8 +-------
> .../ClevoOpenBoardPkg/Features/Tbt/TbtInit/Dxe/TbtDxe.inf | 8 +-------
> .../Features/Tbt/TbtInit/Pei/PeiTbtInit.c | 8 +-------
> .../Features/Tbt/TbtInit/Pei/PeiTbtInit.inf | 8 +-------
> .../Features/Tbt/TbtInit/Smm/TbtSmiHandler.c | 8 +-------
> .../Features/Tbt/TbtInit/Smm/TbtSmiHandler.h | 8 +-------
> .../ClevoOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmm.c | 8 +-------
> .../ClevoOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmm.inf | 8 +-------
> .../Intel/ClevoOpenBoardPkg/Include/Acpi/GlobalNvs.asl | 8 +-------
> .../ClevoOpenBoardPkg/Include/Acpi/GlobalNvsAreaDef.h | 8 +-------
> Platform/Intel/ClevoOpenBoardPkg/Include/IoExpander.h | 8 +-------
> .../ClevoOpenBoardPkg/Include/Library/GpioExpanderLib.h | 8 +-------
> .../ClevoOpenBoardPkg/Include/Library/I2cAccessLib.h | 8 +-------
> .../Intel/ClevoOpenBoardPkg/Include/PchHsioPtssTables.h | 8 +-------
> .../ClevoOpenBoardPkg/Include/Protocol/GlobalNvsArea.h | 8 +-------
> Platform/Intel/ClevoOpenBoardPkg/Include/SioRegs.h | 8 +-------
> .../Library/BaseGpioExpanderLib/BaseGpioExpanderLib.c | 8 +-------
> .../Library/BaseGpioExpanderLib/BaseGpioExpanderLib.inf | 8 +-------
> .../Library/PeiI2cAccessLib/PeiI2cAccessLib.c | 8 +-------
> .../Library/PeiI2cAccessLib/PeiI2cAccessLib.inf | 8 +-------
> .../PeiSerialPortLibSpiFlash/PeiSerialPortLibSpiFlash.c | 8 +-------
> .../PeiSerialPortLibSpiFlash/PeiSerialPortLibSpiFlash.inf | 8 +-------
> .../PeiSiliconPolicyUpdateLibFsp/PcieDeviceTable.c | 8 +-------
> .../PeiSiliconPolicyUpdateLibFsp/PeiFspMiscUpdUpdateLib.c | 8 +-------
> .../PeiSiliconPolicyUpdateLibFsp/PeiFspPolicyUpdateLib.c | 8 +-------
> .../PeiSiliconPolicyUpdateLibFsp/PeiPchPolicyUpdate.c | 8 +-------
> .../PeiSiliconPolicyUpdateLibFsp/PeiPchPolicyUpdate.h | 8 +-------
> .../PeiPchPolicyUpdatePreMem.c | 8 +-------
> .../PeiSiliconPolicyUpdateLibFsp/PeiSaPolicyUpdate.c | 8 +-------
> .../PeiSiliconPolicyUpdateLibFsp/PeiSaPolicyUpdate.h | 8 +-------
> .../PeiSaPolicyUpdatePreMem.c | 8 +-------
> .../PeiSiliconPolicyUpdateLibFsp.inf | 8 +-------
> Platform/Intel/ClevoOpenBoardPkg/N1xxWU/GitEdk2Clevo.bat | 8 +-------
> .../N1xxWU/Include/Fdf/FlashMapInclude.fdf | 8 +-------
> .../Intel/ClevoOpenBoardPkg/N1xxWU/Include/N1xxWUId.h | 8 +-------
> .../Library/BasePlatformHookLib/BasePlatformHookLib.c | 8 +-------
> .../Library/BasePlatformHookLib/BasePlatformHookLib.inf | 8 +-------
> .../N1xxWU/Library/BoardAcpiLib/DxeBoardAcpiTableLib.c | 8 +-------
> .../N1xxWU/Library/BoardAcpiLib/DxeBoardAcpiTableLib.inf | 8 +-------
> .../Library/BoardAcpiLib/DxeMultiBoardAcpiSupportLib.c | 8 +-------
> .../Library/BoardAcpiLib/DxeMultiBoardAcpiSupportLib.inf | 8 +-------
> .../N1xxWU/Library/BoardAcpiLib/DxeN1xxWUAcpiTableLib.c | 8 +-------
> .../N1xxWU/Library/BoardAcpiLib/SmmBoardAcpiEnableLib.c | 8 +-------
> .../N1xxWU/Library/BoardAcpiLib/SmmBoardAcpiEnableLib.inf | 8 +-------
> .../Library/BoardAcpiLib/SmmMultiBoardAcpiSupportLib.c | 8 +-------
> .../Library/BoardAcpiLib/SmmMultiBoardAcpiSupportLib.inf | 8 +-------
> .../N1xxWU/Library/BoardAcpiLib/SmmN1xxWUAcpiEnableLib.c | 8 +-------
> .../N1xxWU/Library/BoardAcpiLib/SmmSiliconAcpiEnableLib.c | 8 +-------
> .../N1xxWU/Library/BoardInitLib/N1xxWUGpioTable.c | 8 +-------
> .../N1xxWU/Library/BoardInitLib/N1xxWUHdaVerbTables.c | 8 +-------
> .../N1xxWU/Library/BoardInitLib/N1xxWUHsioPtssTables.c | 8 +-------
> .../N1xxWU/Library/BoardInitLib/N1xxWUSpdTable.c | 8 +-------
> .../N1xxWU/Library/BoardInitLib/PeiBoardInitPostMemLib.c | 8 +-------
> .../Library/BoardInitLib/PeiBoardInitPostMemLib.inf | 8 +-------
> .../N1xxWU/Library/BoardInitLib/PeiBoardInitPreMemLib.c | 8 +-------
> .../N1xxWU/Library/BoardInitLib/PeiBoardInitPreMemLib.inf | 8 +-------
> .../Library/BoardInitLib/PeiMultiBoardInitPostMemLib.c | 8 +-------
> .../Library/BoardInitLib/PeiMultiBoardInitPostMemLib.inf | 8 +-------
> .../Library/BoardInitLib/PeiMultiBoardInitPreMemLib.c | 8 +-------
> .../Library/BoardInitLib/PeiMultiBoardInitPreMemLib.inf | 8 +-------
> .../N1xxWU/Library/BoardInitLib/PeiN1xxWUDetect.c | 8 +-------
> .../N1xxWU/Library/BoardInitLib/PeiN1xxWUInitLib.h | 8 +-------
> .../N1xxWU/Library/BoardInitLib/PeiN1xxWUInitPostMemLib.c | 8 +-------
> .../N1xxWU/Library/BoardInitLib/PeiN1xxWUInitPreMemLib.c | 8 +-------
> Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkg.dsc | 8 +------
> -
> Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkg.fdf | 8 +-------
> .../ClevoOpenBoardPkg/N1xxWU/OpenBoardPkgBuildOption.dsc | 8 +-------
> .../Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkgConfig.dsc | 8 +-------
> .../Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkgPcd.dsc | 8 +-------
> .../Library/DxeSiliconPolicyUpdateLib/DxeGopPolicyInit.c | 8 +-------
> .../Library/DxeSiliconPolicyUpdateLib/DxeGopPolicyInit.h | 8 +-------
> .../Library/DxeSiliconPolicyUpdateLib/DxeSaPolicyInit.h | 8 +-------
> .../Library/DxeSiliconPolicyUpdateLib/DxeSaPolicyUpdate.c | 8 +-------
> .../DxeSiliconPolicyUpdateLib/DxeSiliconPolicyUpdateLib.c | 8 +-------
> .../DxeSiliconPolicyUpdateLib.inf | 8 +-------
> Platform/Intel/ClevoOpenBoardPkg/N1xxWU/bld.bat | 8 +-------
> Platform/Intel/ClevoOpenBoardPkg/N1xxWU/cln.bat | 8 +-------
> Platform/Intel/ClevoOpenBoardPkg/N1xxWU/postbuild.bat | 8 +-------
> Platform/Intel/ClevoOpenBoardPkg/N1xxWU/prebuild.bat | 8 +-------
> Platform/Intel/ClevoOpenBoardPkg/N1xxWU/prep.bat | 8 +-------
> Platform/Intel/ClevoOpenBoardPkg/OpenBoardPkg.dec | 8 +-------
> 125 files changed, 125 insertions(+), 875 deletions(-)
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/AcpiGnvsInit.c
> b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/AcpiGnvsInit.c
> index fc2657476d..7c10cf8f73 100644
> --- a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/AcpiGnvsInit.c
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/AcpiGnvsInit.c
> @@ -2,13 +2,7 @@
> Acpi Gnvs Init Library.
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe.c
> b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe.c
> index d0a2f4bc84..4f248006bf 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe.c
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe.c
> @@ -2,13 +2,7 @@
> Board ACPI DXE initialization.
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe.inf
> b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe.inf
> index e02a1b5587..f7f4bd2e3d 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe.inf
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2019, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/ALS.ASL
> b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/ALS.ASL
> index 87b7448f95..bcc3405e33 100644
> --- a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/ALS.ASL
> +++ b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/ALS.ASL
> @@ -2,13 +2,7 @@
> ACPI DSDT table
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/AMLUPD.asl
> b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/AMLUPD.asl
> index ef0f3a9ded..30b3e57c4b 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/AMLUPD.asl
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/AMLUPD.asl
> @@ -2,13 +2,7 @@
> ACPI DSDT table
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/CPU.asl
> b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/CPU.asl
> index b229284192..84c151cbf6 100644
> --- a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/CPU.asl
> +++ b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/CPU.asl
> @@ -2,13 +2,7 @@
> ACPI DSDT table
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/DSDT.ASL
> b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/DSDT.ASL
> index 3adf6996e3..93bca6827e 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/DSDT.ASL
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/DSDT.ASL
> @@ -2,13 +2,7 @@
> ACPI DSDT table
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Gpe.asl
> b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Gpe.asl
> index 0218b893d1..8976c7a0ff 100644
> --- a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Gpe.asl
> +++ b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Gpe.asl
> @@ -2,13 +2,7 @@
> ACPI DSDT table
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Itss.asl
> b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Itss.asl
> index 73b3de105e..827a37fbab 100644
> --- a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Itss.asl
> +++ b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Itss.asl
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/LPC_DEV.AS
> L
> b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/LPC_DEV.AS
> L
> index 816f83ba3d..ea09363b84 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/LPC_DEV.AS
> L
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/LPC_DEV.AS
> L
> @@ -2,13 +2,7 @@
> ACPI DSDT table
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/LpcB.asl
> b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/LpcB.asl
> index 29b026a571..6fbaf3a97f 100644
> --- a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/LpcB.asl
> +++ b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/LpcB.asl
> @@ -2,13 +2,7 @@
> ACPI DSDT table
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PCI_DRC.AS
> L
> b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PCI_DRC.AS
> L
> index 4304e07275..fba792642d 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PCI_DRC.AS
> L
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PCI_DRC.AS
> L
> @@ -2,13 +2,7 @@
> ACPI DSDT table
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PciTree.asl
> b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PciTree.asl
> index 3bc988f619..ef65cea0af 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PciTree.asl
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PciTree.asl
> @@ -2,13 +2,7 @@
> ACPI DSDT table
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Platform.asl
> b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Platform.asl
> index 90f873c8bd..063093a08c 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Platform.asl
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Platform.asl
> @@ -2,13 +2,7 @@
> ACPI DSDT table
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PlatformGn
> vs.asl
> b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PlatformGn
> vs.asl
> index 97e54bdccf..788a8ec491 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PlatformGn
> vs.asl
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PlatformGn
> vs.asl
> @@ -2,13 +2,7 @@
> ACPI DSDT table
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Video.asl
> b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Video.asl
> index 002a377d83..b15b754fb0 100644
> --- a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Video.asl
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Video.asl
> @@ -2,13 +2,7 @@
> ACPI DSDT table
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/UpdateDsdt.c
> b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/UpdateDsdt.c
> index 832c64cd00..41f0b8c113 100644
> --- a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/UpdateDsdt.c
> +++ b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/UpdateDsdt.c
> @@ -2,13 +2,7 @@
> Performs board DSDT ACPI table updates.
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/Features/PciHotPlug/PciHotPlug.c
> b/Platform/Intel/ClevoOpenBoardPkg/Features/PciHotPlug/PciHotPlug.c
> index a9e616ffa4..05f128d719 100644
> --- a/Platform/Intel/ClevoOpenBoardPkg/Features/PciHotPlug/PciHotPlug.c
> +++ b/Platform/Intel/ClevoOpenBoardPkg/Features/PciHotPlug/PciHotPlug.c
> @@ -2,13 +2,7 @@
> Performs specific PCI-EXPRESS device resource configuration.
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/Features/PciHotPlug/PciHotPlug.h
> b/Platform/Intel/ClevoOpenBoardPkg/Features/PciHotPlug/PciHotPlug.h
> index 4e20fa201a..53274c17c5 100644
> --- a/Platform/Intel/ClevoOpenBoardPkg/Features/PciHotPlug/PciHotPlug.h
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/Features/PciHotPlug/PciHotPlug.h
> @@ -1,13 +1,7 @@
> /**@file
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/Features/PciHotPlug/PciHotPlug.inf
> b/Platform/Intel/ClevoOpenBoardPkg/Features/PciHotPlug/PciHotPlug.inf
> index a1ca0ec072..e50763336b 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/Features/PciHotPlug/PciHotPlug.inf
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/Features/PciHotPlug/PciHotPlug.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2019, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/AcpiTables/Rtd3SptPcie
> Tbt.asl
> b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/AcpiTables/Rtd3SptPcie
> Tbt.asl
> index 35544fb0a2..c082988fa9 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/AcpiTables/Rtd3SptPcie
> Tbt.asl
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/AcpiTables/Rtd3SptPcie
> Tbt.asl
> @@ -2,13 +2,7 @@
> ACPI RTD3 SSDT table for SPT PCIe
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #define PID_ICC 0xDC
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/AcpiTables/Tbt.asl
> b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/AcpiTables/Tbt.asl
> index 47a97628a5..2efe1a54f3 100644
> --- a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/AcpiTables/Tbt.asl
> +++ b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/AcpiTables/Tbt.asl
> @@ -2,13 +2,7 @@
> Thunderbolt ACPI methods
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #define DTBT_CONTROLLER 0x00
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Acpi/TbtNvs.asl
> b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Acpi/TbtNvs.asl
> index 257005181b..706796f8c5 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Acpi/TbtNvs.asl
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Acpi/TbtNvs.asl
> @@ -1,13 +1,7 @@
> /**@file
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> //
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Acpi/TbtNvsAre
> aDef.h
> b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Acpi/TbtNvsAre
> aDef.h
> index 2c6995a20d..e988bdd712 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Acpi/TbtNvsAre
> aDef.h
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Acpi/TbtNvsAre
> aDef.h
> @@ -1,13 +1,7 @@
> /**@file
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> //
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Library/DxeTbtP
> olicyLib.h
> b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Library/DxeTbtP
> olicyLib.h
> index b69a1a888e..3ac3d88a33 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Library/DxeTbtP
> olicyLib.h
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Library/DxeTbtP
> olicyLib.h
> @@ -2,13 +2,7 @@
> Prototype of the DxeTbtPolicyLib library.
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _DXE_TBT_POLICY_LIB_H_
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Library/PeiTbtP
> olicyLib.h
> b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Library/PeiTbtP
> olicyLib.h
> index aff0717af6..cf9ca8f0c8 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Library/PeiTbtP
> olicyLib.h
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Library/PeiTbtP
> olicyLib.h
> @@ -2,13 +2,7 @@
> Prototype of the PeiTbtPolicyLib library.
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PEI_TBT_POLICY_LIB_H_
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Library/TbtCom
> monLib.h
> b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Library/TbtCom
> monLib.h
> index c2df847077..90966fa4cc 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Library/TbtCom
> monLib.h
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Library/TbtCom
> monLib.h
> @@ -1,13 +1,7 @@
> /**@file
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _TBT_COMMON_LIB_H_
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Ppi/PeiTbtPolicy
> .h
> b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Ppi/PeiTbtPolicy
> .h
> index a9ed0701fd..09b74df889 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Ppi/PeiTbtPolicy
> .h
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Ppi/PeiTbtPolicy
> .h
> @@ -2,13 +2,7 @@
> TBT PEI Policy
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PEI_TBT_POLICY_H_
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Private/Library/
> PeiDTbtInitLib.h
> b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Private/Library/
> PeiDTbtInitLib.h
> index 659106d874..dd31099a7d 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Private/Library/
> PeiDTbtInitLib.h
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Private/Library/
> PeiDTbtInitLib.h
> @@ -2,13 +2,7 @@
> PEI DTBT Init Dispatch library Header file
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef __PEI_DTBT_INIT_LIB_H__
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Private/Library/
> PeiTbtCommonInitLib.h
> b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Private/Library/
> PeiTbtCommonInitLib.h
> index 5c319debd7..718e858b70 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Private/Library/
> PeiTbtCommonInitLib.h
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Private/Library/
> PeiTbtCommonInitLib.h
> @@ -2,13 +2,7 @@
> PEI TBT Common Init Dispatch library Header file
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef __PEI_TBT_COMMON_INIT_LIB_H__
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Protocol/DxeTb
> tPolicy.h
> b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Protocol/DxeTb
> tPolicy.h
> index ab5a829755..5167661c02 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Protocol/DxeTb
> tPolicy.h
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Protocol/DxeTb
> tPolicy.h
> @@ -2,13 +2,7 @@
> TBT DXE Policy
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _DXE_TBT_POLICY_H_
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Protocol/TbtNv
> sArea.h
> b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Protocol/TbtNv
> sArea.h
> index 9296a05821..e57381e12c 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Protocol/TbtNv
> sArea.h
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Protocol/TbtNv
> sArea.h
> @@ -2,13 +2,7 @@
> This file defines the TBT NVS Area Protocol.
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/TbtBoardInfo.h
> b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/TbtBoardInfo.h
> index 8b37ab77e5..13319a9cec 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/TbtBoardInfo.h
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/TbtBoardInfo.h
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _TBT_INFO_GUID_H_
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/TbtPolicyComm
> onDefinition.h
> b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/TbtPolicyComm
> onDefinition.h
> index d88e7cb7b6..eb4c79317d 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/TbtPolicyComm
> onDefinition.h
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/TbtPolicyComm
> onDefinition.h
> @@ -2,13 +2,7 @@
> TBT Policy Common definition.
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _TBT_POLICY_COMMON_H_
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicyLib
> /DxeTbtPolicyLib.c
> b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicyLib
> /DxeTbtPolicyLib.c
> index 1783d8c6b4..b221e26d8e 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicyLib
> /DxeTbtPolicyLib.c
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicyLib
> /DxeTbtPolicyLib.c
> @@ -2,13 +2,7 @@
> This file is DxeTbtPolicyLib library.
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include <DxeTbtPolicyLibrary.h>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicyLib
> /DxeTbtPolicyLib.inf
> b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicyLib
> /DxeTbtPolicyLib.inf
> index 75a7473060..ceeca81a50 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicyLib
> /DxeTbtPolicyLib.inf
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicyLib
> /DxeTbtPolicyLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2019, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicyLib
> /DxeTbtPolicyLibrary.h
> b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicyLib
> /DxeTbtPolicyLibrary.h
> index 6dd1015c61..75bc01e29a 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicyLib
> /DxeTbtPolicyLibrary.h
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicyLib
> /DxeTbtPolicyLibrary.h
> @@ -2,13 +2,7 @@
> Header file for the DxeTBTPolicy library.
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _DXE_TBT_POLICY_LIBRARY_H_
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/PeiDxeSmmTbtC
> ommonLib/TbtCommonLib.c
> b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/PeiDxeSmmTbtC
> ommonLib/TbtCommonLib.c
> index 52871cf447..7afdc25f67 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/PeiDxeSmmTbtC
> ommonLib/TbtCommonLib.c
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/PeiDxeSmmTbtC
> ommonLib/TbtCommonLib.c
> @@ -2,13 +2,7 @@
> Common Thunderbolt functions.
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/PeiDxeSmmTbtC
> ommonLib/TbtCommonLib.inf
> b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/PeiDxeSmmTbtC
> ommonLib/TbtCommonLib.inf
> index 60ea0ba6f1..b7277c1c57 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/PeiDxeSmmTbtC
> ommonLib/TbtCommonLib.inf
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/PeiDxeSmmTbtC
> ommonLib/TbtCommonLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2019, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/PeiTbtPolicyLib/
> PeiTbtPolicyLib.c
> b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/PeiTbtPolicyLib/
> PeiTbtPolicyLib.c
> index 36b49f013e..d6105a0c67 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/PeiTbtPolicyLib/
> PeiTbtPolicyLib.c
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/PeiTbtPolicyLib/
> PeiTbtPolicyLib.c
> @@ -2,13 +2,7 @@
> This file is PeiTbtPolicyLib library.
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include <Library/PeiServicesLib.h>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/PeiTbtPolicyLib/
> PeiTbtPolicyLib.inf
> b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/PeiTbtPolicyLib/
> PeiTbtPolicyLib.inf
> index dc9c4ea9f3..8f554c8aa7 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/PeiTbtPolicyLib/
> PeiTbtPolicyLib.inf
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/PeiTbtPolicyLib/
> PeiTbtPolicyLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2019, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/PeiTbtPolicyLib/
> PeiTbtPolicyLibrary.h
> b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/PeiTbtPolicyLib/
> PeiTbtPolicyLibrary.h
> index b85faef320..38c5d60fab 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/PeiTbtPolicyLib/
> PeiTbtPolicyLibrary.h
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/PeiTbtPolicyLib/
> PeiTbtPolicyLibrary.h
> @@ -2,13 +2,7 @@
> Header file for the PeiTBTPolicy library.
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PEI_TBT_POLICY_LIBRARY_H_
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/Private/PeiDTbtI
> nitLib/PeiDTbtInitLib.c
> b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/Private/PeiDTbtI
> nitLib/PeiDTbtInitLib.c
> index 986a1271d8..9c4bddfc2d 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/Private/PeiDTbtI
> nitLib/PeiDTbtInitLib.c
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/Private/PeiDTbtI
> nitLib/PeiDTbtInitLib.c
> @@ -2,13 +2,7 @@
> Thunderbolt(TM) Pei Library
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include <Library/PeiServicesLib.h>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/Private/PeiDTbtI
> nitLib/PeiDTbtInitLib.inf
> b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/Private/PeiDTbtI
> nitLib/PeiDTbtInitLib.inf
> index b99fd3433c..e33601618a 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/Private/PeiDTbtI
> nitLib/PeiDTbtInitLib.inf
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/Private/PeiDTbtI
> nitLib/PeiDTbtInitLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2019, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Dxe/TbtDxe.c
> b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Dxe/TbtDxe.c
> index 69162f10bf..5e8f80fa59 100644
> --- a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Dxe/TbtDxe.c
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Dxe/TbtDxe.c
> @@ -2,13 +2,7 @@
> Thunderbolt initialization in DXE.
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include <Uefi.h>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Dxe/TbtDxe.inf
> b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Dxe/TbtDxe.inf
> index ad056b69ae..6ec93bf03a 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Dxe/TbtDxe.inf
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Dxe/TbtDxe.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2019, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Pei/PeiTbtInit.c
> b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Pei/PeiTbtInit.c
> index 5c792bf3b9..a824886697 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Pei/PeiTbtInit.c
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Pei/PeiTbtInit.c
> @@ -2,13 +2,7 @@
> Thunderbolt initialization in PEI.
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Pei/PeiTbtInit.inf
> b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Pei/PeiTbtInit.inf
> index 65d8c0a45d..d15c571784 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Pei/PeiTbtInit.inf
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Pei/PeiTbtInit.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2019, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmiHan
> dler.c
> b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmiHan
> dler.c
> index 28de0dc793..216a7b155c 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmiHan
> dler.c
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmiHan
> dler.c
> @@ -2,13 +2,7 @@
> Thunderbolt SMI handler.
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmiHan
> dler.h
> b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmiHan
> dler.h
> index 095d8d44f5..7b06a037da 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmiHan
> dler.h
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmiHan
> dler.h
> @@ -1,13 +1,7 @@
> /**@file
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _TBT_SMI_HANDLER_H_
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmm.c
> b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmm.c
> index 5bbb811e54..5810447792 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmm.c
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmm.c
> @@ -2,13 +2,7 @@
> Thunderbolt initialization in SMM.
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmm.in
> f
> b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmm.in
> f
> index 97322f3d57..3826cf589b 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmm.in
> f
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmm.in
> f
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2019, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git a/Platform/Intel/ClevoOpenBoardPkg/Include/Acpi/GlobalNvs.asl
> b/Platform/Intel/ClevoOpenBoardPkg/Include/Acpi/GlobalNvs.asl
> index 651708ea70..e3b0a1da85 100644
> --- a/Platform/Intel/ClevoOpenBoardPkg/Include/Acpi/GlobalNvs.asl
> +++ b/Platform/Intel/ClevoOpenBoardPkg/Include/Acpi/GlobalNvs.asl
> @@ -2,13 +2,7 @@
> ACPI DSDT table
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/Include/Acpi/GlobalNvsAreaDef.h
> b/Platform/Intel/ClevoOpenBoardPkg/Include/Acpi/GlobalNvsAreaDef.h
> index a1fa221d76..5d096db346 100644
> --- a/Platform/Intel/ClevoOpenBoardPkg/Include/Acpi/GlobalNvsAreaDef.h
> +++ b/Platform/Intel/ClevoOpenBoardPkg/Include/Acpi/GlobalNvsAreaDef.h
> @@ -2,13 +2,7 @@
> ACPI DSDT table
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/Intel/ClevoOpenBoardPkg/Include/IoExpander.h
> b/Platform/Intel/ClevoOpenBoardPkg/Include/IoExpander.h
> index 3a0c628319..0f313e429a 100644
> --- a/Platform/Intel/ClevoOpenBoardPkg/Include/IoExpander.h
> +++ b/Platform/Intel/ClevoOpenBoardPkg/Include/IoExpander.h
> @@ -2,13 +2,7 @@
> GPIO definition table for N1xxWU
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/Include/Library/GpioExpanderLib.h
> b/Platform/Intel/ClevoOpenBoardPkg/Include/Library/GpioExpanderLib.h
> index 3395d631ce..dc75a7decb 100644
> --- a/Platform/Intel/ClevoOpenBoardPkg/Include/Library/GpioExpanderLib.h
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/Include/Library/GpioExpanderLib.h
> @@ -2,13 +2,7 @@
> Support for IO expander TCA6424.
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/Include/Library/I2cAccessLib.h
> b/Platform/Intel/ClevoOpenBoardPkg/Include/Library/I2cAccessLib.h
> index 559af842a5..e36699e8e9 100644
> --- a/Platform/Intel/ClevoOpenBoardPkg/Include/Library/I2cAccessLib.h
> +++ b/Platform/Intel/ClevoOpenBoardPkg/Include/Library/I2cAccessLib.h
> @@ -2,13 +2,7 @@
> Support for IO expander TCA6424.
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/Intel/ClevoOpenBoardPkg/Include/PchHsioPtssTables.h
> b/Platform/Intel/ClevoOpenBoardPkg/Include/PchHsioPtssTables.h
> index 412211ea2c..a2003002cf 100644
> --- a/Platform/Intel/ClevoOpenBoardPkg/Include/PchHsioPtssTables.h
> +++ b/Platform/Intel/ClevoOpenBoardPkg/Include/PchHsioPtssTables.h
> @@ -1,13 +1,7 @@
> /** @file*
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/Include/Protocol/GlobalNvsArea.h
> b/Platform/Intel/ClevoOpenBoardPkg/Include/Protocol/GlobalNvsArea.h
> index 5f72bcf1b9..b10547b6b9 100644
> --- a/Platform/Intel/ClevoOpenBoardPkg/Include/Protocol/GlobalNvsArea.h
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/Include/Protocol/GlobalNvsArea.h
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/Intel/ClevoOpenBoardPkg/Include/SioRegs.h
> b/Platform/Intel/ClevoOpenBoardPkg/Include/SioRegs.h
> index f9aa5d4f18..cf636b798c 100644
> --- a/Platform/Intel/ClevoOpenBoardPkg/Include/SioRegs.h
> +++ b/Platform/Intel/ClevoOpenBoardPkg/Include/SioRegs.h
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/Library/BaseGpioExpanderLib/BaseGp
> ioExpanderLib.c
> b/Platform/Intel/ClevoOpenBoardPkg/Library/BaseGpioExpanderLib/BaseGp
> ioExpanderLib.c
> index 34d52527cb..260c5bb6a2 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/Library/BaseGpioExpanderLib/BaseGp
> ioExpanderLib.c
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/Library/BaseGpioExpanderLib/BaseGp
> ioExpanderLib.c
> @@ -2,13 +2,7 @@
> Support for IO expander TCA6424.
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/Library/BaseGpioExpanderLib/BaseGp
> ioExpanderLib.inf
> b/Platform/Intel/ClevoOpenBoardPkg/Library/BaseGpioExpanderLib/BaseGp
> ioExpanderLib.inf
> index 2750645711..4c2478155e 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/Library/BaseGpioExpanderLib/BaseGp
> ioExpanderLib.inf
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/Library/BaseGpioExpanderLib/BaseGp
> ioExpanderLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2019, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/Library/PeiI2cAccessLib/PeiI2cAccessL
> ib.c
> b/Platform/Intel/ClevoOpenBoardPkg/Library/PeiI2cAccessLib/PeiI2cAccessL
> ib.c
> index 64fccfe868..d66571bdc4 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/Library/PeiI2cAccessLib/PeiI2cAccessL
> ib.c
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/Library/PeiI2cAccessLib/PeiI2cAccessL
> ib.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/Library/PeiI2cAccessLib/PeiI2cAccessL
> ib.inf
> b/Platform/Intel/ClevoOpenBoardPkg/Library/PeiI2cAccessLib/PeiI2cAccessL
> ib.inf
> index 9f4c1cbb80..bbbc74cf90 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/Library/PeiI2cAccessLib/PeiI2cAccessL
> ib.inf
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/Library/PeiI2cAccessLib/PeiI2cAccessL
> ib.inf
> @@ -2,13 +2,7 @@
> #
> # Copyright (c) 2019, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/Library/PeiSerialPortLibSpiFlash/PeiSe
> rialPortLibSpiFlash.c
> b/Platform/Intel/ClevoOpenBoardPkg/Library/PeiSerialPortLibSpiFlash/PeiSe
> rialPortLibSpiFlash.c
> index e36ff8bff8..0230149a38 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/Library/PeiSerialPortLibSpiFlash/PeiSe
> rialPortLibSpiFlash.c
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/Library/PeiSerialPortLibSpiFlash/PeiSe
> rialPortLibSpiFlash.c
> @@ -2,13 +2,7 @@
> Serial I/O Port library implementation for output to SPI flash
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/Library/PeiSerialPortLibSpiFlash/PeiSe
> rialPortLibSpiFlash.inf
> b/Platform/Intel/ClevoOpenBoardPkg/Library/PeiSerialPortLibSpiFlash/PeiSe
> rialPortLibSpiFlash.inf
> index c22201e033..b81ce9dd7a 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/Library/PeiSerialPortLibSpiFlash/PeiSe
> rialPortLibSpiFlash.inf
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/Library/PeiSerialPortLibSpiFlash/PeiSe
> rialPortLibSpiFlash.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2019, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSilic
> onPolicyUpdateLibFsp/PcieDeviceTable.c
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSilic
> onPolicyUpdateLibFsp/PcieDeviceTable.c
> index 40366af4cf..7898dc3592 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSilic
> onPolicyUpdateLibFsp/PcieDeviceTable.c
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSilic
> onPolicyUpdateLibFsp/PcieDeviceTable.c
> @@ -2,13 +2,7 @@
> Intel PCH PEI Policy initialization.
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSilic
> onPolicyUpdateLibFsp/PeiFspMiscUpdUpdateLib.c
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSilic
> onPolicyUpdateLibFsp/PeiFspMiscUpdUpdateLib.c
> index df5a11ab2d..9d6c0176f6 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSilic
> onPolicyUpdateLibFsp/PeiFspMiscUpdUpdateLib.c
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSilic
> onPolicyUpdateLibFsp/PeiFspMiscUpdUpdateLib.c
> @@ -2,13 +2,7 @@
> Implementation of Fsp Misc UPD Initialization.
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSilic
> onPolicyUpdateLibFsp/PeiFspPolicyUpdateLib.c
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSilic
> onPolicyUpdateLibFsp/PeiFspPolicyUpdateLib.c
> index 91d0f03191..c665f7888d 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSilic
> onPolicyUpdateLibFsp/PeiFspPolicyUpdateLib.c
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSilic
> onPolicyUpdateLibFsp/PeiFspPolicyUpdateLib.c
> @@ -2,13 +2,7 @@
> Provides FSP policy update functionality.
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSilic
> onPolicyUpdateLibFsp/PeiPchPolicyUpdate.c
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSilic
> onPolicyUpdateLibFsp/PeiPchPolicyUpdate.c
> index a50b2f2b7c..0bdd51d288 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSilic
> onPolicyUpdateLibFsp/PeiPchPolicyUpdate.c
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSilic
> onPolicyUpdateLibFsp/PeiPchPolicyUpdate.c
> @@ -2,13 +2,7 @@
> Intel PCH PEI Policy initialization.
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSilic
> onPolicyUpdateLibFsp/PeiPchPolicyUpdate.h
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSilic
> onPolicyUpdateLibFsp/PeiPchPolicyUpdate.h
> index b736111344..9f6b236e42 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSilic
> onPolicyUpdateLibFsp/PeiPchPolicyUpdate.h
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSilic
> onPolicyUpdateLibFsp/PeiPchPolicyUpdate.h
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSilic
> onPolicyUpdateLibFsp/PeiPchPolicyUpdatePreMem.c
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSilic
> onPolicyUpdateLibFsp/PeiPchPolicyUpdatePreMem.c
> index b3661f3439..5a62f9bb72 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSilic
> onPolicyUpdateLibFsp/PeiPchPolicyUpdatePreMem.c
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSilic
> onPolicyUpdateLibFsp/PeiPchPolicyUpdatePreMem.c
> @@ -2,13 +2,7 @@
> Intel PCH PEI Policy initialization.
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSilic
> onPolicyUpdateLibFsp/PeiSaPolicyUpdate.c
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSilic
> onPolicyUpdateLibFsp/PeiSaPolicyUpdate.c
> index e445ddef72..133b8c963f 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSilic
> onPolicyUpdateLibFsp/PeiSaPolicyUpdate.c
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSilic
> onPolicyUpdateLibFsp/PeiSaPolicyUpdate.c
> @@ -2,13 +2,7 @@
> Intel System Agent policy initialization.
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSilic
> onPolicyUpdateLibFsp/PeiSaPolicyUpdate.h
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSilic
> onPolicyUpdateLibFsp/PeiSaPolicyUpdate.h
> index 10122af262..c006dbcd68 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSilic
> onPolicyUpdateLibFsp/PeiSaPolicyUpdate.h
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSilic
> onPolicyUpdateLibFsp/PeiSaPolicyUpdate.h
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSilic
> onPolicyUpdateLibFsp/PeiSaPolicyUpdatePreMem.c
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSilic
> onPolicyUpdateLibFsp/PeiSaPolicyUpdatePreMem.c
> index c8d6fe4036..12d2b2cdb2 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSilic
> onPolicyUpdateLibFsp/PeiSaPolicyUpdatePreMem.c
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSilic
> onPolicyUpdateLibFsp/PeiSaPolicyUpdatePreMem.c
> @@ -2,13 +2,7 @@
> Intel System Agent policy initialization.
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSilic
> onPolicyUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSilic
> onPolicyUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf
> index bc938a0436..25531d3d7f 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSilic
> onPolicyUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSilic
> onPolicyUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2019, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/GitEdk2Clevo.bat
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/GitEdk2Clevo.bat
> index 9a34a9a2d2..81f51b3785 100644
> --- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/GitEdk2Clevo.bat
> +++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/GitEdk2Clevo.bat
> @@ -1,13 +1,7 @@
> @REM @file
> @REM
> @REM Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
> -@REM This program and the accompanying materials
> -@REM are licensed and made available under the terms and conditions of
> the BSD License
> -@REM which accompanies this distribution. The full text of the license may
> be found at
> -@REM http://opensource.org/licenses/bsd-license.php
> -@REM
> -@REM THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS
> IS" BASIS,
> -@REM WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND,
> EITHER EXPRESS OR IMPLIED.
> +@REM SPDX-License-Identifier: BSD-2-Clause-Patent
> @REM
>
> @echo off
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Include/Fdf/FlashMapInclud
> e.fdf
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Include/Fdf/FlashMapInclud
> e.fdf
> index 423c6b18f5..d48f8c7a2a 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Include/Fdf/FlashMapInclud
> e.fdf
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Include/Fdf/FlashMapInclud
> e.fdf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2019, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Include/N1xxWUId.h
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Include/N1xxWUId.h
> index c5cf2e3143..684b31f051 100644
> --- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Include/N1xxWUId.h
> +++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Include/N1xxWUId.h
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BasePlatformHookLi
> b/BasePlatformHookLib.c
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BasePlatformHookLi
> b/BasePlatformHookLib.c
> index 637f46cb46..5c5d6a25b4 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BasePlatformHookLi
> b/BasePlatformHookLib.c
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BasePlatformHookLi
> b/BasePlatformHookLib.c
> @@ -2,13 +2,7 @@
> Platform Hook Library
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BasePlatformHookLi
> b/BasePlatformHookLib.inf
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BasePlatformHookLi
> b/BasePlatformHookLib.inf
> index 0b631a79ea..c4ea31bff2 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BasePlatformHookLi
> b/BasePlatformHookLib.inf
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BasePlatformHookLi
> b/BasePlatformHookLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2019, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/DxeB
> oardAcpiTableLib.c
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/DxeB
> oardAcpiTableLib.c
> index 19593cfadf..c56334e82b 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/DxeB
> oardAcpiTableLib.c
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/DxeB
> oardAcpiTableLib.c
> @@ -2,13 +2,7 @@
> DXE board-specific ACPI functionality.
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/DxeB
> oardAcpiTableLib.inf
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/DxeB
> oardAcpiTableLib.inf
> index 4b2529d695..06e703e12d 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/DxeB
> oardAcpiTableLib.inf
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/DxeB
> oardAcpiTableLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2019, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/DxeM
> ultiBoardAcpiSupportLib.c
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/DxeM
> ultiBoardAcpiSupportLib.c
> index 7eb19ba594..4171d4ad6d 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/DxeM
> ultiBoardAcpiSupportLib.c
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/DxeM
> ultiBoardAcpiSupportLib.c
> @@ -2,13 +2,7 @@
> DXE multi-board ACPI table support functionality.
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/DxeM
> ultiBoardAcpiSupportLib.inf
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/DxeM
> ultiBoardAcpiSupportLib.inf
> index f191b04eee..c505909ad3 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/DxeM
> ultiBoardAcpiSupportLib.inf
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/DxeM
> ultiBoardAcpiSupportLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2019, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/DxeN
> 1xxWUAcpiTableLib.c
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/DxeN
> 1xxWUAcpiTableLib.c
> index 9137bed899..96a3232fe5 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/DxeN
> 1xxWUAcpiTableLib.c
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/DxeN
> 1xxWUAcpiTableLib.c
> @@ -2,13 +2,7 @@
> Clevo N1xxWU board DXE ACPI table functionality.
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/SmmB
> oardAcpiEnableLib.c
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/SmmB
> oardAcpiEnableLib.c
> index 99dae10e57..2d9e9e98da 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/SmmB
> oardAcpiEnableLib.c
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/SmmB
> oardAcpiEnableLib.c
> @@ -2,13 +2,7 @@
> Clevo N1xxWU board SMM ACPI table enable/disable functionality.
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/SmmB
> oardAcpiEnableLib.inf
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/SmmB
> oardAcpiEnableLib.inf
> index efeebff979..8752fbb43f 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/SmmB
> oardAcpiEnableLib.inf
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/SmmB
> oardAcpiEnableLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2019, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/Smm
> MultiBoardAcpiSupportLib.c
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/Smm
> MultiBoardAcpiSupportLib.c
> index 19de0b842e..a06505a34a 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/Smm
> MultiBoardAcpiSupportLib.c
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/Smm
> MultiBoardAcpiSupportLib.c
> @@ -2,13 +2,7 @@
> SMM multi-board ACPI support functionality.
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/Smm
> MultiBoardAcpiSupportLib.inf
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/Smm
> MultiBoardAcpiSupportLib.inf
> index f75f8844d9..3c4cfaccd3 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/Smm
> MultiBoardAcpiSupportLib.inf
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/Smm
> MultiBoardAcpiSupportLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2019, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/Smm
> N1xxWUAcpiEnableLib.c
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/Smm
> N1xxWUAcpiEnableLib.c
> index 82d5c40bf2..8c1caa1898 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/Smm
> N1xxWUAcpiEnableLib.c
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/Smm
> N1xxWUAcpiEnableLib.c
> @@ -2,13 +2,7 @@
> Platform Hook Library instances
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/SmmS
> iliconAcpiEnableLib.c
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/SmmS
> iliconAcpiEnableLib.c
> index 93765b1ae3..1baa8daa70 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/SmmS
> iliconAcpiEnableLib.c
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/SmmS
> iliconAcpiEnableLib.c
> @@ -2,13 +2,7 @@
> SMM ACPI enable library.
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/N1xxW
> UGpioTable.c
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/N1xxW
> UGpioTable.c
> index bc7554ae2b..08a20673f0 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/N1xxW
> UGpioTable.c
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/N1xxW
> UGpioTable.c
> @@ -2,13 +2,7 @@
> GPIO definition table for N1xxWU
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/N1xxW
> UHdaVerbTables.c
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/N1xxW
> UHdaVerbTables.c
> index 28c906e560..26d7401c6c 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/N1xxW
> UHdaVerbTables.c
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/N1xxW
> UHdaVerbTables.c
> @@ -2,13 +2,7 @@
> HDA Verb table for N1xxWU
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/N1xxW
> UHsioPtssTables.c
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/N1xxW
> UHsioPtssTables.c
> index 5f71865469..9e52dd2671 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/N1xxW
> UHsioPtssTables.c
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/N1xxW
> UHsioPtssTables.c
> @@ -2,13 +2,7 @@
> N1xxWU HSIO PTSS H File
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/N1xxW
> USpdTable.c
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/N1xxW
> USpdTable.c
> index afc7315665..18a04eba17 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/N1xxW
> USpdTable.c
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/N1xxW
> USpdTable.c
> @@ -2,13 +2,7 @@
> GPIO definition table for N1xxWU
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiBoa
> rdInitPostMemLib.c
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiBoa
> rdInitPostMemLib.c
> index 1433176ca8..b7ff3062b2 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiBoa
> rdInitPostMemLib.c
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiBoa
> rdInitPostMemLib.c
> @@ -2,13 +2,7 @@
> Board post-memory initialization.
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiBoa
> rdInitPostMemLib.inf
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiBoa
> rdInitPostMemLib.inf
> index 3c8705d997..01225c9114 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiBoa
> rdInitPostMemLib.inf
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiBoa
> rdInitPostMemLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2019, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiBoa
> rdInitPreMemLib.c
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiBoa
> rdInitPreMemLib.c
> index 2596880bfc..c1fe2a55c0 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiBoa
> rdInitPreMemLib.c
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiBoa
> rdInitPreMemLib.c
> @@ -2,13 +2,7 @@
> Board post-memory initialization.
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiBoa
> rdInitPreMemLib.inf
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiBoa
> rdInitPreMemLib.inf
> index 0dbbafd0f6..22797cd80f 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiBoa
> rdInitPreMemLib.inf
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiBoa
> rdInitPreMemLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2019, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiMul
> tiBoardInitPostMemLib.c
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiMul
> tiBoardInitPostMemLib.c
> index c58842d9f4..8570039624 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiMul
> tiBoardInitPostMemLib.c
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiMul
> tiBoardInitPostMemLib.c
> @@ -2,13 +2,7 @@
> Multi-board post-memory initialization.
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiMul
> tiBoardInitPostMemLib.inf
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiMul
> tiBoardInitPostMemLib.inf
> index dc35136a0d..47efb21a79 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiMul
> tiBoardInitPostMemLib.inf
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiMul
> tiBoardInitPostMemLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2019, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiMul
> tiBoardInitPreMemLib.c
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiMul
> tiBoardInitPreMemLib.c
> index 4323495c04..842316e610 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiMul
> tiBoardInitPreMemLib.c
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiMul
> tiBoardInitPreMemLib.c
> @@ -2,13 +2,7 @@
> Board pre-memory initialization.
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiMul
> tiBoardInitPreMemLib.inf
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiMul
> tiBoardInitPreMemLib.inf
> index c0df18faa3..8f73c2fa40 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiMul
> tiBoardInitPreMemLib.inf
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiMul
> tiBoardInitPreMemLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2019, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiN1x
> xWUDetect.c
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiN1x
> xWUDetect.c
> index edda4da7a0..9e31a92926 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiN1x
> xWUDetect.c
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiN1x
> xWUDetect.c
> @@ -2,13 +2,7 @@
> Clevo N1xxWU board detection.
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiN1x
> xWUInitLib.h
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiN1x
> xWUInitLib.h
> index 34eff7d5c3..ddb873aaa2 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiN1x
> xWUInitLib.h
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiN1x
> xWUInitLib.h
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiN1x
> xWUInitPostMemLib.c
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiN1x
> xWUInitPostMemLib.c
> index 5bd74035cb..832130e15e 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiN1x
> xWUInitPostMemLib.c
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiN1x
> xWUInitPostMemLib.c
> @@ -2,13 +2,7 @@
> Clevo N1xxWU board post-memory initialization.
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiN1x
> xWUInitPreMemLib.c
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiN1x
> xWUInitPreMemLib.c
> index d9e2e659ab..10550baf8a 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiN1x
> xWUInitPreMemLib.c
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiN1x
> xWUInitPreMemLib.c
> @@ -2,13 +2,7 @@
> Clevo N1xxWU board pre-memory initialization.
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkg.dsc
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkg.dsc
> index 4fc4c9c141..02ef06579b 100644
> --- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkg.dsc
> +++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkg.dsc
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2019, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
> [Defines]
> diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkg.fdf
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkg.fdf
> index 6b8cb4a0b5..67aebbd547 100644
> --- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkg.fdf
> +++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkg.fdf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2019, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkgBuildOption.
> dsc
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkgBuildOption.
> dsc
> index 92c757190c..2cfcfdf776 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkgBuildOption.
> dsc
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkgBuildOption.
> dsc
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2019, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkgConfig.dsc
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkgConfig.dsc
> index 2f7d386469..ea759776fb 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkgConfig.dsc
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkgConfig.dsc
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2019, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkgPcd.dsc
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkgPcd.dsc
> index 9b6f5005eb..7bb341a1dd 100644
> --- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkgPcd.dsc
> +++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkgPcd.dsc
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2019, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Policy/Library/DxeSiliconPol
> icyUpdateLib/DxeGopPolicyInit.c
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Policy/Library/DxeSiliconPol
> icyUpdateLib/DxeGopPolicyInit.c
> index 56d2afd917..99c7d42c4e 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Policy/Library/DxeSiliconPol
> icyUpdateLib/DxeGopPolicyInit.c
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Policy/Library/DxeSiliconPol
> icyUpdateLib/DxeGopPolicyInit.c
> @@ -2,13 +2,7 @@
> DXE GOP policy initialization.
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Policy/Library/DxeSiliconPol
> icyUpdateLib/DxeGopPolicyInit.h
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Policy/Library/DxeSiliconPol
> icyUpdateLib/DxeGopPolicyInit.h
> index c7a4b73e8c..f4ab1a5bca 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Policy/Library/DxeSiliconPol
> icyUpdateLib/DxeGopPolicyInit.h
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Policy/Library/DxeSiliconPol
> icyUpdateLib/DxeGopPolicyInit.h
> @@ -2,13 +2,7 @@
> Header file for the GopPolicyInitDxe Driver.
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _GOP_POLICY_INIT_DXE_H_
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Policy/Library/DxeSiliconPol
> icyUpdateLib/DxeSaPolicyInit.h
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Policy/Library/DxeSiliconPol
> icyUpdateLib/DxeSaPolicyInit.h
> index ebf8c3967f..bb4b4369ad 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Policy/Library/DxeSiliconPol
> icyUpdateLib/DxeSaPolicyInit.h
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Policy/Library/DxeSiliconPol
> icyUpdateLib/DxeSaPolicyInit.h
> @@ -2,13 +2,7 @@
> Header file for the SaPolicyInitDxe Driver.
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _SA_POLICY_INIT_DXE_H_
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Policy/Library/DxeSiliconPol
> icyUpdateLib/DxeSaPolicyUpdate.c
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Policy/Library/DxeSiliconPol
> icyUpdateLib/DxeSaPolicyUpdate.c
> index f7fb071e2b..d140237576 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Policy/Library/DxeSiliconPol
> icyUpdateLib/DxeSaPolicyUpdate.c
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Policy/Library/DxeSiliconPol
> icyUpdateLib/DxeSaPolicyUpdate.c
> @@ -2,13 +2,7 @@
> This file is the library for SA DXE Policy initialization.
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Policy/Library/DxeSiliconPol
> icyUpdateLib/DxeSiliconPolicyUpdateLib.c
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Policy/Library/DxeSiliconPol
> icyUpdateLib/DxeSiliconPolicyUpdateLib.c
> index a7ddfcc428..5c7f388213 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Policy/Library/DxeSiliconPol
> icyUpdateLib/DxeSiliconPolicyUpdateLib.c
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Policy/Library/DxeSiliconPol
> icyUpdateLib/DxeSiliconPolicyUpdateLib.c
> @@ -2,13 +2,7 @@
> DXE silicon policy update library.
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Policy/Library/DxeSiliconPol
> icyUpdateLib/DxeSiliconPolicyUpdateLib.inf
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Policy/Library/DxeSiliconPol
> icyUpdateLib/DxeSiliconPolicyUpdateLib.inf
> index c6ffd6d40e..dd7047b9cf 100644
> ---
> a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Policy/Library/DxeSiliconPol
> icyUpdateLib/DxeSiliconPolicyUpdateLib.inf
> +++
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Policy/Library/DxeSiliconPol
> icyUpdateLib/DxeSiliconPolicyUpdateLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2019, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/bld.bat
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/bld.bat
> index 03c8f98d93..606ce979a7 100644
> --- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/bld.bat
> +++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/bld.bat
> @@ -1,13 +1,7 @@
> @REM @file
> @REM
> @REM Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
> -@REM This program and the accompanying materials
> -@REM are licensed and made available under the terms and conditions of
> the BSD License
> -@REM which accompanies this distribution. The full text of the license may
> be found at
> -@REM http://opensource.org/licenses/bsd-license.php
> -@REM
> -@REM THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS
> IS" BASIS,
> -@REM WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND,
> EITHER EXPRESS OR IMPLIED.
> +@REM SPDX-License-Identifier: BSD-2-Clause-Patent
> @REM
>
> :: Useage: bld [/s] [/f <FEATURE_PCD_NAME> <FALSE or TRUE>] [/r]
> diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/cln.bat
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/cln.bat
> index d4d98dd135..61c8a7d1a4 100644
> --- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/cln.bat
> +++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/cln.bat
> @@ -1,13 +1,7 @@
> @REM @file
> @REM
> @REM Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
> -@REM This program and the accompanying materials
> -@REM are licensed and made available under the terms and conditions of
> the BSD License
> -@REM which accompanies this distribution. The full text of the license may
> be found at
> -@REM http://opensource.org/licenses/bsd-license.php
> -@REM
> -@REM THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS
> IS" BASIS,
> -@REM WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND,
> EITHER EXPRESS OR IMPLIED.
> +@REM SPDX-License-Identifier: BSD-2-Clause-Patent
> @REM
>
> @echo off
> diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/postbuild.bat
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/postbuild.bat
> index 70be663897..5553645fbf 100644
> --- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/postbuild.bat
> +++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/postbuild.bat
> @@ -1,13 +1,7 @@
> @REM @file
> @REM
> @REM Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
> -@REM This program and the accompanying materials
> -@REM are licensed and made available under the terms and conditions of
> the BSD License
> -@REM which accompanies this distribution. The full text of the license may
> be found at
> -@REM http://opensource.org/licenses/bsd-license.php
> -@REM
> -@REM THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS
> IS" BASIS,
> -@REM WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND,
> EITHER EXPRESS OR IMPLIED.
> +@REM SPDX-License-Identifier: BSD-2-Clause-Patent
> @REM
>
> @REM #
> diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/prebuild.bat
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/prebuild.bat
> index c3360403f1..c18dd5e89d 100644
> --- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/prebuild.bat
> +++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/prebuild.bat
> @@ -2,13 +2,7 @@
> @REM Pre build script.
> @REM
> @REM Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
> -@REM This program and the accompanying materials
> -@REM are licensed and made available under the terms and conditions of
> the BSD License
> -@REM which accompanies this distribution. The full text of the license may
> be found at
> -@REM http://opensource.org/licenses/bsd-license.php
> -@REM
> -@REM THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS
> IS" BASIS,
> -@REM WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND,
> EITHER EXPRESS OR IMPLIED.
> +@REM SPDX-License-Identifier: BSD-2-Clause-Patent
> @REM
>
> cd ..
> diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/prep.bat
> b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/prep.bat
> index 46a514b9ed..cb0d44f722 100644
> --- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/prep.bat
> +++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/prep.bat
> @@ -1,13 +1,7 @@
> @REM @file
> @REM
> @REM Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
> -@REM This program and the accompanying materials
> -@REM are licensed and made available under the terms and conditions of
> the BSD License
> -@REM which accompanies this distribution. The full text of the license may
> be found at
> -@REM http://opensource.org/licenses/bsd-license.php
> -@REM
> -@REM THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS
> IS" BASIS,
> -@REM WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND,
> EITHER EXPRESS OR IMPLIED.
> +@REM SPDX-License-Identifier: BSD-2-Clause-Patent
> @REM
>
> @echo OFF
> diff --git a/Platform/Intel/ClevoOpenBoardPkg/OpenBoardPkg.dec
> b/Platform/Intel/ClevoOpenBoardPkg/OpenBoardPkg.dec
> index aa457e64db..29816e3c21 100644
> --- a/Platform/Intel/ClevoOpenBoardPkg/OpenBoardPkg.dec
> +++ b/Platform/Intel/ClevoOpenBoardPkg/OpenBoardPkg.dec
> @@ -7,13 +7,7 @@
> #
> # Copyright (c) 2019, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
> [Defines]
> --
> 2.21.0.windows.1
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: [[edk2-platforms][PATCH V2] 09/30] Platform/Intel/ClevoOpenBoardPkg: Replace BSD License with BSD+Patent License
2019-05-15 23:09 ` [[edk2-platforms][PATCH V2] 09/30] Platform/Intel/ClevoOpenBoardPkg: " Michael D Kinney
2019-05-17 6:50 ` Kubacki, Michael A
@ 2019-05-17 21:05 ` Sinha, Ankit
1 sibling, 0 replies; 63+ messages in thread
From: Sinha, Ankit @ 2019-05-17 21:05 UTC (permalink / raw)
To: Kinney, Michael D, devel@edk2.groups.io; +Cc: Kubacki, Michael A
Reviewed-by: Ankit Sinha <ankit.sinha@intel.com>
-----Original Message-----
From: Kinney, Michael D
Sent: Wednesday, May 15, 2019 4:10 PM
To: devel@edk2.groups.io
Cc: Kubacki, Michael A <michael.a.kubacki@intel.com>; Sinha, Ankit <ankit.sinha@intel.com>
Subject: [[edk2-platforms][PATCH V2] 09/30] Platform/Intel/ClevoOpenBoardPkg: Replace BSD License with BSD+Patent License
https://bugzilla.tianocore.org/show_bug.cgi?id=1373
Replace BSD 2-Clause License with BSD+Patent License. This change is
based on the following emails:
https://lists.01.org/pipermail/edk2-devel/2019-February/036260.html
https://lists.01.org/pipermail/edk2-devel/2018-October/030385.html
RFCs with detailed process for the license change:
V3: https://lists.01.org/pipermail/edk2-devel/2019-March/038116.html
V2: https://lists.01.org/pipermail/edk2-devel/2019-March/037669.html
V1: https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html
Cc: Michael Kubacki <michael.a.kubacki@intel.com>
Cc: Ankit Sinha <ankit.sinha@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
.../ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/AcpiGnvsInit.c | 8 +-------
.../ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe.c | 8 +-------
.../ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe.inf | 8 +-------
.../ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/ALS.ASL | 8 +-------
.../ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/AMLUPD.asl | 8 +-------
.../ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/CPU.asl | 8 +-------
.../ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/DSDT.ASL | 8 +-------
.../ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Gpe.asl | 8 +-------
.../ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Itss.asl | 8 +-------
.../ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/LPC_DEV.ASL | 8 +-------
.../ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/LpcB.asl | 8 +-------
.../ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PCI_DRC.ASL | 8 +-------
.../ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PciTree.asl | 8 +-------
.../ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Platform.asl | 8 +-------
.../Acpi/BoardAcpiDxe/Dsdt/PlatformGnvs.asl | 8 +-------
.../ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Video.asl | 8 +-------
.../ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/UpdateDsdt.c | 8 +-------
.../ClevoOpenBoardPkg/Features/PciHotPlug/PciHotPlug.c | 8 +-------
.../ClevoOpenBoardPkg/Features/PciHotPlug/PciHotPlug.h | 8 +-------
.../ClevoOpenBoardPkg/Features/PciHotPlug/PciHotPlug.inf | 8 +-------
.../Features/Tbt/AcpiTables/Rtd3SptPcieTbt.asl | 8 +-------
.../ClevoOpenBoardPkg/Features/Tbt/AcpiTables/Tbt.asl | 8 +-------
.../Features/Tbt/Include/Acpi/TbtNvs.asl | 8 +-------
.../Features/Tbt/Include/Acpi/TbtNvsAreaDef.h | 8 +-------
.../Features/Tbt/Include/Library/DxeTbtPolicyLib.h | 8 +-------
.../Features/Tbt/Include/Library/PeiTbtPolicyLib.h | 8 +-------
.../Features/Tbt/Include/Library/TbtCommonLib.h | 8 +-------
.../Features/Tbt/Include/Ppi/PeiTbtPolicy.h | 8 +-------
.../Features/Tbt/Include/Private/Library/PeiDTbtInitLib.h | 8 +-------
.../Tbt/Include/Private/Library/PeiTbtCommonInitLib.h | 8 +-------
.../Features/Tbt/Include/Protocol/DxeTbtPolicy.h | 8 +-------
.../Features/Tbt/Include/Protocol/TbtNvsArea.h | 8 +-------
.../ClevoOpenBoardPkg/Features/Tbt/Include/TbtBoardInfo.h | 8 +-------
.../Features/Tbt/Include/TbtPolicyCommonDefinition.h | 8 +-------
.../Tbt/Library/DxeTbtPolicyLib/DxeTbtPolicyLib.c | 8 +-------
.../Tbt/Library/DxeTbtPolicyLib/DxeTbtPolicyLib.inf | 8 +-------
.../Tbt/Library/DxeTbtPolicyLib/DxeTbtPolicyLibrary.h | 8 +-------
.../Tbt/Library/PeiDxeSmmTbtCommonLib/TbtCommonLib.c | 8 +-------
.../Tbt/Library/PeiDxeSmmTbtCommonLib/TbtCommonLib.inf | 8 +-------
.../Tbt/Library/PeiTbtPolicyLib/PeiTbtPolicyLib.c | 8 +-------
.../Tbt/Library/PeiTbtPolicyLib/PeiTbtPolicyLib.inf | 8 +-------
.../Tbt/Library/PeiTbtPolicyLib/PeiTbtPolicyLibrary.h | 8 +-------
.../Tbt/Library/Private/PeiDTbtInitLib/PeiDTbtInitLib.c | 8 +-------
.../Tbt/Library/Private/PeiDTbtInitLib/PeiDTbtInitLib.inf | 8 +-------
.../ClevoOpenBoardPkg/Features/Tbt/TbtInit/Dxe/TbtDxe.c | 8 +-------
.../ClevoOpenBoardPkg/Features/Tbt/TbtInit/Dxe/TbtDxe.inf | 8 +-------
.../Features/Tbt/TbtInit/Pei/PeiTbtInit.c | 8 +-------
.../Features/Tbt/TbtInit/Pei/PeiTbtInit.inf | 8 +-------
.../Features/Tbt/TbtInit/Smm/TbtSmiHandler.c | 8 +-------
.../Features/Tbt/TbtInit/Smm/TbtSmiHandler.h | 8 +-------
.../ClevoOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmm.c | 8 +-------
.../ClevoOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmm.inf | 8 +-------
.../Intel/ClevoOpenBoardPkg/Include/Acpi/GlobalNvs.asl | 8 +-------
.../ClevoOpenBoardPkg/Include/Acpi/GlobalNvsAreaDef.h | 8 +-------
Platform/Intel/ClevoOpenBoardPkg/Include/IoExpander.h | 8 +-------
.../ClevoOpenBoardPkg/Include/Library/GpioExpanderLib.h | 8 +-------
.../ClevoOpenBoardPkg/Include/Library/I2cAccessLib.h | 8 +-------
.../Intel/ClevoOpenBoardPkg/Include/PchHsioPtssTables.h | 8 +-------
.../ClevoOpenBoardPkg/Include/Protocol/GlobalNvsArea.h | 8 +-------
Platform/Intel/ClevoOpenBoardPkg/Include/SioRegs.h | 8 +-------
.../Library/BaseGpioExpanderLib/BaseGpioExpanderLib.c | 8 +-------
.../Library/BaseGpioExpanderLib/BaseGpioExpanderLib.inf | 8 +-------
.../Library/PeiI2cAccessLib/PeiI2cAccessLib.c | 8 +-------
.../Library/PeiI2cAccessLib/PeiI2cAccessLib.inf | 8 +-------
.../PeiSerialPortLibSpiFlash/PeiSerialPortLibSpiFlash.c | 8 +-------
.../PeiSerialPortLibSpiFlash/PeiSerialPortLibSpiFlash.inf | 8 +-------
.../PeiSiliconPolicyUpdateLibFsp/PcieDeviceTable.c | 8 +-------
.../PeiSiliconPolicyUpdateLibFsp/PeiFspMiscUpdUpdateLib.c | 8 +-------
.../PeiSiliconPolicyUpdateLibFsp/PeiFspPolicyUpdateLib.c | 8 +-------
.../PeiSiliconPolicyUpdateLibFsp/PeiPchPolicyUpdate.c | 8 +-------
.../PeiSiliconPolicyUpdateLibFsp/PeiPchPolicyUpdate.h | 8 +-------
.../PeiPchPolicyUpdatePreMem.c | 8 +-------
.../PeiSiliconPolicyUpdateLibFsp/PeiSaPolicyUpdate.c | 8 +-------
.../PeiSiliconPolicyUpdateLibFsp/PeiSaPolicyUpdate.h | 8 +-------
.../PeiSaPolicyUpdatePreMem.c | 8 +-------
.../PeiSiliconPolicyUpdateLibFsp.inf | 8 +-------
Platform/Intel/ClevoOpenBoardPkg/N1xxWU/GitEdk2Clevo.bat | 8 +-------
.../N1xxWU/Include/Fdf/FlashMapInclude.fdf | 8 +-------
.../Intel/ClevoOpenBoardPkg/N1xxWU/Include/N1xxWUId.h | 8 +-------
.../Library/BasePlatformHookLib/BasePlatformHookLib.c | 8 +-------
.../Library/BasePlatformHookLib/BasePlatformHookLib.inf | 8 +-------
.../N1xxWU/Library/BoardAcpiLib/DxeBoardAcpiTableLib.c | 8 +-------
.../N1xxWU/Library/BoardAcpiLib/DxeBoardAcpiTableLib.inf | 8 +-------
.../Library/BoardAcpiLib/DxeMultiBoardAcpiSupportLib.c | 8 +-------
.../Library/BoardAcpiLib/DxeMultiBoardAcpiSupportLib.inf | 8 +-------
.../N1xxWU/Library/BoardAcpiLib/DxeN1xxWUAcpiTableLib.c | 8 +-------
.../N1xxWU/Library/BoardAcpiLib/SmmBoardAcpiEnableLib.c | 8 +-------
.../N1xxWU/Library/BoardAcpiLib/SmmBoardAcpiEnableLib.inf | 8 +-------
.../Library/BoardAcpiLib/SmmMultiBoardAcpiSupportLib.c | 8 +-------
.../Library/BoardAcpiLib/SmmMultiBoardAcpiSupportLib.inf | 8 +-------
.../N1xxWU/Library/BoardAcpiLib/SmmN1xxWUAcpiEnableLib.c | 8 +-------
.../N1xxWU/Library/BoardAcpiLib/SmmSiliconAcpiEnableLib.c | 8 +-------
.../N1xxWU/Library/BoardInitLib/N1xxWUGpioTable.c | 8 +-------
.../N1xxWU/Library/BoardInitLib/N1xxWUHdaVerbTables.c | 8 +-------
.../N1xxWU/Library/BoardInitLib/N1xxWUHsioPtssTables.c | 8 +-------
.../N1xxWU/Library/BoardInitLib/N1xxWUSpdTable.c | 8 +-------
.../N1xxWU/Library/BoardInitLib/PeiBoardInitPostMemLib.c | 8 +-------
.../Library/BoardInitLib/PeiBoardInitPostMemLib.inf | 8 +-------
.../N1xxWU/Library/BoardInitLib/PeiBoardInitPreMemLib.c | 8 +-------
.../N1xxWU/Library/BoardInitLib/PeiBoardInitPreMemLib.inf | 8 +-------
.../Library/BoardInitLib/PeiMultiBoardInitPostMemLib.c | 8 +-------
.../Library/BoardInitLib/PeiMultiBoardInitPostMemLib.inf | 8 +-------
.../Library/BoardInitLib/PeiMultiBoardInitPreMemLib.c | 8 +-------
.../Library/BoardInitLib/PeiMultiBoardInitPreMemLib.inf | 8 +-------
.../N1xxWU/Library/BoardInitLib/PeiN1xxWUDetect.c | 8 +-------
.../N1xxWU/Library/BoardInitLib/PeiN1xxWUInitLib.h | 8 +-------
.../N1xxWU/Library/BoardInitLib/PeiN1xxWUInitPostMemLib.c | 8 +-------
.../N1xxWU/Library/BoardInitLib/PeiN1xxWUInitPreMemLib.c | 8 +-------
Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkg.dsc | 8 +-------
Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkg.fdf | 8 +-------
.../ClevoOpenBoardPkg/N1xxWU/OpenBoardPkgBuildOption.dsc | 8 +-------
.../Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkgConfig.dsc | 8 +-------
.../Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkgPcd.dsc | 8 +-------
.../Library/DxeSiliconPolicyUpdateLib/DxeGopPolicyInit.c | 8 +-------
.../Library/DxeSiliconPolicyUpdateLib/DxeGopPolicyInit.h | 8 +-------
.../Library/DxeSiliconPolicyUpdateLib/DxeSaPolicyInit.h | 8 +-------
.../Library/DxeSiliconPolicyUpdateLib/DxeSaPolicyUpdate.c | 8 +-------
.../DxeSiliconPolicyUpdateLib/DxeSiliconPolicyUpdateLib.c | 8 +-------
.../DxeSiliconPolicyUpdateLib.inf | 8 +-------
Platform/Intel/ClevoOpenBoardPkg/N1xxWU/bld.bat | 8 +-------
Platform/Intel/ClevoOpenBoardPkg/N1xxWU/cln.bat | 8 +-------
Platform/Intel/ClevoOpenBoardPkg/N1xxWU/postbuild.bat | 8 +-------
Platform/Intel/ClevoOpenBoardPkg/N1xxWU/prebuild.bat | 8 +-------
Platform/Intel/ClevoOpenBoardPkg/N1xxWU/prep.bat | 8 +-------
Platform/Intel/ClevoOpenBoardPkg/OpenBoardPkg.dec | 8 +-------
125 files changed, 125 insertions(+), 875 deletions(-)
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/AcpiGnvsInit.c b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/AcpiGnvsInit.c
index fc2657476d..7c10cf8f73 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/AcpiGnvsInit.c
+++ b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/AcpiGnvsInit.c
@@ -2,13 +2,7 @@
Acpi Gnvs Init Library.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe.c b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe.c
index d0a2f4bc84..4f248006bf 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe.c
+++ b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe.c
@@ -2,13 +2,7 @@
Board ACPI DXE initialization.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe.inf b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe.inf
index e02a1b5587..f7f4bd2e3d 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe.inf
+++ b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2019, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/ALS.ASL b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/ALS.ASL
index 87b7448f95..bcc3405e33 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/ALS.ASL
+++ b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/ALS.ASL
@@ -2,13 +2,7 @@
ACPI DSDT table
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/AMLUPD.asl b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/AMLUPD.asl
index ef0f3a9ded..30b3e57c4b 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/AMLUPD.asl
+++ b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/AMLUPD.asl
@@ -2,13 +2,7 @@
ACPI DSDT table
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/CPU.asl b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/CPU.asl
index b229284192..84c151cbf6 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/CPU.asl
+++ b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/CPU.asl
@@ -2,13 +2,7 @@
ACPI DSDT table
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/DSDT.ASL b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/DSDT.ASL
index 3adf6996e3..93bca6827e 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/DSDT.ASL
+++ b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/DSDT.ASL
@@ -2,13 +2,7 @@
ACPI DSDT table
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Gpe.asl b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Gpe.asl
index 0218b893d1..8976c7a0ff 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Gpe.asl
+++ b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Gpe.asl
@@ -2,13 +2,7 @@
ACPI DSDT table
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Itss.asl b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Itss.asl
index 73b3de105e..827a37fbab 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Itss.asl
+++ b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Itss.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/LPC_DEV.ASL b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/LPC_DEV.ASL
index 816f83ba3d..ea09363b84 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/LPC_DEV.ASL
+++ b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/LPC_DEV.ASL
@@ -2,13 +2,7 @@
ACPI DSDT table
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/LpcB.asl b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/LpcB.asl
index 29b026a571..6fbaf3a97f 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/LpcB.asl
+++ b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/LpcB.asl
@@ -2,13 +2,7 @@
ACPI DSDT table
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PCI_DRC.ASL b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PCI_DRC.ASL
index 4304e07275..fba792642d 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PCI_DRC.ASL
+++ b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PCI_DRC.ASL
@@ -2,13 +2,7 @@
ACPI DSDT table
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PciTree.asl b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PciTree.asl
index 3bc988f619..ef65cea0af 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PciTree.asl
+++ b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PciTree.asl
@@ -2,13 +2,7 @@
ACPI DSDT table
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Platform.asl b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Platform.asl
index 90f873c8bd..063093a08c 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Platform.asl
+++ b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Platform.asl
@@ -2,13 +2,7 @@
ACPI DSDT table
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PlatformGnvs.asl b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PlatformGnvs.asl
index 97e54bdccf..788a8ec491 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PlatformGnvs.asl
+++ b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PlatformGnvs.asl
@@ -2,13 +2,7 @@
ACPI DSDT table
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Video.asl b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Video.asl
index 002a377d83..b15b754fb0 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Video.asl
+++ b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Video.asl
@@ -2,13 +2,7 @@
ACPI DSDT table
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/UpdateDsdt.c b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/UpdateDsdt.c
index 832c64cd00..41f0b8c113 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/UpdateDsdt.c
+++ b/Platform/Intel/ClevoOpenBoardPkg/Acpi/BoardAcpiDxe/UpdateDsdt.c
@@ -2,13 +2,7 @@
Performs board DSDT ACPI table updates.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Features/PciHotPlug/PciHotPlug.c b/Platform/Intel/ClevoOpenBoardPkg/Features/PciHotPlug/PciHotPlug.c
index a9e616ffa4..05f128d719 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Features/PciHotPlug/PciHotPlug.c
+++ b/Platform/Intel/ClevoOpenBoardPkg/Features/PciHotPlug/PciHotPlug.c
@@ -2,13 +2,7 @@
Performs specific PCI-EXPRESS device resource configuration.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Features/PciHotPlug/PciHotPlug.h b/Platform/Intel/ClevoOpenBoardPkg/Features/PciHotPlug/PciHotPlug.h
index 4e20fa201a..53274c17c5 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Features/PciHotPlug/PciHotPlug.h
+++ b/Platform/Intel/ClevoOpenBoardPkg/Features/PciHotPlug/PciHotPlug.h
@@ -1,13 +1,7 @@
/**@file
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Features/PciHotPlug/PciHotPlug.inf b/Platform/Intel/ClevoOpenBoardPkg/Features/PciHotPlug/PciHotPlug.inf
index a1ca0ec072..e50763336b 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Features/PciHotPlug/PciHotPlug.inf
+++ b/Platform/Intel/ClevoOpenBoardPkg/Features/PciHotPlug/PciHotPlug.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2019, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/AcpiTables/Rtd3SptPcieTbt.asl b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/AcpiTables/Rtd3SptPcieTbt.asl
index 35544fb0a2..c082988fa9 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/AcpiTables/Rtd3SptPcieTbt.asl
+++ b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/AcpiTables/Rtd3SptPcieTbt.asl
@@ -2,13 +2,7 @@
ACPI RTD3 SSDT table for SPT PCIe
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#define PID_ICC 0xDC
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/AcpiTables/Tbt.asl b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/AcpiTables/Tbt.asl
index 47a97628a5..2efe1a54f3 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/AcpiTables/Tbt.asl
+++ b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/AcpiTables/Tbt.asl
@@ -2,13 +2,7 @@
Thunderbolt ACPI methods
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#define DTBT_CONTROLLER 0x00
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Acpi/TbtNvs.asl b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Acpi/TbtNvs.asl
index 257005181b..706796f8c5 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Acpi/TbtNvs.asl
+++ b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Acpi/TbtNvs.asl
@@ -1,13 +1,7 @@
/**@file
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
//
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Acpi/TbtNvsAreaDef.h b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Acpi/TbtNvsAreaDef.h
index 2c6995a20d..e988bdd712 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Acpi/TbtNvsAreaDef.h
+++ b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Acpi/TbtNvsAreaDef.h
@@ -1,13 +1,7 @@
/**@file
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
//
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Library/DxeTbtPolicyLib.h b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Library/DxeTbtPolicyLib.h
index b69a1a888e..3ac3d88a33 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Library/DxeTbtPolicyLib.h
+++ b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Library/DxeTbtPolicyLib.h
@@ -2,13 +2,7 @@
Prototype of the DxeTbtPolicyLib library.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _DXE_TBT_POLICY_LIB_H_
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Library/PeiTbtPolicyLib.h b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Library/PeiTbtPolicyLib.h
index aff0717af6..cf9ca8f0c8 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Library/PeiTbtPolicyLib.h
+++ b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Library/PeiTbtPolicyLib.h
@@ -2,13 +2,7 @@
Prototype of the PeiTbtPolicyLib library.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PEI_TBT_POLICY_LIB_H_
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Library/TbtCommonLib.h b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Library/TbtCommonLib.h
index c2df847077..90966fa4cc 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Library/TbtCommonLib.h
+++ b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Library/TbtCommonLib.h
@@ -1,13 +1,7 @@
/**@file
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _TBT_COMMON_LIB_H_
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Ppi/PeiTbtPolicy.h b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Ppi/PeiTbtPolicy.h
index a9ed0701fd..09b74df889 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Ppi/PeiTbtPolicy.h
+++ b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Ppi/PeiTbtPolicy.h
@@ -2,13 +2,7 @@
TBT PEI Policy
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PEI_TBT_POLICY_H_
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Private/Library/PeiDTbtInitLib.h b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Private/Library/PeiDTbtInitLib.h
index 659106d874..dd31099a7d 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Private/Library/PeiDTbtInitLib.h
+++ b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Private/Library/PeiDTbtInitLib.h
@@ -2,13 +2,7 @@
PEI DTBT Init Dispatch library Header file
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef __PEI_DTBT_INIT_LIB_H__
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Private/Library/PeiTbtCommonInitLib.h b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Private/Library/PeiTbtCommonInitLib.h
index 5c319debd7..718e858b70 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Private/Library/PeiTbtCommonInitLib.h
+++ b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Private/Library/PeiTbtCommonInitLib.h
@@ -2,13 +2,7 @@
PEI TBT Common Init Dispatch library Header file
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef __PEI_TBT_COMMON_INIT_LIB_H__
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Protocol/DxeTbtPolicy.h b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Protocol/DxeTbtPolicy.h
index ab5a829755..5167661c02 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Protocol/DxeTbtPolicy.h
+++ b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Protocol/DxeTbtPolicy.h
@@ -2,13 +2,7 @@
TBT DXE Policy
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _DXE_TBT_POLICY_H_
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Protocol/TbtNvsArea.h b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Protocol/TbtNvsArea.h
index 9296a05821..e57381e12c 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Protocol/TbtNvsArea.h
+++ b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/Protocol/TbtNvsArea.h
@@ -2,13 +2,7 @@
This file defines the TBT NVS Area Protocol.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/TbtBoardInfo.h b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/TbtBoardInfo.h
index 8b37ab77e5..13319a9cec 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/TbtBoardInfo.h
+++ b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/TbtBoardInfo.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _TBT_INFO_GUID_H_
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/TbtPolicyCommonDefinition.h b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/TbtPolicyCommonDefinition.h
index d88e7cb7b6..eb4c79317d 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/TbtPolicyCommonDefinition.h
+++ b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Include/TbtPolicyCommonDefinition.h
@@ -2,13 +2,7 @@
TBT Policy Common definition.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _TBT_POLICY_COMMON_H_
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicyLib/DxeTbtPolicyLib.c b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicyLib/DxeTbtPolicyLib.c
index 1783d8c6b4..b221e26d8e 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicyLib/DxeTbtPolicyLib.c
+++ b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicyLib/DxeTbtPolicyLib.c
@@ -2,13 +2,7 @@
This file is DxeTbtPolicyLib library.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include <DxeTbtPolicyLibrary.h>
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicyLib/DxeTbtPolicyLib.inf b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicyLib/DxeTbtPolicyLib.inf
index 75a7473060..ceeca81a50 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicyLib/DxeTbtPolicyLib.inf
+++ b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicyLib/DxeTbtPolicyLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2019, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicyLib/DxeTbtPolicyLibrary.h b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicyLib/DxeTbtPolicyLibrary.h
index 6dd1015c61..75bc01e29a 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicyLib/DxeTbtPolicyLibrary.h
+++ b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicyLib/DxeTbtPolicyLibrary.h
@@ -2,13 +2,7 @@
Header file for the DxeTBTPolicy library.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _DXE_TBT_POLICY_LIBRARY_H_
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/PeiDxeSmmTbtCommonLib/TbtCommonLib.c b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/PeiDxeSmmTbtCommonLib/TbtCommonLib.c
index 52871cf447..7afdc25f67 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/PeiDxeSmmTbtCommonLib/TbtCommonLib.c
+++ b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/PeiDxeSmmTbtCommonLib/TbtCommonLib.c
@@ -2,13 +2,7 @@
Common Thunderbolt functions.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/PeiDxeSmmTbtCommonLib/TbtCommonLib.inf b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/PeiDxeSmmTbtCommonLib/TbtCommonLib.inf
index 60ea0ba6f1..b7277c1c57 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/PeiDxeSmmTbtCommonLib/TbtCommonLib.inf
+++ b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/PeiDxeSmmTbtCommonLib/TbtCommonLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2019, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/PeiTbtPolicyLib/PeiTbtPolicyLib.c b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/PeiTbtPolicyLib/PeiTbtPolicyLib.c
index 36b49f013e..d6105a0c67 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/PeiTbtPolicyLib/PeiTbtPolicyLib.c
+++ b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/PeiTbtPolicyLib/PeiTbtPolicyLib.c
@@ -2,13 +2,7 @@
This file is PeiTbtPolicyLib library.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include <Library/PeiServicesLib.h>
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/PeiTbtPolicyLib/PeiTbtPolicyLib.inf b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/PeiTbtPolicyLib/PeiTbtPolicyLib.inf
index dc9c4ea9f3..8f554c8aa7 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/PeiTbtPolicyLib/PeiTbtPolicyLib.inf
+++ b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/PeiTbtPolicyLib/PeiTbtPolicyLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2019, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/PeiTbtPolicyLib/PeiTbtPolicyLibrary.h b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/PeiTbtPolicyLib/PeiTbtPolicyLibrary.h
index b85faef320..38c5d60fab 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/PeiTbtPolicyLib/PeiTbtPolicyLibrary.h
+++ b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/PeiTbtPolicyLib/PeiTbtPolicyLibrary.h
@@ -2,13 +2,7 @@
Header file for the PeiTBTPolicy library.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PEI_TBT_POLICY_LIBRARY_H_
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/Private/PeiDTbtInitLib/PeiDTbtInitLib.c b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/Private/PeiDTbtInitLib/PeiDTbtInitLib.c
index 986a1271d8..9c4bddfc2d 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/Private/PeiDTbtInitLib/PeiDTbtInitLib.c
+++ b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/Private/PeiDTbtInitLib/PeiDTbtInitLib.c
@@ -2,13 +2,7 @@
Thunderbolt(TM) Pei Library
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include <Library/PeiServicesLib.h>
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/Private/PeiDTbtInitLib/PeiDTbtInitLib.inf b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/Private/PeiDTbtInitLib/PeiDTbtInitLib.inf
index b99fd3433c..e33601618a 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/Private/PeiDTbtInitLib/PeiDTbtInitLib.inf
+++ b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/Library/Private/PeiDTbtInitLib/PeiDTbtInitLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2019, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Dxe/TbtDxe.c b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Dxe/TbtDxe.c
index 69162f10bf..5e8f80fa59 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Dxe/TbtDxe.c
+++ b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Dxe/TbtDxe.c
@@ -2,13 +2,7 @@
Thunderbolt initialization in DXE.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include <Uefi.h>
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Dxe/TbtDxe.inf b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Dxe/TbtDxe.inf
index ad056b69ae..6ec93bf03a 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Dxe/TbtDxe.inf
+++ b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Dxe/TbtDxe.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2019, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Pei/PeiTbtInit.c b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Pei/PeiTbtInit.c
index 5c792bf3b9..a824886697 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Pei/PeiTbtInit.c
+++ b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Pei/PeiTbtInit.c
@@ -2,13 +2,7 @@
Thunderbolt initialization in PEI.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Pei/PeiTbtInit.inf b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Pei/PeiTbtInit.inf
index 65d8c0a45d..d15c571784 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Pei/PeiTbtInit.inf
+++ b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Pei/PeiTbtInit.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2019, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmiHandler.c b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmiHandler.c
index 28de0dc793..216a7b155c 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmiHandler.c
+++ b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmiHandler.c
@@ -2,13 +2,7 @@
Thunderbolt SMI handler.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmiHandler.h b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmiHandler.h
index 095d8d44f5..7b06a037da 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmiHandler.h
+++ b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmiHandler.h
@@ -1,13 +1,7 @@
/**@file
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _TBT_SMI_HANDLER_H_
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmm.c b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmm.c
index 5bbb811e54..5810447792 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmm.c
+++ b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmm.c
@@ -2,13 +2,7 @@
Thunderbolt initialization in SMM.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmm.inf b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmm.inf
index 97322f3d57..3826cf589b 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmm.inf
+++ b/Platform/Intel/ClevoOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmm.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2019, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Include/Acpi/GlobalNvs.asl b/Platform/Intel/ClevoOpenBoardPkg/Include/Acpi/GlobalNvs.asl
index 651708ea70..e3b0a1da85 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Include/Acpi/GlobalNvs.asl
+++ b/Platform/Intel/ClevoOpenBoardPkg/Include/Acpi/GlobalNvs.asl
@@ -2,13 +2,7 @@
ACPI DSDT table
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Include/Acpi/GlobalNvsAreaDef.h b/Platform/Intel/ClevoOpenBoardPkg/Include/Acpi/GlobalNvsAreaDef.h
index a1fa221d76..5d096db346 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Include/Acpi/GlobalNvsAreaDef.h
+++ b/Platform/Intel/ClevoOpenBoardPkg/Include/Acpi/GlobalNvsAreaDef.h
@@ -2,13 +2,7 @@
ACPI DSDT table
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Include/IoExpander.h b/Platform/Intel/ClevoOpenBoardPkg/Include/IoExpander.h
index 3a0c628319..0f313e429a 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Include/IoExpander.h
+++ b/Platform/Intel/ClevoOpenBoardPkg/Include/IoExpander.h
@@ -2,13 +2,7 @@
GPIO definition table for N1xxWU
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Include/Library/GpioExpanderLib.h b/Platform/Intel/ClevoOpenBoardPkg/Include/Library/GpioExpanderLib.h
index 3395d631ce..dc75a7decb 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Include/Library/GpioExpanderLib.h
+++ b/Platform/Intel/ClevoOpenBoardPkg/Include/Library/GpioExpanderLib.h
@@ -2,13 +2,7 @@
Support for IO expander TCA6424.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Include/Library/I2cAccessLib.h b/Platform/Intel/ClevoOpenBoardPkg/Include/Library/I2cAccessLib.h
index 559af842a5..e36699e8e9 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Include/Library/I2cAccessLib.h
+++ b/Platform/Intel/ClevoOpenBoardPkg/Include/Library/I2cAccessLib.h
@@ -2,13 +2,7 @@
Support for IO expander TCA6424.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Include/PchHsioPtssTables.h b/Platform/Intel/ClevoOpenBoardPkg/Include/PchHsioPtssTables.h
index 412211ea2c..a2003002cf 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Include/PchHsioPtssTables.h
+++ b/Platform/Intel/ClevoOpenBoardPkg/Include/PchHsioPtssTables.h
@@ -1,13 +1,7 @@
/** @file*
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Include/Protocol/GlobalNvsArea.h b/Platform/Intel/ClevoOpenBoardPkg/Include/Protocol/GlobalNvsArea.h
index 5f72bcf1b9..b10547b6b9 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Include/Protocol/GlobalNvsArea.h
+++ b/Platform/Intel/ClevoOpenBoardPkg/Include/Protocol/GlobalNvsArea.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Include/SioRegs.h b/Platform/Intel/ClevoOpenBoardPkg/Include/SioRegs.h
index f9aa5d4f18..cf636b798c 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Include/SioRegs.h
+++ b/Platform/Intel/ClevoOpenBoardPkg/Include/SioRegs.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Library/BaseGpioExpanderLib/BaseGpioExpanderLib.c b/Platform/Intel/ClevoOpenBoardPkg/Library/BaseGpioExpanderLib/BaseGpioExpanderLib.c
index 34d52527cb..260c5bb6a2 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Library/BaseGpioExpanderLib/BaseGpioExpanderLib.c
+++ b/Platform/Intel/ClevoOpenBoardPkg/Library/BaseGpioExpanderLib/BaseGpioExpanderLib.c
@@ -2,13 +2,7 @@
Support for IO expander TCA6424.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Library/BaseGpioExpanderLib/BaseGpioExpanderLib.inf b/Platform/Intel/ClevoOpenBoardPkg/Library/BaseGpioExpanderLib/BaseGpioExpanderLib.inf
index 2750645711..4c2478155e 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Library/BaseGpioExpanderLib/BaseGpioExpanderLib.inf
+++ b/Platform/Intel/ClevoOpenBoardPkg/Library/BaseGpioExpanderLib/BaseGpioExpanderLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2019, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Library/PeiI2cAccessLib/PeiI2cAccessLib.c b/Platform/Intel/ClevoOpenBoardPkg/Library/PeiI2cAccessLib/PeiI2cAccessLib.c
index 64fccfe868..d66571bdc4 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Library/PeiI2cAccessLib/PeiI2cAccessLib.c
+++ b/Platform/Intel/ClevoOpenBoardPkg/Library/PeiI2cAccessLib/PeiI2cAccessLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Library/PeiI2cAccessLib/PeiI2cAccessLib.inf b/Platform/Intel/ClevoOpenBoardPkg/Library/PeiI2cAccessLib/PeiI2cAccessLib.inf
index 9f4c1cbb80..bbbc74cf90 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Library/PeiI2cAccessLib/PeiI2cAccessLib.inf
+++ b/Platform/Intel/ClevoOpenBoardPkg/Library/PeiI2cAccessLib/PeiI2cAccessLib.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2019, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Library/PeiSerialPortLibSpiFlash/PeiSerialPortLibSpiFlash.c b/Platform/Intel/ClevoOpenBoardPkg/Library/PeiSerialPortLibSpiFlash/PeiSerialPortLibSpiFlash.c
index e36ff8bff8..0230149a38 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Library/PeiSerialPortLibSpiFlash/PeiSerialPortLibSpiFlash.c
+++ b/Platform/Intel/ClevoOpenBoardPkg/Library/PeiSerialPortLibSpiFlash/PeiSerialPortLibSpiFlash.c
@@ -2,13 +2,7 @@
Serial I/O Port library implementation for output to SPI flash
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/Library/PeiSerialPortLibSpiFlash/PeiSerialPortLibSpiFlash.inf b/Platform/Intel/ClevoOpenBoardPkg/Library/PeiSerialPortLibSpiFlash/PeiSerialPortLibSpiFlash.inf
index c22201e033..b81ce9dd7a 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/Library/PeiSerialPortLibSpiFlash/PeiSerialPortLibSpiFlash.inf
+++ b/Platform/Intel/ClevoOpenBoardPkg/Library/PeiSerialPortLibSpiFlash/PeiSerialPortLibSpiFlash.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2019, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PcieDeviceTable.c b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PcieDeviceTable.c
index 40366af4cf..7898dc3592 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PcieDeviceTable.c
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PcieDeviceTable.c
@@ -2,13 +2,7 @@
Intel PCH PEI Policy initialization.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiFspMiscUpdUpdateLib.c b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiFspMiscUpdUpdateLib.c
index df5a11ab2d..9d6c0176f6 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiFspMiscUpdUpdateLib.c
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiFspMiscUpdUpdateLib.c
@@ -2,13 +2,7 @@
Implementation of Fsp Misc UPD Initialization.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiFspPolicyUpdateLib.c b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiFspPolicyUpdateLib.c
index 91d0f03191..c665f7888d 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiFspPolicyUpdateLib.c
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiFspPolicyUpdateLib.c
@@ -2,13 +2,7 @@
Provides FSP policy update functionality.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiPchPolicyUpdate.c b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiPchPolicyUpdate.c
index a50b2f2b7c..0bdd51d288 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiPchPolicyUpdate.c
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiPchPolicyUpdate.c
@@ -2,13 +2,7 @@
Intel PCH PEI Policy initialization.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiPchPolicyUpdate.h b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiPchPolicyUpdate.h
index b736111344..9f6b236e42 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiPchPolicyUpdate.h
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiPchPolicyUpdate.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiPchPolicyUpdatePreMem.c b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiPchPolicyUpdatePreMem.c
index b3661f3439..5a62f9bb72 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiPchPolicyUpdatePreMem.c
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiPchPolicyUpdatePreMem.c
@@ -2,13 +2,7 @@
Intel PCH PEI Policy initialization.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiSaPolicyUpdate.c b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiSaPolicyUpdate.c
index e445ddef72..133b8c963f 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiSaPolicyUpdate.c
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiSaPolicyUpdate.c
@@ -2,13 +2,7 @@
Intel System Agent policy initialization.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiSaPolicyUpdate.h b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiSaPolicyUpdate.h
index 10122af262..c006dbcd68 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiSaPolicyUpdate.h
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiSaPolicyUpdate.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiSaPolicyUpdatePreMem.c b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiSaPolicyUpdatePreMem.c
index c8d6fe4036..12d2b2cdb2 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiSaPolicyUpdatePreMem.c
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiSaPolicyUpdatePreMem.c
@@ -2,13 +2,7 @@
Intel System Agent policy initialization.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf
index bc938a0436..25531d3d7f 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2019, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/GitEdk2Clevo.bat b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/GitEdk2Clevo.bat
index 9a34a9a2d2..81f51b3785 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/GitEdk2Clevo.bat
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/GitEdk2Clevo.bat
@@ -1,13 +1,7 @@
@REM @file
@REM
@REM Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
-@REM This program and the accompanying materials
-@REM are licensed and made available under the terms and conditions of the BSD License
-@REM which accompanies this distribution. The full text of the license may be found at
-@REM http://opensource.org/licenses/bsd-license.php
-@REM
-@REM THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-@REM WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+@REM SPDX-License-Identifier: BSD-2-Clause-Patent
@REM
@echo off
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Include/Fdf/FlashMapInclude.fdf b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Include/Fdf/FlashMapInclude.fdf
index 423c6b18f5..d48f8c7a2a 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Include/Fdf/FlashMapInclude.fdf
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Include/Fdf/FlashMapInclude.fdf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2019, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Include/N1xxWUId.h b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Include/N1xxWUId.h
index c5cf2e3143..684b31f051 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Include/N1xxWUId.h
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Include/N1xxWUId.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BasePlatformHookLib/BasePlatformHookLib.c b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BasePlatformHookLib/BasePlatformHookLib.c
index 637f46cb46..5c5d6a25b4 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BasePlatformHookLib/BasePlatformHookLib.c
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BasePlatformHookLib/BasePlatformHookLib.c
@@ -2,13 +2,7 @@
Platform Hook Library
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BasePlatformHookLib/BasePlatformHookLib.inf b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BasePlatformHookLib/BasePlatformHookLib.inf
index 0b631a79ea..c4ea31bff2 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BasePlatformHookLib/BasePlatformHookLib.inf
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BasePlatformHookLib/BasePlatformHookLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2019, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/DxeBoardAcpiTableLib.c b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/DxeBoardAcpiTableLib.c
index 19593cfadf..c56334e82b 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/DxeBoardAcpiTableLib.c
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/DxeBoardAcpiTableLib.c
@@ -2,13 +2,7 @@
DXE board-specific ACPI functionality.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/DxeBoardAcpiTableLib.inf b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/DxeBoardAcpiTableLib.inf
index 4b2529d695..06e703e12d 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/DxeBoardAcpiTableLib.inf
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/DxeBoardAcpiTableLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2019, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/DxeMultiBoardAcpiSupportLib.c b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/DxeMultiBoardAcpiSupportLib.c
index 7eb19ba594..4171d4ad6d 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/DxeMultiBoardAcpiSupportLib.c
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/DxeMultiBoardAcpiSupportLib.c
@@ -2,13 +2,7 @@
DXE multi-board ACPI table support functionality.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/DxeMultiBoardAcpiSupportLib.inf b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/DxeMultiBoardAcpiSupportLib.inf
index f191b04eee..c505909ad3 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/DxeMultiBoardAcpiSupportLib.inf
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/DxeMultiBoardAcpiSupportLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2019, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/DxeN1xxWUAcpiTableLib.c b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/DxeN1xxWUAcpiTableLib.c
index 9137bed899..96a3232fe5 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/DxeN1xxWUAcpiTableLib.c
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/DxeN1xxWUAcpiTableLib.c
@@ -2,13 +2,7 @@
Clevo N1xxWU board DXE ACPI table functionality.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/SmmBoardAcpiEnableLib.c b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/SmmBoardAcpiEnableLib.c
index 99dae10e57..2d9e9e98da 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/SmmBoardAcpiEnableLib.c
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/SmmBoardAcpiEnableLib.c
@@ -2,13 +2,7 @@
Clevo N1xxWU board SMM ACPI table enable/disable functionality.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/SmmBoardAcpiEnableLib.inf b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/SmmBoardAcpiEnableLib.inf
index efeebff979..8752fbb43f 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/SmmBoardAcpiEnableLib.inf
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/SmmBoardAcpiEnableLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2019, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/SmmMultiBoardAcpiSupportLib.c b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/SmmMultiBoardAcpiSupportLib.c
index 19de0b842e..a06505a34a 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/SmmMultiBoardAcpiSupportLib.c
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/SmmMultiBoardAcpiSupportLib.c
@@ -2,13 +2,7 @@
SMM multi-board ACPI support functionality.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/SmmMultiBoardAcpiSupportLib.inf b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/SmmMultiBoardAcpiSupportLib.inf
index f75f8844d9..3c4cfaccd3 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/SmmMultiBoardAcpiSupportLib.inf
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/SmmMultiBoardAcpiSupportLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2019, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/SmmN1xxWUAcpiEnableLib.c b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/SmmN1xxWUAcpiEnableLib.c
index 82d5c40bf2..8c1caa1898 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/SmmN1xxWUAcpiEnableLib.c
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/SmmN1xxWUAcpiEnableLib.c
@@ -2,13 +2,7 @@
Platform Hook Library instances
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/SmmSiliconAcpiEnableLib.c b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/SmmSiliconAcpiEnableLib.c
index 93765b1ae3..1baa8daa70 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/SmmSiliconAcpiEnableLib.c
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardAcpiLib/SmmSiliconAcpiEnableLib.c
@@ -2,13 +2,7 @@
SMM ACPI enable library.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/N1xxWUGpioTable.c b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/N1xxWUGpioTable.c
index bc7554ae2b..08a20673f0 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/N1xxWUGpioTable.c
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/N1xxWUGpioTable.c
@@ -2,13 +2,7 @@
GPIO definition table for N1xxWU
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/N1xxWUHdaVerbTables.c b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/N1xxWUHdaVerbTables.c
index 28c906e560..26d7401c6c 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/N1xxWUHdaVerbTables.c
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/N1xxWUHdaVerbTables.c
@@ -2,13 +2,7 @@
HDA Verb table for N1xxWU
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/N1xxWUHsioPtssTables.c b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/N1xxWUHsioPtssTables.c
index 5f71865469..9e52dd2671 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/N1xxWUHsioPtssTables.c
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/N1xxWUHsioPtssTables.c
@@ -2,13 +2,7 @@
N1xxWU HSIO PTSS H File
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/N1xxWUSpdTable.c b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/N1xxWUSpdTable.c
index afc7315665..18a04eba17 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/N1xxWUSpdTable.c
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/N1xxWUSpdTable.c
@@ -2,13 +2,7 @@
GPIO definition table for N1xxWU
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiBoardInitPostMemLib.c b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiBoardInitPostMemLib.c
index 1433176ca8..b7ff3062b2 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiBoardInitPostMemLib.c
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiBoardInitPostMemLib.c
@@ -2,13 +2,7 @@
Board post-memory initialization.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiBoardInitPostMemLib.inf b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiBoardInitPostMemLib.inf
index 3c8705d997..01225c9114 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiBoardInitPostMemLib.inf
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiBoardInitPostMemLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2019, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiBoardInitPreMemLib.c b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiBoardInitPreMemLib.c
index 2596880bfc..c1fe2a55c0 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiBoardInitPreMemLib.c
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiBoardInitPreMemLib.c
@@ -2,13 +2,7 @@
Board post-memory initialization.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiBoardInitPreMemLib.inf b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiBoardInitPreMemLib.inf
index 0dbbafd0f6..22797cd80f 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiBoardInitPreMemLib.inf
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiBoardInitPreMemLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2019, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiMultiBoardInitPostMemLib.c b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiMultiBoardInitPostMemLib.c
index c58842d9f4..8570039624 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiMultiBoardInitPostMemLib.c
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiMultiBoardInitPostMemLib.c
@@ -2,13 +2,7 @@
Multi-board post-memory initialization.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiMultiBoardInitPostMemLib.inf b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiMultiBoardInitPostMemLib.inf
index dc35136a0d..47efb21a79 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiMultiBoardInitPostMemLib.inf
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiMultiBoardInitPostMemLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2019, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiMultiBoardInitPreMemLib.c b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiMultiBoardInitPreMemLib.c
index 4323495c04..842316e610 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiMultiBoardInitPreMemLib.c
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiMultiBoardInitPreMemLib.c
@@ -2,13 +2,7 @@
Board pre-memory initialization.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiMultiBoardInitPreMemLib.inf b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiMultiBoardInitPreMemLib.inf
index c0df18faa3..8f73c2fa40 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiMultiBoardInitPreMemLib.inf
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiMultiBoardInitPreMemLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2019, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiN1xxWUDetect.c b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiN1xxWUDetect.c
index edda4da7a0..9e31a92926 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiN1xxWUDetect.c
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiN1xxWUDetect.c
@@ -2,13 +2,7 @@
Clevo N1xxWU board detection.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiN1xxWUInitLib.h b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiN1xxWUInitLib.h
index 34eff7d5c3..ddb873aaa2 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiN1xxWUInitLib.h
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiN1xxWUInitLib.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiN1xxWUInitPostMemLib.c b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiN1xxWUInitPostMemLib.c
index 5bd74035cb..832130e15e 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiN1xxWUInitPostMemLib.c
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiN1xxWUInitPostMemLib.c
@@ -2,13 +2,7 @@
Clevo N1xxWU board post-memory initialization.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiN1xxWUInitPreMemLib.c b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiN1xxWUInitPreMemLib.c
index d9e2e659ab..10550baf8a 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiN1xxWUInitPreMemLib.c
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Library/BoardInitLib/PeiN1xxWUInitPreMemLib.c
@@ -2,13 +2,7 @@
Clevo N1xxWU board pre-memory initialization.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkg.dsc b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkg.dsc
index 4fc4c9c141..02ef06579b 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkg.dsc
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkg.dsc
@@ -3,13 +3,7 @@
#
# Copyright (c) 2019, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
[Defines]
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkg.fdf b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkg.fdf
index 6b8cb4a0b5..67aebbd547 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkg.fdf
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkg.fdf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2019, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkgBuildOption.dsc b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkgBuildOption.dsc
index 92c757190c..2cfcfdf776 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkgBuildOption.dsc
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkgBuildOption.dsc
@@ -3,13 +3,7 @@
#
# Copyright (c) 2019, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkgConfig.dsc b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkgConfig.dsc
index 2f7d386469..ea759776fb 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkgConfig.dsc
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkgConfig.dsc
@@ -3,13 +3,7 @@
#
# Copyright (c) 2019, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkgPcd.dsc b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkgPcd.dsc
index 9b6f5005eb..7bb341a1dd 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkgPcd.dsc
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/OpenBoardPkgPcd.dsc
@@ -3,13 +3,7 @@
#
# Copyright (c) 2019, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Policy/Library/DxeSiliconPolicyUpdateLib/DxeGopPolicyInit.c b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Policy/Library/DxeSiliconPolicyUpdateLib/DxeGopPolicyInit.c
index 56d2afd917..99c7d42c4e 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Policy/Library/DxeSiliconPolicyUpdateLib/DxeGopPolicyInit.c
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Policy/Library/DxeSiliconPolicyUpdateLib/DxeGopPolicyInit.c
@@ -2,13 +2,7 @@
DXE GOP policy initialization.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Policy/Library/DxeSiliconPolicyUpdateLib/DxeGopPolicyInit.h b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Policy/Library/DxeSiliconPolicyUpdateLib/DxeGopPolicyInit.h
index c7a4b73e8c..f4ab1a5bca 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Policy/Library/DxeSiliconPolicyUpdateLib/DxeGopPolicyInit.h
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Policy/Library/DxeSiliconPolicyUpdateLib/DxeGopPolicyInit.h
@@ -2,13 +2,7 @@
Header file for the GopPolicyInitDxe Driver.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _GOP_POLICY_INIT_DXE_H_
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSaPolicyInit.h b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSaPolicyInit.h
index ebf8c3967f..bb4b4369ad 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSaPolicyInit.h
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSaPolicyInit.h
@@ -2,13 +2,7 @@
Header file for the SaPolicyInitDxe Driver.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _SA_POLICY_INIT_DXE_H_
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSaPolicyUpdate.c b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSaPolicyUpdate.c
index f7fb071e2b..d140237576 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSaPolicyUpdate.c
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSaPolicyUpdate.c
@@ -2,13 +2,7 @@
This file is the library for SA DXE Policy initialization.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSiliconPolicyUpdateLib.c b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSiliconPolicyUpdateLib.c
index a7ddfcc428..5c7f388213 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSiliconPolicyUpdateLib.c
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSiliconPolicyUpdateLib.c
@@ -2,13 +2,7 @@
DXE silicon policy update library.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSiliconPolicyUpdateLib.inf b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSiliconPolicyUpdateLib.inf
index c6ffd6d40e..dd7047b9cf 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSiliconPolicyUpdateLib.inf
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSiliconPolicyUpdateLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2019, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/bld.bat b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/bld.bat
index 03c8f98d93..606ce979a7 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/bld.bat
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/bld.bat
@@ -1,13 +1,7 @@
@REM @file
@REM
@REM Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
-@REM This program and the accompanying materials
-@REM are licensed and made available under the terms and conditions of the BSD License
-@REM which accompanies this distribution. The full text of the license may be found at
-@REM http://opensource.org/licenses/bsd-license.php
-@REM
-@REM THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-@REM WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+@REM SPDX-License-Identifier: BSD-2-Clause-Patent
@REM
:: Useage: bld [/s] [/f <FEATURE_PCD_NAME> <FALSE or TRUE>] [/r]
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/cln.bat b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/cln.bat
index d4d98dd135..61c8a7d1a4 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/cln.bat
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/cln.bat
@@ -1,13 +1,7 @@
@REM @file
@REM
@REM Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
-@REM This program and the accompanying materials
-@REM are licensed and made available under the terms and conditions of the BSD License
-@REM which accompanies this distribution. The full text of the license may be found at
-@REM http://opensource.org/licenses/bsd-license.php
-@REM
-@REM THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-@REM WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+@REM SPDX-License-Identifier: BSD-2-Clause-Patent
@REM
@echo off
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/postbuild.bat b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/postbuild.bat
index 70be663897..5553645fbf 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/postbuild.bat
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/postbuild.bat
@@ -1,13 +1,7 @@
@REM @file
@REM
@REM Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
-@REM This program and the accompanying materials
-@REM are licensed and made available under the terms and conditions of the BSD License
-@REM which accompanies this distribution. The full text of the license may be found at
-@REM http://opensource.org/licenses/bsd-license.php
-@REM
-@REM THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-@REM WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+@REM SPDX-License-Identifier: BSD-2-Clause-Patent
@REM
@REM #
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/prebuild.bat b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/prebuild.bat
index c3360403f1..c18dd5e89d 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/prebuild.bat
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/prebuild.bat
@@ -2,13 +2,7 @@
@REM Pre build script.
@REM
@REM Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
-@REM This program and the accompanying materials
-@REM are licensed and made available under the terms and conditions of the BSD License
-@REM which accompanies this distribution. The full text of the license may be found at
-@REM http://opensource.org/licenses/bsd-license.php
-@REM
-@REM THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-@REM WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+@REM SPDX-License-Identifier: BSD-2-Clause-Patent
@REM
cd ..
diff --git a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/prep.bat b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/prep.bat
index 46a514b9ed..cb0d44f722 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/prep.bat
+++ b/Platform/Intel/ClevoOpenBoardPkg/N1xxWU/prep.bat
@@ -1,13 +1,7 @@
@REM @file
@REM
@REM Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
-@REM This program and the accompanying materials
-@REM are licensed and made available under the terms and conditions of the BSD License
-@REM which accompanies this distribution. The full text of the license may be found at
-@REM http://opensource.org/licenses/bsd-license.php
-@REM
-@REM THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-@REM WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+@REM SPDX-License-Identifier: BSD-2-Clause-Patent
@REM
@echo OFF
diff --git a/Platform/Intel/ClevoOpenBoardPkg/OpenBoardPkg.dec b/Platform/Intel/ClevoOpenBoardPkg/OpenBoardPkg.dec
index aa457e64db..29816e3c21 100644
--- a/Platform/Intel/ClevoOpenBoardPkg/OpenBoardPkg.dec
+++ b/Platform/Intel/ClevoOpenBoardPkg/OpenBoardPkg.dec
@@ -7,13 +7,7 @@
#
# Copyright (c) 2019, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
[Defines]
--
2.21.0.windows.1
^ permalink raw reply related [flat|nested] 63+ messages in thread
* [[edk2-platforms][PATCH V2] 10/30] Platform/Intel/KabylakeOpenBoardPkg: Replace BSD License with BSD+Patent License
2019-05-15 23:09 [[edk2-platforms][PATCH V2] 00/30] Change edk2-platforms/master to BSD+Patent License Michael D Kinney
` (8 preceding siblings ...)
2019-05-15 23:09 ` [[edk2-platforms][PATCH V2] 09/30] Platform/Intel/ClevoOpenBoardPkg: " Michael D Kinney
@ 2019-05-15 23:09 ` Michael D Kinney
2019-05-16 0:23 ` Chiu, Chasel
2019-05-17 6:51 ` Kubacki, Michael A
2019-05-15 23:09 ` [[edk2-platforms][PATCH V2] 11/30] Platform/Intel/MinPlatformPkg: " Michael D Kinney
` (20 subsequent siblings)
30 siblings, 2 replies; 63+ messages in thread
From: Michael D Kinney @ 2019-05-15 23:09 UTC (permalink / raw)
To: devel; +Cc: Chasel Chiu, Michael Kubacki
https://bugzilla.tianocore.org/show_bug.cgi?id=1373
Replace BSD 2-Clause License with BSD+Patent License. This change is
based on the following emails:
https://lists.01.org/pipermail/edk2-devel/2019-February/036260.html
https://lists.01.org/pipermail/edk2-devel/2018-October/030385.html
RFCs with detailed process for the license change:
V3: https://lists.01.org/pipermail/edk2-devel/2019-March/038116.html
V2: https://lists.01.org/pipermail/edk2-devel/2019-March/037669.html
V1: https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html
Cc: Chasel Chiu <chasel.chiu@intel.com>
Cc: Michael Kubacki <michael.a.kubacki@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
.../KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/AcpiGnvsInit.c | 8 +-------
.../KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe.c | 8 +-------
.../Acpi/BoardAcpiDxe/BoardAcpiDxe.inf | 8 +-------
.../KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/ALS.ASL | 8 +-------
.../Acpi/BoardAcpiDxe/Dsdt/AMLUPD.asl | 8 +-------
.../KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/CPU.asl | 8 +-------
.../KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/DSDT.ASL | 8 +-------
.../KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Gpe.asl | 8 +-------
.../KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Itss.asl | 8 +-------
.../Acpi/BoardAcpiDxe/Dsdt/LPC_DEV.ASL | 8 +-------
.../KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/LpcB.asl | 8 +-------
.../Acpi/BoardAcpiDxe/Dsdt/PCI_DRC.ASL | 8 +-------
.../Acpi/BoardAcpiDxe/Dsdt/PciTree.asl | 8 +-------
.../Acpi/BoardAcpiDxe/Dsdt/Platform.asl | 8 +-------
.../Acpi/BoardAcpiDxe/Dsdt/PlatformGnvs.asl | 8 +-------
.../KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Video.asl | 8 +-------
.../KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/UpdateDsdt.c | 8 +-------
.../KabylakeOpenBoardPkg/Features/PciHotPlug/PciHotPlug.c | 8 +-------
.../KabylakeOpenBoardPkg/Features/PciHotPlug/PciHotPlug.h | 8 +-------
.../Features/PciHotPlug/PciHotPlug.inf | 8 +-------
.../Features/Tbt/AcpiTables/Rtd3SptPcieTbt.asl | 8 +-------
.../KabylakeOpenBoardPkg/Features/Tbt/AcpiTables/Tbt.asl | 8 +-------
.../Features/Tbt/Include/Acpi/TbtNvs.asl | 8 +-------
.../Features/Tbt/Include/Acpi/TbtNvsAreaDef.h | 8 +-------
.../Features/Tbt/Include/Library/DxeTbtPolicyLib.h | 8 +-------
.../Features/Tbt/Include/Library/PeiTbtPolicyLib.h | 8 +-------
.../Features/Tbt/Include/Library/TbtCommonLib.h | 8 +-------
.../Features/Tbt/Include/Ppi/PeiTbtPolicy.h | 8 +-------
.../Features/Tbt/Include/Private/Library/PeiDTbtInitLib.h | 8 +-------
.../Tbt/Include/Private/Library/PeiTbtCommonInitLib.h | 8 +-------
.../Features/Tbt/Include/Protocol/DxeTbtPolicy.h | 8 +-------
.../Features/Tbt/Include/Protocol/TbtNvsArea.h | 8 +-------
.../Features/Tbt/Include/TbtBoardInfo.h | 8 +-------
.../Features/Tbt/Include/TbtPolicyCommonDefinition.h | 8 +-------
.../Tbt/Library/DxeTbtPolicyLib/DxeTbtPolicyLib.c | 8 +-------
.../Tbt/Library/DxeTbtPolicyLib/DxeTbtPolicyLib.inf | 8 +-------
.../Tbt/Library/DxeTbtPolicyLib/DxeTbtPolicyLibrary.h | 8 +-------
.../Tbt/Library/PeiDxeSmmTbtCommonLib/TbtCommonLib.c | 8 +-------
.../Tbt/Library/PeiDxeSmmTbtCommonLib/TbtCommonLib.inf | 8 +-------
.../Tbt/Library/PeiTbtPolicyLib/PeiTbtPolicyLib.c | 8 +-------
.../Tbt/Library/PeiTbtPolicyLib/PeiTbtPolicyLib.inf | 8 +-------
.../Tbt/Library/PeiTbtPolicyLib/PeiTbtPolicyLibrary.h | 8 +-------
.../Tbt/Library/Private/PeiDTbtInitLib/PeiDTbtInitLib.c | 8 +-------
.../Tbt/Library/Private/PeiDTbtInitLib/PeiDTbtInitLib.inf | 8 +-------
.../Features/Tbt/TbtInit/Dxe/TbtDxe.c | 8 +-------
.../Features/Tbt/TbtInit/Dxe/TbtDxe.inf | 8 +-------
.../Features/Tbt/TbtInit/Pei/PeiTbtInit.c | 8 +-------
.../Features/Tbt/TbtInit/Pei/PeiTbtInit.inf | 8 +-------
.../Features/Tbt/TbtInit/Smm/TbtSmiHandler.c | 8 +-------
.../Features/Tbt/TbtInit/Smm/TbtSmiHandler.h | 8 +-------
.../Features/Tbt/TbtInit/Smm/TbtSmm.c | 8 +-------
.../Features/Tbt/TbtInit/Smm/TbtSmm.inf | 8 +-------
.../PeiSiliconPolicyUpdateLibFsp/PcieDeviceTable.c | 8 +-------
.../PeiSiliconPolicyUpdateLibFsp/PeiFspMiscUpdUpdateLib.c | 8 +-------
.../PeiSiliconPolicyUpdateLibFsp/PeiFspPolicyUpdateLib.c | 8 +-------
.../PeiSiliconPolicyUpdateLibFsp/PeiPchPolicyUpdate.c | 8 +-------
.../PeiSiliconPolicyUpdateLibFsp/PeiPchPolicyUpdate.h | 8 +-------
.../PeiPchPolicyUpdatePreMem.c | 8 +-------
.../PeiSiliconPolicyUpdateLibFsp/PeiSaPolicyUpdate.c | 8 +-------
.../PeiSiliconPolicyUpdateLibFsp/PeiSaPolicyUpdate.h | 8 +-------
.../PeiSaPolicyUpdatePreMem.c | 8 +-------
.../PeiSiliconPolicyUpdateLibFsp.inf | 8 +-------
.../Intel/KabylakeOpenBoardPkg/Include/Acpi/GlobalNvs.asl | 8 +-------
.../KabylakeOpenBoardPkg/Include/Acpi/GlobalNvsAreaDef.h | 8 +-------
.../KabylakeOpenBoardPkg/Include/Fdf/FlashMapInclude.fdf | 8 +-------
Platform/Intel/KabylakeOpenBoardPkg/Include/IoExpander.h | 8 +-------
.../Include/Library/GpioExpanderLib.h | 8 +-------
.../KabylakeOpenBoardPkg/Include/Library/I2cAccessLib.h | 8 +-------
.../KabylakeOpenBoardPkg/Include/PchHsioPtssTables.h | 8 +-------
.../KabylakeOpenBoardPkg/Include/Protocol/GlobalNvsArea.h | 8 +-------
Platform/Intel/KabylakeOpenBoardPkg/Include/SioRegs.h | 8 +-------
.../KabylakeRvp3/GitEdk2MinKabylake.bat | 8 +-------
.../KabylakeRvp3/Include/KabylakeRvp3Id.h | 8 +-------
.../Library/BasePlatformHookLib/BasePlatformHookLib.c | 8 +-------
.../Library/BasePlatformHookLib/BasePlatformHookLib.inf | 8 +-------
.../Library/BoardAcpiLib/DxeBoardAcpiTableLib.c | 8 +-------
.../Library/BoardAcpiLib/DxeBoardAcpiTableLib.inf | 8 +-------
.../Library/BoardAcpiLib/DxeKabylakeRvp3AcpiTableLib.c | 8 +-------
.../Library/BoardAcpiLib/DxeMultiBoardAcpiSupportLib.c | 8 +-------
.../Library/BoardAcpiLib/DxeMultiBoardAcpiSupportLib.inf | 8 +-------
.../Library/BoardAcpiLib/SmmBoardAcpiEnableLib.c | 8 +-------
.../Library/BoardAcpiLib/SmmBoardAcpiEnableLib.inf | 8 +-------
.../Library/BoardAcpiLib/SmmKabylakeRvp3AcpiEnableLib.c | 8 +-------
.../Library/BoardAcpiLib/SmmMultiBoardAcpiSupportLib.c | 8 +-------
.../Library/BoardAcpiLib/SmmMultiBoardAcpiSupportLib.inf | 8 +-------
.../Library/BoardAcpiLib/SmmSiliconAcpiEnableLib.c | 8 +-------
.../Library/BoardInitLib/KabylakeRvp3GpioTable.c | 8 +-------
.../Library/BoardInitLib/KabylakeRvp3HdaVerbTables.c | 8 +-------
.../Library/BoardInitLib/KabylakeRvp3HsioPtssTables.c | 8 +-------
.../Library/BoardInitLib/KabylakeRvp3SpdTable.c | 8 +-------
.../Library/BoardInitLib/PeiBoardInitPostMemLib.c | 8 +-------
.../Library/BoardInitLib/PeiBoardInitPostMemLib.inf | 8 +-------
.../Library/BoardInitLib/PeiBoardInitPreMemLib.c | 8 +-------
.../Library/BoardInitLib/PeiBoardInitPreMemLib.inf | 8 +-------
.../Library/BoardInitLib/PeiKabylakeRvp3Detect.c | 8 +-------
.../Library/BoardInitLib/PeiKabylakeRvp3InitLib.h | 8 +-------
.../Library/BoardInitLib/PeiKabylakeRvp3InitPostMemLib.c | 8 +-------
.../Library/BoardInitLib/PeiKabylakeRvp3InitPreMemLib.c | 8 +-------
.../Library/BoardInitLib/PeiMultiBoardInitPostMemLib.c | 8 +-------
.../Library/BoardInitLib/PeiMultiBoardInitPostMemLib.inf | 8 +-------
.../Library/BoardInitLib/PeiMultiBoardInitPreMemLib.c | 8 +-------
.../Library/BoardInitLib/PeiMultiBoardInitPreMemLib.inf | 8 +-------
.../KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.dsc | 8 +-------
.../KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.fdf | 8 +-------
.../KabylakeRvp3/OpenBoardPkgBuildOption.dsc | 8 +-------
.../KabylakeRvp3/OpenBoardPkgConfig.dsc | 8 +-------
.../KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgPcd.dsc | 8 +-------
Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/bld.bat | 8 +-------
Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/cln.bat | 8 +-------
.../Intel/KabylakeOpenBoardPkg/KabylakeRvp3/postbuild.bat | 8 +-------
.../Intel/KabylakeOpenBoardPkg/KabylakeRvp3/prebuild.bat | 8 +-------
Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/prep.bat | 8 +-------
.../Library/BaseGpioExpanderLib/BaseGpioExpanderLib.c | 8 +-------
.../Library/BaseGpioExpanderLib/BaseGpioExpanderLib.inf | 8 +-------
.../Library/PeiI2cAccessLib/PeiI2cAccessLib.c | 8 +-------
.../Library/PeiI2cAccessLib/PeiI2cAccessLib.inf | 8 +-------
Platform/Intel/KabylakeOpenBoardPkg/OpenBoardPkg.dec | 8 +-------
.../Library/DxeSiliconPolicyUpdateLib/DxeGopPolicyInit.c | 8 +-------
.../Library/DxeSiliconPolicyUpdateLib/DxeGopPolicyInit.h | 8 +-------
.../Library/DxeSiliconPolicyUpdateLib/DxeSaPolicyInit.h | 8 +-------
.../Library/DxeSiliconPolicyUpdateLib/DxeSaPolicyUpdate.c | 8 +-------
.../DxeSiliconPolicyUpdateLib/DxeSiliconPolicyUpdateLib.c | 8 +-------
.../DxeSiliconPolicyUpdateLib.inf | 8 +-------
123 files changed, 123 insertions(+), 861 deletions(-)
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/AcpiGnvsInit.c b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/AcpiGnvsInit.c
index 3586cc6116..0d9d217e38 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/AcpiGnvsInit.c
+++ b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/AcpiGnvsInit.c
@@ -2,13 +2,7 @@
Acpi Gnvs Init Library.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe.c b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe.c
index bb3154757d..0361ffc2fb 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe.c
+++ b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe.c
@@ -2,13 +2,7 @@
ACPI Platform Driver
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe.inf b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe.inf
index dce49b14e2..0eaf2fab49 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe.inf
+++ b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/ALS.ASL b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/ALS.ASL
index 9075769a49..ab28f70471 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/ALS.ASL
+++ b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/ALS.ASL
@@ -2,13 +2,7 @@
ACPI DSDT table
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/AMLUPD.asl b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/AMLUPD.asl
index 085b15cec2..86cccdc83e 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/AMLUPD.asl
+++ b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/AMLUPD.asl
@@ -2,13 +2,7 @@
ACPI DSDT table
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/CPU.asl b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/CPU.asl
index b62a305b7a..1f1fdb2e00 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/CPU.asl
+++ b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/CPU.asl
@@ -2,13 +2,7 @@
ACPI DSDT table
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/DSDT.ASL b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/DSDT.ASL
index 44c9aead14..de3b137c34 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/DSDT.ASL
+++ b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/DSDT.ASL
@@ -2,13 +2,7 @@
ACPI DSDT table
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Gpe.asl b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Gpe.asl
index 8433c1fcab..449eab178e 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Gpe.asl
+++ b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Gpe.asl
@@ -2,13 +2,7 @@
ACPI DSDT table
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Itss.asl b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Itss.asl
index 8210926859..ccca884908 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Itss.asl
+++ b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Itss.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/LPC_DEV.ASL b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/LPC_DEV.ASL
index 64b4722011..0acd1e92bf 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/LPC_DEV.ASL
+++ b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/LPC_DEV.ASL
@@ -2,13 +2,7 @@
ACPI DSDT table
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/LpcB.asl b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/LpcB.asl
index cf0eb2092a..9f9d39c92c 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/LpcB.asl
+++ b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/LpcB.asl
@@ -2,13 +2,7 @@
ACPI DSDT table
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PCI_DRC.ASL b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PCI_DRC.ASL
index 8b1593f1cf..2d8cf4c421 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PCI_DRC.ASL
+++ b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PCI_DRC.ASL
@@ -2,13 +2,7 @@
ACPI DSDT table
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PciTree.asl b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PciTree.asl
index a32bb30f14..88073f3954 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PciTree.asl
+++ b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PciTree.asl
@@ -2,13 +2,7 @@
ACPI DSDT table
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Platform.asl b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Platform.asl
index c784d516db..9dc6cf0e8c 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Platform.asl
+++ b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Platform.asl
@@ -2,13 +2,7 @@
ACPI DSDT table
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PlatformGnvs.asl b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PlatformGnvs.asl
index 60223054ab..b4db4af4be 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PlatformGnvs.asl
+++ b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PlatformGnvs.asl
@@ -2,13 +2,7 @@
ACPI DSDT table
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Video.asl b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Video.asl
index a77a1f5805..7b6a1dfa30 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Video.asl
+++ b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Video.asl
@@ -2,13 +2,7 @@
ACPI DSDT table
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/UpdateDsdt.c b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/UpdateDsdt.c
index c4651f117a..f47397ae98 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/UpdateDsdt.c
+++ b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/UpdateDsdt.c
@@ -2,13 +2,7 @@
Acpi Gnvs Init Library.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/Features/PciHotPlug/PciHotPlug.c b/Platform/Intel/KabylakeOpenBoardPkg/Features/PciHotPlug/PciHotPlug.c
index 38ca4f954f..e68c356f6b 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/Features/PciHotPlug/PciHotPlug.c
+++ b/Platform/Intel/KabylakeOpenBoardPkg/Features/PciHotPlug/PciHotPlug.c
@@ -3,13 +3,7 @@
Devics resource configuration.
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/Features/PciHotPlug/PciHotPlug.h b/Platform/Intel/KabylakeOpenBoardPkg/Features/PciHotPlug/PciHotPlug.h
index 3260af2b15..4c53a4ad6a 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/Features/PciHotPlug/PciHotPlug.h
+++ b/Platform/Intel/KabylakeOpenBoardPkg/Features/PciHotPlug/PciHotPlug.h
@@ -1,13 +1,7 @@
/**@file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/Features/PciHotPlug/PciHotPlug.inf b/Platform/Intel/KabylakeOpenBoardPkg/Features/PciHotPlug/PciHotPlug.inf
index b444782ffc..4139721e5e 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/Features/PciHotPlug/PciHotPlug.inf
+++ b/Platform/Intel/KabylakeOpenBoardPkg/Features/PciHotPlug/PciHotPlug.inf
@@ -4,13 +4,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/AcpiTables/Rtd3SptPcieTbt.asl b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/AcpiTables/Rtd3SptPcieTbt.asl
index b54b5a41c3..2e7f4b6470 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/AcpiTables/Rtd3SptPcieTbt.asl
+++ b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/AcpiTables/Rtd3SptPcieTbt.asl
@@ -2,13 +2,7 @@
ACPI RTD3 SSDT table for SPT PCIe
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/AcpiTables/Tbt.asl b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/AcpiTables/Tbt.asl
index d20e35f12e..ca28589621 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/AcpiTables/Tbt.asl
+++ b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/AcpiTables/Tbt.asl
@@ -2,13 +2,7 @@
Thunderbolt ACPI methods
Copyright (c) 2018 - 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Acpi/TbtNvs.asl b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Acpi/TbtNvs.asl
index 65961e0940..62db427059 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Acpi/TbtNvs.asl
+++ b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Acpi/TbtNvs.asl
@@ -1,13 +1,7 @@
/**@file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Acpi/TbtNvsAreaDef.h b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Acpi/TbtNvsAreaDef.h
index 583fda5914..8e5f342b34 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Acpi/TbtNvsAreaDef.h
+++ b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Acpi/TbtNvsAreaDef.h
@@ -1,13 +1,7 @@
/**@file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Library/DxeTbtPolicyLib.h b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Library/DxeTbtPolicyLib.h
index 9fe16b8a68..8d1b3b1e0e 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Library/DxeTbtPolicyLib.h
+++ b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Library/DxeTbtPolicyLib.h
@@ -2,13 +2,7 @@
Prototype of the DxeTbtPolicyLib library.
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _DXE_TBT_POLICY_LIB_H_
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Library/PeiTbtPolicyLib.h b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Library/PeiTbtPolicyLib.h
index f1ca61ca4e..843b677bac 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Library/PeiTbtPolicyLib.h
+++ b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Library/PeiTbtPolicyLib.h
@@ -2,13 +2,7 @@
Prototype of the PeiTbtPolicyLib library.
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PEI_TBT_POLICY_LIB_H_
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Library/TbtCommonLib.h b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Library/TbtCommonLib.h
index f9338d3bd5..0180179bba 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Library/TbtCommonLib.h
+++ b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Library/TbtCommonLib.h
@@ -1,13 +1,7 @@
/**@file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _TBT_COMMON_LIB_H_
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Ppi/PeiTbtPolicy.h b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Ppi/PeiTbtPolicy.h
index 9b7ff25c55..da65103252 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Ppi/PeiTbtPolicy.h
+++ b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Ppi/PeiTbtPolicy.h
@@ -2,13 +2,7 @@
TBT PEI Policy
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Private/Library/PeiDTbtInitLib.h b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Private/Library/PeiDTbtInitLib.h
index 963a678845..52f3e8ca1d 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Private/Library/PeiDTbtInitLib.h
+++ b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Private/Library/PeiDTbtInitLib.h
@@ -2,13 +2,7 @@
PEI DTBT Init Dispatch library Header file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef __PEI_DTBT_INIT_LIB_H__
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Private/Library/PeiTbtCommonInitLib.h b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Private/Library/PeiTbtCommonInitLib.h
index 3af3f64377..1f3a911e95 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Private/Library/PeiTbtCommonInitLib.h
+++ b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Private/Library/PeiTbtCommonInitLib.h
@@ -2,13 +2,7 @@
PEI TBT Common Init Dispatch library Header file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef __PEI_TBT_COMMON_INIT_LIB_H__
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Protocol/DxeTbtPolicy.h b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Protocol/DxeTbtPolicy.h
index 76f5071d9a..dc5bc282cb 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Protocol/DxeTbtPolicy.h
+++ b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Protocol/DxeTbtPolicy.h
@@ -2,13 +2,7 @@
TBT DXE Policy
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Protocol/TbtNvsArea.h b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Protocol/TbtNvsArea.h
index c662f162ec..366165fd58 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Protocol/TbtNvsArea.h
+++ b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Protocol/TbtNvsArea.h
@@ -2,13 +2,7 @@
This file defines the TBT NVS Area Protocol.
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/TbtBoardInfo.h b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/TbtBoardInfo.h
index 9844935212..41873a4e29 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/TbtBoardInfo.h
+++ b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/TbtBoardInfo.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _TBT_INFO_GUID_H_
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/TbtPolicyCommonDefinition.h b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/TbtPolicyCommonDefinition.h
index 2033126a25..e60cfe9e29 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/TbtPolicyCommonDefinition.h
+++ b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/TbtPolicyCommonDefinition.h
@@ -2,13 +2,7 @@
TBT Policy Common definition.
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicyLib/DxeTbtPolicyLib.c b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicyLib/DxeTbtPolicyLib.c
index 0e58bc8294..65cb592472 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicyLib/DxeTbtPolicyLib.c
+++ b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicyLib/DxeTbtPolicyLib.c
@@ -2,13 +2,7 @@
This file is DxeTbtPolicyLib library.
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include <DxeTbtPolicyLibrary.h>
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicyLib/DxeTbtPolicyLib.inf b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicyLib/DxeTbtPolicyLib.inf
index 38f30d1f11..931b1a3203 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicyLib/DxeTbtPolicyLib.inf
+++ b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicyLib/DxeTbtPolicyLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicyLib/DxeTbtPolicyLibrary.h b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicyLib/DxeTbtPolicyLibrary.h
index e0f749ec53..5e79dc2862 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicyLib/DxeTbtPolicyLibrary.h
+++ b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicyLib/DxeTbtPolicyLibrary.h
@@ -2,13 +2,7 @@
Header file for the DxeTBTPolicy library.
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _DXE_TBT_POLICY_LIBRARY_H_
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/PeiDxeSmmTbtCommonLib/TbtCommonLib.c b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/PeiDxeSmmTbtCommonLib/TbtCommonLib.c
index 4f2690ca56..f596785aa3 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/PeiDxeSmmTbtCommonLib/TbtCommonLib.c
+++ b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/PeiDxeSmmTbtCommonLib/TbtCommonLib.c
@@ -2,13 +2,7 @@
PeiTbtInit library implementition with empty functions.
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/PeiDxeSmmTbtCommonLib/TbtCommonLib.inf b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/PeiDxeSmmTbtCommonLib/TbtCommonLib.inf
index ec8a31421e..ff1f7777ce 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/PeiDxeSmmTbtCommonLib/TbtCommonLib.inf
+++ b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/PeiDxeSmmTbtCommonLib/TbtCommonLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/PeiTbtPolicyLib/PeiTbtPolicyLib.c b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/PeiTbtPolicyLib/PeiTbtPolicyLib.c
index d0e3229db5..1bd43fbd1b 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/PeiTbtPolicyLib/PeiTbtPolicyLib.c
+++ b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/PeiTbtPolicyLib/PeiTbtPolicyLib.c
@@ -2,13 +2,7 @@
This file is PeiTbtPolicyLib library.
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include <Library/PeiServicesLib.h>
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/PeiTbtPolicyLib/PeiTbtPolicyLib.inf b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/PeiTbtPolicyLib/PeiTbtPolicyLib.inf
index fa88e97b8f..91cae945b8 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/PeiTbtPolicyLib/PeiTbtPolicyLib.inf
+++ b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/PeiTbtPolicyLib/PeiTbtPolicyLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/PeiTbtPolicyLib/PeiTbtPolicyLibrary.h b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/PeiTbtPolicyLib/PeiTbtPolicyLibrary.h
index 16ac667b1c..803b99b37c 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/PeiTbtPolicyLib/PeiTbtPolicyLibrary.h
+++ b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/PeiTbtPolicyLib/PeiTbtPolicyLibrary.h
@@ -2,13 +2,7 @@
Header file for the PeiTBTPolicy library.
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PEI_TBT_POLICY_LIBRARY_H_
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/Private/PeiDTbtInitLib/PeiDTbtInitLib.c b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/Private/PeiDTbtInitLib/PeiDTbtInitLib.c
index 4521bff957..21d149c7c2 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/Private/PeiDTbtInitLib/PeiDTbtInitLib.c
+++ b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/Private/PeiDTbtInitLib/PeiDTbtInitLib.c
@@ -2,13 +2,7 @@
Thunderbolt(TM) Pei Library
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include <Library/PeiServicesLib.h>
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/Private/PeiDTbtInitLib/PeiDTbtInitLib.inf b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/Private/PeiDTbtInitLib/PeiDTbtInitLib.inf
index 83a0f57535..1d90bfca7c 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/Private/PeiDTbtInitLib/PeiDTbtInitLib.inf
+++ b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/Private/PeiDTbtInitLib/PeiDTbtInitLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Dxe/TbtDxe.c b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Dxe/TbtDxe.c
index cfe38d8018..13a687576c 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Dxe/TbtDxe.c
+++ b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Dxe/TbtDxe.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include <Uefi.h>
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Dxe/TbtDxe.inf b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Dxe/TbtDxe.inf
index 86f51191d1..9e117b77eb 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Dxe/TbtDxe.inf
+++ b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Dxe/TbtDxe.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Pei/PeiTbtInit.c b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Pei/PeiTbtInit.c
index a9a022844d..4803efae73 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Pei/PeiTbtInit.c
+++ b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Pei/PeiTbtInit.c
@@ -2,13 +2,7 @@
Source code file for TBT Init PEI module
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Pei/PeiTbtInit.inf b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Pei/PeiTbtInit.inf
index fdf85cbd67..f702c2753d 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Pei/PeiTbtInit.inf
+++ b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Pei/PeiTbtInit.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmiHandler.c b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmiHandler.c
index 5280f9e1c8..58814060dd 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmiHandler.c
+++ b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmiHandler.c
@@ -1,13 +1,7 @@
/**@file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmiHandler.h b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmiHandler.h
index 22f6aeeb7f..186f5162f6 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmiHandler.h
+++ b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmiHandler.h
@@ -1,13 +1,7 @@
/**@file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _TBT_SMI_HANDLER_H_
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmm.c b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmm.c
index f2abfb0db9..57f7eceed7 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmm.c
+++ b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmm.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmm.inf b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmm.inf
index 31ecb9767a..9218c8fe67 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmm.inf
+++ b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmm.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PcieDeviceTable.c b/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PcieDeviceTable.c
index c03c51e8ca..155dfdaf62 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PcieDeviceTable.c
+++ b/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PcieDeviceTable.c
@@ -2,13 +2,7 @@
This file is SampleCode of the library for Intel PCH PEI Policy initialization.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiFspMiscUpdUpdateLib.c b/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiFspMiscUpdUpdateLib.c
index 57a1846ad2..d8aff1960f 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiFspMiscUpdUpdateLib.c
+++ b/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiFspMiscUpdUpdateLib.c
@@ -2,13 +2,7 @@
Implementation of Fsp Misc UPD Initialization.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiFspPolicyUpdateLib.c b/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiFspPolicyUpdateLib.c
index f3c56419b5..55be16265e 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiFspPolicyUpdateLib.c
+++ b/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiFspPolicyUpdateLib.c
@@ -2,13 +2,7 @@
Provide FSP wrapper platform related function.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiPchPolicyUpdate.c b/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiPchPolicyUpdate.c
index c1c8bf131d..b469720ac6 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiPchPolicyUpdate.c
+++ b/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiPchPolicyUpdate.c
@@ -2,13 +2,7 @@
This file is SampleCode of the library for Intel PCH PEI Policy initialization.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiPchPolicyUpdate.h b/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiPchPolicyUpdate.h
index a4e69f4e73..e1df30951f 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiPchPolicyUpdate.h
+++ b/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiPchPolicyUpdate.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiPchPolicyUpdatePreMem.c b/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiPchPolicyUpdatePreMem.c
index fc27d67e69..f6390ee12c 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiPchPolicyUpdatePreMem.c
+++ b/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiPchPolicyUpdatePreMem.c
@@ -2,13 +2,7 @@
This file is SampleCode of the library for Intel PCH PEI Policy initialization.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiSaPolicyUpdate.c b/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiSaPolicyUpdate.c
index fd54c63a92..d6ec3e38dd 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiSaPolicyUpdate.c
+++ b/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiSaPolicyUpdate.c
@@ -2,13 +2,7 @@
Do Platform Stage System Agent initialization.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiSaPolicyUpdate.h b/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiSaPolicyUpdate.h
index da6f746772..3abf3fc8fd 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiSaPolicyUpdate.h
+++ b/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiSaPolicyUpdate.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiSaPolicyUpdatePreMem.c b/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiSaPolicyUpdatePreMem.c
index 94d5094855..8f9ad901eb 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiSaPolicyUpdatePreMem.c
+++ b/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiSaPolicyUpdatePreMem.c
@@ -2,13 +2,7 @@
Do Platform Stage System Agent initialization.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf b/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf
index c155308632..fa8d91e076 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf
+++ b/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/Include/Acpi/GlobalNvs.asl b/Platform/Intel/KabylakeOpenBoardPkg/Include/Acpi/GlobalNvs.asl
index 27c64a1aa0..e0ff9d9bf5 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/Include/Acpi/GlobalNvs.asl
+++ b/Platform/Intel/KabylakeOpenBoardPkg/Include/Acpi/GlobalNvs.asl
@@ -2,13 +2,7 @@
ACPI DSDT table
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/Include/Acpi/GlobalNvsAreaDef.h b/Platform/Intel/KabylakeOpenBoardPkg/Include/Acpi/GlobalNvsAreaDef.h
index 2394e56c97..93c5a0b55a 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/Include/Acpi/GlobalNvsAreaDef.h
+++ b/Platform/Intel/KabylakeOpenBoardPkg/Include/Acpi/GlobalNvsAreaDef.h
@@ -2,13 +2,7 @@
ACPI DSDT table
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/Include/Fdf/FlashMapInclude.fdf b/Platform/Intel/KabylakeOpenBoardPkg/Include/Fdf/FlashMapInclude.fdf
index 7ed3fe5256..3a28bd4109 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/Include/Fdf/FlashMapInclude.fdf
+++ b/Platform/Intel/KabylakeOpenBoardPkg/Include/Fdf/FlashMapInclude.fdf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/Include/IoExpander.h b/Platform/Intel/KabylakeOpenBoardPkg/Include/IoExpander.h
index 0e6bda1108..eb1b2414c4 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/Include/IoExpander.h
+++ b/Platform/Intel/KabylakeOpenBoardPkg/Include/IoExpander.h
@@ -2,13 +2,7 @@
GPIO definition table for KabylakeRvp3
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/Include/Library/GpioExpanderLib.h b/Platform/Intel/KabylakeOpenBoardPkg/Include/Library/GpioExpanderLib.h
index 427caa7e3b..bbbdc2755d 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/Include/Library/GpioExpanderLib.h
+++ b/Platform/Intel/KabylakeOpenBoardPkg/Include/Library/GpioExpanderLib.h
@@ -2,13 +2,7 @@
Support for IO expander TCA6424.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/Include/Library/I2cAccessLib.h b/Platform/Intel/KabylakeOpenBoardPkg/Include/Library/I2cAccessLib.h
index 84d9d758fb..a69bfc023b 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/Include/Library/I2cAccessLib.h
+++ b/Platform/Intel/KabylakeOpenBoardPkg/Include/Library/I2cAccessLib.h
@@ -2,13 +2,7 @@
Support for IO expander TCA6424.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/Include/PchHsioPtssTables.h b/Platform/Intel/KabylakeOpenBoardPkg/Include/PchHsioPtssTables.h
index 7dc8df5d09..56a0bbab0f 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/Include/PchHsioPtssTables.h
+++ b/Platform/Intel/KabylakeOpenBoardPkg/Include/PchHsioPtssTables.h
@@ -1,13 +1,7 @@
/** @file*
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/Include/Protocol/GlobalNvsArea.h b/Platform/Intel/KabylakeOpenBoardPkg/Include/Protocol/GlobalNvsArea.h
index ad1c1bb881..b151a8fa8b 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/Include/Protocol/GlobalNvsArea.h
+++ b/Platform/Intel/KabylakeOpenBoardPkg/Include/Protocol/GlobalNvsArea.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/Include/SioRegs.h b/Platform/Intel/KabylakeOpenBoardPkg/Include/SioRegs.h
index be14e2ab89..ec61a7defd 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/Include/SioRegs.h
+++ b/Platform/Intel/KabylakeOpenBoardPkg/Include/SioRegs.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/GitEdk2MinKabylake.bat b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/GitEdk2MinKabylake.bat
index 4e13ed18e5..3bb13df80a 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/GitEdk2MinKabylake.bat
+++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/GitEdk2MinKabylake.bat
@@ -1,13 +1,7 @@
@REM @file
@REM
@REM Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-@REM This program and the accompanying materials
-@REM are licensed and made available under the terms and conditions of the BSD License
-@REM which accompanies this distribution. The full text of the license may be found at
-@REM http://opensource.org/licenses/bsd-license.php
-@REM
-@REM THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-@REM WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+@REM SPDX-License-Identifier: BSD-2-Clause-Patent
@REM
@echo off
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Include/KabylakeRvp3Id.h b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Include/KabylakeRvp3Id.h
index ebdc45ae97..3b6397af1f 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Include/KabylakeRvp3Id.h
+++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Include/KabylakeRvp3Id.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BasePlatformHookLib/BasePlatformHookLib.c b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BasePlatformHookLib/BasePlatformHookLib.c
index 245f3595f1..c7fc6986f5 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BasePlatformHookLib/BasePlatformHookLib.c
+++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BasePlatformHookLib/BasePlatformHookLib.c
@@ -2,13 +2,7 @@
Platform Hook Library instances
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BasePlatformHookLib/BasePlatformHookLib.inf b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BasePlatformHookLib/BasePlatformHookLib.inf
index a2eec09e83..e65c7a25c2 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BasePlatformHookLib/BasePlatformHookLib.inf
+++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BasePlatformHookLib/BasePlatformHookLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib/DxeBoardAcpiTableLib.c b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib/DxeBoardAcpiTableLib.c
index 617ce4592f..60c11290c0 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib/DxeBoardAcpiTableLib.c
+++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib/DxeBoardAcpiTableLib.c
@@ -2,13 +2,7 @@
Platform Hook Library instances
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib/DxeBoardAcpiTableLib.inf b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib/DxeBoardAcpiTableLib.inf
index b1ee3a4c15..f3fed024ec 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib/DxeBoardAcpiTableLib.inf
+++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib/DxeBoardAcpiTableLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib/DxeKabylakeRvp3AcpiTableLib.c b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib/DxeKabylakeRvp3AcpiTableLib.c
index de75ed60ba..e65742559a 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib/DxeKabylakeRvp3AcpiTableLib.c
+++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib/DxeKabylakeRvp3AcpiTableLib.c
@@ -2,13 +2,7 @@
Platform Hook Library instances
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib/DxeMultiBoardAcpiSupportLib.c b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib/DxeMultiBoardAcpiSupportLib.c
index eef941ecd5..da488e097c 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib/DxeMultiBoardAcpiSupportLib.c
+++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib/DxeMultiBoardAcpiSupportLib.c
@@ -2,13 +2,7 @@
Platform Hook Library instances
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib/DxeMultiBoardAcpiSupportLib.inf b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib/DxeMultiBoardAcpiSupportLib.inf
index 5536b6e21f..e0394214ee 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib/DxeMultiBoardAcpiSupportLib.inf
+++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib/DxeMultiBoardAcpiSupportLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib/SmmBoardAcpiEnableLib.c b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib/SmmBoardAcpiEnableLib.c
index 1633ab1203..3de0ae34a7 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib/SmmBoardAcpiEnableLib.c
+++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib/SmmBoardAcpiEnableLib.c
@@ -2,13 +2,7 @@
Platform Hook Library instances
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib/SmmBoardAcpiEnableLib.inf b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib/SmmBoardAcpiEnableLib.inf
index 7fa9ffff47..32068b59d7 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib/SmmBoardAcpiEnableLib.inf
+++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib/SmmBoardAcpiEnableLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib/SmmKabylakeRvp3AcpiEnableLib.c b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib/SmmKabylakeRvp3AcpiEnableLib.c
index 43cac20579..71c6e230fa 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib/SmmKabylakeRvp3AcpiEnableLib.c
+++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib/SmmKabylakeRvp3AcpiEnableLib.c
@@ -2,13 +2,7 @@
Platform Hook Library instances
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib/SmmMultiBoardAcpiSupportLib.c b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib/SmmMultiBoardAcpiSupportLib.c
index 157fb47565..91590d5278 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib/SmmMultiBoardAcpiSupportLib.c
+++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib/SmmMultiBoardAcpiSupportLib.c
@@ -2,13 +2,7 @@
Platform Hook Library instances
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib/SmmMultiBoardAcpiSupportLib.inf b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib/SmmMultiBoardAcpiSupportLib.inf
index 56fe2e3e3f..fad4230c85 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib/SmmMultiBoardAcpiSupportLib.inf
+++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib/SmmMultiBoardAcpiSupportLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib/SmmSiliconAcpiEnableLib.c b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib/SmmSiliconAcpiEnableLib.c
index 268d10ea6e..185aa4ad2d 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib/SmmSiliconAcpiEnableLib.c
+++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib/SmmSiliconAcpiEnableLib.c
@@ -2,13 +2,7 @@
Platform Hook Library instances
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/KabylakeRvp3GpioTable.c b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/KabylakeRvp3GpioTable.c
index 05dc520458..2439c6bc1e 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/KabylakeRvp3GpioTable.c
+++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/KabylakeRvp3GpioTable.c
@@ -2,13 +2,7 @@
GPIO definition table for KabylakeRvp3
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/KabylakeRvp3HdaVerbTables.c b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/KabylakeRvp3HdaVerbTables.c
index 1a820d1d5b..92afcbab06 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/KabylakeRvp3HdaVerbTables.c
+++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/KabylakeRvp3HdaVerbTables.c
@@ -2,13 +2,7 @@
HDA Verb table for KabylakeRvp3
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/KabylakeRvp3HsioPtssTables.c b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/KabylakeRvp3HsioPtssTables.c
index 91f78330cb..8a9048fa4c 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/KabylakeRvp3HsioPtssTables.c
+++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/KabylakeRvp3HsioPtssTables.c
@@ -2,13 +2,7 @@
KabylakeRvp3 HSIO PTSS H File
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/KabylakeRvp3SpdTable.c b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/KabylakeRvp3SpdTable.c
index 907a1e422e..3ac9adc466 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/KabylakeRvp3SpdTable.c
+++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/KabylakeRvp3SpdTable.c
@@ -2,13 +2,7 @@
GPIO definition table for KabylakeRvp3
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiBoardInitPostMemLib.c b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiBoardInitPostMemLib.c
index 62f2d89467..d88c4eb461 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiBoardInitPostMemLib.c
+++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiBoardInitPostMemLib.c
@@ -2,13 +2,7 @@
Platform Hook Library instances
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiBoardInitPostMemLib.inf b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiBoardInitPostMemLib.inf
index 89ba2dea69..108ee8f541 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiBoardInitPostMemLib.inf
+++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiBoardInitPostMemLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiBoardInitPreMemLib.c b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiBoardInitPreMemLib.c
index 7dd5d7a8ad..69e0f50282 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiBoardInitPreMemLib.c
+++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiBoardInitPreMemLib.c
@@ -2,13 +2,7 @@
Platform Hook Library instances
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiBoardInitPreMemLib.inf b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiBoardInitPreMemLib.inf
index 114d7ea5e1..51f6787e4f 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiBoardInitPreMemLib.inf
+++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiBoardInitPreMemLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiKabylakeRvp3Detect.c b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiKabylakeRvp3Detect.c
index 23c5c634e3..0f4ad61f0a 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiKabylakeRvp3Detect.c
+++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiKabylakeRvp3Detect.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiKabylakeRvp3InitLib.h b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiKabylakeRvp3InitLib.h
index ff12343802..1878b2c6bd 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiKabylakeRvp3InitLib.h
+++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiKabylakeRvp3InitLib.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiKabylakeRvp3InitPostMemLib.c b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiKabylakeRvp3InitPostMemLib.c
index c4df084843..5d398ab665 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiKabylakeRvp3InitPostMemLib.c
+++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiKabylakeRvp3InitPostMemLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiKabylakeRvp3InitPreMemLib.c b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiKabylakeRvp3InitPreMemLib.c
index 9d7c12ddb2..1667e29067 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiKabylakeRvp3InitPreMemLib.c
+++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiKabylakeRvp3InitPreMemLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiMultiBoardInitPostMemLib.c b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiMultiBoardInitPostMemLib.c
index 5842393932..3778911610 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiMultiBoardInitPostMemLib.c
+++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiMultiBoardInitPostMemLib.c
@@ -2,13 +2,7 @@
Platform Hook Library instances
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiMultiBoardInitPostMemLib.inf b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiMultiBoardInitPostMemLib.inf
index fdeae0c5f4..b118f9030a 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiMultiBoardInitPostMemLib.inf
+++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiMultiBoardInitPostMemLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiMultiBoardInitPreMemLib.c b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiMultiBoardInitPreMemLib.c
index d1fb6591d1..b8b161377e 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiMultiBoardInitPreMemLib.c
+++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiMultiBoardInitPreMemLib.c
@@ -2,13 +2,7 @@
Platform Hook Library instances
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiMultiBoardInitPreMemLib.inf b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiMultiBoardInitPreMemLib.inf
index 28ba665d96..25684b00d0 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiMultiBoardInitPreMemLib.inf
+++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiMultiBoardInitPreMemLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.dsc b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.dsc
index 8602052666..1bef21dd42 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.dsc
+++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.dsc
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017 - 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
[Defines]
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.fdf b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.fdf
index 8e8abab0dc..0cff53e308 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.fdf
+++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.fdf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017 - 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgBuildOption.dsc b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgBuildOption.dsc
index 318b0573ad..04c57868b7 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgBuildOption.dsc
+++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgBuildOption.dsc
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgConfig.dsc b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgConfig.dsc
index f3d082ce41..15468494dd 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgConfig.dsc
+++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgConfig.dsc
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017 - 2019, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgPcd.dsc b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgPcd.dsc
index c0d566db21..9774acb5eb 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgPcd.dsc
+++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgPcd.dsc
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017 - 2019, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/bld.bat b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/bld.bat
index e0ad5eefdc..449660b75d 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/bld.bat
+++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/bld.bat
@@ -1,13 +1,7 @@
@REM @file
@REM
@REM Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-@REM This program and the accompanying materials
-@REM are licensed and made available under the terms and conditions of the BSD License
-@REM which accompanies this distribution. The full text of the license may be found at
-@REM http://opensource.org/licenses/bsd-license.php
-@REM
-@REM THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-@REM WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+@REM SPDX-License-Identifier: BSD-2-Clause-Patent
@REM
:: Useage: bld [/s] [/f <FEATURE_PCD_NAME> <FALSE or TRUE>] [/r]
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/cln.bat b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/cln.bat
index 8c4e0f51e6..76c078ac05 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/cln.bat
+++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/cln.bat
@@ -1,13 +1,7 @@
@REM @file
@REM
@REM Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-@REM This program and the accompanying materials
-@REM are licensed and made available under the terms and conditions of the BSD License
-@REM which accompanies this distribution. The full text of the license may be found at
-@REM http://opensource.org/licenses/bsd-license.php
-@REM
-@REM THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-@REM WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+@REM SPDX-License-Identifier: BSD-2-Clause-Patent
@REM
@echo off
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/postbuild.bat b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/postbuild.bat
index a39319fd9f..1f934fb333 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/postbuild.bat
+++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/postbuild.bat
@@ -1,13 +1,7 @@
@REM @file
@REM
@REM Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-@REM This program and the accompanying materials
-@REM are licensed and made available under the terms and conditions of the BSD License
-@REM which accompanies this distribution. The full text of the license may be found at
-@REM http://opensource.org/licenses/bsd-license.php
-@REM
-@REM THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-@REM WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+@REM SPDX-License-Identifier: BSD-2-Clause-Patent
@REM
@REM #
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/prebuild.bat b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/prebuild.bat
index 2861eec08f..9ec800ae6f 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/prebuild.bat
+++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/prebuild.bat
@@ -2,13 +2,7 @@
@REM Pre build script.
@REM
@REM Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-@REM This program and the accompanying materials
-@REM are licensed and made available under the terms and conditions of the BSD License
-@REM which accompanies this distribution. The full text of the license may be found at
-@REM http://opensource.org/licenses/bsd-license.php
-@REM
-@REM THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-@REM WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+@REM SPDX-License-Identifier: BSD-2-Clause-Patent
@REM
cd ..
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/prep.bat b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/prep.bat
index 68e664e435..2ab785f27c 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/prep.bat
+++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/prep.bat
@@ -1,13 +1,7 @@
@REM @file
@REM
@REM Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-@REM This program and the accompanying materials
-@REM are licensed and made available under the terms and conditions of the BSD License
-@REM which accompanies this distribution. The full text of the license may be found at
-@REM http://opensource.org/licenses/bsd-license.php
-@REM
-@REM THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-@REM WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+@REM SPDX-License-Identifier: BSD-2-Clause-Patent
@REM
@echo OFF
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/Library/BaseGpioExpanderLib/BaseGpioExpanderLib.c b/Platform/Intel/KabylakeOpenBoardPkg/Library/BaseGpioExpanderLib/BaseGpioExpanderLib.c
index 5236484f64..ead1e6df19 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/Library/BaseGpioExpanderLib/BaseGpioExpanderLib.c
+++ b/Platform/Intel/KabylakeOpenBoardPkg/Library/BaseGpioExpanderLib/BaseGpioExpanderLib.c
@@ -2,13 +2,7 @@
Support for IO expander TCA6424.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/Library/BaseGpioExpanderLib/BaseGpioExpanderLib.inf b/Platform/Intel/KabylakeOpenBoardPkg/Library/BaseGpioExpanderLib/BaseGpioExpanderLib.inf
index a20e4ba043..23780d7f75 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/Library/BaseGpioExpanderLib/BaseGpioExpanderLib.inf
+++ b/Platform/Intel/KabylakeOpenBoardPkg/Library/BaseGpioExpanderLib/BaseGpioExpanderLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/Library/PeiI2cAccessLib/PeiI2cAccessLib.c b/Platform/Intel/KabylakeOpenBoardPkg/Library/PeiI2cAccessLib/PeiI2cAccessLib.c
index acc176e60b..7c60c80c1b 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/Library/PeiI2cAccessLib/PeiI2cAccessLib.c
+++ b/Platform/Intel/KabylakeOpenBoardPkg/Library/PeiI2cAccessLib/PeiI2cAccessLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/Library/PeiI2cAccessLib/PeiI2cAccessLib.inf b/Platform/Intel/KabylakeOpenBoardPkg/Library/PeiI2cAccessLib/PeiI2cAccessLib.inf
index 4d252037f5..86d49b1a73 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/Library/PeiI2cAccessLib/PeiI2cAccessLib.inf
+++ b/Platform/Intel/KabylakeOpenBoardPkg/Library/PeiI2cAccessLib/PeiI2cAccessLib.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/OpenBoardPkg.dec b/Platform/Intel/KabylakeOpenBoardPkg/OpenBoardPkg.dec
index d0fdb109f1..e32659865e 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/OpenBoardPkg.dec
+++ b/Platform/Intel/KabylakeOpenBoardPkg/OpenBoardPkg.dec
@@ -7,13 +7,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/Policy/Library/DxeSiliconPolicyUpdateLib/DxeGopPolicyInit.c b/Platform/Intel/KabylakeOpenBoardPkg/Policy/Library/DxeSiliconPolicyUpdateLib/DxeGopPolicyInit.c
index e455208f80..7744af6b3c 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/Policy/Library/DxeSiliconPolicyUpdateLib/DxeGopPolicyInit.c
+++ b/Platform/Intel/KabylakeOpenBoardPkg/Policy/Library/DxeSiliconPolicyUpdateLib/DxeGopPolicyInit.c
@@ -2,13 +2,7 @@
This file initialises and Installs GopPolicy Protocol.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/Policy/Library/DxeSiliconPolicyUpdateLib/DxeGopPolicyInit.h b/Platform/Intel/KabylakeOpenBoardPkg/Policy/Library/DxeSiliconPolicyUpdateLib/DxeGopPolicyInit.h
index 3de117337f..17f9b545fc 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/Policy/Library/DxeSiliconPolicyUpdateLib/DxeGopPolicyInit.h
+++ b/Platform/Intel/KabylakeOpenBoardPkg/Policy/Library/DxeSiliconPolicyUpdateLib/DxeGopPolicyInit.h
@@ -2,13 +2,7 @@
Header file for the GopPolicyInitDxe Driver.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _GOP_POLICY_INIT_DXE_H_
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSaPolicyInit.h b/Platform/Intel/KabylakeOpenBoardPkg/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSaPolicyInit.h
index 1a1536c299..b49e13da54 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSaPolicyInit.h
+++ b/Platform/Intel/KabylakeOpenBoardPkg/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSaPolicyInit.h
@@ -2,13 +2,7 @@
Header file for the SaPolicyInitDxe Driver.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _SA_POLICY_INIT_DXE_H_
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSaPolicyUpdate.c b/Platform/Intel/KabylakeOpenBoardPkg/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSaPolicyUpdate.c
index be3fe02aea..733cc9d4fc 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSaPolicyUpdate.c
+++ b/Platform/Intel/KabylakeOpenBoardPkg/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSaPolicyUpdate.c
@@ -2,13 +2,7 @@
This file is the library for SA DXE Policy initialization.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSiliconPolicyUpdateLib.c b/Platform/Intel/KabylakeOpenBoardPkg/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSiliconPolicyUpdateLib.c
index 6a258e69d6..d4dbb414a2 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSiliconPolicyUpdateLib.c
+++ b/Platform/Intel/KabylakeOpenBoardPkg/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSiliconPolicyUpdateLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSiliconPolicyUpdateLib.inf b/Platform/Intel/KabylakeOpenBoardPkg/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSiliconPolicyUpdateLib.inf
index 7a50563c84..ad12b027a5 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSiliconPolicyUpdateLib.inf
+++ b/Platform/Intel/KabylakeOpenBoardPkg/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSiliconPolicyUpdateLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
--
2.21.0.windows.1
^ permalink raw reply related [flat|nested] 63+ messages in thread* Re: [[edk2-platforms][PATCH V2] 10/30] Platform/Intel/KabylakeOpenBoardPkg: Replace BSD License with BSD+Patent License
2019-05-15 23:09 ` [[edk2-platforms][PATCH V2] 10/30] Platform/Intel/KabylakeOpenBoardPkg: " Michael D Kinney
@ 2019-05-16 0:23 ` Chiu, Chasel
2019-05-17 6:51 ` Kubacki, Michael A
1 sibling, 0 replies; 63+ messages in thread
From: Chiu, Chasel @ 2019-05-16 0:23 UTC (permalink / raw)
To: Kinney, Michael D, devel@edk2.groups.io; +Cc: Kubacki, Michael A
Reviewed-by: Chasel Chiu <chasel.chiu@intel.com>
> -----Original Message-----
> From: Kinney, Michael D
> Sent: Thursday, May 16, 2019 7:10 AM
> To: devel@edk2.groups.io
> Cc: Chiu, Chasel <chasel.chiu@intel.com>; Kubacki, Michael A
> <michael.a.kubacki@intel.com>
> Subject: [[edk2-platforms][PATCH V2] 10/30]
> Platform/Intel/KabylakeOpenBoardPkg: Replace BSD License with BSD+Patent
> License
>
> https://bugzilla.tianocore.org/show_bug.cgi?id=1373
>
> Replace BSD 2-Clause License with BSD+Patent License. This change is
> based on the following emails:
>
> https://lists.01.org/pipermail/edk2-devel/2019-February/036260.html
> https://lists.01.org/pipermail/edk2-devel/2018-October/030385.html
>
> RFCs with detailed process for the license change:
>
> V3: https://lists.01.org/pipermail/edk2-devel/2019-March/038116.html
> V2: https://lists.01.org/pipermail/edk2-devel/2019-March/037669.html
> V1: https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html
>
> Cc: Chasel Chiu <chasel.chiu@intel.com>
> Cc: Michael Kubacki <michael.a.kubacki@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
> ---
> .../KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/AcpiGnvsInit.c | 8 +-------
> .../KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe.c | 8 +-------
> .../Acpi/BoardAcpiDxe/BoardAcpiDxe.inf | 8 +-------
> .../KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/ALS.ASL | 8 +-------
> .../Acpi/BoardAcpiDxe/Dsdt/AMLUPD.asl | 8 +-------
> .../KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/CPU.asl | 8 +-------
> .../KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/DSDT.ASL | 8 +-------
> .../KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Gpe.asl | 8 +-------
> .../KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Itss.asl | 8 +-------
> .../Acpi/BoardAcpiDxe/Dsdt/LPC_DEV.ASL | 8 +-------
> .../KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/LpcB.asl | 8 +-------
> .../Acpi/BoardAcpiDxe/Dsdt/PCI_DRC.ASL | 8 +-------
> .../Acpi/BoardAcpiDxe/Dsdt/PciTree.asl | 8 +-------
> .../Acpi/BoardAcpiDxe/Dsdt/Platform.asl | 8 +-------
> .../Acpi/BoardAcpiDxe/Dsdt/PlatformGnvs.asl | 8 +-------
> .../KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Video.asl | 8 +-------
> .../KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/UpdateDsdt.c | 8 +-------
> .../KabylakeOpenBoardPkg/Features/PciHotPlug/PciHotPlug.c | 8 +-------
> .../KabylakeOpenBoardPkg/Features/PciHotPlug/PciHotPlug.h | 8 +-------
> .../Features/PciHotPlug/PciHotPlug.inf | 8 +-------
> .../Features/Tbt/AcpiTables/Rtd3SptPcieTbt.asl | 8 +-------
> .../KabylakeOpenBoardPkg/Features/Tbt/AcpiTables/Tbt.asl | 8 +-------
> .../Features/Tbt/Include/Acpi/TbtNvs.asl | 8 +-------
> .../Features/Tbt/Include/Acpi/TbtNvsAreaDef.h | 8 +-------
> .../Features/Tbt/Include/Library/DxeTbtPolicyLib.h | 8 +-------
> .../Features/Tbt/Include/Library/PeiTbtPolicyLib.h | 8 +-------
> .../Features/Tbt/Include/Library/TbtCommonLib.h | 8 +-------
> .../Features/Tbt/Include/Ppi/PeiTbtPolicy.h | 8 +-------
> .../Features/Tbt/Include/Private/Library/PeiDTbtInitLib.h | 8 +-------
> .../Tbt/Include/Private/Library/PeiTbtCommonInitLib.h | 8 +-------
> .../Features/Tbt/Include/Protocol/DxeTbtPolicy.h | 8 +-------
> .../Features/Tbt/Include/Protocol/TbtNvsArea.h | 8 +-------
> .../Features/Tbt/Include/TbtBoardInfo.h | 8 +-------
> .../Features/Tbt/Include/TbtPolicyCommonDefinition.h | 8 +-------
> .../Tbt/Library/DxeTbtPolicyLib/DxeTbtPolicyLib.c | 8 +-------
> .../Tbt/Library/DxeTbtPolicyLib/DxeTbtPolicyLib.inf | 8 +-------
> .../Tbt/Library/DxeTbtPolicyLib/DxeTbtPolicyLibrary.h | 8 +-------
> .../Tbt/Library/PeiDxeSmmTbtCommonLib/TbtCommonLib.c | 8 +-------
> .../Tbt/Library/PeiDxeSmmTbtCommonLib/TbtCommonLib.inf | 8 +-------
> .../Tbt/Library/PeiTbtPolicyLib/PeiTbtPolicyLib.c | 8 +-------
> .../Tbt/Library/PeiTbtPolicyLib/PeiTbtPolicyLib.inf | 8 +-------
> .../Tbt/Library/PeiTbtPolicyLib/PeiTbtPolicyLibrary.h | 8 +-------
> .../Tbt/Library/Private/PeiDTbtInitLib/PeiDTbtInitLib.c | 8 +-------
> .../Tbt/Library/Private/PeiDTbtInitLib/PeiDTbtInitLib.inf | 8 +-------
> .../Features/Tbt/TbtInit/Dxe/TbtDxe.c | 8 +-------
> .../Features/Tbt/TbtInit/Dxe/TbtDxe.inf | 8 +-------
> .../Features/Tbt/TbtInit/Pei/PeiTbtInit.c | 8 +-------
> .../Features/Tbt/TbtInit/Pei/PeiTbtInit.inf | 8 +-------
> .../Features/Tbt/TbtInit/Smm/TbtSmiHandler.c | 8 +-------
> .../Features/Tbt/TbtInit/Smm/TbtSmiHandler.h | 8 +-------
> .../Features/Tbt/TbtInit/Smm/TbtSmm.c | 8 +-------
> .../Features/Tbt/TbtInit/Smm/TbtSmm.inf | 8 +-------
> .../PeiSiliconPolicyUpdateLibFsp/PcieDeviceTable.c | 8 +-------
> .../PeiSiliconPolicyUpdateLibFsp/PeiFspMiscUpdUpdateLib.c | 8 +-------
> .../PeiSiliconPolicyUpdateLibFsp/PeiFspPolicyUpdateLib.c | 8 +-------
> .../PeiSiliconPolicyUpdateLibFsp/PeiPchPolicyUpdate.c | 8 +-------
> .../PeiSiliconPolicyUpdateLibFsp/PeiPchPolicyUpdate.h | 8 +-------
> .../PeiPchPolicyUpdatePreMem.c | 8 +-------
> .../PeiSiliconPolicyUpdateLibFsp/PeiSaPolicyUpdate.c | 8 +-------
> .../PeiSiliconPolicyUpdateLibFsp/PeiSaPolicyUpdate.h | 8 +-------
> .../PeiSaPolicyUpdatePreMem.c | 8 +-------
> .../PeiSiliconPolicyUpdateLibFsp.inf | 8 +-------
> .../Intel/KabylakeOpenBoardPkg/Include/Acpi/GlobalNvs.asl | 8 +-------
> .../KabylakeOpenBoardPkg/Include/Acpi/GlobalNvsAreaDef.h | 8 +-------
> .../KabylakeOpenBoardPkg/Include/Fdf/FlashMapInclude.fdf | 8 +-------
> Platform/Intel/KabylakeOpenBoardPkg/Include/IoExpander.h | 8 +-------
> .../Include/Library/GpioExpanderLib.h | 8 +-------
> .../KabylakeOpenBoardPkg/Include/Library/I2cAccessLib.h | 8 +-------
> .../KabylakeOpenBoardPkg/Include/PchHsioPtssTables.h | 8 +-------
> .../KabylakeOpenBoardPkg/Include/Protocol/GlobalNvsArea.h | 8 +-------
> Platform/Intel/KabylakeOpenBoardPkg/Include/SioRegs.h | 8 +-------
> .../KabylakeRvp3/GitEdk2MinKabylake.bat | 8 +-------
> .../KabylakeRvp3/Include/KabylakeRvp3Id.h | 8 +-------
> .../Library/BasePlatformHookLib/BasePlatformHookLib.c | 8 +-------
> .../Library/BasePlatformHookLib/BasePlatformHookLib.inf | 8 +-------
> .../Library/BoardAcpiLib/DxeBoardAcpiTableLib.c | 8 +-------
> .../Library/BoardAcpiLib/DxeBoardAcpiTableLib.inf | 8 +-------
> .../Library/BoardAcpiLib/DxeKabylakeRvp3AcpiTableLib.c | 8 +-------
> .../Library/BoardAcpiLib/DxeMultiBoardAcpiSupportLib.c | 8 +-------
> .../Library/BoardAcpiLib/DxeMultiBoardAcpiSupportLib.inf | 8 +-------
> .../Library/BoardAcpiLib/SmmBoardAcpiEnableLib.c | 8 +-------
> .../Library/BoardAcpiLib/SmmBoardAcpiEnableLib.inf | 8 +-------
> .../Library/BoardAcpiLib/SmmKabylakeRvp3AcpiEnableLib.c | 8 +-------
> .../Library/BoardAcpiLib/SmmMultiBoardAcpiSupportLib.c | 8 +-------
> .../Library/BoardAcpiLib/SmmMultiBoardAcpiSupportLib.inf | 8 +-------
> .../Library/BoardAcpiLib/SmmSiliconAcpiEnableLib.c | 8 +-------
> .../Library/BoardInitLib/KabylakeRvp3GpioTable.c | 8 +-------
> .../Library/BoardInitLib/KabylakeRvp3HdaVerbTables.c | 8 +-------
> .../Library/BoardInitLib/KabylakeRvp3HsioPtssTables.c | 8 +-------
> .../Library/BoardInitLib/KabylakeRvp3SpdTable.c | 8 +-------
> .../Library/BoardInitLib/PeiBoardInitPostMemLib.c | 8 +-------
> .../Library/BoardInitLib/PeiBoardInitPostMemLib.inf | 8 +-------
> .../Library/BoardInitLib/PeiBoardInitPreMemLib.c | 8 +-------
> .../Library/BoardInitLib/PeiBoardInitPreMemLib.inf | 8 +-------
> .../Library/BoardInitLib/PeiKabylakeRvp3Detect.c | 8 +-------
> .../Library/BoardInitLib/PeiKabylakeRvp3InitLib.h | 8 +-------
> .../Library/BoardInitLib/PeiKabylakeRvp3InitPostMemLib.c | 8 +-------
> .../Library/BoardInitLib/PeiKabylakeRvp3InitPreMemLib.c | 8 +-------
> .../Library/BoardInitLib/PeiMultiBoardInitPostMemLib.c | 8 +-------
> .../Library/BoardInitLib/PeiMultiBoardInitPostMemLib.inf | 8 +-------
> .../Library/BoardInitLib/PeiMultiBoardInitPreMemLib.c | 8 +-------
> .../Library/BoardInitLib/PeiMultiBoardInitPreMemLib.inf | 8 +-------
> .../KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.dsc | 8 +-------
> .../KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.fdf | 8 +-------
> .../KabylakeRvp3/OpenBoardPkgBuildOption.dsc | 8 +-------
> .../KabylakeRvp3/OpenBoardPkgConfig.dsc | 8 +-------
> .../KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgPcd.dsc | 8 +-------
> Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/bld.bat | 8 +-------
> Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/cln.bat | 8 +-------
> .../Intel/KabylakeOpenBoardPkg/KabylakeRvp3/postbuild.bat | 8 +-------
> .../Intel/KabylakeOpenBoardPkg/KabylakeRvp3/prebuild.bat | 8 +-------
> Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/prep.bat | 8 +-------
> .../Library/BaseGpioExpanderLib/BaseGpioExpanderLib.c | 8 +-------
> .../Library/BaseGpioExpanderLib/BaseGpioExpanderLib.inf | 8 +-------
> .../Library/PeiI2cAccessLib/PeiI2cAccessLib.c | 8 +-------
> .../Library/PeiI2cAccessLib/PeiI2cAccessLib.inf | 8 +-------
> Platform/Intel/KabylakeOpenBoardPkg/OpenBoardPkg.dec | 8 +-------
> .../Library/DxeSiliconPolicyUpdateLib/DxeGopPolicyInit.c | 8 +-------
> .../Library/DxeSiliconPolicyUpdateLib/DxeGopPolicyInit.h | 8 +-------
> .../Library/DxeSiliconPolicyUpdateLib/DxeSaPolicyInit.h | 8 +-------
> .../Library/DxeSiliconPolicyUpdateLib/DxeSaPolicyUpdate.c | 8 +-------
> .../DxeSiliconPolicyUpdateLib/DxeSiliconPolicyUpdateLib.c | 8 +-------
> .../DxeSiliconPolicyUpdateLib.inf | 8 +-------
> 123 files changed, 123 insertions(+), 861 deletions(-)
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/AcpiGnvsInit.c
> b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/AcpiGnvsInit.c
> index 3586cc6116..0d9d217e38 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/AcpiGnvsInit.c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/AcpiGnvsInit.c
> @@ -2,13 +2,7 @@
> Acpi Gnvs Init Library.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe.c
> b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe.c
> index bb3154757d..0361ffc2fb 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe.c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe.c
> @@ -2,13 +2,7 @@
> ACPI Platform Driver
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe.in
> f
> b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe.i
> nf
> index dce49b14e2..0eaf2fab49 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe.in
> f
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe.i
> nf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/ALS.ASL
> b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/ALS.ASL
> index 9075769a49..ab28f70471 100644
> --- a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/ALS.ASL
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/ALS.ASL
> @@ -2,13 +2,7 @@
> ACPI DSDT table
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/AMLUPD.a
> sl
> b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/AMLUPD.a
> sl
> index 085b15cec2..86cccdc83e 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/AMLUPD.a
> sl
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/AMLUPD.a
> sl
> @@ -2,13 +2,7 @@
> ACPI DSDT table
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/CPU.asl
> b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/CPU.asl
> index b62a305b7a..1f1fdb2e00 100644
> --- a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/CPU.asl
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/CPU.asl
> @@ -2,13 +2,7 @@
> ACPI DSDT table
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/DSDT.ASL
> b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/DSDT.ASL
> index 44c9aead14..de3b137c34 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/DSDT.ASL
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/DSDT.ASL
> @@ -2,13 +2,7 @@
> ACPI DSDT table
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Gpe.asl
> b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Gpe.asl
> index 8433c1fcab..449eab178e 100644
> --- a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Gpe.asl
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Gpe.asl
> @@ -2,13 +2,7 @@
> ACPI DSDT table
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Itss.asl
> b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Itss.asl
> index 8210926859..ccca884908 100644
> --- a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Itss.asl
> +++ b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Itss.asl
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/LPC_DEV.A
> SL
> b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/LPC_DEV.A
> SL
> index 64b4722011..0acd1e92bf 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/LPC_DEV.A
> SL
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/LPC_DEV.A
> SL
> @@ -2,13 +2,7 @@
> ACPI DSDT table
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/LpcB.asl
> b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/LpcB.asl
> index cf0eb2092a..9f9d39c92c 100644
> --- a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/LpcB.asl
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/LpcB.asl
> @@ -2,13 +2,7 @@
> ACPI DSDT table
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PCI_DRC.A
> SL
> b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PCI_DRC.A
> SL
> index 8b1593f1cf..2d8cf4c421 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PCI_DRC.A
> SL
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PCI_DRC.A
> SL
> @@ -2,13 +2,7 @@
> ACPI DSDT table
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PciTree.asl
> b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PciTree.asl
> index a32bb30f14..88073f3954 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PciTree.asl
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PciTree.asl
> @@ -2,13 +2,7 @@
> ACPI DSDT table
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Platform.a
> sl
> b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Platform.a
> sl
> index c784d516db..9dc6cf0e8c 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Platform.a
> sl
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Platform.a
> sl
> @@ -2,13 +2,7 @@
> ACPI DSDT table
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PlatformG
> nvs.asl
> b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PlatformG
> nvs.asl
> index 60223054ab..b4db4af4be 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PlatformG
> nvs.asl
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PlatformG
> nvs.asl
> @@ -2,13 +2,7 @@
> ACPI DSDT table
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Video.asl
> b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Video.asl
> index a77a1f5805..7b6a1dfa30 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Video.asl
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Video.asl
> @@ -2,13 +2,7 @@
> ACPI DSDT table
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/UpdateDsdt.c
> b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/UpdateDsdt.c
> index c4651f117a..f47397ae98 100644
> --- a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/UpdateDsdt.c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/UpdateDsdt.c
> @@ -2,13 +2,7 @@
> Acpi Gnvs Init Library.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/PciHotPlug/PciHotPlug.c
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/PciHotPlug/PciHotPlug.c
> index 38ca4f954f..e68c356f6b 100644
> --- a/Platform/Intel/KabylakeOpenBoardPkg/Features/PciHotPlug/PciHotPlug.c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/PciHotPlug/PciHotPlug.c
> @@ -3,13 +3,7 @@
> Devics resource configuration.
>
> Copyright (c) 2018, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/PciHotPlug/PciHotPlug.h
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/PciHotPlug/PciHotPlug.h
> index 3260af2b15..4c53a4ad6a 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/PciHotPlug/PciHotPlug.h
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/PciHotPlug/PciHotPlug.h
> @@ -1,13 +1,7 @@
> /**@file
>
> Copyright (c) 2018, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/PciHotPlug/PciHotPlug.inf
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/PciHotPlug/PciHotPlug.inf
> index b444782ffc..4139721e5e 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/PciHotPlug/PciHotPlug.inf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/PciHotPlug/PciHotPlug.inf
> @@ -4,13 +4,7 @@
> #
> # Copyright (c) 2018, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/AcpiTables/Rtd3SptPci
> eTbt.asl
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/AcpiTables/Rtd3SptPci
> eTbt.asl
> index b54b5a41c3..2e7f4b6470 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/AcpiTables/Rtd3SptPci
> eTbt.asl
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/AcpiTables/Rtd3SptPci
> eTbt.asl
> @@ -2,13 +2,7 @@
> ACPI RTD3 SSDT table for SPT PCIe
>
> Copyright (c) 2018, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/AcpiTables/Tbt.asl
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/AcpiTables/Tbt.asl
> index d20e35f12e..ca28589621 100644
> --- a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/AcpiTables/Tbt.asl
> +++ b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/AcpiTables/Tbt.asl
> @@ -2,13 +2,7 @@
> Thunderbolt ACPI methods
>
> Copyright (c) 2018 - 2019, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Acpi/TbtNvs.a
> sl
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Acpi/TbtNvs.a
> sl
> index 65961e0940..62db427059 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Acpi/TbtNvs.a
> sl
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Acpi/TbtNvs.a
> sl
> @@ -1,13 +1,7 @@
> /**@file
>
> Copyright (c) 2018, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Acpi/TbtNvsA
> reaDef.h
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Acpi/TbtNvsA
> reaDef.h
> index 583fda5914..8e5f342b34 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Acpi/TbtNvsA
> reaDef.h
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Acpi/TbtNvsA
> reaDef.h
> @@ -1,13 +1,7 @@
> /**@file
>
> Copyright (c) 2018, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Library/DxeTb
> tPolicyLib.h
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Library/DxeTb
> tPolicyLib.h
> index 9fe16b8a68..8d1b3b1e0e 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Library/DxeTb
> tPolicyLib.h
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Library/DxeTb
> tPolicyLib.h
> @@ -2,13 +2,7 @@
> Prototype of the DxeTbtPolicyLib library.
>
> Copyright (c) 2018, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _DXE_TBT_POLICY_LIB_H_
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Library/PeiTbt
> PolicyLib.h
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Library/PeiTbt
> PolicyLib.h
> index f1ca61ca4e..843b677bac 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Library/PeiTbt
> PolicyLib.h
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Library/PeiTbt
> PolicyLib.h
> @@ -2,13 +2,7 @@
> Prototype of the PeiTbtPolicyLib library.
>
> Copyright (c) 2018, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PEI_TBT_POLICY_LIB_H_
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Library/TbtCo
> mmonLib.h
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Library/TbtCo
> mmonLib.h
> index f9338d3bd5..0180179bba 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Library/TbtCo
> mmonLib.h
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Library/TbtCo
> mmonLib.h
> @@ -1,13 +1,7 @@
> /**@file
>
> Copyright (c) 2018, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _TBT_COMMON_LIB_H_
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Ppi/PeiTbtPoli
> cy.h
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Ppi/PeiTbtPoli
> cy.h
> index 9b7ff25c55..da65103252 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Ppi/PeiTbtPoli
> cy.h
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Ppi/PeiTbtPoli
> cy.h
> @@ -2,13 +2,7 @@
> TBT PEI Policy
>
> Copyright (c) 2018, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Private/Librar
> y/PeiDTbtInitLib.h
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Private/Librar
> y/PeiDTbtInitLib.h
> index 963a678845..52f3e8ca1d 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Private/Librar
> y/PeiDTbtInitLib.h
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Private/Librar
> y/PeiDTbtInitLib.h
> @@ -2,13 +2,7 @@
> PEI DTBT Init Dispatch library Header file
>
> Copyright (c) 2018, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef __PEI_DTBT_INIT_LIB_H__
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Private/Librar
> y/PeiTbtCommonInitLib.h
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Private/Librar
> y/PeiTbtCommonInitLib.h
> index 3af3f64377..1f3a911e95 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Private/Librar
> y/PeiTbtCommonInitLib.h
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Private/Librar
> y/PeiTbtCommonInitLib.h
> @@ -2,13 +2,7 @@
> PEI TBT Common Init Dispatch library Header file
>
> Copyright (c) 2018, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef __PEI_TBT_COMMON_INIT_LIB_H__
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Protocol/Dxe
> TbtPolicy.h
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Protocol/Dxe
> TbtPolicy.h
> index 76f5071d9a..dc5bc282cb 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Protocol/Dxe
> TbtPolicy.h
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Protocol/Dxe
> TbtPolicy.h
> @@ -2,13 +2,7 @@
> TBT DXE Policy
>
> Copyright (c) 2018, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Protocol/Tbt
> NvsArea.h
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Protocol/Tbt
> NvsArea.h
> index c662f162ec..366165fd58 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Protocol/Tbt
> NvsArea.h
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Protocol/Tbt
> NvsArea.h
> @@ -2,13 +2,7 @@
> This file defines the TBT NVS Area Protocol.
>
> Copyright (c) 2018, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/TbtBoardInfo.
> h
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/TbtBoardInfo.
> h
> index 9844935212..41873a4e29 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/TbtBoardInfo.
> h
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/TbtBoardInfo.
> h
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2018, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _TBT_INFO_GUID_H_
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/TbtPolicyCom
> monDefinition.h
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/TbtPolicyCom
> monDefinition.h
> index 2033126a25..e60cfe9e29 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/TbtPolicyCom
> monDefinition.h
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/TbtPolicyCom
> monDefinition.h
> @@ -2,13 +2,7 @@
> TBT Policy Common definition.
>
> Copyright (c) 2018, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicyLi
> b/DxeTbtPolicyLib.c
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicyLi
> b/DxeTbtPolicyLib.c
> index 0e58bc8294..65cb592472 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicyLi
> b/DxeTbtPolicyLib.c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicyLi
> b/DxeTbtPolicyLib.c
> @@ -2,13 +2,7 @@
> This file is DxeTbtPolicyLib library.
>
> Copyright (c) 2018, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include <DxeTbtPolicyLibrary.h>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicyLi
> b/DxeTbtPolicyLib.inf
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicyLi
> b/DxeTbtPolicyLib.inf
> index 38f30d1f11..931b1a3203 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicyLi
> b/DxeTbtPolicyLib.inf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicyLi
> b/DxeTbtPolicyLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2018, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicyLi
> b/DxeTbtPolicyLibrary.h
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicyLi
> b/DxeTbtPolicyLibrary.h
> index e0f749ec53..5e79dc2862 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicyLi
> b/DxeTbtPolicyLibrary.h
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicyLi
> b/DxeTbtPolicyLibrary.h
> @@ -2,13 +2,7 @@
> Header file for the DxeTBTPolicy library.
>
> Copyright (c) 2018, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _DXE_TBT_POLICY_LIBRARY_H_
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/PeiDxeSmmTb
> tCommonLib/TbtCommonLib.c
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/PeiDxeSmmTb
> tCommonLib/TbtCommonLib.c
> index 4f2690ca56..f596785aa3 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/PeiDxeSmmTb
> tCommonLib/TbtCommonLib.c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/PeiDxeSmmTb
> tCommonLib/TbtCommonLib.c
> @@ -2,13 +2,7 @@
> PeiTbtInit library implementition with empty functions.
>
> Copyright (c) 2018, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/PeiDxeSmmTb
> tCommonLib/TbtCommonLib.inf
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/PeiDxeSmmTb
> tCommonLib/TbtCommonLib.inf
> index ec8a31421e..ff1f7777ce 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/PeiDxeSmmTb
> tCommonLib/TbtCommonLib.inf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/PeiDxeSmmTb
> tCommonLib/TbtCommonLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2018, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/PeiTbtPolicyLi
> b/PeiTbtPolicyLib.c
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/PeiTbtPolicyLi
> b/PeiTbtPolicyLib.c
> index d0e3229db5..1bd43fbd1b 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/PeiTbtPolicyLi
> b/PeiTbtPolicyLib.c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/PeiTbtPolicyLi
> b/PeiTbtPolicyLib.c
> @@ -2,13 +2,7 @@
> This file is PeiTbtPolicyLib library.
>
> Copyright (c) 2018, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include <Library/PeiServicesLib.h>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/PeiTbtPolicyLi
> b/PeiTbtPolicyLib.inf
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/PeiTbtPolicyLi
> b/PeiTbtPolicyLib.inf
> index fa88e97b8f..91cae945b8 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/PeiTbtPolicyLi
> b/PeiTbtPolicyLib.inf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/PeiTbtPolicyLi
> b/PeiTbtPolicyLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2018, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/PeiTbtPolicyLi
> b/PeiTbtPolicyLibrary.h
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/PeiTbtPolicyLi
> b/PeiTbtPolicyLibrary.h
> index 16ac667b1c..803b99b37c 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/PeiTbtPolicyLi
> b/PeiTbtPolicyLibrary.h
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/PeiTbtPolicyLi
> b/PeiTbtPolicyLibrary.h
> @@ -2,13 +2,7 @@
> Header file for the PeiTBTPolicy library.
>
> Copyright (c) 2018, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PEI_TBT_POLICY_LIBRARY_H_
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/Private/PeiDT
> btInitLib/PeiDTbtInitLib.c
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/Private/PeiDT
> btInitLib/PeiDTbtInitLib.c
> index 4521bff957..21d149c7c2 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/Private/PeiDT
> btInitLib/PeiDTbtInitLib.c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/Private/PeiDT
> btInitLib/PeiDTbtInitLib.c
> @@ -2,13 +2,7 @@
> Thunderbolt(TM) Pei Library
>
> Copyright (c) 2018, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include <Library/PeiServicesLib.h>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/Private/PeiDT
> btInitLib/PeiDTbtInitLib.inf
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/Private/PeiDT
> btInitLib/PeiDTbtInitLib.inf
> index 83a0f57535..1d90bfca7c 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/Private/PeiDT
> btInitLib/PeiDTbtInitLib.inf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/Private/PeiDT
> btInitLib/PeiDTbtInitLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2018, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Dxe/TbtDxe.c
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Dxe/TbtDxe.c
> index cfe38d8018..13a687576c 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Dxe/TbtDxe.c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Dxe/TbtDxe.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2018, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include <Uefi.h>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Dxe/TbtDxe.inf
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Dxe/TbtDxe.inf
> index 86f51191d1..9e117b77eb 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Dxe/TbtDxe.inf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Dxe/TbtDxe.inf
> @@ -2,13 +2,7 @@
> #
> # Copyright (c) 2018, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Pei/PeiTbtInit.
> c
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Pei/PeiTbtInit.
> c
> index a9a022844d..4803efae73 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Pei/PeiTbtInit.
> c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Pei/PeiTbtInit.
> c
> @@ -2,13 +2,7 @@
> Source code file for TBT Init PEI module
>
> Copyright (c) 2018, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Pei/PeiTbtInit.i
> nf
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Pei/PeiTbtInit.i
> nf
> index fdf85cbd67..f702c2753d 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Pei/PeiTbtInit.i
> nf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Pei/PeiTbtInit.i
> nf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2018, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmiH
> andler.c
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmiH
> andler.c
> index 5280f9e1c8..58814060dd 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmiH
> andler.c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmiH
> andler.c
> @@ -1,13 +1,7 @@
> /**@file
>
> Copyright (c) 2018, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmiH
> andler.h
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmiH
> andler.h
> index 22f6aeeb7f..186f5162f6 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmiH
> andler.h
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmiH
> andler.h
> @@ -1,13 +1,7 @@
> /**@file
>
> Copyright (c) 2018, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _TBT_SMI_HANDLER_H_
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmm.
> c
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmm.
> c
> index f2abfb0db9..57f7eceed7 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmm.
> c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmm.
> c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2018, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmm.
> inf
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmm.
> inf
> index 31ecb9767a..9218c8fe67 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmm.
> inf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmm.
> inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2018, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicy
> UpdateLibFsp/PcieDeviceTable.c
> b/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicy
> UpdateLibFsp/PcieDeviceTable.c
> index c03c51e8ca..155dfdaf62 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicy
> UpdateLibFsp/PcieDeviceTable.c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicy
> UpdateLibFsp/PcieDeviceTable.c
> @@ -2,13 +2,7 @@
> This file is SampleCode of the library for Intel PCH PEI Policy initialization.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicy
> UpdateLibFsp/PeiFspMiscUpdUpdateLib.c
> b/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicy
> UpdateLibFsp/PeiFspMiscUpdUpdateLib.c
> index 57a1846ad2..d8aff1960f 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicy
> UpdateLibFsp/PeiFspMiscUpdUpdateLib.c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicy
> UpdateLibFsp/PeiFspMiscUpdUpdateLib.c
> @@ -2,13 +2,7 @@
> Implementation of Fsp Misc UPD Initialization.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicy
> UpdateLibFsp/PeiFspPolicyUpdateLib.c
> b/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicy
> UpdateLibFsp/PeiFspPolicyUpdateLib.c
> index f3c56419b5..55be16265e 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicy
> UpdateLibFsp/PeiFspPolicyUpdateLib.c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicy
> UpdateLibFsp/PeiFspPolicyUpdateLib.c
> @@ -2,13 +2,7 @@
> Provide FSP wrapper platform related function.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicy
> UpdateLibFsp/PeiPchPolicyUpdate.c
> b/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicy
> UpdateLibFsp/PeiPchPolicyUpdate.c
> index c1c8bf131d..b469720ac6 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicy
> UpdateLibFsp/PeiPchPolicyUpdate.c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicy
> UpdateLibFsp/PeiPchPolicyUpdate.c
> @@ -2,13 +2,7 @@
> This file is SampleCode of the library for Intel PCH PEI Policy initialization.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicy
> UpdateLibFsp/PeiPchPolicyUpdate.h
> b/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicy
> UpdateLibFsp/PeiPchPolicyUpdate.h
> index a4e69f4e73..e1df30951f 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicy
> UpdateLibFsp/PeiPchPolicyUpdate.h
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicy
> UpdateLibFsp/PeiPchPolicyUpdate.h
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicy
> UpdateLibFsp/PeiPchPolicyUpdatePreMem.c
> b/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicy
> UpdateLibFsp/PeiPchPolicyUpdatePreMem.c
> index fc27d67e69..f6390ee12c 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicy
> UpdateLibFsp/PeiPchPolicyUpdatePreMem.c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicy
> UpdateLibFsp/PeiPchPolicyUpdatePreMem.c
> @@ -2,13 +2,7 @@
> This file is SampleCode of the library for Intel PCH PEI Policy initialization.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicy
> UpdateLibFsp/PeiSaPolicyUpdate.c
> b/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicy
> UpdateLibFsp/PeiSaPolicyUpdate.c
> index fd54c63a92..d6ec3e38dd 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicy
> UpdateLibFsp/PeiSaPolicyUpdate.c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicy
> UpdateLibFsp/PeiSaPolicyUpdate.c
> @@ -2,13 +2,7 @@
> Do Platform Stage System Agent initialization.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicy
> UpdateLibFsp/PeiSaPolicyUpdate.h
> b/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicy
> UpdateLibFsp/PeiSaPolicyUpdate.h
> index da6f746772..3abf3fc8fd 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicy
> UpdateLibFsp/PeiSaPolicyUpdate.h
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicy
> UpdateLibFsp/PeiSaPolicyUpdate.h
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicy
> UpdateLibFsp/PeiSaPolicyUpdatePreMem.c
> b/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicy
> UpdateLibFsp/PeiSaPolicyUpdatePreMem.c
> index 94d5094855..8f9ad901eb 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicy
> UpdateLibFsp/PeiSaPolicyUpdatePreMem.c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicy
> UpdateLibFsp/PeiSaPolicyUpdatePreMem.c
> @@ -2,13 +2,7 @@
> Do Platform Stage System Agent initialization.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicy
> UpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf
> b/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicy
> UpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf
> index c155308632..fa8d91e076 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicy
> UpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicy
> UpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Platform/Intel/KabylakeOpenBoardPkg/Include/Acpi/GlobalNvs.asl
> b/Platform/Intel/KabylakeOpenBoardPkg/Include/Acpi/GlobalNvs.asl
> index 27c64a1aa0..e0ff9d9bf5 100644
> --- a/Platform/Intel/KabylakeOpenBoardPkg/Include/Acpi/GlobalNvs.asl
> +++ b/Platform/Intel/KabylakeOpenBoardPkg/Include/Acpi/GlobalNvs.asl
> @@ -2,13 +2,7 @@
> ACPI DSDT table
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Include/Acpi/GlobalNvsAreaDef.h
> b/Platform/Intel/KabylakeOpenBoardPkg/Include/Acpi/GlobalNvsAreaDef.h
> index 2394e56c97..93c5a0b55a 100644
> --- a/Platform/Intel/KabylakeOpenBoardPkg/Include/Acpi/GlobalNvsAreaDef.h
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Include/Acpi/GlobalNvsAreaDef.h
> @@ -2,13 +2,7 @@
> ACPI DSDT table
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Include/Fdf/FlashMapInclude.fdf
> b/Platform/Intel/KabylakeOpenBoardPkg/Include/Fdf/FlashMapInclude.fdf
> index 7ed3fe5256..3a28bd4109 100644
> --- a/Platform/Intel/KabylakeOpenBoardPkg/Include/Fdf/FlashMapInclude.fdf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Include/Fdf/FlashMapInclude.fdf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Platform/Intel/KabylakeOpenBoardPkg/Include/IoExpander.h
> b/Platform/Intel/KabylakeOpenBoardPkg/Include/IoExpander.h
> index 0e6bda1108..eb1b2414c4 100644
> --- a/Platform/Intel/KabylakeOpenBoardPkg/Include/IoExpander.h
> +++ b/Platform/Intel/KabylakeOpenBoardPkg/Include/IoExpander.h
> @@ -2,13 +2,7 @@
> GPIO definition table for KabylakeRvp3
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Include/Library/GpioExpanderLib.h
> b/Platform/Intel/KabylakeOpenBoardPkg/Include/Library/GpioExpanderLib.h
> index 427caa7e3b..bbbdc2755d 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Include/Library/GpioExpanderLib.h
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Include/Library/GpioExpanderLib.h
> @@ -2,13 +2,7 @@
> Support for IO expander TCA6424.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Include/Library/I2cAccessLib.h
> b/Platform/Intel/KabylakeOpenBoardPkg/Include/Library/I2cAccessLib.h
> index 84d9d758fb..a69bfc023b 100644
> --- a/Platform/Intel/KabylakeOpenBoardPkg/Include/Library/I2cAccessLib.h
> +++ b/Platform/Intel/KabylakeOpenBoardPkg/Include/Library/I2cAccessLib.h
> @@ -2,13 +2,7 @@
> Support for IO expander TCA6424.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/Intel/KabylakeOpenBoardPkg/Include/PchHsioPtssTables.h
> b/Platform/Intel/KabylakeOpenBoardPkg/Include/PchHsioPtssTables.h
> index 7dc8df5d09..56a0bbab0f 100644
> --- a/Platform/Intel/KabylakeOpenBoardPkg/Include/PchHsioPtssTables.h
> +++ b/Platform/Intel/KabylakeOpenBoardPkg/Include/PchHsioPtssTables.h
> @@ -1,13 +1,7 @@
> /** @file*
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Include/Protocol/GlobalNvsArea.h
> b/Platform/Intel/KabylakeOpenBoardPkg/Include/Protocol/GlobalNvsArea.h
> index ad1c1bb881..b151a8fa8b 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Include/Protocol/GlobalNvsArea.h
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Include/Protocol/GlobalNvsArea.h
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/Intel/KabylakeOpenBoardPkg/Include/SioRegs.h
> b/Platform/Intel/KabylakeOpenBoardPkg/Include/SioRegs.h
> index be14e2ab89..ec61a7defd 100644
> --- a/Platform/Intel/KabylakeOpenBoardPkg/Include/SioRegs.h
> +++ b/Platform/Intel/KabylakeOpenBoardPkg/Include/SioRegs.h
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/GitEdk2MinKabylake.
> bat
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/GitEdk2MinKabylake.
> bat
> index 4e13ed18e5..3bb13df80a 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/GitEdk2MinKabylake.
> bat
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/GitEdk2MinKabylake.
> bat
> @@ -1,13 +1,7 @@
> @REM @file
> @REM
> @REM Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -@REM This program and the accompanying materials
> -@REM are licensed and made available under the terms and conditions of the
> BSD License
> -@REM which accompanies this distribution. The full text of the license may be
> found at
> -@REM http://opensource.org/licenses/bsd-license.php
> -@REM
> -@REM THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -@REM WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +@REM SPDX-License-Identifier: BSD-2-Clause-Patent
> @REM
>
> @echo off
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Include/KabylakeRvp
> 3Id.h
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Include/KabylakeRvp
> 3Id.h
> index ebdc45ae97..3b6397af1f 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Include/KabylakeRvp
> 3Id.h
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Include/KabylakeRvp
> 3Id.h
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BasePlatform
> HookLib/BasePlatformHookLib.c
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BasePlatform
> HookLib/BasePlatformHookLib.c
> index 245f3595f1..c7fc6986f5 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BasePlatform
> HookLib/BasePlatformHookLib.c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BasePlatform
> HookLib/BasePlatformHookLib.c
> @@ -2,13 +2,7 @@
> Platform Hook Library instances
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BasePlatform
> HookLib/BasePlatformHookLib.inf
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BasePlatform
> HookLib/BasePlatformHookLib.inf
> index a2eec09e83..e65c7a25c2 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BasePlatform
> HookLib/BasePlatformHookLib.inf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BasePlatform
> HookLib/BasePlatformHookLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib
> /DxeBoardAcpiTableLib.c
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib
> /DxeBoardAcpiTableLib.c
> index 617ce4592f..60c11290c0 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib
> /DxeBoardAcpiTableLib.c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib
> /DxeBoardAcpiTableLib.c
> @@ -2,13 +2,7 @@
> Platform Hook Library instances
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib
> /DxeBoardAcpiTableLib.inf
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib
> /DxeBoardAcpiTableLib.inf
> index b1ee3a4c15..f3fed024ec 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib
> /DxeBoardAcpiTableLib.inf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib
> /DxeBoardAcpiTableLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib
> /DxeKabylakeRvp3AcpiTableLib.c
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib
> /DxeKabylakeRvp3AcpiTableLib.c
> index de75ed60ba..e65742559a 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib
> /DxeKabylakeRvp3AcpiTableLib.c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib
> /DxeKabylakeRvp3AcpiTableLib.c
> @@ -2,13 +2,7 @@
> Platform Hook Library instances
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib
> /DxeMultiBoardAcpiSupportLib.c
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib
> /DxeMultiBoardAcpiSupportLib.c
> index eef941ecd5..da488e097c 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib
> /DxeMultiBoardAcpiSupportLib.c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib
> /DxeMultiBoardAcpiSupportLib.c
> @@ -2,13 +2,7 @@
> Platform Hook Library instances
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib
> /DxeMultiBoardAcpiSupportLib.inf
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib
> /DxeMultiBoardAcpiSupportLib.inf
> index 5536b6e21f..e0394214ee 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib
> /DxeMultiBoardAcpiSupportLib.inf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib
> /DxeMultiBoardAcpiSupportLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib
> /SmmBoardAcpiEnableLib.c
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib
> /SmmBoardAcpiEnableLib.c
> index 1633ab1203..3de0ae34a7 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib
> /SmmBoardAcpiEnableLib.c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib
> /SmmBoardAcpiEnableLib.c
> @@ -2,13 +2,7 @@
> Platform Hook Library instances
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib
> /SmmBoardAcpiEnableLib.inf
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib
> /SmmBoardAcpiEnableLib.inf
> index 7fa9ffff47..32068b59d7 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib
> /SmmBoardAcpiEnableLib.inf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib
> /SmmBoardAcpiEnableLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib
> /SmmKabylakeRvp3AcpiEnableLib.c
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib
> /SmmKabylakeRvp3AcpiEnableLib.c
> index 43cac20579..71c6e230fa 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib
> /SmmKabylakeRvp3AcpiEnableLib.c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib
> /SmmKabylakeRvp3AcpiEnableLib.c
> @@ -2,13 +2,7 @@
> Platform Hook Library instances
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib
> /SmmMultiBoardAcpiSupportLib.c
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib
> /SmmMultiBoardAcpiSupportLib.c
> index 157fb47565..91590d5278 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib
> /SmmMultiBoardAcpiSupportLib.c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib
> /SmmMultiBoardAcpiSupportLib.c
> @@ -2,13 +2,7 @@
> Platform Hook Library instances
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib
> /SmmMultiBoardAcpiSupportLib.inf
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib
> /SmmMultiBoardAcpiSupportLib.inf
> index 56fe2e3e3f..fad4230c85 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib
> /SmmMultiBoardAcpiSupportLib.inf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib
> /SmmMultiBoardAcpiSupportLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib
> /SmmSiliconAcpiEnableLib.c
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib
> /SmmSiliconAcpiEnableLib.c
> index 268d10ea6e..185aa4ad2d 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib
> /SmmSiliconAcpiEnableLib.c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib
> /SmmSiliconAcpiEnableLib.c
> @@ -2,13 +2,7 @@
> Platform Hook Library instances
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/
> KabylakeRvp3GpioTable.c
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/
> KabylakeRvp3GpioTable.c
> index 05dc520458..2439c6bc1e 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/
> KabylakeRvp3GpioTable.c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/
> KabylakeRvp3GpioTable.c
> @@ -2,13 +2,7 @@
> GPIO definition table for KabylakeRvp3
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/
> KabylakeRvp3HdaVerbTables.c
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/
> KabylakeRvp3HdaVerbTables.c
> index 1a820d1d5b..92afcbab06 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/
> KabylakeRvp3HdaVerbTables.c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/
> KabylakeRvp3HdaVerbTables.c
> @@ -2,13 +2,7 @@
> HDA Verb table for KabylakeRvp3
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/
> KabylakeRvp3HsioPtssTables.c
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/
> KabylakeRvp3HsioPtssTables.c
> index 91f78330cb..8a9048fa4c 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/
> KabylakeRvp3HsioPtssTables.c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/
> KabylakeRvp3HsioPtssTables.c
> @@ -2,13 +2,7 @@
> KabylakeRvp3 HSIO PTSS H File
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/
> KabylakeRvp3SpdTable.c
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/
> KabylakeRvp3SpdTable.c
> index 907a1e422e..3ac9adc466 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/
> KabylakeRvp3SpdTable.c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/
> KabylakeRvp3SpdTable.c
> @@ -2,13 +2,7 @@
> GPIO definition table for KabylakeRvp3
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/
> PeiBoardInitPostMemLib.c
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/
> PeiBoardInitPostMemLib.c
> index 62f2d89467..d88c4eb461 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/
> PeiBoardInitPostMemLib.c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/
> PeiBoardInitPostMemLib.c
> @@ -2,13 +2,7 @@
> Platform Hook Library instances
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/
> PeiBoardInitPostMemLib.inf
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/
> PeiBoardInitPostMemLib.inf
> index 89ba2dea69..108ee8f541 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/
> PeiBoardInitPostMemLib.inf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/
> PeiBoardInitPostMemLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/
> PeiBoardInitPreMemLib.c
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/
> PeiBoardInitPreMemLib.c
> index 7dd5d7a8ad..69e0f50282 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/
> PeiBoardInitPreMemLib.c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/
> PeiBoardInitPreMemLib.c
> @@ -2,13 +2,7 @@
> Platform Hook Library instances
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/
> PeiBoardInitPreMemLib.inf
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/
> PeiBoardInitPreMemLib.inf
> index 114d7ea5e1..51f6787e4f 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/
> PeiBoardInitPreMemLib.inf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/
> PeiBoardInitPreMemLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/
> PeiKabylakeRvp3Detect.c
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/
> PeiKabylakeRvp3Detect.c
> index 23c5c634e3..0f4ad61f0a 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/
> PeiKabylakeRvp3Detect.c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/
> PeiKabylakeRvp3Detect.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/
> PeiKabylakeRvp3InitLib.h
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/
> PeiKabylakeRvp3InitLib.h
> index ff12343802..1878b2c6bd 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/
> PeiKabylakeRvp3InitLib.h
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/
> PeiKabylakeRvp3InitLib.h
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/
> PeiKabylakeRvp3InitPostMemLib.c
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/
> PeiKabylakeRvp3InitPostMemLib.c
> index c4df084843..5d398ab665 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/
> PeiKabylakeRvp3InitPostMemLib.c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/
> PeiKabylakeRvp3InitPostMemLib.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/
> PeiKabylakeRvp3InitPreMemLib.c
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/
> PeiKabylakeRvp3InitPreMemLib.c
> index 9d7c12ddb2..1667e29067 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/
> PeiKabylakeRvp3InitPreMemLib.c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/
> PeiKabylakeRvp3InitPreMemLib.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/
> PeiMultiBoardInitPostMemLib.c
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/
> PeiMultiBoardInitPostMemLib.c
> index 5842393932..3778911610 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/
> PeiMultiBoardInitPostMemLib.c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/
> PeiMultiBoardInitPostMemLib.c
> @@ -2,13 +2,7 @@
> Platform Hook Library instances
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/
> PeiMultiBoardInitPostMemLib.inf
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/
> PeiMultiBoardInitPostMemLib.inf
> index fdeae0c5f4..b118f9030a 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/
> PeiMultiBoardInitPostMemLib.inf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/
> PeiMultiBoardInitPostMemLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/
> PeiMultiBoardInitPreMemLib.c
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/
> PeiMultiBoardInitPreMemLib.c
> index d1fb6591d1..b8b161377e 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/
> PeiMultiBoardInitPreMemLib.c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/
> PeiMultiBoardInitPreMemLib.c
> @@ -2,13 +2,7 @@
> Platform Hook Library instances
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/
> PeiMultiBoardInitPreMemLib.inf
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/
> PeiMultiBoardInitPreMemLib.inf
> index 28ba665d96..25684b00d0 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/
> PeiMultiBoardInitPreMemLib.inf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/
> PeiMultiBoardInitPreMemLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.dsc
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.dsc
> index 8602052666..1bef21dd42 100644
> --- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.dsc
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.dsc
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017 - 2018, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
> [Defines]
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.fdf
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.fdf
> index 8e8abab0dc..0cff53e308 100644
> --- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.fdf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.fdf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017 - 2018, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgBuildO
> ption.dsc
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgBuild
> Option.dsc
> index 318b0573ad..04c57868b7 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgBuildO
> ption.dsc
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgBuild
> Option.dsc
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgConfig
> .dsc
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgConfig
> .dsc
> index f3d082ce41..15468494dd 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgConfig
> .dsc
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgConfig
> .dsc
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017 - 2019, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgPcd.ds
> c
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgPcd.ds
> c
> index c0d566db21..9774acb5eb 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgPcd.ds
> c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgPcd.ds
> c
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017 - 2019, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/bld.bat
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/bld.bat
> index e0ad5eefdc..449660b75d 100644
> --- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/bld.bat
> +++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/bld.bat
> @@ -1,13 +1,7 @@
> @REM @file
> @REM
> @REM Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -@REM This program and the accompanying materials
> -@REM are licensed and made available under the terms and conditions of the
> BSD License
> -@REM which accompanies this distribution. The full text of the license may be
> found at
> -@REM http://opensource.org/licenses/bsd-license.php
> -@REM
> -@REM THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -@REM WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +@REM SPDX-License-Identifier: BSD-2-Clause-Patent
> @REM
>
> :: Useage: bld [/s] [/f <FEATURE_PCD_NAME> <FALSE or TRUE>] [/r]
> diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/cln.bat
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/cln.bat
> index 8c4e0f51e6..76c078ac05 100644
> --- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/cln.bat
> +++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/cln.bat
> @@ -1,13 +1,7 @@
> @REM @file
> @REM
> @REM Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -@REM This program and the accompanying materials
> -@REM are licensed and made available under the terms and conditions of the
> BSD License
> -@REM which accompanies this distribution. The full text of the license may be
> found at
> -@REM http://opensource.org/licenses/bsd-license.php
> -@REM
> -@REM THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -@REM WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +@REM SPDX-License-Identifier: BSD-2-Clause-Patent
> @REM
>
> @echo off
> diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/postbuild.bat
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/postbuild.bat
> index a39319fd9f..1f934fb333 100644
> --- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/postbuild.bat
> +++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/postbuild.bat
> @@ -1,13 +1,7 @@
> @REM @file
> @REM
> @REM Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -@REM This program and the accompanying materials
> -@REM are licensed and made available under the terms and conditions of the
> BSD License
> -@REM which accompanies this distribution. The full text of the license may be
> found at
> -@REM http://opensource.org/licenses/bsd-license.php
> -@REM
> -@REM THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -@REM WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +@REM SPDX-License-Identifier: BSD-2-Clause-Patent
> @REM
>
> @REM #
> diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/prebuild.bat
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/prebuild.bat
> index 2861eec08f..9ec800ae6f 100644
> --- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/prebuild.bat
> +++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/prebuild.bat
> @@ -2,13 +2,7 @@
> @REM Pre build script.
> @REM
> @REM Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -@REM This program and the accompanying materials
> -@REM are licensed and made available under the terms and conditions of the
> BSD License
> -@REM which accompanies this distribution. The full text of the license may be
> found at
> -@REM http://opensource.org/licenses/bsd-license.php
> -@REM
> -@REM THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -@REM WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +@REM SPDX-License-Identifier: BSD-2-Clause-Patent
> @REM
>
> cd ..
> diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/prep.bat
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/prep.bat
> index 68e664e435..2ab785f27c 100644
> --- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/prep.bat
> +++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/prep.bat
> @@ -1,13 +1,7 @@
> @REM @file
> @REM
> @REM Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -@REM This program and the accompanying materials
> -@REM are licensed and made available under the terms and conditions of the
> BSD License
> -@REM which accompanies this distribution. The full text of the license may be
> found at
> -@REM http://opensource.org/licenses/bsd-license.php
> -@REM
> -@REM THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -@REM WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +@REM SPDX-License-Identifier: BSD-2-Clause-Patent
> @REM
>
> @echo OFF
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Library/BaseGpioExpanderLib/Base
> GpioExpanderLib.c
> b/Platform/Intel/KabylakeOpenBoardPkg/Library/BaseGpioExpanderLib/Base
> GpioExpanderLib.c
> index 5236484f64..ead1e6df19 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Library/BaseGpioExpanderLib/Base
> GpioExpanderLib.c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Library/BaseGpioExpanderLib/Base
> GpioExpanderLib.c
> @@ -2,13 +2,7 @@
> Support for IO expander TCA6424.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Library/BaseGpioExpanderLib/Base
> GpioExpanderLib.inf
> b/Platform/Intel/KabylakeOpenBoardPkg/Library/BaseGpioExpanderLib/Base
> GpioExpanderLib.inf
> index a20e4ba043..23780d7f75 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Library/BaseGpioExpanderLib/Base
> GpioExpanderLib.inf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Library/BaseGpioExpanderLib/Base
> GpioExpanderLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Library/PeiI2cAccessLib/PeiI2cAcces
> sLib.c
> b/Platform/Intel/KabylakeOpenBoardPkg/Library/PeiI2cAccessLib/PeiI2cAcces
> sLib.c
> index acc176e60b..7c60c80c1b 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Library/PeiI2cAccessLib/PeiI2cAcces
> sLib.c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Library/PeiI2cAccessLib/PeiI2cAcces
> sLib.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Library/PeiI2cAccessLib/PeiI2cAcces
> sLib.inf
> b/Platform/Intel/KabylakeOpenBoardPkg/Library/PeiI2cAccessLib/PeiI2cAcces
> sLib.inf
> index 4d252037f5..86d49b1a73 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Library/PeiI2cAccessLib/PeiI2cAcces
> sLib.inf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Library/PeiI2cAccessLib/PeiI2cAcces
> sLib.inf
> @@ -2,13 +2,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git a/Platform/Intel/KabylakeOpenBoardPkg/OpenBoardPkg.dec
> b/Platform/Intel/KabylakeOpenBoardPkg/OpenBoardPkg.dec
> index d0fdb109f1..e32659865e 100644
> --- a/Platform/Intel/KabylakeOpenBoardPkg/OpenBoardPkg.dec
> +++ b/Platform/Intel/KabylakeOpenBoardPkg/OpenBoardPkg.dec
> @@ -7,13 +7,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Policy/Library/DxeSiliconPolicyUpdat
> eLib/DxeGopPolicyInit.c
> b/Platform/Intel/KabylakeOpenBoardPkg/Policy/Library/DxeSiliconPolicyUpda
> teLib/DxeGopPolicyInit.c
> index e455208f80..7744af6b3c 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Policy/Library/DxeSiliconPolicyUpdat
> eLib/DxeGopPolicyInit.c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Policy/Library/DxeSiliconPolicyUpda
> teLib/DxeGopPolicyInit.c
> @@ -2,13 +2,7 @@
> This file initialises and Installs GopPolicy Protocol.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Policy/Library/DxeSiliconPolicyUpdat
> eLib/DxeGopPolicyInit.h
> b/Platform/Intel/KabylakeOpenBoardPkg/Policy/Library/DxeSiliconPolicyUpda
> teLib/DxeGopPolicyInit.h
> index 3de117337f..17f9b545fc 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Policy/Library/DxeSiliconPolicyUpdat
> eLib/DxeGopPolicyInit.h
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Policy/Library/DxeSiliconPolicyUpda
> teLib/DxeGopPolicyInit.h
> @@ -2,13 +2,7 @@
> Header file for the GopPolicyInitDxe Driver.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _GOP_POLICY_INIT_DXE_H_
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Policy/Library/DxeSiliconPolicyUpdat
> eLib/DxeSaPolicyInit.h
> b/Platform/Intel/KabylakeOpenBoardPkg/Policy/Library/DxeSiliconPolicyUpda
> teLib/DxeSaPolicyInit.h
> index 1a1536c299..b49e13da54 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Policy/Library/DxeSiliconPolicyUpdat
> eLib/DxeSaPolicyInit.h
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Policy/Library/DxeSiliconPolicyUpda
> teLib/DxeSaPolicyInit.h
> @@ -2,13 +2,7 @@
> Header file for the SaPolicyInitDxe Driver.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _SA_POLICY_INIT_DXE_H_
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Policy/Library/DxeSiliconPolicyUpdat
> eLib/DxeSaPolicyUpdate.c
> b/Platform/Intel/KabylakeOpenBoardPkg/Policy/Library/DxeSiliconPolicyUpda
> teLib/DxeSaPolicyUpdate.c
> index be3fe02aea..733cc9d4fc 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Policy/Library/DxeSiliconPolicyUpdat
> eLib/DxeSaPolicyUpdate.c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Policy/Library/DxeSiliconPolicyUpda
> teLib/DxeSaPolicyUpdate.c
> @@ -2,13 +2,7 @@
> This file is the library for SA DXE Policy initialization.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Policy/Library/DxeSiliconPolicyUpdat
> eLib/DxeSiliconPolicyUpdateLib.c
> b/Platform/Intel/KabylakeOpenBoardPkg/Policy/Library/DxeSiliconPolicyUpda
> teLib/DxeSiliconPolicyUpdateLib.c
> index 6a258e69d6..d4dbb414a2 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Policy/Library/DxeSiliconPolicyUpdat
> eLib/DxeSiliconPolicyUpdateLib.c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Policy/Library/DxeSiliconPolicyUpda
> teLib/DxeSiliconPolicyUpdateLib.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Policy/Library/DxeSiliconPolicyUpdat
> eLib/DxeSiliconPolicyUpdateLib.inf
> b/Platform/Intel/KabylakeOpenBoardPkg/Policy/Library/DxeSiliconPolicyUpda
> teLib/DxeSiliconPolicyUpdateLib.inf
> index 7a50563c84..ad12b027a5 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Policy/Library/DxeSiliconPolicyUpdat
> eLib/DxeSiliconPolicyUpdateLib.inf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Policy/Library/DxeSiliconPolicyUpda
> teLib/DxeSiliconPolicyUpdateLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> --
> 2.21.0.windows.1
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: [[edk2-platforms][PATCH V2] 10/30] Platform/Intel/KabylakeOpenBoardPkg: Replace BSD License with BSD+Patent License
2019-05-15 23:09 ` [[edk2-platforms][PATCH V2] 10/30] Platform/Intel/KabylakeOpenBoardPkg: " Michael D Kinney
2019-05-16 0:23 ` Chiu, Chasel
@ 2019-05-17 6:51 ` Kubacki, Michael A
1 sibling, 0 replies; 63+ messages in thread
From: Kubacki, Michael A @ 2019-05-17 6:51 UTC (permalink / raw)
To: Kinney, Michael D, devel@edk2.groups.io; +Cc: Chiu, Chasel
Reviewed-by: Michael Kubacki <michael.a.kubacki@intel.com>
> -----Original Message-----
> From: Kinney, Michael D
> Sent: Wednesday, May 15, 2019 4:10 PM
> To: devel@edk2.groups.io
> Cc: Chiu, Chasel <chasel.chiu@intel.com>; Kubacki, Michael A
> <michael.a.kubacki@intel.com>
> Subject: [[edk2-platforms][PATCH V2] 10/30]
> Platform/Intel/KabylakeOpenBoardPkg: Replace BSD License with
> BSD+Patent License
>
> https://bugzilla.tianocore.org/show_bug.cgi?id=1373
>
> Replace BSD 2-Clause License with BSD+Patent License. This change is
> based on the following emails:
>
> https://lists.01.org/pipermail/edk2-devel/2019-February/036260.html
> https://lists.01.org/pipermail/edk2-devel/2018-October/030385.html
>
> RFCs with detailed process for the license change:
>
> V3: https://lists.01.org/pipermail/edk2-devel/2019-March/038116.html
> V2: https://lists.01.org/pipermail/edk2-devel/2019-March/037669.html
> V1: https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html
>
> Cc: Chasel Chiu <chasel.chiu@intel.com>
> Cc: Michael Kubacki <michael.a.kubacki@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
> ---
> .../KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/AcpiGnvsInit.c | 8 +-------
> .../KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe.c | 8 +-------
> .../Acpi/BoardAcpiDxe/BoardAcpiDxe.inf | 8 +-------
> .../KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/ALS.ASL | 8 +-------
> .../Acpi/BoardAcpiDxe/Dsdt/AMLUPD.asl | 8 +-------
> .../KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/CPU.asl | 8 +-------
> .../KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/DSDT.ASL | 8 +-------
> .../KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Gpe.asl | 8 +-------
> .../KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Itss.asl | 8 +-------
> .../Acpi/BoardAcpiDxe/Dsdt/LPC_DEV.ASL | 8 +-------
> .../KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/LpcB.asl | 8 +-------
> .../Acpi/BoardAcpiDxe/Dsdt/PCI_DRC.ASL | 8 +-------
> .../Acpi/BoardAcpiDxe/Dsdt/PciTree.asl | 8 +-------
> .../Acpi/BoardAcpiDxe/Dsdt/Platform.asl | 8 +-------
> .../Acpi/BoardAcpiDxe/Dsdt/PlatformGnvs.asl | 8 +-------
> .../KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Video.asl | 8 +-------
> .../KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/UpdateDsdt.c | 8 +-------
> .../KabylakeOpenBoardPkg/Features/PciHotPlug/PciHotPlug.c | 8 +-------
> .../KabylakeOpenBoardPkg/Features/PciHotPlug/PciHotPlug.h | 8 +-------
> .../Features/PciHotPlug/PciHotPlug.inf | 8 +-------
> .../Features/Tbt/AcpiTables/Rtd3SptPcieTbt.asl | 8 +-------
> .../KabylakeOpenBoardPkg/Features/Tbt/AcpiTables/Tbt.asl | 8 +-------
> .../Features/Tbt/Include/Acpi/TbtNvs.asl | 8 +-------
> .../Features/Tbt/Include/Acpi/TbtNvsAreaDef.h | 8 +-------
> .../Features/Tbt/Include/Library/DxeTbtPolicyLib.h | 8 +-------
> .../Features/Tbt/Include/Library/PeiTbtPolicyLib.h | 8 +-------
> .../Features/Tbt/Include/Library/TbtCommonLib.h | 8 +-------
> .../Features/Tbt/Include/Ppi/PeiTbtPolicy.h | 8 +-------
> .../Features/Tbt/Include/Private/Library/PeiDTbtInitLib.h | 8 +-------
> .../Tbt/Include/Private/Library/PeiTbtCommonInitLib.h | 8 +-------
> .../Features/Tbt/Include/Protocol/DxeTbtPolicy.h | 8 +-------
> .../Features/Tbt/Include/Protocol/TbtNvsArea.h | 8 +-------
> .../Features/Tbt/Include/TbtBoardInfo.h | 8 +-------
> .../Features/Tbt/Include/TbtPolicyCommonDefinition.h | 8 +-------
> .../Tbt/Library/DxeTbtPolicyLib/DxeTbtPolicyLib.c | 8 +-------
> .../Tbt/Library/DxeTbtPolicyLib/DxeTbtPolicyLib.inf | 8 +-------
> .../Tbt/Library/DxeTbtPolicyLib/DxeTbtPolicyLibrary.h | 8 +-------
> .../Tbt/Library/PeiDxeSmmTbtCommonLib/TbtCommonLib.c | 8 +-------
> .../Tbt/Library/PeiDxeSmmTbtCommonLib/TbtCommonLib.inf | 8 +-------
> .../Tbt/Library/PeiTbtPolicyLib/PeiTbtPolicyLib.c | 8 +-------
> .../Tbt/Library/PeiTbtPolicyLib/PeiTbtPolicyLib.inf | 8 +-------
> .../Tbt/Library/PeiTbtPolicyLib/PeiTbtPolicyLibrary.h | 8 +-------
> .../Tbt/Library/Private/PeiDTbtInitLib/PeiDTbtInitLib.c | 8 +-------
> .../Tbt/Library/Private/PeiDTbtInitLib/PeiDTbtInitLib.inf | 8 +-------
> .../Features/Tbt/TbtInit/Dxe/TbtDxe.c | 8 +-------
> .../Features/Tbt/TbtInit/Dxe/TbtDxe.inf | 8 +-------
> .../Features/Tbt/TbtInit/Pei/PeiTbtInit.c | 8 +-------
> .../Features/Tbt/TbtInit/Pei/PeiTbtInit.inf | 8 +-------
> .../Features/Tbt/TbtInit/Smm/TbtSmiHandler.c | 8 +-------
> .../Features/Tbt/TbtInit/Smm/TbtSmiHandler.h | 8 +-------
> .../Features/Tbt/TbtInit/Smm/TbtSmm.c | 8 +-------
> .../Features/Tbt/TbtInit/Smm/TbtSmm.inf | 8 +-------
> .../PeiSiliconPolicyUpdateLibFsp/PcieDeviceTable.c | 8 +-------
> .../PeiSiliconPolicyUpdateLibFsp/PeiFspMiscUpdUpdateLib.c | 8 +-------
> .../PeiSiliconPolicyUpdateLibFsp/PeiFspPolicyUpdateLib.c | 8 +-------
> .../PeiSiliconPolicyUpdateLibFsp/PeiPchPolicyUpdate.c | 8 +-------
> .../PeiSiliconPolicyUpdateLibFsp/PeiPchPolicyUpdate.h | 8 +-------
> .../PeiPchPolicyUpdatePreMem.c | 8 +-------
> .../PeiSiliconPolicyUpdateLibFsp/PeiSaPolicyUpdate.c | 8 +-------
> .../PeiSiliconPolicyUpdateLibFsp/PeiSaPolicyUpdate.h | 8 +-------
> .../PeiSaPolicyUpdatePreMem.c | 8 +-------
> .../PeiSiliconPolicyUpdateLibFsp.inf | 8 +-------
> .../Intel/KabylakeOpenBoardPkg/Include/Acpi/GlobalNvs.asl | 8 +-------
> .../KabylakeOpenBoardPkg/Include/Acpi/GlobalNvsAreaDef.h | 8 +-------
> .../KabylakeOpenBoardPkg/Include/Fdf/FlashMapInclude.fdf | 8 +-------
> Platform/Intel/KabylakeOpenBoardPkg/Include/IoExpander.h | 8 +-------
> .../Include/Library/GpioExpanderLib.h | 8 +-------
> .../KabylakeOpenBoardPkg/Include/Library/I2cAccessLib.h | 8 +-------
> .../KabylakeOpenBoardPkg/Include/PchHsioPtssTables.h | 8 +-------
> .../KabylakeOpenBoardPkg/Include/Protocol/GlobalNvsArea.h | 8 +-------
> Platform/Intel/KabylakeOpenBoardPkg/Include/SioRegs.h | 8 +-------
> .../KabylakeRvp3/GitEdk2MinKabylake.bat | 8 +-------
> .../KabylakeRvp3/Include/KabylakeRvp3Id.h | 8 +-------
> .../Library/BasePlatformHookLib/BasePlatformHookLib.c | 8 +-------
> .../Library/BasePlatformHookLib/BasePlatformHookLib.inf | 8 +-------
> .../Library/BoardAcpiLib/DxeBoardAcpiTableLib.c | 8 +-------
> .../Library/BoardAcpiLib/DxeBoardAcpiTableLib.inf | 8 +-------
> .../Library/BoardAcpiLib/DxeKabylakeRvp3AcpiTableLib.c | 8 +-------
> .../Library/BoardAcpiLib/DxeMultiBoardAcpiSupportLib.c | 8 +-------
> .../Library/BoardAcpiLib/DxeMultiBoardAcpiSupportLib.inf | 8 +-------
> .../Library/BoardAcpiLib/SmmBoardAcpiEnableLib.c | 8 +-------
> .../Library/BoardAcpiLib/SmmBoardAcpiEnableLib.inf | 8 +-------
> .../Library/BoardAcpiLib/SmmKabylakeRvp3AcpiEnableLib.c | 8 +-------
> .../Library/BoardAcpiLib/SmmMultiBoardAcpiSupportLib.c | 8 +-------
> .../Library/BoardAcpiLib/SmmMultiBoardAcpiSupportLib.inf | 8 +-------
> .../Library/BoardAcpiLib/SmmSiliconAcpiEnableLib.c | 8 +-------
> .../Library/BoardInitLib/KabylakeRvp3GpioTable.c | 8 +-------
> .../Library/BoardInitLib/KabylakeRvp3HdaVerbTables.c | 8 +-------
> .../Library/BoardInitLib/KabylakeRvp3HsioPtssTables.c | 8 +-------
> .../Library/BoardInitLib/KabylakeRvp3SpdTable.c | 8 +-------
> .../Library/BoardInitLib/PeiBoardInitPostMemLib.c | 8 +-------
> .../Library/BoardInitLib/PeiBoardInitPostMemLib.inf | 8 +-------
> .../Library/BoardInitLib/PeiBoardInitPreMemLib.c | 8 +-------
> .../Library/BoardInitLib/PeiBoardInitPreMemLib.inf | 8 +-------
> .../Library/BoardInitLib/PeiKabylakeRvp3Detect.c | 8 +-------
> .../Library/BoardInitLib/PeiKabylakeRvp3InitLib.h | 8 +-------
> .../Library/BoardInitLib/PeiKabylakeRvp3InitPostMemLib.c | 8 +-------
> .../Library/BoardInitLib/PeiKabylakeRvp3InitPreMemLib.c | 8 +-------
> .../Library/BoardInitLib/PeiMultiBoardInitPostMemLib.c | 8 +-------
> .../Library/BoardInitLib/PeiMultiBoardInitPostMemLib.inf | 8 +-------
> .../Library/BoardInitLib/PeiMultiBoardInitPreMemLib.c | 8 +-------
> .../Library/BoardInitLib/PeiMultiBoardInitPreMemLib.inf | 8 +-------
> .../KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.dsc | 8 +-------
> .../KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.fdf | 8 +-------
> .../KabylakeRvp3/OpenBoardPkgBuildOption.dsc | 8 +-------
> .../KabylakeRvp3/OpenBoardPkgConfig.dsc | 8 +-------
> .../KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgPcd.dsc | 8 +-------
> Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/bld.bat | 8 +-------
> Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/cln.bat | 8 +-------
> .../Intel/KabylakeOpenBoardPkg/KabylakeRvp3/postbuild.bat | 8 +-------
> .../Intel/KabylakeOpenBoardPkg/KabylakeRvp3/prebuild.bat | 8 +-------
> Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/prep.bat | 8 +-------
> .../Library/BaseGpioExpanderLib/BaseGpioExpanderLib.c | 8 +-------
> .../Library/BaseGpioExpanderLib/BaseGpioExpanderLib.inf | 8 +-------
> .../Library/PeiI2cAccessLib/PeiI2cAccessLib.c | 8 +-------
> .../Library/PeiI2cAccessLib/PeiI2cAccessLib.inf | 8 +-------
> Platform/Intel/KabylakeOpenBoardPkg/OpenBoardPkg.dec | 8 +-------
> .../Library/DxeSiliconPolicyUpdateLib/DxeGopPolicyInit.c | 8 +-------
> .../Library/DxeSiliconPolicyUpdateLib/DxeGopPolicyInit.h | 8 +-------
> .../Library/DxeSiliconPolicyUpdateLib/DxeSaPolicyInit.h | 8 +-------
> .../Library/DxeSiliconPolicyUpdateLib/DxeSaPolicyUpdate.c | 8 +-------
> .../DxeSiliconPolicyUpdateLib/DxeSiliconPolicyUpdateLib.c | 8 +-------
> .../DxeSiliconPolicyUpdateLib.inf | 8 +-------
> 123 files changed, 123 insertions(+), 861 deletions(-)
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/AcpiGnvsInit.c
> b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/AcpiGnvsInit.c
> index 3586cc6116..0d9d217e38 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/AcpiGnvsInit.c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/AcpiGnvsInit.c
> @@ -2,13 +2,7 @@
> Acpi Gnvs Init Library.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe
> .c
> b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe
> .c
> index bb3154757d..0361ffc2fb 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe
> .c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe
> .c
> @@ -2,13 +2,7 @@
> ACPI Platform Driver
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe
> .inf
> b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe
> .inf
> index dce49b14e2..0eaf2fab49 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe
> .inf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe
> .inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/ALS.ASL
> b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/ALS.ASL
> index 9075769a49..ab28f70471 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/ALS.ASL
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/ALS.ASL
> @@ -2,13 +2,7 @@
> ACPI DSDT table
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/AMLUPD
> .asl
> b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/AMLUPD
> .asl
> index 085b15cec2..86cccdc83e 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/AMLUPD
> .asl
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/AMLUPD
> .asl
> @@ -2,13 +2,7 @@
> ACPI DSDT table
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/CPU.asl
> b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/CPU.asl
> index b62a305b7a..1f1fdb2e00 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/CPU.asl
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/CPU.asl
> @@ -2,13 +2,7 @@
> ACPI DSDT table
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/DSDT.AS
> L
> b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/DSDT.AS
> L
> index 44c9aead14..de3b137c34 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/DSDT.AS
> L
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/DSDT.AS
> L
> @@ -2,13 +2,7 @@
> ACPI DSDT table
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Gpe.asl
> b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Gpe.asl
> index 8433c1fcab..449eab178e 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Gpe.asl
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Gpe.asl
> @@ -2,13 +2,7 @@
> ACPI DSDT table
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Itss.asl
> b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Itss.asl
> index 8210926859..ccca884908 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Itss.asl
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Itss.asl
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/LPC_DEV
> .ASL
> b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/LPC_DEV
> .ASL
> index 64b4722011..0acd1e92bf 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/LPC_DEV
> .ASL
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/LPC_DEV
> .ASL
> @@ -2,13 +2,7 @@
> ACPI DSDT table
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/LpcB.asl
> b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/LpcB.asl
> index cf0eb2092a..9f9d39c92c 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/LpcB.asl
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/LpcB.asl
> @@ -2,13 +2,7 @@
> ACPI DSDT table
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PCI_DRC
> .ASL
> b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PCI_DRC
> .ASL
> index 8b1593f1cf..2d8cf4c421 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PCI_DRC
> .ASL
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PCI_DRC
> .ASL
> @@ -2,13 +2,7 @@
> ACPI DSDT table
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PciTree.
> asl
> b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PciTree.
> asl
> index a32bb30f14..88073f3954 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PciTree.
> asl
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PciTree.
> asl
> @@ -2,13 +2,7 @@
> ACPI DSDT table
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Platform
> .asl
> b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Platform
> .asl
> index c784d516db..9dc6cf0e8c 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Platform
> .asl
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Platform
> .asl
> @@ -2,13 +2,7 @@
> ACPI DSDT table
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Platform
> Gnvs.asl
> b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Platform
> Gnvs.asl
> index 60223054ab..b4db4af4be 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Platform
> Gnvs.asl
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Platform
> Gnvs.asl
> @@ -2,13 +2,7 @@
> ACPI DSDT table
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Video.asl
> b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Video.asl
> index a77a1f5805..7b6a1dfa30 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Video.asl
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Video.asl
> @@ -2,13 +2,7 @@
> ACPI DSDT table
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/UpdateDsdt.c
> b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/UpdateDsdt.c
> index c4651f117a..f47397ae98 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/UpdateDsdt.c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/UpdateDsdt.c
> @@ -2,13 +2,7 @@
> Acpi Gnvs Init Library.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/PciHotPlug/PciHotPlug.c
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/PciHotPlug/PciHotPlug.c
> index 38ca4f954f..e68c356f6b 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/PciHotPlug/PciHotPlug.c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/PciHotPlug/PciHotPlug.c
> @@ -3,13 +3,7 @@
> Devics resource configuration.
>
> Copyright (c) 2018, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/PciHotPlug/PciHotPlug.h
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/PciHotPlug/PciHotPlug.h
> index 3260af2b15..4c53a4ad6a 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/PciHotPlug/PciHotPlug.h
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/PciHotPlug/PciHotPlug.h
> @@ -1,13 +1,7 @@
> /**@file
>
> Copyright (c) 2018, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/PciHotPlug/PciHotPlug.in
> f
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/PciHotPlug/PciHotPlug.in
> f
> index b444782ffc..4139721e5e 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/PciHotPlug/PciHotPlug.in
> f
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/PciHotPlug/PciHotPlug.in
> f
> @@ -4,13 +4,7 @@
> #
> # Copyright (c) 2018, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/AcpiTables/Rtd3SptP
> cieTbt.asl
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/AcpiTables/Rtd3SptP
> cieTbt.asl
> index b54b5a41c3..2e7f4b6470 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/AcpiTables/Rtd3SptP
> cieTbt.asl
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/AcpiTables/Rtd3SptP
> cieTbt.asl
> @@ -2,13 +2,7 @@
> ACPI RTD3 SSDT table for SPT PCIe
>
> Copyright (c) 2018, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/AcpiTables/Tbt.asl
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/AcpiTables/Tbt.asl
> index d20e35f12e..ca28589621 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/AcpiTables/Tbt.asl
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/AcpiTables/Tbt.asl
> @@ -2,13 +2,7 @@
> Thunderbolt ACPI methods
>
> Copyright (c) 2018 - 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Acpi/TbtNvs.
> asl
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Acpi/TbtNvs.
> asl
> index 65961e0940..62db427059 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Acpi/TbtNvs.
> asl
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Acpi/TbtNvs.
> asl
> @@ -1,13 +1,7 @@
> /**@file
>
> Copyright (c) 2018, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Acpi/TbtNvs
> AreaDef.h
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Acpi/TbtNvs
> AreaDef.h
> index 583fda5914..8e5f342b34 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Acpi/TbtNvs
> AreaDef.h
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Acpi/TbtNvs
> AreaDef.h
> @@ -1,13 +1,7 @@
> /**@file
>
> Copyright (c) 2018, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Library/DxeT
> btPolicyLib.h
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Library/DxeT
> btPolicyLib.h
> index 9fe16b8a68..8d1b3b1e0e 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Library/DxeT
> btPolicyLib.h
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Library/DxeT
> btPolicyLib.h
> @@ -2,13 +2,7 @@
> Prototype of the DxeTbtPolicyLib library.
>
> Copyright (c) 2018, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _DXE_TBT_POLICY_LIB_H_
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Library/PeiT
> btPolicyLib.h
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Library/PeiT
> btPolicyLib.h
> index f1ca61ca4e..843b677bac 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Library/PeiT
> btPolicyLib.h
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Library/PeiT
> btPolicyLib.h
> @@ -2,13 +2,7 @@
> Prototype of the PeiTbtPolicyLib library.
>
> Copyright (c) 2018, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PEI_TBT_POLICY_LIB_H_
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Library/TbtC
> ommonLib.h
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Library/TbtC
> ommonLib.h
> index f9338d3bd5..0180179bba 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Library/TbtC
> ommonLib.h
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Library/TbtC
> ommonLib.h
> @@ -1,13 +1,7 @@
> /**@file
>
> Copyright (c) 2018, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _TBT_COMMON_LIB_H_
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Ppi/PeiTbtPo
> licy.h
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Ppi/PeiTbtPo
> licy.h
> index 9b7ff25c55..da65103252 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Ppi/PeiTbtPo
> licy.h
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Ppi/PeiTbtPo
> licy.h
> @@ -2,13 +2,7 @@
> TBT PEI Policy
>
> Copyright (c) 2018, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Private/Libra
> ry/PeiDTbtInitLib.h
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Private/Libra
> ry/PeiDTbtInitLib.h
> index 963a678845..52f3e8ca1d 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Private/Libra
> ry/PeiDTbtInitLib.h
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Private/Libra
> ry/PeiDTbtInitLib.h
> @@ -2,13 +2,7 @@
> PEI DTBT Init Dispatch library Header file
>
> Copyright (c) 2018, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef __PEI_DTBT_INIT_LIB_H__
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Private/Libra
> ry/PeiTbtCommonInitLib.h
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Private/Libra
> ry/PeiTbtCommonInitLib.h
> index 3af3f64377..1f3a911e95 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Private/Libra
> ry/PeiTbtCommonInitLib.h
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Private/Libra
> ry/PeiTbtCommonInitLib.h
> @@ -2,13 +2,7 @@
> PEI TBT Common Init Dispatch library Header file
>
> Copyright (c) 2018, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef __PEI_TBT_COMMON_INIT_LIB_H__
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Protocol/Dx
> eTbtPolicy.h
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Protocol/Dx
> eTbtPolicy.h
> index 76f5071d9a..dc5bc282cb 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Protocol/Dx
> eTbtPolicy.h
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Protocol/Dx
> eTbtPolicy.h
> @@ -2,13 +2,7 @@
> TBT DXE Policy
>
> Copyright (c) 2018, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Protocol/Tbt
> NvsArea.h
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Protocol/Tbt
> NvsArea.h
> index c662f162ec..366165fd58 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Protocol/Tbt
> NvsArea.h
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/Protocol/Tbt
> NvsArea.h
> @@ -2,13 +2,7 @@
> This file defines the TBT NVS Area Protocol.
>
> Copyright (c) 2018, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/TbtBoardInf
> o.h
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/TbtBoardInf
> o.h
> index 9844935212..41873a4e29 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/TbtBoardInf
> o.h
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/TbtBoardInf
> o.h
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2018, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _TBT_INFO_GUID_H_
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/TbtPolicyCo
> mmonDefinition.h
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/TbtPolicyCo
> mmonDefinition.h
> index 2033126a25..e60cfe9e29 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/TbtPolicyCo
> mmonDefinition.h
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Include/TbtPolicyCo
> mmonDefinition.h
> @@ -2,13 +2,7 @@
> TBT Policy Common definition.
>
> Copyright (c) 2018, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicy
> Lib/DxeTbtPolicyLib.c
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicy
> Lib/DxeTbtPolicyLib.c
> index 0e58bc8294..65cb592472 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicy
> Lib/DxeTbtPolicyLib.c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicy
> Lib/DxeTbtPolicyLib.c
> @@ -2,13 +2,7 @@
> This file is DxeTbtPolicyLib library.
>
> Copyright (c) 2018, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include <DxeTbtPolicyLibrary.h>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicy
> Lib/DxeTbtPolicyLib.inf
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicy
> Lib/DxeTbtPolicyLib.inf
> index 38f30d1f11..931b1a3203 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicy
> Lib/DxeTbtPolicyLib.inf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicy
> Lib/DxeTbtPolicyLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2018, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicy
> Lib/DxeTbtPolicyLibrary.h
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicy
> Lib/DxeTbtPolicyLibrary.h
> index e0f749ec53..5e79dc2862 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicy
> Lib/DxeTbtPolicyLibrary.h
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicy
> Lib/DxeTbtPolicyLibrary.h
> @@ -2,13 +2,7 @@
> Header file for the DxeTBTPolicy library.
>
> Copyright (c) 2018, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _DXE_TBT_POLICY_LIBRARY_H_
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/PeiDxeSmmT
> btCommonLib/TbtCommonLib.c
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/PeiDxeSmmT
> btCommonLib/TbtCommonLib.c
> index 4f2690ca56..f596785aa3 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/PeiDxeSmmT
> btCommonLib/TbtCommonLib.c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/PeiDxeSmmT
> btCommonLib/TbtCommonLib.c
> @@ -2,13 +2,7 @@
> PeiTbtInit library implementition with empty functions.
>
> Copyright (c) 2018, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/PeiDxeSmmT
> btCommonLib/TbtCommonLib.inf
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/PeiDxeSmmT
> btCommonLib/TbtCommonLib.inf
> index ec8a31421e..ff1f7777ce 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/PeiDxeSmmT
> btCommonLib/TbtCommonLib.inf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/PeiDxeSmmT
> btCommonLib/TbtCommonLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2018, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/PeiTbtPolicyL
> ib/PeiTbtPolicyLib.c
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/PeiTbtPolicyL
> ib/PeiTbtPolicyLib.c
> index d0e3229db5..1bd43fbd1b 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/PeiTbtPolicyL
> ib/PeiTbtPolicyLib.c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/PeiTbtPolicyL
> ib/PeiTbtPolicyLib.c
> @@ -2,13 +2,7 @@
> This file is PeiTbtPolicyLib library.
>
> Copyright (c) 2018, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include <Library/PeiServicesLib.h>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/PeiTbtPolicyL
> ib/PeiTbtPolicyLib.inf
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/PeiTbtPolicyL
> ib/PeiTbtPolicyLib.inf
> index fa88e97b8f..91cae945b8 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/PeiTbtPolicyL
> ib/PeiTbtPolicyLib.inf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/PeiTbtPolicyL
> ib/PeiTbtPolicyLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2018, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/PeiTbtPolicyL
> ib/PeiTbtPolicyLibrary.h
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/PeiTbtPolicyL
> ib/PeiTbtPolicyLibrary.h
> index 16ac667b1c..803b99b37c 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/PeiTbtPolicyL
> ib/PeiTbtPolicyLibrary.h
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/PeiTbtPolicyL
> ib/PeiTbtPolicyLibrary.h
> @@ -2,13 +2,7 @@
> Header file for the PeiTBTPolicy library.
>
> Copyright (c) 2018, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PEI_TBT_POLICY_LIBRARY_H_
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/Private/PeiD
> TbtInitLib/PeiDTbtInitLib.c
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/Private/PeiD
> TbtInitLib/PeiDTbtInitLib.c
> index 4521bff957..21d149c7c2 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/Private/PeiD
> TbtInitLib/PeiDTbtInitLib.c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/Private/PeiD
> TbtInitLib/PeiDTbtInitLib.c
> @@ -2,13 +2,7 @@
> Thunderbolt(TM) Pei Library
>
> Copyright (c) 2018, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include <Library/PeiServicesLib.h>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/Private/PeiD
> TbtInitLib/PeiDTbtInitLib.inf
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/Private/PeiD
> TbtInitLib/PeiDTbtInitLib.inf
> index 83a0f57535..1d90bfca7c 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/Private/PeiD
> TbtInitLib/PeiDTbtInitLib.inf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/Private/PeiD
> TbtInitLib/PeiDTbtInitLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2018, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Dxe/TbtDxe.
> c
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Dxe/TbtDxe.
> c
> index cfe38d8018..13a687576c 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Dxe/TbtDxe.
> c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Dxe/TbtDxe.
> c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2018, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include <Uefi.h>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Dxe/TbtDxe.i
> nf
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Dxe/TbtDxe.i
> nf
> index 86f51191d1..9e117b77eb 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Dxe/TbtDxe.i
> nf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Dxe/TbtDxe.i
> nf
> @@ -2,13 +2,7 @@
> #
> # Copyright (c) 2018, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Pei/PeiTbtInit
> .c
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Pei/PeiTbtInit
> .c
> index a9a022844d..4803efae73 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Pei/PeiTbtInit
> .c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Pei/PeiTbtInit
> .c
> @@ -2,13 +2,7 @@
> Source code file for TBT Init PEI module
>
> Copyright (c) 2018, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Pei/PeiTbtInit
> .inf
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Pei/PeiTbtInit
> .inf
> index fdf85cbd67..f702c2753d 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Pei/PeiTbtInit
> .inf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Pei/PeiTbtInit
> .inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2018, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmi
> Handler.c
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmi
> Handler.c
> index 5280f9e1c8..58814060dd 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmi
> Handler.c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmi
> Handler.c
> @@ -1,13 +1,7 @@
> /**@file
>
> Copyright (c) 2018, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmi
> Handler.h
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmi
> Handler.h
> index 22f6aeeb7f..186f5162f6 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmi
> Handler.h
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmi
> Handler.h
> @@ -1,13 +1,7 @@
> /**@file
>
> Copyright (c) 2018, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _TBT_SMI_HANDLER_H_
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSm
> m.c
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSm
> m.c
> index f2abfb0db9..57f7eceed7 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSm
> m.c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSm
> m.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2018, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSm
> m.inf
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSm
> m.inf
> index 31ecb9767a..9218c8fe67 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSm
> m.inf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSm
> m.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2018, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPoli
> cyUpdateLibFsp/PcieDeviceTable.c
> b/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPoli
> cyUpdateLibFsp/PcieDeviceTable.c
> index c03c51e8ca..155dfdaf62 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPoli
> cyUpdateLibFsp/PcieDeviceTable.c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPoli
> cyUpdateLibFsp/PcieDeviceTable.c
> @@ -2,13 +2,7 @@
> This file is SampleCode of the library for Intel PCH PEI Policy initialization.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPoli
> cyUpdateLibFsp/PeiFspMiscUpdUpdateLib.c
> b/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPoli
> cyUpdateLibFsp/PeiFspMiscUpdUpdateLib.c
> index 57a1846ad2..d8aff1960f 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPoli
> cyUpdateLibFsp/PeiFspMiscUpdUpdateLib.c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPoli
> cyUpdateLibFsp/PeiFspMiscUpdUpdateLib.c
> @@ -2,13 +2,7 @@
> Implementation of Fsp Misc UPD Initialization.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPoli
> cyUpdateLibFsp/PeiFspPolicyUpdateLib.c
> b/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPoli
> cyUpdateLibFsp/PeiFspPolicyUpdateLib.c
> index f3c56419b5..55be16265e 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPoli
> cyUpdateLibFsp/PeiFspPolicyUpdateLib.c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPoli
> cyUpdateLibFsp/PeiFspPolicyUpdateLib.c
> @@ -2,13 +2,7 @@
> Provide FSP wrapper platform related function.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPoli
> cyUpdateLibFsp/PeiPchPolicyUpdate.c
> b/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPoli
> cyUpdateLibFsp/PeiPchPolicyUpdate.c
> index c1c8bf131d..b469720ac6 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPoli
> cyUpdateLibFsp/PeiPchPolicyUpdate.c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPoli
> cyUpdateLibFsp/PeiPchPolicyUpdate.c
> @@ -2,13 +2,7 @@
> This file is SampleCode of the library for Intel PCH PEI Policy initialization.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPoli
> cyUpdateLibFsp/PeiPchPolicyUpdate.h
> b/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPoli
> cyUpdateLibFsp/PeiPchPolicyUpdate.h
> index a4e69f4e73..e1df30951f 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPoli
> cyUpdateLibFsp/PeiPchPolicyUpdate.h
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPoli
> cyUpdateLibFsp/PeiPchPolicyUpdate.h
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPoli
> cyUpdateLibFsp/PeiPchPolicyUpdatePreMem.c
> b/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPoli
> cyUpdateLibFsp/PeiPchPolicyUpdatePreMem.c
> index fc27d67e69..f6390ee12c 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPoli
> cyUpdateLibFsp/PeiPchPolicyUpdatePreMem.c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPoli
> cyUpdateLibFsp/PeiPchPolicyUpdatePreMem.c
> @@ -2,13 +2,7 @@
> This file is SampleCode of the library for Intel PCH PEI Policy initialization.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPoli
> cyUpdateLibFsp/PeiSaPolicyUpdate.c
> b/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPoli
> cyUpdateLibFsp/PeiSaPolicyUpdate.c
> index fd54c63a92..d6ec3e38dd 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPoli
> cyUpdateLibFsp/PeiSaPolicyUpdate.c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPoli
> cyUpdateLibFsp/PeiSaPolicyUpdate.c
> @@ -2,13 +2,7 @@
> Do Platform Stage System Agent initialization.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPoli
> cyUpdateLibFsp/PeiSaPolicyUpdate.h
> b/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPoli
> cyUpdateLibFsp/PeiSaPolicyUpdate.h
> index da6f746772..3abf3fc8fd 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPoli
> cyUpdateLibFsp/PeiSaPolicyUpdate.h
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPoli
> cyUpdateLibFsp/PeiSaPolicyUpdate.h
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPoli
> cyUpdateLibFsp/PeiSaPolicyUpdatePreMem.c
> b/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPoli
> cyUpdateLibFsp/PeiSaPolicyUpdatePreMem.c
> index 94d5094855..8f9ad901eb 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPoli
> cyUpdateLibFsp/PeiSaPolicyUpdatePreMem.c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPoli
> cyUpdateLibFsp/PeiSaPolicyUpdatePreMem.c
> @@ -2,13 +2,7 @@
> Do Platform Stage System Agent initialization.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPoli
> cyUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf
> b/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPoli
> cyUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf
> index c155308632..fa8d91e076 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPoli
> cyUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPoli
> cyUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Include/Acpi/GlobalNvs.asl
> b/Platform/Intel/KabylakeOpenBoardPkg/Include/Acpi/GlobalNvs.asl
> index 27c64a1aa0..e0ff9d9bf5 100644
> --- a/Platform/Intel/KabylakeOpenBoardPkg/Include/Acpi/GlobalNvs.asl
> +++ b/Platform/Intel/KabylakeOpenBoardPkg/Include/Acpi/GlobalNvs.asl
> @@ -2,13 +2,7 @@
> ACPI DSDT table
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Include/Acpi/GlobalNvsAreaDef.h
> b/Platform/Intel/KabylakeOpenBoardPkg/Include/Acpi/GlobalNvsAreaDef.h
> index 2394e56c97..93c5a0b55a 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Include/Acpi/GlobalNvsAreaDef.h
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Include/Acpi/GlobalNvsAreaDef.h
> @@ -2,13 +2,7 @@
> ACPI DSDT table
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Include/Fdf/FlashMapInclude.fdf
> b/Platform/Intel/KabylakeOpenBoardPkg/Include/Fdf/FlashMapInclude.fdf
> index 7ed3fe5256..3a28bd4109 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Include/Fdf/FlashMapInclude.fdf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Include/Fdf/FlashMapInclude.fdf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Platform/Intel/KabylakeOpenBoardPkg/Include/IoExpander.h
> b/Platform/Intel/KabylakeOpenBoardPkg/Include/IoExpander.h
> index 0e6bda1108..eb1b2414c4 100644
> --- a/Platform/Intel/KabylakeOpenBoardPkg/Include/IoExpander.h
> +++ b/Platform/Intel/KabylakeOpenBoardPkg/Include/IoExpander.h
> @@ -2,13 +2,7 @@
> GPIO definition table for KabylakeRvp3
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Include/Library/GpioExpanderLib.h
> b/Platform/Intel/KabylakeOpenBoardPkg/Include/Library/GpioExpanderLib.h
> index 427caa7e3b..bbbdc2755d 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Include/Library/GpioExpanderLib.h
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Include/Library/GpioExpanderLib.h
> @@ -2,13 +2,7 @@
> Support for IO expander TCA6424.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Include/Library/I2cAccessLib.h
> b/Platform/Intel/KabylakeOpenBoardPkg/Include/Library/I2cAccessLib.h
> index 84d9d758fb..a69bfc023b 100644
> --- a/Platform/Intel/KabylakeOpenBoardPkg/Include/Library/I2cAccessLib.h
> +++ b/Platform/Intel/KabylakeOpenBoardPkg/Include/Library/I2cAccessLib.h
> @@ -2,13 +2,7 @@
> Support for IO expander TCA6424.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Include/PchHsioPtssTables.h
> b/Platform/Intel/KabylakeOpenBoardPkg/Include/PchHsioPtssTables.h
> index 7dc8df5d09..56a0bbab0f 100644
> --- a/Platform/Intel/KabylakeOpenBoardPkg/Include/PchHsioPtssTables.h
> +++ b/Platform/Intel/KabylakeOpenBoardPkg/Include/PchHsioPtssTables.h
> @@ -1,13 +1,7 @@
> /** @file*
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Include/Protocol/GlobalNvsArea.h
> b/Platform/Intel/KabylakeOpenBoardPkg/Include/Protocol/GlobalNvsArea.h
> index ad1c1bb881..b151a8fa8b 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Include/Protocol/GlobalNvsArea.h
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Include/Protocol/GlobalNvsArea.h
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/Intel/KabylakeOpenBoardPkg/Include/SioRegs.h
> b/Platform/Intel/KabylakeOpenBoardPkg/Include/SioRegs.h
> index be14e2ab89..ec61a7defd 100644
> --- a/Platform/Intel/KabylakeOpenBoardPkg/Include/SioRegs.h
> +++ b/Platform/Intel/KabylakeOpenBoardPkg/Include/SioRegs.h
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/GitEdk2MinKabylak
> e.bat
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/GitEdk2MinKabylak
> e.bat
> index 4e13ed18e5..3bb13df80a 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/GitEdk2MinKabylak
> e.bat
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/GitEdk2MinKabylak
> e.bat
> @@ -1,13 +1,7 @@
> @REM @file
> @REM
> @REM Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -@REM This program and the accompanying materials
> -@REM are licensed and made available under the terms and conditions of
> the BSD License
> -@REM which accompanies this distribution. The full text of the license may
> be found at
> -@REM http://opensource.org/licenses/bsd-license.php
> -@REM
> -@REM THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS
> IS" BASIS,
> -@REM WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND,
> EITHER EXPRESS OR IMPLIED.
> +@REM SPDX-License-Identifier: BSD-2-Clause-Patent
> @REM
>
> @echo off
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Include/KabylakeRv
> p3Id.h
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Include/KabylakeRv
> p3Id.h
> index ebdc45ae97..3b6397af1f 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Include/KabylakeRv
> p3Id.h
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Include/KabylakeRv
> p3Id.h
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BasePlatfor
> mHookLib/BasePlatformHookLib.c
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BasePlatfor
> mHookLib/BasePlatformHookLib.c
> index 245f3595f1..c7fc6986f5 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BasePlatfor
> mHookLib/BasePlatformHookLib.c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BasePlatfor
> mHookLib/BasePlatformHookLib.c
> @@ -2,13 +2,7 @@
> Platform Hook Library instances
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BasePlatfor
> mHookLib/BasePlatformHookLib.inf
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BasePlatfor
> mHookLib/BasePlatformHookLib.inf
> index a2eec09e83..e65c7a25c2 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BasePlatfor
> mHookLib/BasePlatformHookLib.inf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BasePlatfor
> mHookLib/BasePlatformHookLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLi
> b/DxeBoardAcpiTableLib.c
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLi
> b/DxeBoardAcpiTableLib.c
> index 617ce4592f..60c11290c0 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLi
> b/DxeBoardAcpiTableLib.c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLi
> b/DxeBoardAcpiTableLib.c
> @@ -2,13 +2,7 @@
> Platform Hook Library instances
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLi
> b/DxeBoardAcpiTableLib.inf
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLi
> b/DxeBoardAcpiTableLib.inf
> index b1ee3a4c15..f3fed024ec 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLi
> b/DxeBoardAcpiTableLib.inf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLi
> b/DxeBoardAcpiTableLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLi
> b/DxeKabylakeRvp3AcpiTableLib.c
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLi
> b/DxeKabylakeRvp3AcpiTableLib.c
> index de75ed60ba..e65742559a 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLi
> b/DxeKabylakeRvp3AcpiTableLib.c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLi
> b/DxeKabylakeRvp3AcpiTableLib.c
> @@ -2,13 +2,7 @@
> Platform Hook Library instances
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLi
> b/DxeMultiBoardAcpiSupportLib.c
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLi
> b/DxeMultiBoardAcpiSupportLib.c
> index eef941ecd5..da488e097c 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLi
> b/DxeMultiBoardAcpiSupportLib.c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLi
> b/DxeMultiBoardAcpiSupportLib.c
> @@ -2,13 +2,7 @@
> Platform Hook Library instances
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLi
> b/DxeMultiBoardAcpiSupportLib.inf
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLi
> b/DxeMultiBoardAcpiSupportLib.inf
> index 5536b6e21f..e0394214ee 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLi
> b/DxeMultiBoardAcpiSupportLib.inf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLi
> b/DxeMultiBoardAcpiSupportLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLi
> b/SmmBoardAcpiEnableLib.c
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLi
> b/SmmBoardAcpiEnableLib.c
> index 1633ab1203..3de0ae34a7 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLi
> b/SmmBoardAcpiEnableLib.c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLi
> b/SmmBoardAcpiEnableLib.c
> @@ -2,13 +2,7 @@
> Platform Hook Library instances
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLi
> b/SmmBoardAcpiEnableLib.inf
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLi
> b/SmmBoardAcpiEnableLib.inf
> index 7fa9ffff47..32068b59d7 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLi
> b/SmmBoardAcpiEnableLib.inf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLi
> b/SmmBoardAcpiEnableLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLi
> b/SmmKabylakeRvp3AcpiEnableLib.c
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLi
> b/SmmKabylakeRvp3AcpiEnableLib.c
> index 43cac20579..71c6e230fa 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLi
> b/SmmKabylakeRvp3AcpiEnableLib.c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLi
> b/SmmKabylakeRvp3AcpiEnableLib.c
> @@ -2,13 +2,7 @@
> Platform Hook Library instances
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLi
> b/SmmMultiBoardAcpiSupportLib.c
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLi
> b/SmmMultiBoardAcpiSupportLib.c
> index 157fb47565..91590d5278 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLi
> b/SmmMultiBoardAcpiSupportLib.c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLi
> b/SmmMultiBoardAcpiSupportLib.c
> @@ -2,13 +2,7 @@
> Platform Hook Library instances
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLi
> b/SmmMultiBoardAcpiSupportLib.inf
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLi
> b/SmmMultiBoardAcpiSupportLib.inf
> index 56fe2e3e3f..fad4230c85 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLi
> b/SmmMultiBoardAcpiSupportLib.inf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLi
> b/SmmMultiBoardAcpiSupportLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLi
> b/SmmSiliconAcpiEnableLib.c
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLi
> b/SmmSiliconAcpiEnableLib.c
> index 268d10ea6e..185aa4ad2d 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLi
> b/SmmSiliconAcpiEnableLib.c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLi
> b/SmmSiliconAcpiEnableLib.c
> @@ -2,13 +2,7 @@
> Platform Hook Library instances
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib
> /KabylakeRvp3GpioTable.c
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib
> /KabylakeRvp3GpioTable.c
> index 05dc520458..2439c6bc1e 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib
> /KabylakeRvp3GpioTable.c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib
> /KabylakeRvp3GpioTable.c
> @@ -2,13 +2,7 @@
> GPIO definition table for KabylakeRvp3
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib
> /KabylakeRvp3HdaVerbTables.c
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib
> /KabylakeRvp3HdaVerbTables.c
> index 1a820d1d5b..92afcbab06 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib
> /KabylakeRvp3HdaVerbTables.c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib
> /KabylakeRvp3HdaVerbTables.c
> @@ -2,13 +2,7 @@
> HDA Verb table for KabylakeRvp3
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib
> /KabylakeRvp3HsioPtssTables.c
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib
> /KabylakeRvp3HsioPtssTables.c
> index 91f78330cb..8a9048fa4c 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib
> /KabylakeRvp3HsioPtssTables.c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib
> /KabylakeRvp3HsioPtssTables.c
> @@ -2,13 +2,7 @@
> KabylakeRvp3 HSIO PTSS H File
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib
> /KabylakeRvp3SpdTable.c
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib
> /KabylakeRvp3SpdTable.c
> index 907a1e422e..3ac9adc466 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib
> /KabylakeRvp3SpdTable.c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib
> /KabylakeRvp3SpdTable.c
> @@ -2,13 +2,7 @@
> GPIO definition table for KabylakeRvp3
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib
> /PeiBoardInitPostMemLib.c
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib
> /PeiBoardInitPostMemLib.c
> index 62f2d89467..d88c4eb461 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib
> /PeiBoardInitPostMemLib.c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib
> /PeiBoardInitPostMemLib.c
> @@ -2,13 +2,7 @@
> Platform Hook Library instances
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib
> /PeiBoardInitPostMemLib.inf
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib
> /PeiBoardInitPostMemLib.inf
> index 89ba2dea69..108ee8f541 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib
> /PeiBoardInitPostMemLib.inf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib
> /PeiBoardInitPostMemLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib
> /PeiBoardInitPreMemLib.c
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib
> /PeiBoardInitPreMemLib.c
> index 7dd5d7a8ad..69e0f50282 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib
> /PeiBoardInitPreMemLib.c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib
> /PeiBoardInitPreMemLib.c
> @@ -2,13 +2,7 @@
> Platform Hook Library instances
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib
> /PeiBoardInitPreMemLib.inf
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib
> /PeiBoardInitPreMemLib.inf
> index 114d7ea5e1..51f6787e4f 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib
> /PeiBoardInitPreMemLib.inf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib
> /PeiBoardInitPreMemLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib
> /PeiKabylakeRvp3Detect.c
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib
> /PeiKabylakeRvp3Detect.c
> index 23c5c634e3..0f4ad61f0a 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib
> /PeiKabylakeRvp3Detect.c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib
> /PeiKabylakeRvp3Detect.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib
> /PeiKabylakeRvp3InitLib.h
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib
> /PeiKabylakeRvp3InitLib.h
> index ff12343802..1878b2c6bd 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib
> /PeiKabylakeRvp3InitLib.h
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib
> /PeiKabylakeRvp3InitLib.h
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib
> /PeiKabylakeRvp3InitPostMemLib.c
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib
> /PeiKabylakeRvp3InitPostMemLib.c
> index c4df084843..5d398ab665 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib
> /PeiKabylakeRvp3InitPostMemLib.c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib
> /PeiKabylakeRvp3InitPostMemLib.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib
> /PeiKabylakeRvp3InitPreMemLib.c
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib
> /PeiKabylakeRvp3InitPreMemLib.c
> index 9d7c12ddb2..1667e29067 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib
> /PeiKabylakeRvp3InitPreMemLib.c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib
> /PeiKabylakeRvp3InitPreMemLib.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib
> /PeiMultiBoardInitPostMemLib.c
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib
> /PeiMultiBoardInitPostMemLib.c
> index 5842393932..3778911610 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib
> /PeiMultiBoardInitPostMemLib.c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib
> /PeiMultiBoardInitPostMemLib.c
> @@ -2,13 +2,7 @@
> Platform Hook Library instances
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib
> /PeiMultiBoardInitPostMemLib.inf
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib
> /PeiMultiBoardInitPostMemLib.inf
> index fdeae0c5f4..b118f9030a 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib
> /PeiMultiBoardInitPostMemLib.inf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib
> /PeiMultiBoardInitPostMemLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib
> /PeiMultiBoardInitPreMemLib.c
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib
> /PeiMultiBoardInitPreMemLib.c
> index d1fb6591d1..b8b161377e 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib
> /PeiMultiBoardInitPreMemLib.c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib
> /PeiMultiBoardInitPreMemLib.c
> @@ -2,13 +2,7 @@
> Platform Hook Library instances
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib
> /PeiMultiBoardInitPreMemLib.inf
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib
> /PeiMultiBoardInitPreMemLib.inf
> index 28ba665d96..25684b00d0 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib
> /PeiMultiBoardInitPreMemLib.inf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib
> /PeiMultiBoardInitPreMemLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.dsc
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.dsc
> index 8602052666..1bef21dd42 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.dsc
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.dsc
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017 - 2018, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
> [Defines]
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.fdf
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.fdf
> index 8e8abab0dc..0cff53e308 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.fdf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.fdf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017 - 2018, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgBuild
> Option.dsc
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgBuild
> Option.dsc
> index 318b0573ad..04c57868b7 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgBuild
> Option.dsc
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgBuild
> Option.dsc
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgConf
> ig.dsc
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgConf
> ig.dsc
> index f3d082ce41..15468494dd 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgConf
> ig.dsc
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgConf
> ig.dsc
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017 - 2019, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgPcd.
> dsc
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgPcd.
> dsc
> index c0d566db21..9774acb5eb 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgPcd.
> dsc
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgPcd.
> dsc
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017 - 2019, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/bld.bat
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/bld.bat
> index e0ad5eefdc..449660b75d 100644
> --- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/bld.bat
> +++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/bld.bat
> @@ -1,13 +1,7 @@
> @REM @file
> @REM
> @REM Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -@REM This program and the accompanying materials
> -@REM are licensed and made available under the terms and conditions of
> the BSD License
> -@REM which accompanies this distribution. The full text of the license may
> be found at
> -@REM http://opensource.org/licenses/bsd-license.php
> -@REM
> -@REM THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS
> IS" BASIS,
> -@REM WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND,
> EITHER EXPRESS OR IMPLIED.
> +@REM SPDX-License-Identifier: BSD-2-Clause-Patent
> @REM
>
> :: Useage: bld [/s] [/f <FEATURE_PCD_NAME> <FALSE or TRUE>] [/r]
> diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/cln.bat
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/cln.bat
> index 8c4e0f51e6..76c078ac05 100644
> --- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/cln.bat
> +++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/cln.bat
> @@ -1,13 +1,7 @@
> @REM @file
> @REM
> @REM Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -@REM This program and the accompanying materials
> -@REM are licensed and made available under the terms and conditions of
> the BSD License
> -@REM which accompanies this distribution. The full text of the license may
> be found at
> -@REM http://opensource.org/licenses/bsd-license.php
> -@REM
> -@REM THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS
> IS" BASIS,
> -@REM WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND,
> EITHER EXPRESS OR IMPLIED.
> +@REM SPDX-License-Identifier: BSD-2-Clause-Patent
> @REM
>
> @echo off
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/postbuild.bat
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/postbuild.bat
> index a39319fd9f..1f934fb333 100644
> --- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/postbuild.bat
> +++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/postbuild.bat
> @@ -1,13 +1,7 @@
> @REM @file
> @REM
> @REM Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -@REM This program and the accompanying materials
> -@REM are licensed and made available under the terms and conditions of
> the BSD License
> -@REM which accompanies this distribution. The full text of the license may
> be found at
> -@REM http://opensource.org/licenses/bsd-license.php
> -@REM
> -@REM THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS
> IS" BASIS,
> -@REM WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND,
> EITHER EXPRESS OR IMPLIED.
> +@REM SPDX-License-Identifier: BSD-2-Clause-Patent
> @REM
>
> @REM #
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/prebuild.bat
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/prebuild.bat
> index 2861eec08f..9ec800ae6f 100644
> --- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/prebuild.bat
> +++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/prebuild.bat
> @@ -2,13 +2,7 @@
> @REM Pre build script.
> @REM
> @REM Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -@REM This program and the accompanying materials
> -@REM are licensed and made available under the terms and conditions of
> the BSD License
> -@REM which accompanies this distribution. The full text of the license may
> be found at
> -@REM http://opensource.org/licenses/bsd-license.php
> -@REM
> -@REM THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS
> IS" BASIS,
> -@REM WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND,
> EITHER EXPRESS OR IMPLIED.
> +@REM SPDX-License-Identifier: BSD-2-Clause-Patent
> @REM
>
> cd ..
> diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/prep.bat
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/prep.bat
> index 68e664e435..2ab785f27c 100644
> --- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/prep.bat
> +++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/prep.bat
> @@ -1,13 +1,7 @@
> @REM @file
> @REM
> @REM Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -@REM This program and the accompanying materials
> -@REM are licensed and made available under the terms and conditions of
> the BSD License
> -@REM which accompanies this distribution. The full text of the license may
> be found at
> -@REM http://opensource.org/licenses/bsd-license.php
> -@REM
> -@REM THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS
> IS" BASIS,
> -@REM WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND,
> EITHER EXPRESS OR IMPLIED.
> +@REM SPDX-License-Identifier: BSD-2-Clause-Patent
> @REM
>
> @echo OFF
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Library/BaseGpioExpanderLib/Bas
> eGpioExpanderLib.c
> b/Platform/Intel/KabylakeOpenBoardPkg/Library/BaseGpioExpanderLib/Bas
> eGpioExpanderLib.c
> index 5236484f64..ead1e6df19 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Library/BaseGpioExpanderLib/Bas
> eGpioExpanderLib.c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Library/BaseGpioExpanderLib/Bas
> eGpioExpanderLib.c
> @@ -2,13 +2,7 @@
> Support for IO expander TCA6424.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Library/BaseGpioExpanderLib/Bas
> eGpioExpanderLib.inf
> b/Platform/Intel/KabylakeOpenBoardPkg/Library/BaseGpioExpanderLib/Bas
> eGpioExpanderLib.inf
> index a20e4ba043..23780d7f75 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Library/BaseGpioExpanderLib/Bas
> eGpioExpanderLib.inf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Library/BaseGpioExpanderLib/Bas
> eGpioExpanderLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Library/PeiI2cAccessLib/PeiI2cAcc
> essLib.c
> b/Platform/Intel/KabylakeOpenBoardPkg/Library/PeiI2cAccessLib/PeiI2cAcc
> essLib.c
> index acc176e60b..7c60c80c1b 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Library/PeiI2cAccessLib/PeiI2cAcc
> essLib.c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Library/PeiI2cAccessLib/PeiI2cAcc
> essLib.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Library/PeiI2cAccessLib/PeiI2cAcc
> essLib.inf
> b/Platform/Intel/KabylakeOpenBoardPkg/Library/PeiI2cAccessLib/PeiI2cAcc
> essLib.inf
> index 4d252037f5..86d49b1a73 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Library/PeiI2cAccessLib/PeiI2cAcc
> essLib.inf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Library/PeiI2cAccessLib/PeiI2cAcc
> essLib.inf
> @@ -2,13 +2,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git a/Platform/Intel/KabylakeOpenBoardPkg/OpenBoardPkg.dec
> b/Platform/Intel/KabylakeOpenBoardPkg/OpenBoardPkg.dec
> index d0fdb109f1..e32659865e 100644
> --- a/Platform/Intel/KabylakeOpenBoardPkg/OpenBoardPkg.dec
> +++ b/Platform/Intel/KabylakeOpenBoardPkg/OpenBoardPkg.dec
> @@ -7,13 +7,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Policy/Library/DxeSiliconPolicyUpd
> ateLib/DxeGopPolicyInit.c
> b/Platform/Intel/KabylakeOpenBoardPkg/Policy/Library/DxeSiliconPolicyUpd
> ateLib/DxeGopPolicyInit.c
> index e455208f80..7744af6b3c 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Policy/Library/DxeSiliconPolicyUpd
> ateLib/DxeGopPolicyInit.c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Policy/Library/DxeSiliconPolicyUpd
> ateLib/DxeGopPolicyInit.c
> @@ -2,13 +2,7 @@
> This file initialises and Installs GopPolicy Protocol.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Policy/Library/DxeSiliconPolicyUpd
> ateLib/DxeGopPolicyInit.h
> b/Platform/Intel/KabylakeOpenBoardPkg/Policy/Library/DxeSiliconPolicyUpd
> ateLib/DxeGopPolicyInit.h
> index 3de117337f..17f9b545fc 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Policy/Library/DxeSiliconPolicyUpd
> ateLib/DxeGopPolicyInit.h
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Policy/Library/DxeSiliconPolicyUpd
> ateLib/DxeGopPolicyInit.h
> @@ -2,13 +2,7 @@
> Header file for the GopPolicyInitDxe Driver.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _GOP_POLICY_INIT_DXE_H_
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Policy/Library/DxeSiliconPolicyUpd
> ateLib/DxeSaPolicyInit.h
> b/Platform/Intel/KabylakeOpenBoardPkg/Policy/Library/DxeSiliconPolicyUpd
> ateLib/DxeSaPolicyInit.h
> index 1a1536c299..b49e13da54 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Policy/Library/DxeSiliconPolicyUpd
> ateLib/DxeSaPolicyInit.h
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Policy/Library/DxeSiliconPolicyUpd
> ateLib/DxeSaPolicyInit.h
> @@ -2,13 +2,7 @@
> Header file for the SaPolicyInitDxe Driver.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _SA_POLICY_INIT_DXE_H_
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Policy/Library/DxeSiliconPolicyUpd
> ateLib/DxeSaPolicyUpdate.c
> b/Platform/Intel/KabylakeOpenBoardPkg/Policy/Library/DxeSiliconPolicyUpd
> ateLib/DxeSaPolicyUpdate.c
> index be3fe02aea..733cc9d4fc 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Policy/Library/DxeSiliconPolicyUpd
> ateLib/DxeSaPolicyUpdate.c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Policy/Library/DxeSiliconPolicyUpd
> ateLib/DxeSaPolicyUpdate.c
> @@ -2,13 +2,7 @@
> This file is the library for SA DXE Policy initialization.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Policy/Library/DxeSiliconPolicyUpd
> ateLib/DxeSiliconPolicyUpdateLib.c
> b/Platform/Intel/KabylakeOpenBoardPkg/Policy/Library/DxeSiliconPolicyUpd
> ateLib/DxeSiliconPolicyUpdateLib.c
> index 6a258e69d6..d4dbb414a2 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Policy/Library/DxeSiliconPolicyUpd
> ateLib/DxeSiliconPolicyUpdateLib.c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Policy/Library/DxeSiliconPolicyUpd
> ateLib/DxeSiliconPolicyUpdateLib.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Policy/Library/DxeSiliconPolicyUpd
> ateLib/DxeSiliconPolicyUpdateLib.inf
> b/Platform/Intel/KabylakeOpenBoardPkg/Policy/Library/DxeSiliconPolicyUpd
> ateLib/DxeSiliconPolicyUpdateLib.inf
> index 7a50563c84..ad12b027a5 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Policy/Library/DxeSiliconPolicyUpd
> ateLib/DxeSiliconPolicyUpdateLib.inf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Policy/Library/DxeSiliconPolicyUpd
> ateLib/DxeSiliconPolicyUpdateLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> --
> 2.21.0.windows.1
^ permalink raw reply [flat|nested] 63+ messages in thread
* [[edk2-platforms][PATCH V2] 11/30] Platform/Intel/MinPlatformPkg: Replace BSD License with BSD+Patent License
2019-05-15 23:09 [[edk2-platforms][PATCH V2] 00/30] Change edk2-platforms/master to BSD+Patent License Michael D Kinney
` (9 preceding siblings ...)
2019-05-15 23:09 ` [[edk2-platforms][PATCH V2] 10/30] Platform/Intel/KabylakeOpenBoardPkg: " Michael D Kinney
@ 2019-05-15 23:09 ` Michael D Kinney
2019-05-16 0:22 ` Chiu, Chasel
2019-05-17 6:52 ` Kubacki, Michael A
2019-05-15 23:09 ` [[edk2-platforms][PATCH V2] 12/30] Platform/Intel/PurleyOpenBoardPkg: " Michael D Kinney
` (19 subsequent siblings)
30 siblings, 2 replies; 63+ messages in thread
From: Michael D Kinney @ 2019-05-15 23:09 UTC (permalink / raw)
To: devel; +Cc: Michael Kubacki, Chasel Chiu
https://bugzilla.tianocore.org/show_bug.cgi?id=1373
Replace BSD 2-Clause License with BSD+Patent License. This change is
based on the following emails:
https://lists.01.org/pipermail/edk2-devel/2019-February/036260.html
https://lists.01.org/pipermail/edk2-devel/2018-October/030385.html
RFCs with detailed process for the license change:
V3: https://lists.01.org/pipermail/edk2-devel/2019-March/038116.html
V2: https://lists.01.org/pipermail/edk2-devel/2019-March/037669.html
V1: https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html
Cc: Michael Kubacki <michael.a.kubacki@intel.com>
Cc: Chasel Chiu <chasel.chiu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
Platform/Intel/MinPlatformPkg/Acpi/AcpiSmm/AcpiSmm.c | 8 +-------
Platform/Intel/MinPlatformPkg/Acpi/AcpiSmm/AcpiSmm.h | 8 +-------
Platform/Intel/MinPlatformPkg/Acpi/AcpiSmm/AcpiSmm.inf | 8 +-------
.../Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c | 8 +-------
.../Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.h | 8 +-------
.../MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.inf | 8 +-------
.../Intel/MinPlatformPkg/Acpi/AcpiTables/Facs/Facs.c | 8 +-------
.../Intel/MinPlatformPkg/Acpi/AcpiTables/Fadt/Fadt.c | 8 +-------
.../Intel/MinPlatformPkg/Acpi/AcpiTables/Hpet/Hpet.c | 8 +-------
.../Intel/MinPlatformPkg/Acpi/AcpiTables/Wsmt/Wsmt.c | 8 +-------
.../Acpi/Library/BoardAcpiLibNull/BoardAcpiEnableLib.c | 8 +-------
.../Library/BoardAcpiLibNull/BoardAcpiEnableLibNull.inf | 8 +-------
.../Acpi/Library/BoardAcpiLibNull/BoardAcpiTableLib.c | 8 +-------
.../Library/BoardAcpiLibNull/BoardAcpiTableLibNull.inf | 8 +-------
.../Acpi/Library/DxeAslUpdateLib/DxeAslUpdateLib.c | 8 +-------
.../Acpi/Library/DxeAslUpdateLib/DxeAslUpdateLib.inf | 8 +-------
.../MultiBoardAcpiSupportLib/DxeBoardAcpiTableLib.c | 8 +-------
.../DxeMultiBoardAcpiSupportLib.c | 8 +-------
.../DxeMultiBoardAcpiSupportLib.inf | 8 +-------
.../MultiBoardAcpiSupportLib/SmmBoardAcpiEnableLib.c | 8 +-------
.../SmmMultiBoardAcpiSupportLib.c | 8 +-------
.../SmmMultiBoardAcpiSupportLib.inf | 8 +-------
Platform/Intel/MinPlatformPkg/Acpi/MinDsdt/MinDsdt.asl | 8 +-------
Platform/Intel/MinPlatformPkg/Acpi/MinDsdt/MinDsdt.c | 8 +-------
Platform/Intel/MinPlatformPkg/Acpi/MinDsdt/MinDsdt.inf | 8 +-------
.../Bds/Library/DxePlatformBootManagerLib/BdsPlatform.c | 8 +-------
.../Bds/Library/DxePlatformBootManagerLib/BdsPlatform.h | 8 +-------
.../DxePlatformBootManagerLib.inf | 8 +-------
.../Bds/Library/DxePlatformBootManagerLib/MemoryTest.c | 8 +-------
.../DxePlatformBootManagerLib/PlatformBootOption.c | 8 +-------
.../SpiFlashCommonLibNull/SpiFlashCommonLibNull.c | 8 +-------
.../SpiFlashCommonLibNull/SpiFlashCommonLibNull.inf | 8 +-------
.../MinPlatformPkg/Flash/SpiFvbService/Common/FvbInfo.c | 8 +-------
.../Flash/SpiFvbService/Common/SpiFvbServiceCommon.c | 8 +-------
.../Flash/SpiFvbService/Common/SpiFvbServiceCommon.h | 8 +-------
.../Flash/SpiFvbService/Smm/SpiFvbServiceSmm.c | 8 +-------
.../Flash/SpiFvbService/SpiFvbServiceSmm.inf | 8 +-------
.../DxeFspWrapperPlatformLib.inf | 8 +-------
.../DxeFspWrapperPlatformResetLib.c | 8 +-------
.../PeiFspWrapperHobProcessLib/FspWrapperHobProcessLib.c | 8 +-------
.../PeiFspWrapperHobProcessLib.inf | 8 +-------
.../PeiFspWrapperPlatformLib/PeiFspWrapperPlatformLib.c | 8 +-------
.../PeiFspWrapperPlatformLib.inf | 8 +-------
.../PeiFspWrapperPlatformResetLib.c | 8 +-------
.../FspWrapperPlatformSecLib.c | 8 +-------
.../Library/SecFspWrapperPlatformSecLib/FsptCoreUpd.h | 8 +-------
.../Library/SecFspWrapperPlatformSecLib/Ia32/Fsp.h | 8 +-------
.../SecFspWrapperPlatformSecLib/Ia32/PeiCoreEntry.S | 8 +-------
.../SecFspWrapperPlatformSecLib/Ia32/PeiCoreEntry.asm | 8 +-------
.../Library/SecFspWrapperPlatformSecLib/Ia32/SecEntry.S | 8 +-------
.../SecFspWrapperPlatformSecLib/Ia32/SecEntry.asm | 8 +-------
.../Library/SecFspWrapperPlatformSecLib/Ia32/Stack.S | 8 +-------
.../Library/SecFspWrapperPlatformSecLib/Ia32/Stack.asm | 8 +-------
.../Library/SecFspWrapperPlatformSecLib/PlatformInit.c | 8 +-------
.../SecFspWrapperPlatformSecLib.inf | 8 +-------
.../SecFspWrapperPlatformSecLib/SecGetPerformance.c | 8 +-------
.../SecFspWrapperPlatformSecLib/SecPlatformInformation.c | 8 +-------
.../Library/SecFspWrapperPlatformSecLib/SecRamInitData.c | 8 +-------
.../Library/SecFspWrapperPlatformSecLib/SecTempRamDone.c | 8 +-------
.../FspWrapper/SaveMemoryConfig/SaveMemoryConfig.c | 8 +-------
.../FspWrapper/SaveMemoryConfig/SaveMemoryConfig.inf | 8 +-------
.../HstiIbvPlatformDxe/ExternalDeviceDmaProtection.c | 8 +-------
.../FirmwareTrustConfigurationCryptoStrength.c | 8 +-------
.../FirmwareVersionRollbackProtection.c | 8 +-------
.../Hsti/HstiIbvPlatformDxe/HstiIbvPlatformDxe.c | 8 +-------
.../Hsti/HstiIbvPlatformDxe/HstiIbvPlatformDxe.h | 8 +-------
.../Hsti/HstiIbvPlatformDxe/HstiIbvPlatformDxe.inf | 8 +-------
.../MinPlatformPkg/Hsti/HstiIbvPlatformDxe/MorSupport.c | 8 +-------
.../Hsti/HstiIbvPlatformDxe/NoTestKeyVerification.c | 8 +-------
.../Hsti/HstiIbvPlatformDxe/SecureBootBypass.c | 8 +-------
.../Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc | 8 +-------
.../Intel/MinPlatformPkg/Include/Dsc/CoreDxeInclude.dsc | 8 +-------
Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc | 8 +-------
.../Intel/MinPlatformPkg/Include/Dsc/CorePeiInclude.dsc | 8 +-------
Platform/Intel/MinPlatformPkg/Include/Dsc/CorePeiLib.dsc | 8 +-------
.../MinPlatformPkg/Include/Fdf/CoreOsBootInclude.fdf | 8 +-------
.../MinPlatformPkg/Include/Fdf/CorePostMemoryInclude.fdf | 8 +-------
.../MinPlatformPkg/Include/Fdf/CorePreMemoryInclude.fdf | 8 +-------
.../Include/Fdf/CoreSecurityLateInclude.fdf | 8 +-------
.../Include/Fdf/CoreSecurityPostMemoryInclude.fdf | 8 +-------
.../Include/Fdf/CoreSecurityPreMemoryInclude.fdf | 8 +-------
.../MinPlatformPkg/Include/Fdf/CoreUefiBootInclude.fdf | 8 +-------
.../Intel/MinPlatformPkg/Include/Fdf/RuleInclude.fdf | 8 +-------
.../MinPlatformPkg/Include/Guid/SmramMemoryReserve.h | 8 +-------
.../Intel/MinPlatformPkg/Include/HstiIbvFeatureBit.h | 8 +-------
.../Intel/MinPlatformPkg/Include/Library/AslUpdateLib.h | 8 +-------
.../MinPlatformPkg/Include/Library/BoardAcpiEnableLib.h | 8 +-------
.../MinPlatformPkg/Include/Library/BoardAcpiTableLib.h | 8 +-------
.../Intel/MinPlatformPkg/Include/Library/BoardInitLib.h | 8 +-------
.../Intel/MinPlatformPkg/Include/Library/CompressLib.h | 8 +-------
.../MinPlatformPkg/Include/Library/HobVariableLib.h | 8 +-------
.../Include/Library/MultiBoardAcpiSupportLib.h | 8 +-------
.../Include/Library/MultiBoardInitSupportLib.h | 8 +-------
Platform/Intel/MinPlatformPkg/Include/Library/PeiLib.h | 8 +-------
.../Intel/MinPlatformPkg/Include/Library/ReportFvLib.h | 8 +-------
.../MinPlatformPkg/Include/Library/SecBoardInitLib.h | 8 +-------
.../Include/Library/SiliconPolicyInitLib.h | 8 +-------
.../Include/Library/SiliconPolicyUpdateLib.h | 8 +-------
.../MinPlatformPkg/Include/Library/SpiFlashCommonLib.h | 8 +-------
.../MinPlatformPkg/Include/Library/TestPointCheckLib.h | 8 +-------
.../Intel/MinPlatformPkg/Include/Library/TestPointLib.h | 8 +-------
.../Intel/MinPlatformPkg/Include/Ppi/BaseMemoryTest.h | 8 +-------
.../MinPlatformPkg/Include/Ppi/PlatformMemorySize.h | 8 +-------
.../MinPlatformPkg/Library/CompressLib/CompressLib.c | 8 +-------
.../MinPlatformPkg/Library/CompressLib/CompressLib.inf | 7 +------
.../MinPlatformPkg/Library/PeiHobVariableLibFce/Fce.h | 8 +-------
.../Library/PeiHobVariableLibFce/InternalCommonLib.c | 8 +-------
.../Library/PeiHobVariableLibFce/PeiHobVariableLibFce.c | 8 +-------
.../PeiHobVariableLibFce/PeiHobVariableLibFce.inf | 8 +-------
.../PeiHobVariableLibFce/PeiHobVariableLibFceOptSize.c | 8 +-------
.../PeiHobVariableLibFce/PeiHobVariableLibFceOptSize.inf | 8 +-------
.../Library/PeiHobVariableLibFce/Variable.h | 8 +-------
Platform/Intel/MinPlatformPkg/Library/PeiLib/PeiLib.c | 8 +-------
Platform/Intel/MinPlatformPkg/Library/PeiLib/PeiLib.inf | 8 +-------
Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec | 8 +-------
Platform/Intel/MinPlatformPkg/MinPlatformPkg.dsc | 8 +-------
.../PciHostBridgeLibSimple/PciHostBridgeLibSimple.c | 8 +-------
.../PciHostBridgeLibSimple/PciHostBridgeLibSimple.inf | 8 +-------
.../PciSegmentInfoLibSimple/PciSegmentInfoLibSimple.c | 9 +--------
.../PciSegmentInfoLibSimple/PciSegmentInfoLibSimple.inf | 7 +------
.../PlatformInit/Library/BoardInitLibNull/BoardInitLib.c | 8 +-------
.../Library/BoardInitLibNull/BoardInitLibNull.inf | 8 +-------
.../Library/MultiBoardInitSupportLib/DxeBoardInitLib.c | 8 +-------
.../DxeMultiBoardInitSupportLib.c | 8 +-------
.../DxeMultiBoardInitSupportLib.inf | 8 +-------
.../Library/MultiBoardInitSupportLib/PeiBoardInitLib.c | 8 +-------
.../PeiMultiBoardInitSupportLib.c | 8 +-------
.../PeiMultiBoardInitSupportLib.inf | 8 +-------
.../PlatformInit/Library/PeiReportFvLib/PeiReportFvLib.c | 8 +-------
.../Library/PeiReportFvLib/PeiReportFvLib.inf | 8 +-------
.../Library/SecBoardInitLibNull/Ia32/SecBoardInit.nasm | 8 +-------
.../Library/SecBoardInitLibNull/SecBoardInitLib.c | 8 +-------
.../Library/SecBoardInitLibNull/SecBoardInitLibNull.inf | 8 +-------
.../SiliconPolicyInitLibNull/SiliconPolicyInitLibNull.c | 8 +-------
.../SiliconPolicyInitLibNull.inf | 8 +-------
.../SiliconPolicyUpdateLibNull.c | 8 +-------
.../SiliconPolicyUpdateLibNull.inf | 8 +-------
.../PlatformInit/PlatformInitDxe/PlatformInitDxe.c | 8 +-------
.../PlatformInit/PlatformInitDxe/PlatformInitDxe.inf | 8 +-------
.../PlatformInit/PlatformInitPei/PlatformInitPostMem.c | 8 +-------
.../PlatformInit/PlatformInitPei/PlatformInitPostMem.inf | 8 +-------
.../PlatformInit/PlatformInitPei/PlatformInitPreMem.c | 8 +-------
.../PlatformInit/PlatformInitPei/PlatformInitPreMem.inf | 8 +-------
.../PlatformInit/PlatformInitSmm/PlatformInitSmm.c | 8 +-------
.../PlatformInit/PlatformInitSmm/PlatformInitSmm.inf | 8 +-------
.../MinPlatformPkg/PlatformInit/ReportFv/ReportFvPei.c | 8 +-------
.../MinPlatformPkg/PlatformInit/ReportFv/ReportFvPei.inf | 8 +-------
.../PlatformInit/SiliconPolicyDxe/SiliconPolicyDxe.c | 8 +-------
.../PlatformInit/SiliconPolicyDxe/SiliconPolicyDxe.inf | 8 +-------
.../SiliconPolicyPei/SiliconPolicyPeiPostMem.c | 8 +-------
.../SiliconPolicyPei/SiliconPolicyPeiPostMem.inf | 8 +-------
.../SiliconPolicyPei/SiliconPolicyPeiPreMem.c | 8 +-------
.../SiliconPolicyPei/SiliconPolicyPeiPreMem.inf | 8 +-------
.../Services/StallServicePei/StallServicePei.c | 8 +-------
.../Services/StallServicePei/StallServicePei.inf | 8 +-------
.../MinPlatformPkg/Tcg/Tcg2PlatformDxe/Tcg2PlatformDxe.c | 8 +-------
.../Tcg/Tcg2PlatformDxe/Tcg2PlatformDxe.inf | 8 +-------
.../MinPlatformPkg/Tcg/Tcg2PlatformPei/Tcg2PlatformPei.c | 8 +-------
.../Tcg/Tcg2PlatformPei/Tcg2PlatformPei.inf | 8 +-------
.../Test/Library/TestPointCheckLib/DxeCheckAcpi.c | 8 +-------
.../Test/Library/TestPointCheckLib/DxeCheckAcpiDmar.c | 8 +-------
.../Test/Library/TestPointCheckLib/DxeCheckAcpiHpet.c | 8 +-------
.../Test/Library/TestPointCheckLib/DxeCheckAcpiMadt.c | 8 +-------
.../Test/Library/TestPointCheckLib/DxeCheckAcpiMcfg.c | 8 +-------
.../Test/Library/TestPointCheckLib/DxeCheckAcpiTpm.c | 8 +-------
.../Test/Library/TestPointCheckLib/DxeCheckAcpiWsmt.c | 8 +-------
.../Library/TestPointCheckLib/DxeCheckBootVariable.c | 8 +-------
.../Library/TestPointCheckLib/DxeCheckConsoleVariable.c | 8 +-------
.../Test/Library/TestPointCheckLib/DxeCheckDevicePath.c | 8 +-------
.../Library/TestPointCheckLib/DxeCheckDmaProtection.c | 8 +-------
.../Test/Library/TestPointCheckLib/DxeCheckEsrt.c | 8 +-------
.../Test/Library/TestPointCheckLib/DxeCheckGcd.c | 8 +-------
.../Test/Library/TestPointCheckLib/DxeCheckHsti.c | 8 +-------
.../Test/Library/TestPointCheckLib/DxeCheckLoadedImage.c | 8 +-------
.../Library/TestPointCheckLib/DxeCheckMemoryAttribute.c | 8 +-------
.../Test/Library/TestPointCheckLib/DxeCheckMemoryMap.c | 8 +-------
.../TestPointCheckLib/DxeCheckMemoryTypeInformation.c | 8 +-------
.../Test/Library/TestPointCheckLib/DxeCheckPci.c | 8 +-------
.../Library/TestPointCheckLib/DxeCheckPiSignedFvBoot.c | 8 +-------
.../TestPointCheckLib/DxeCheckSmiHandlerInstrument.c | 8 +-------
.../Test/Library/TestPointCheckLib/DxeCheckSmmInfo.c | 8 +-------
.../Test/Library/TestPointCheckLib/DxeCheckTcgMor.c | 8 +-------
.../Library/TestPointCheckLib/DxeCheckTcgTrustedBoot.c | 8 +-------
.../Library/TestPointCheckLib/DxeCheckUefiSecureBoot.c | 8 +-------
.../Test/Library/TestPointCheckLib/DxeCheckVariable.c | 8 +-------
.../Library/TestPointCheckLib/DxeTestPointCheckLib.c | 8 +-------
.../Library/TestPointCheckLib/DxeTestPointCheckLib.inf | 8 +-------
.../Library/TestPointCheckLib/PeiCheckDmaProtection.c | 8 +-------
.../Test/Library/TestPointCheckLib/PeiCheckFvInfo.c | 8 +-------
.../Test/Library/TestPointCheckLib/PeiCheckHob.c | 8 +-------
.../Test/Library/TestPointCheckLib/PeiCheckMtrr.c | 8 +-------
.../Test/Library/TestPointCheckLib/PeiCheckPci.c | 8 +-------
.../Test/Library/TestPointCheckLib/PeiCheckSmmInfo.c | 8 +-------
.../Library/TestPointCheckLib/PeiTestPointCheckLib.c | 8 +-------
.../Library/TestPointCheckLib/PeiTestPointCheckLib.inf | 8 +-------
.../Test/Library/TestPointCheckLib/SecCheckCpuInfo.c | 8 +-------
.../Library/TestPointCheckLib/SecTestPointCheckLib.c | 8 +-------
.../Library/TestPointCheckLib/SecTestPointCheckLib.inf | 8 +-------
.../TestPointCheckLib/SmmCheckCommunicationBuffer.c | 8 +-------
.../Test/Library/TestPointCheckLib/SmmCheckLoadedImage.c | 8 +-------
.../Library/TestPointCheckLib/SmmCheckMemoryAttribute.c | 8 +-------
.../Test/Library/TestPointCheckLib/SmmCheckPaging.c | 8 +-------
.../Test/Library/TestPointCheckLib/SmmCheckSmrr.c | 8 +-------
.../Library/TestPointCheckLib/SmmTestPointCheckLib.c | 8 +-------
.../Library/TestPointCheckLib/SmmTestPointCheckLib.inf | 8 +-------
.../Test/Library/TestPointCheckLib/TestPointHelp.c | 8 +-------
.../Test/Library/TestPointCheckLib/TestPointInternal.h | 8 +-------
.../TestPointCheckLibNull/TestPointCheckLibNull.c | 8 +-------
.../TestPointCheckLibNull/TestPointCheckLibNull.inf | 8 +-------
.../Test/Library/TestPointLib/DxeTestPoint.c | 8 +-------
.../Test/Library/TestPointLib/DxeTestPoint.h | 8 +-------
.../Test/Library/TestPointLib/DxeTestPointAip.c | 8 +-------
.../Test/Library/TestPointLib/DxeTestPointLib.inf | 7 +------
.../Test/Library/TestPointLib/PeiTestPoint.c | 8 +-------
.../Test/Library/TestPointLib/PeiTestPoint.h | 8 +-------
.../Test/Library/TestPointLib/PeiTestPointLib.inf | 7 +------
.../Test/Library/TestPointLib/SmmTestPoint.c | 8 +-------
.../Test/Library/TestPointLib/SmmTestPoint.h | 8 +-------
.../Test/Library/TestPointLib/SmmTestPointAip.c | 8 +-------
.../Library/TestPointLib/SmmTestPointCommunication.c | 8 +-------
.../Test/Library/TestPointLib/SmmTestPointLib.inf | 7 +------
.../MinPlatformPkg/Test/TestPointDumpApp/TestPointDump.c | 8 +-------
.../Test/TestPointDumpApp/TestPointDumpApp.inf | 8 +-------
.../Test/TestPointStubDxe/TestPointStubDxe.c | 8 +-------
.../Test/TestPointStubDxe/TestPointStubDxe.inf | 8 +-------
.../MinPlatformPkg/Tools/AmlGenOffset/AmlGenOffset.py | 8 +-------
.../Tools/Fsp/PatchFspBinFvsBaseAddress.py | 8 +-------
.../Intel/MinPlatformPkg/Tools/Help/CheckCodeBase.py | 8 +-------
Platform/Intel/MinPlatformPkg/Tools/ParseVar/ParseVar.py | 8 +-------
Platform/Intel/MinPlatformPkg/Tools/PatchFv/PatchBfv.py | 8 +-------
.../Intel/MinPlatformPkg/Tools/PatchFv/PatchBinFv.py | 8 +-------
.../Intel/MinPlatformPkg/Tools/PatchFv/RebaseBinFv.py | 8 +-------
.../Intel/MinPlatformPkg/Tools/PatchFv/SyncBinFvInf.py | 8 +-------
233 files changed, 233 insertions(+), 1627 deletions(-)
diff --git a/Platform/Intel/MinPlatformPkg/Acpi/AcpiSmm/AcpiSmm.c b/Platform/Intel/MinPlatformPkg/Acpi/AcpiSmm/AcpiSmm.c
index 74c1678bc8..809f75d3c5 100644
--- a/Platform/Intel/MinPlatformPkg/Acpi/AcpiSmm/AcpiSmm.c
+++ b/Platform/Intel/MinPlatformPkg/Acpi/AcpiSmm/AcpiSmm.c
@@ -2,13 +2,7 @@
Acpi Smm driver.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Acpi/AcpiSmm/AcpiSmm.h b/Platform/Intel/MinPlatformPkg/Acpi/AcpiSmm/AcpiSmm.h
index a34d87250f..e34ffb1b75 100644
--- a/Platform/Intel/MinPlatformPkg/Acpi/AcpiSmm/AcpiSmm.h
+++ b/Platform/Intel/MinPlatformPkg/Acpi/AcpiSmm/AcpiSmm.h
@@ -2,13 +2,7 @@
Header file for the Smm platform driver.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Acpi/AcpiSmm/AcpiSmm.inf b/Platform/Intel/MinPlatformPkg/Acpi/AcpiSmm/AcpiSmm.inf
index 8675a45b7a..fbaf467525 100644
--- a/Platform/Intel/MinPlatformPkg/Acpi/AcpiSmm/AcpiSmm.inf
+++ b/Platform/Intel/MinPlatformPkg/Acpi/AcpiSmm/AcpiSmm.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c
index ade65d8ab7..5eb727929b 100644
--- a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c
+++ b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c
@@ -2,13 +2,7 @@
ACPI Platform Driver
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.h b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.h
index 6a314f5733..bd11f9e988 100644
--- a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.h
+++ b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.h
@@ -2,13 +2,7 @@
This is an implementation of the ACPI platform driver.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.inf b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.inf
index 6a5b94ef28..5d9c8cab50 100644
--- a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.inf
+++ b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Facs/Facs.c b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Facs/Facs.c
index b454a8ddc1..cde6e478c6 100644
--- a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Facs/Facs.c
+++ b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Facs/Facs.c
@@ -4,13 +4,7 @@
for bug fixes, no porting is required.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Fadt/Fadt.c b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Fadt/Fadt.c
index 0def9f6c2b..6efb38cda4 100644
--- a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Fadt/Fadt.c
+++ b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Fadt/Fadt.c
@@ -4,13 +4,7 @@
for bug fixes, no porting is required.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Hpet/Hpet.c b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Hpet/Hpet.c
index 2512793158..8721beb03f 100644
--- a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Hpet/Hpet.c
+++ b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Hpet/Hpet.c
@@ -4,13 +4,7 @@
for bug fixes, no porting is required.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Wsmt/Wsmt.c b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Wsmt/Wsmt.c
index 6d25de2ae7..6880f47fa6 100644
--- a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Wsmt/Wsmt.c
+++ b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Wsmt/Wsmt.c
@@ -2,13 +2,7 @@
ACPI WSMT table
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Acpi/Library/BoardAcpiLibNull/BoardAcpiEnableLib.c b/Platform/Intel/MinPlatformPkg/Acpi/Library/BoardAcpiLibNull/BoardAcpiEnableLib.c
index ff284fc404..334cb21714 100644
--- a/Platform/Intel/MinPlatformPkg/Acpi/Library/BoardAcpiLibNull/BoardAcpiEnableLib.c
+++ b/Platform/Intel/MinPlatformPkg/Acpi/Library/BoardAcpiLibNull/BoardAcpiEnableLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Acpi/Library/BoardAcpiLibNull/BoardAcpiEnableLibNull.inf b/Platform/Intel/MinPlatformPkg/Acpi/Library/BoardAcpiLibNull/BoardAcpiEnableLibNull.inf
index 10cc8fffff..54985ee50d 100644
--- a/Platform/Intel/MinPlatformPkg/Acpi/Library/BoardAcpiLibNull/BoardAcpiEnableLibNull.inf
+++ b/Platform/Intel/MinPlatformPkg/Acpi/Library/BoardAcpiLibNull/BoardAcpiEnableLibNull.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/MinPlatformPkg/Acpi/Library/BoardAcpiLibNull/BoardAcpiTableLib.c b/Platform/Intel/MinPlatformPkg/Acpi/Library/BoardAcpiLibNull/BoardAcpiTableLib.c
index 59a27c29a9..e49e6ad441 100644
--- a/Platform/Intel/MinPlatformPkg/Acpi/Library/BoardAcpiLibNull/BoardAcpiTableLib.c
+++ b/Platform/Intel/MinPlatformPkg/Acpi/Library/BoardAcpiLibNull/BoardAcpiTableLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Acpi/Library/BoardAcpiLibNull/BoardAcpiTableLibNull.inf b/Platform/Intel/MinPlatformPkg/Acpi/Library/BoardAcpiLibNull/BoardAcpiTableLibNull.inf
index 1564c8546f..04f55b49d5 100644
--- a/Platform/Intel/MinPlatformPkg/Acpi/Library/BoardAcpiLibNull/BoardAcpiTableLibNull.inf
+++ b/Platform/Intel/MinPlatformPkg/Acpi/Library/BoardAcpiLibNull/BoardAcpiTableLibNull.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/MinPlatformPkg/Acpi/Library/DxeAslUpdateLib/DxeAslUpdateLib.c b/Platform/Intel/MinPlatformPkg/Acpi/Library/DxeAslUpdateLib/DxeAslUpdateLib.c
index ea85be4a11..e6ab43db6d 100644
--- a/Platform/Intel/MinPlatformPkg/Acpi/Library/DxeAslUpdateLib/DxeAslUpdateLib.c
+++ b/Platform/Intel/MinPlatformPkg/Acpi/Library/DxeAslUpdateLib/DxeAslUpdateLib.c
@@ -7,13 +7,7 @@
This library uses the ACPI Support protocol.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include <Base.h>
diff --git a/Platform/Intel/MinPlatformPkg/Acpi/Library/DxeAslUpdateLib/DxeAslUpdateLib.inf b/Platform/Intel/MinPlatformPkg/Acpi/Library/DxeAslUpdateLib/DxeAslUpdateLib.inf
index 20fcc4e63c..1ddca75e97 100644
--- a/Platform/Intel/MinPlatformPkg/Acpi/Library/DxeAslUpdateLib/DxeAslUpdateLib.inf
+++ b/Platform/Intel/MinPlatformPkg/Acpi/Library/DxeAslUpdateLib/DxeAslUpdateLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/DxeBoardAcpiTableLib.c b/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/DxeBoardAcpiTableLib.c
index 700d5e0773..dff47aad79 100644
--- a/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/DxeBoardAcpiTableLib.c
+++ b/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/DxeBoardAcpiTableLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/DxeMultiBoardAcpiSupportLib.c b/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/DxeMultiBoardAcpiSupportLib.c
index d054d724d6..43318236e0 100644
--- a/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/DxeMultiBoardAcpiSupportLib.c
+++ b/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/DxeMultiBoardAcpiSupportLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/DxeMultiBoardAcpiSupportLib.inf b/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/DxeMultiBoardAcpiSupportLib.inf
index 8422faf62a..826c7f4008 100644
--- a/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/DxeMultiBoardAcpiSupportLib.inf
+++ b/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/DxeMultiBoardAcpiSupportLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/SmmBoardAcpiEnableLib.c b/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/SmmBoardAcpiEnableLib.c
index a0c6b20e13..54af6a8c3c 100644
--- a/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/SmmBoardAcpiEnableLib.c
+++ b/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/SmmBoardAcpiEnableLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/SmmMultiBoardAcpiSupportLib.c b/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/SmmMultiBoardAcpiSupportLib.c
index d858e8ae27..ac253eec84 100644
--- a/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/SmmMultiBoardAcpiSupportLib.c
+++ b/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/SmmMultiBoardAcpiSupportLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/SmmMultiBoardAcpiSupportLib.inf b/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/SmmMultiBoardAcpiSupportLib.inf
index 0ce45b25cb..5415446b57 100644
--- a/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/SmmMultiBoardAcpiSupportLib.inf
+++ b/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/SmmMultiBoardAcpiSupportLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/MinPlatformPkg/Acpi/MinDsdt/MinDsdt.asl b/Platform/Intel/MinPlatformPkg/Acpi/MinDsdt/MinDsdt.asl
index aed770a39d..0d94472450 100644
--- a/Platform/Intel/MinPlatformPkg/Acpi/MinDsdt/MinDsdt.asl
+++ b/Platform/Intel/MinPlatformPkg/Acpi/MinDsdt/MinDsdt.asl
@@ -2,13 +2,7 @@
ACPI minimum DSDT table
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Acpi/MinDsdt/MinDsdt.c b/Platform/Intel/MinPlatformPkg/Acpi/MinDsdt/MinDsdt.c
index ef40e97b7c..9bc2224538 100644
--- a/Platform/Intel/MinPlatformPkg/Acpi/MinDsdt/MinDsdt.c
+++ b/Platform/Intel/MinPlatformPkg/Acpi/MinDsdt/MinDsdt.c
@@ -2,13 +2,7 @@
Min DSDT Driver
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Acpi/MinDsdt/MinDsdt.inf b/Platform/Intel/MinPlatformPkg/Acpi/MinDsdt/MinDsdt.inf
index 3ffa79c966..1066f13cfe 100644
--- a/Platform/Intel/MinPlatformPkg/Acpi/MinDsdt/MinDsdt.inf
+++ b/Platform/Intel/MinPlatformPkg/Acpi/MinDsdt/MinDsdt.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/BdsPlatform.c b/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/BdsPlatform.c
index 41fe3f2cca..491fb0f26f 100644
--- a/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/BdsPlatform.c
+++ b/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/BdsPlatform.c
@@ -2,13 +2,7 @@
This file include all platform action which can be customized by IBV/OEM.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/BdsPlatform.h b/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/BdsPlatform.h
index 779ba9a98d..360a00d7d7 100644
--- a/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/BdsPlatform.h
+++ b/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/BdsPlatform.h
@@ -2,13 +2,7 @@
Header file for BDS Platform specific code
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/DxePlatformBootManagerLib.inf b/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/DxePlatformBootManagerLib.inf
index bd9c0467b9..388ffd808b 100644
--- a/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/DxePlatformBootManagerLib.inf
+++ b/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/DxePlatformBootManagerLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/MemoryTest.c b/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/MemoryTest.c
index 0a47f9252d..654845349a 100644
--- a/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/MemoryTest.c
+++ b/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/MemoryTest.c
@@ -2,13 +2,7 @@
Perform the platform memory test
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/PlatformBootOption.c b/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/PlatformBootOption.c
index ea30de0540..84aa097d58 100644
--- a/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/PlatformBootOption.c
+++ b/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/PlatformBootOption.c
@@ -2,13 +2,7 @@
Driver for Platform Boot Options support.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Flash/Library/SpiFlashCommonLibNull/SpiFlashCommonLibNull.c b/Platform/Intel/MinPlatformPkg/Flash/Library/SpiFlashCommonLibNull/SpiFlashCommonLibNull.c
index bacc440630..403b16a1b4 100644
--- a/Platform/Intel/MinPlatformPkg/Flash/Library/SpiFlashCommonLibNull/SpiFlashCommonLibNull.c
+++ b/Platform/Intel/MinPlatformPkg/Flash/Library/SpiFlashCommonLibNull/SpiFlashCommonLibNull.c
@@ -2,13 +2,7 @@
Null Library instance of SPI Flash Common Library Class
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Flash/Library/SpiFlashCommonLibNull/SpiFlashCommonLibNull.inf b/Platform/Intel/MinPlatformPkg/Flash/Library/SpiFlashCommonLibNull/SpiFlashCommonLibNull.inf
index 73853c0d1c..d4964681de 100644
--- a/Platform/Intel/MinPlatformPkg/Flash/Library/SpiFlashCommonLibNull/SpiFlashCommonLibNull.inf
+++ b/Platform/Intel/MinPlatformPkg/Flash/Library/SpiFlashCommonLibNull/SpiFlashCommonLibNull.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/Common/FvbInfo.c b/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/Common/FvbInfo.c
index bd4366ea7c..7f2678fa9e 100644
--- a/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/Common/FvbInfo.c
+++ b/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/Common/FvbInfo.c
@@ -3,13 +3,7 @@
These data is intent to decouple FVB driver with FV header.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/Common/SpiFvbServiceCommon.c b/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/Common/SpiFvbServiceCommon.c
index 20ad9a3a38..113c749d04 100644
--- a/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/Common/SpiFvbServiceCommon.c
+++ b/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/Common/SpiFvbServiceCommon.c
@@ -3,13 +3,7 @@
which are compliant with the Intel(R) Serial Flash Interface Compatibility Specification.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/Common/SpiFvbServiceCommon.h b/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/Common/SpiFvbServiceCommon.h
index 876f14dc8c..6379fc86d5 100644
--- a/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/Common/SpiFvbServiceCommon.h
+++ b/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/Common/SpiFvbServiceCommon.h
@@ -2,13 +2,7 @@
Common source definitions used in serial flash drivers
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/Smm/SpiFvbServiceSmm.c b/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/Smm/SpiFvbServiceSmm.c
index f0c2a1df8b..251fcae30b 100644
--- a/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/Smm/SpiFvbServiceSmm.c
+++ b/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/Smm/SpiFvbServiceSmm.c
@@ -3,13 +3,7 @@
which are compliant with the Intel(R) Serial Flash Interface Compatibility Specification.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/SpiFvbServiceSmm.inf b/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/SpiFvbServiceSmm.inf
index eb3519fb6a..cca7de94a0 100644
--- a/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/SpiFvbServiceSmm.inf
+++ b/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/SpiFvbServiceSmm.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/DxeFspWrapperPlatformLib/DxeFspWrapperPlatformLib.inf b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/DxeFspWrapperPlatformLib/DxeFspWrapperPlatformLib.inf
index 48c4433b01..a1226dbcfe 100644
--- a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/DxeFspWrapperPlatformLib/DxeFspWrapperPlatformLib.inf
+++ b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/DxeFspWrapperPlatformLib/DxeFspWrapperPlatformLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/DxeFspWrapperPlatformLib/DxeFspWrapperPlatformResetLib.c b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/DxeFspWrapperPlatformLib/DxeFspWrapperPlatformResetLib.c
index 395f189ee9..b4d509db85 100644
--- a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/DxeFspWrapperPlatformLib/DxeFspWrapperPlatformResetLib.c
+++ b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/DxeFspWrapperPlatformLib/DxeFspWrapperPlatformResetLib.c
@@ -2,13 +2,7 @@
Dxe library function to reset the system from FSP wrapper.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include <PiDxe.h>
diff --git a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperHobProcessLib/FspWrapperHobProcessLib.c b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperHobProcessLib/FspWrapperHobProcessLib.c
index 7323a46da4..e8df06dfb7 100644
--- a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperHobProcessLib/FspWrapperHobProcessLib.c
+++ b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperHobProcessLib/FspWrapperHobProcessLib.c
@@ -2,13 +2,7 @@
Provide FSP wrapper hob process related function.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperHobProcessLib/PeiFspWrapperHobProcessLib.inf b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperHobProcessLib/PeiFspWrapperHobProcessLib.inf
index 362851e128..a76e3195d6 100644
--- a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperHobProcessLib/PeiFspWrapperHobProcessLib.inf
+++ b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperHobProcessLib/PeiFspWrapperHobProcessLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperPlatformLib/PeiFspWrapperPlatformLib.c b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperPlatformLib/PeiFspWrapperPlatformLib.c
index 2c6c026ee5..0def288805 100644
--- a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperPlatformLib/PeiFspWrapperPlatformLib.c
+++ b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperPlatformLib/PeiFspWrapperPlatformLib.c
@@ -2,13 +2,7 @@
Provide FSP wrapper platform related function.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperPlatformLib/PeiFspWrapperPlatformLib.inf b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperPlatformLib/PeiFspWrapperPlatformLib.inf
index f7e82d81d7..dafd17dc11 100644
--- a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperPlatformLib/PeiFspWrapperPlatformLib.inf
+++ b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperPlatformLib/PeiFspWrapperPlatformLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperPlatformLib/PeiFspWrapperPlatformResetLib.c b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperPlatformLib/PeiFspWrapperPlatformResetLib.c
index 501197c709..191bcb2fbb 100644
--- a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperPlatformLib/PeiFspWrapperPlatformResetLib.c
+++ b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperPlatformLib/PeiFspWrapperPlatformResetLib.c
@@ -2,13 +2,7 @@
Pei library function to reset the system from FSP wrapper.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/FspWrapperPlatformSecLib.c b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/FspWrapperPlatformSecLib.c
index 27096fec32..303f3aac40 100644
--- a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/FspWrapperPlatformSecLib.c
+++ b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/FspWrapperPlatformSecLib.c
@@ -2,13 +2,7 @@
Provide FSP wrapper platform sec related function.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/FsptCoreUpd.h b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/FsptCoreUpd.h
index bfdc279c4a..7c0f605b92 100644
--- a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/FsptCoreUpd.h
+++ b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/FsptCoreUpd.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/Ia32/Fsp.h b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/Ia32/Fsp.h
index ba5219198c..9f6cdcf476 100644
--- a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/Ia32/Fsp.h
+++ b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/Ia32/Fsp.h
@@ -2,13 +2,7 @@
Fsp related definitions
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/Ia32/PeiCoreEntry.S b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/Ia32/PeiCoreEntry.S
index 8923577263..8c8356f3a0 100644
--- a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/Ia32/PeiCoreEntry.S
+++ b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/Ia32/PeiCoreEntry.S
@@ -2,13 +2,7 @@
# Find and call SecStartup
#
# Copyright (c) 2017, 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 that accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php.
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/Ia32/PeiCoreEntry.asm b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/Ia32/PeiCoreEntry.asm
index d4703dc8ba..c854067db1 100644
--- a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/Ia32/PeiCoreEntry.asm
+++ b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/Ia32/PeiCoreEntry.asm
@@ -2,13 +2,7 @@
; Find and call SecStartup
;
; Copyright (c) 2017, 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 that accompanies this distribution.
-; The full text of the license may be found at
-; http://opensource.org/licenses/bsd-license.php.
-;
-; THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-; WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+; SPDX-License-Identifier: BSD-2-Clause-Patent
;
;;
diff --git a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/Ia32/SecEntry.S b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/Ia32/SecEntry.S
index 396e7a4c16..63c420a8dc 100644
--- a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/Ia32/SecEntry.S
+++ b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/Ia32/SecEntry.S
@@ -3,13 +3,7 @@
# It consumes the reset vector, calls TempRamInit API from FSP binary.
#
# Copyright (c) 2017, 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 that accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php.
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/Ia32/SecEntry.asm b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/Ia32/SecEntry.asm
index 7b82cbaa0e..2886a37d73 100644
--- a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/Ia32/SecEntry.asm
+++ b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/Ia32/SecEntry.asm
@@ -3,13 +3,7 @@
; It consumes the reset vector, calls TempRamInit API from FSP binary.
;
; Copyright (c) 2017, 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 that accompanies this distribution.
-; The full text of the license may be found at
-; http://opensource.org/licenses/bsd-license.php.
-;
-; THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-; WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+; SPDX-License-Identifier: BSD-2-Clause-Patent
;
;;
diff --git a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/Ia32/Stack.S b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/Ia32/Stack.S
index e0eb80ad9a..9953daa195 100644
--- a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/Ia32/Stack.S
+++ b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/Ia32/Stack.S
@@ -2,13 +2,7 @@
# Switch the stack from temporary memory to permenent memory.
#
# Copyright (c) 2017, 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 that accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php.
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/Ia32/Stack.asm b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/Ia32/Stack.asm
index 27ae218e63..183024066a 100644
--- a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/Ia32/Stack.asm
+++ b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/Ia32/Stack.asm
@@ -2,13 +2,7 @@
; Switch the stack from temporary memory to permenent memory.
;
; Copyright (c) 2017, 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 that accompanies this distribution.
-; The full text of the license may be found at
-; http://opensource.org/licenses/bsd-license.php.
-;
-; THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-; WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+; SPDX-License-Identifier: BSD-2-Clause-Patent
;
;;
diff --git a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/PlatformInit.c b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/PlatformInit.c
index 6d810686f3..ef89e3f310 100644
--- a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/PlatformInit.c
+++ b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/PlatformInit.c
@@ -2,13 +2,7 @@
Provide platform init function.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/SecFspWrapperPlatformSecLib.inf b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/SecFspWrapperPlatformSecLib.inf
index 9c133577cd..6f2c95adb7 100644
--- a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/SecFspWrapperPlatformSecLib.inf
+++ b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/SecFspWrapperPlatformSecLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/SecGetPerformance.c b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/SecGetPerformance.c
index 7d06b4e985..c4eeb2b188 100644
--- a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/SecGetPerformance.c
+++ b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/SecGetPerformance.c
@@ -2,13 +2,7 @@
Sample to provide SecGetPerformance function.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/SecPlatformInformation.c b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/SecPlatformInformation.c
index 3b8189fadd..5b94ed2bef 100644
--- a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/SecPlatformInformation.c
+++ b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/SecPlatformInformation.c
@@ -2,13 +2,7 @@
Provide SecPlatformInformation function.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/SecRamInitData.c b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/SecRamInitData.c
index 485f198db4..b356327b4c 100644
--- a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/SecRamInitData.c
+++ b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/SecRamInitData.c
@@ -2,13 +2,7 @@
Provide TempRamInitParams data.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/SecTempRamDone.c b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/SecTempRamDone.c
index 98bec31013..cde8a80a4e 100644
--- a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/SecTempRamDone.c
+++ b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/SecTempRamDone.c
@@ -2,13 +2,7 @@
Provide SecTemporaryRamDone function.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/FspWrapper/SaveMemoryConfig/SaveMemoryConfig.c b/Platform/Intel/MinPlatformPkg/FspWrapper/SaveMemoryConfig/SaveMemoryConfig.c
index b01c610bf5..41ed2550bd 100644
--- a/Platform/Intel/MinPlatformPkg/FspWrapper/SaveMemoryConfig/SaveMemoryConfig.c
+++ b/Platform/Intel/MinPlatformPkg/FspWrapper/SaveMemoryConfig/SaveMemoryConfig.c
@@ -3,13 +3,7 @@
exists, and saves the data to nvRAM.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/FspWrapper/SaveMemoryConfig/SaveMemoryConfig.inf b/Platform/Intel/MinPlatformPkg/FspWrapper/SaveMemoryConfig/SaveMemoryConfig.inf
index 0b6eda9d25..0c8689a6f6 100644
--- a/Platform/Intel/MinPlatformPkg/FspWrapper/SaveMemoryConfig/SaveMemoryConfig.inf
+++ b/Platform/Intel/MinPlatformPkg/FspWrapper/SaveMemoryConfig/SaveMemoryConfig.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/ExternalDeviceDmaProtection.c b/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/ExternalDeviceDmaProtection.c
index 197813fe66..f96c2f07ec 100644
--- a/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/ExternalDeviceDmaProtection.c
+++ b/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/ExternalDeviceDmaProtection.c
@@ -4,13 +4,7 @@
in this sample driver.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/FirmwareTrustConfigurationCryptoStrength.c b/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/FirmwareTrustConfigurationCryptoStrength.c
index 6e2f5f4c10..dd0a53ff48 100644
--- a/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/FirmwareTrustConfigurationCryptoStrength.c
+++ b/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/FirmwareTrustConfigurationCryptoStrength.c
@@ -4,13 +4,7 @@
in this sample driver.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/FirmwareVersionRollbackProtection.c b/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/FirmwareVersionRollbackProtection.c
index a22836c8a5..3f66e67054 100644
--- a/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/FirmwareVersionRollbackProtection.c
+++ b/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/FirmwareVersionRollbackProtection.c
@@ -4,13 +4,7 @@
in this sample driver.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/HstiIbvPlatformDxe.c b/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/HstiIbvPlatformDxe.c
index 02af6dbbe7..8be9e98eae 100644
--- a/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/HstiIbvPlatformDxe.c
+++ b/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/HstiIbvPlatformDxe.c
@@ -4,13 +4,7 @@
publishes the IBV role HSTI structure indicating all tests pass
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/HstiIbvPlatformDxe.h b/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/HstiIbvPlatformDxe.h
index 1e32229895..1dff22363d 100644
--- a/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/HstiIbvPlatformDxe.h
+++ b/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/HstiIbvPlatformDxe.h
@@ -3,13 +3,7 @@
and publishing IBV HSTI
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/HstiIbvPlatformDxe.inf b/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/HstiIbvPlatformDxe.inf
index 97356620f5..6481452860 100644
--- a/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/HstiIbvPlatformDxe.inf
+++ b/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/HstiIbvPlatformDxe.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/MorSupport.c b/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/MorSupport.c
index 9a1e8a0385..0358b546ee 100644
--- a/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/MorSupport.c
+++ b/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/MorSupport.c
@@ -4,13 +4,7 @@
in this sample driver.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/NoTestKeyVerification.c b/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/NoTestKeyVerification.c
index 6f03495572..55beb7860a 100644
--- a/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/NoTestKeyVerification.c
+++ b/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/NoTestKeyVerification.c
@@ -4,13 +4,7 @@
in this sample driver.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/SecureBootBypass.c b/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/SecureBootBypass.c
index 472ec42673..4936b305ab 100644
--- a/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/SecureBootBypass.c
+++ b/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/SecureBootBypass.c
@@ -4,13 +4,7 @@
in this sample driver.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc
index dd0173a1af..efe02c99f3 100644
--- a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc
+++ b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017 - 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeInclude.dsc b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeInclude.dsc
index 6bd526a27b..f0e578f8cc 100644
--- a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeInclude.dsc
+++ b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeInclude.dsc
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017 - 2019, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc
index 1ed3591f36..5b3679bb4e 100644
--- a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc
+++ b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017 - 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/MinPlatformPkg/Include/Dsc/CorePeiInclude.dsc b/Platform/Intel/MinPlatformPkg/Include/Dsc/CorePeiInclude.dsc
index 231eb60e41..08e50cac07 100644
--- a/Platform/Intel/MinPlatformPkg/Include/Dsc/CorePeiInclude.dsc
+++ b/Platform/Intel/MinPlatformPkg/Include/Dsc/CorePeiInclude.dsc
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/MinPlatformPkg/Include/Dsc/CorePeiLib.dsc b/Platform/Intel/MinPlatformPkg/Include/Dsc/CorePeiLib.dsc
index 6855d1e5b7..3f784d58c9 100644
--- a/Platform/Intel/MinPlatformPkg/Include/Dsc/CorePeiLib.dsc
+++ b/Platform/Intel/MinPlatformPkg/Include/Dsc/CorePeiLib.dsc
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreOsBootInclude.fdf b/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreOsBootInclude.fdf
index 0f975a8923..24f1a0c508 100644
--- a/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreOsBootInclude.fdf
+++ b/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreOsBootInclude.fdf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/MinPlatformPkg/Include/Fdf/CorePostMemoryInclude.fdf b/Platform/Intel/MinPlatformPkg/Include/Fdf/CorePostMemoryInclude.fdf
index 013c10146b..3c2716d672 100644
--- a/Platform/Intel/MinPlatformPkg/Include/Fdf/CorePostMemoryInclude.fdf
+++ b/Platform/Intel/MinPlatformPkg/Include/Fdf/CorePostMemoryInclude.fdf
@@ -3,12 +3,6 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/MinPlatformPkg/Include/Fdf/CorePreMemoryInclude.fdf b/Platform/Intel/MinPlatformPkg/Include/Fdf/CorePreMemoryInclude.fdf
index e1b195d4d7..c0828997cf 100644
--- a/Platform/Intel/MinPlatformPkg/Include/Fdf/CorePreMemoryInclude.fdf
+++ b/Platform/Intel/MinPlatformPkg/Include/Fdf/CorePreMemoryInclude.fdf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreSecurityLateInclude.fdf b/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreSecurityLateInclude.fdf
index 2171fe12e5..45dda7ea0a 100644
--- a/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreSecurityLateInclude.fdf
+++ b/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreSecurityLateInclude.fdf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017 - 2019, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreSecurityPostMemoryInclude.fdf b/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreSecurityPostMemoryInclude.fdf
index 013c10146b..3c2716d672 100644
--- a/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreSecurityPostMemoryInclude.fdf
+++ b/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreSecurityPostMemoryInclude.fdf
@@ -3,12 +3,6 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreSecurityPreMemoryInclude.fdf b/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreSecurityPreMemoryInclude.fdf
index d0a4d39d57..af5d032fce 100644
--- a/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreSecurityPreMemoryInclude.fdf
+++ b/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreSecurityPreMemoryInclude.fdf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreUefiBootInclude.fdf b/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreUefiBootInclude.fdf
index be3caad402..7859c0b1a5 100644
--- a/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreUefiBootInclude.fdf
+++ b/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreUefiBootInclude.fdf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017 - 2019, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/MinPlatformPkg/Include/Fdf/RuleInclude.fdf b/Platform/Intel/MinPlatformPkg/Include/Fdf/RuleInclude.fdf
index 1b20442fa6..c4c4315ad8 100644
--- a/Platform/Intel/MinPlatformPkg/Include/Fdf/RuleInclude.fdf
+++ b/Platform/Intel/MinPlatformPkg/Include/Fdf/RuleInclude.fdf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/MinPlatformPkg/Include/Guid/SmramMemoryReserve.h b/Platform/Intel/MinPlatformPkg/Include/Guid/SmramMemoryReserve.h
index 04589cf040..9918c768ba 100644
--- a/Platform/Intel/MinPlatformPkg/Include/Guid/SmramMemoryReserve.h
+++ b/Platform/Intel/MinPlatformPkg/Include/Guid/SmramMemoryReserve.h
@@ -9,13 +9,7 @@
This GUIDed HOB can be used to convey the existence of the T-SEG reservation and H-SEG usage
Copyright (c) 2007 - 2010, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
@par Revision Reference:
GUIDs defined in SmmCis spec version 0.9.
diff --git a/Platform/Intel/MinPlatformPkg/Include/HstiIbvFeatureBit.h b/Platform/Intel/MinPlatformPkg/Include/HstiIbvFeatureBit.h
index 3a17c494b2..fa0cf30370 100644
--- a/Platform/Intel/MinPlatformPkg/Include/HstiIbvFeatureBit.h
+++ b/Platform/Intel/MinPlatformPkg/Include/HstiIbvFeatureBit.h
@@ -3,13 +3,7 @@
including error string definitions
Copyright (c) 2017 -2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Include/Library/AslUpdateLib.h b/Platform/Intel/MinPlatformPkg/Include/Library/AslUpdateLib.h
index dc76e33557..d58b6d6458 100644
--- a/Platform/Intel/MinPlatformPkg/Include/Library/AslUpdateLib.h
+++ b/Platform/Intel/MinPlatformPkg/Include/Library/AslUpdateLib.h
@@ -6,13 +6,7 @@
restrictions, etc).
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Include/Library/BoardAcpiEnableLib.h b/Platform/Intel/MinPlatformPkg/Include/Library/BoardAcpiEnableLib.h
index 48de84cfed..edd8dbbd9d 100644
--- a/Platform/Intel/MinPlatformPkg/Include/Library/BoardAcpiEnableLib.h
+++ b/Platform/Intel/MinPlatformPkg/Include/Library/BoardAcpiEnableLib.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Include/Library/BoardAcpiTableLib.h b/Platform/Intel/MinPlatformPkg/Include/Library/BoardAcpiTableLib.h
index d001393654..119661a42e 100644
--- a/Platform/Intel/MinPlatformPkg/Include/Library/BoardAcpiTableLib.h
+++ b/Platform/Intel/MinPlatformPkg/Include/Library/BoardAcpiTableLib.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Include/Library/BoardInitLib.h b/Platform/Intel/MinPlatformPkg/Include/Library/BoardInitLib.h
index 914bef1382..32dce7fb17 100644
--- a/Platform/Intel/MinPlatformPkg/Include/Library/BoardInitLib.h
+++ b/Platform/Intel/MinPlatformPkg/Include/Library/BoardInitLib.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017 - 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Include/Library/CompressLib.h b/Platform/Intel/MinPlatformPkg/Include/Library/CompressLib.h
index e7db7bc8c5..95ead25679 100644
--- a/Platform/Intel/MinPlatformPkg/Include/Library/CompressLib.h
+++ b/Platform/Intel/MinPlatformPkg/Include/Library/CompressLib.h
@@ -2,13 +2,7 @@
Header file for compression routine.
Copyright (c) 2005 - 2014, 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Include/Library/HobVariableLib.h b/Platform/Intel/MinPlatformPkg/Include/Library/HobVariableLib.h
index 8b5e1dc858..d5d84e6deb 100644
--- a/Platform/Intel/MinPlatformPkg/Include/Library/HobVariableLib.h
+++ b/Platform/Intel/MinPlatformPkg/Include/Library/HobVariableLib.h
@@ -1,13 +1,7 @@
/**@file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Include/Library/MultiBoardAcpiSupportLib.h b/Platform/Intel/MinPlatformPkg/Include/Library/MultiBoardAcpiSupportLib.h
index 15087428e8..a8bb99250c 100644
--- a/Platform/Intel/MinPlatformPkg/Include/Library/MultiBoardAcpiSupportLib.h
+++ b/Platform/Intel/MinPlatformPkg/Include/Library/MultiBoardAcpiSupportLib.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Include/Library/MultiBoardInitSupportLib.h b/Platform/Intel/MinPlatformPkg/Include/Library/MultiBoardInitSupportLib.h
index c4c36216fe..6c14b5677d 100644
--- a/Platform/Intel/MinPlatformPkg/Include/Library/MultiBoardInitSupportLib.h
+++ b/Platform/Intel/MinPlatformPkg/Include/Library/MultiBoardInitSupportLib.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Include/Library/PeiLib.h b/Platform/Intel/MinPlatformPkg/Include/Library/PeiLib.h
index 8889f97d59..d8b1a47c58 100644
--- a/Platform/Intel/MinPlatformPkg/Include/Library/PeiLib.h
+++ b/Platform/Intel/MinPlatformPkg/Include/Library/PeiLib.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Include/Library/ReportFvLib.h b/Platform/Intel/MinPlatformPkg/Include/Library/ReportFvLib.h
index 08b3e85bc3..5c40bd0e6e 100644
--- a/Platform/Intel/MinPlatformPkg/Include/Library/ReportFvLib.h
+++ b/Platform/Intel/MinPlatformPkg/Include/Library/ReportFvLib.h
@@ -5,13 +5,7 @@
This library installs pre-memory and post-memory firmware volumes.
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Include/Library/SecBoardInitLib.h b/Platform/Intel/MinPlatformPkg/Include/Library/SecBoardInitLib.h
index 9142b14335..f90d6f2ff2 100644
--- a/Platform/Intel/MinPlatformPkg/Include/Library/SecBoardInitLib.h
+++ b/Platform/Intel/MinPlatformPkg/Include/Library/SecBoardInitLib.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Include/Library/SiliconPolicyInitLib.h b/Platform/Intel/MinPlatformPkg/Include/Library/SiliconPolicyInitLib.h
index cc9a825f40..506fb4faf1 100644
--- a/Platform/Intel/MinPlatformPkg/Include/Library/SiliconPolicyInitLib.h
+++ b/Platform/Intel/MinPlatformPkg/Include/Library/SiliconPolicyInitLib.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Include/Library/SiliconPolicyUpdateLib.h b/Platform/Intel/MinPlatformPkg/Include/Library/SiliconPolicyUpdateLib.h
index 0e166f1dc9..80be3e6056 100644
--- a/Platform/Intel/MinPlatformPkg/Include/Library/SiliconPolicyUpdateLib.h
+++ b/Platform/Intel/MinPlatformPkg/Include/Library/SiliconPolicyUpdateLib.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Include/Library/SpiFlashCommonLib.h b/Platform/Intel/MinPlatformPkg/Include/Library/SpiFlashCommonLib.h
index 12dfaeb440..0c5e72258c 100644
--- a/Platform/Intel/MinPlatformPkg/Include/Library/SpiFlashCommonLib.h
+++ b/Platform/Intel/MinPlatformPkg/Include/Library/SpiFlashCommonLib.h
@@ -3,13 +3,7 @@
internal structure and functions used by SpiFlashCommonLib.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Include/Library/TestPointCheckLib.h b/Platform/Intel/MinPlatformPkg/Include/Library/TestPointCheckLib.h
index 6c7c9f4798..7265e22689 100644
--- a/Platform/Intel/MinPlatformPkg/Include/Library/TestPointCheckLib.h
+++ b/Platform/Intel/MinPlatformPkg/Include/Library/TestPointCheckLib.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017 - 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Include/Library/TestPointLib.h b/Platform/Intel/MinPlatformPkg/Include/Library/TestPointLib.h
index a8b21ca001..36a8757260 100644
--- a/Platform/Intel/MinPlatformPkg/Include/Library/TestPointLib.h
+++ b/Platform/Intel/MinPlatformPkg/Include/Library/TestPointLib.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Include/Ppi/BaseMemoryTest.h b/Platform/Intel/MinPlatformPkg/Include/Ppi/BaseMemoryTest.h
index 2e0dfbaab7..1e3c8632a6 100644
--- a/Platform/Intel/MinPlatformPkg/Include/Ppi/BaseMemoryTest.h
+++ b/Platform/Intel/MinPlatformPkg/Include/Ppi/BaseMemoryTest.h
@@ -3,13 +3,7 @@
of the PEIM being initialized by the PEI Dispatcher.
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Include/Ppi/PlatformMemorySize.h b/Platform/Intel/MinPlatformPkg/Include/Ppi/PlatformMemorySize.h
index e778d27743..d4599cc811 100644
--- a/Platform/Intel/MinPlatformPkg/Include/Ppi/PlatformMemorySize.h
+++ b/Platform/Intel/MinPlatformPkg/Include/Ppi/PlatformMemorySize.h
@@ -3,13 +3,7 @@
pass control into DXE
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Library/CompressLib/CompressLib.c b/Platform/Intel/MinPlatformPkg/Library/CompressLib/CompressLib.c
index 52ce2cde15..9f93e1ee2d 100644
--- a/Platform/Intel/MinPlatformPkg/Library/CompressLib/CompressLib.c
+++ b/Platform/Intel/MinPlatformPkg/Library/CompressLib/CompressLib.c
@@ -8,13 +8,7 @@
are applied to each Block.
Copyright (c) 2007 - 2014, 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Library/CompressLib/CompressLib.inf b/Platform/Intel/MinPlatformPkg/Library/CompressLib/CompressLib.inf
index 86f41f1651..6a8ac3c588 100644
--- a/Platform/Intel/MinPlatformPkg/Library/CompressLib/CompressLib.inf
+++ b/Platform/Intel/MinPlatformPkg/Library/CompressLib/CompressLib.inf
@@ -3,12 +3,7 @@
#
# Copyright (c) 2007 - 2014, 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 distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php.
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#
##
diff --git a/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/Fce.h b/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/Fce.h
index a9010a2763..92c63f8920 100644
--- a/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/Fce.h
+++ b/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/Fce.h
@@ -1,13 +1,7 @@
/**@file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/InternalCommonLib.c b/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/InternalCommonLib.c
index cb7f928426..9acc2141d1 100644
--- a/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/InternalCommonLib.c
+++ b/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/InternalCommonLib.c
@@ -1,13 +1,7 @@
/**@file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/PeiHobVariableLibFce.c b/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/PeiHobVariableLibFce.c
index 7ae65c08d6..6e19ee0be2 100644
--- a/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/PeiHobVariableLibFce.c
+++ b/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/PeiHobVariableLibFce.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/PeiHobVariableLibFce.inf b/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/PeiHobVariableLibFce.inf
index 66526b3fbd..fd80c6112f 100644
--- a/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/PeiHobVariableLibFce.inf
+++ b/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/PeiHobVariableLibFce.inf
@@ -4,13 +4,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/PeiHobVariableLibFceOptSize.c b/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/PeiHobVariableLibFceOptSize.c
index cd93898d25..3502bbe12d 100644
--- a/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/PeiHobVariableLibFceOptSize.c
+++ b/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/PeiHobVariableLibFceOptSize.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/PeiHobVariableLibFceOptSize.inf b/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/PeiHobVariableLibFceOptSize.inf
index 9f6d60622d..82d81c989d 100644
--- a/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/PeiHobVariableLibFceOptSize.inf
+++ b/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/PeiHobVariableLibFceOptSize.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/Variable.h b/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/Variable.h
index fa9fb0292c..84e55e8835 100644
--- a/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/Variable.h
+++ b/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/Variable.h
@@ -1,13 +1,7 @@
/**@file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Library/PeiLib/PeiLib.c b/Platform/Intel/MinPlatformPkg/Library/PeiLib/PeiLib.c
index 22b19df832..96dfd588dc 100644
--- a/Platform/Intel/MinPlatformPkg/Library/PeiLib/PeiLib.c
+++ b/Platform/Intel/MinPlatformPkg/Library/PeiLib/PeiLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Library/PeiLib/PeiLib.inf b/Platform/Intel/MinPlatformPkg/Library/PeiLib/PeiLib.inf
index 2ad74bf058..86b1628c9f 100644
--- a/Platform/Intel/MinPlatformPkg/Library/PeiLib/PeiLib.inf
+++ b/Platform/Intel/MinPlatformPkg/Library/PeiLib/PeiLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec b/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec
index 3185776ac3..8efbf322f2 100644
--- a/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec
+++ b/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec
@@ -8,13 +8,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dsc b/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dsc
index 0875f6589e..8a3638b7e6 100644
--- a/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dsc
+++ b/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dsc
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017 - 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/MinPlatformPkg/Pci/Library/PciHostBridgeLibSimple/PciHostBridgeLibSimple.c b/Platform/Intel/MinPlatformPkg/Pci/Library/PciHostBridgeLibSimple/PciHostBridgeLibSimple.c
index 557ac2a5b3..f7df32da1c 100644
--- a/Platform/Intel/MinPlatformPkg/Pci/Library/PciHostBridgeLibSimple/PciHostBridgeLibSimple.c
+++ b/Platform/Intel/MinPlatformPkg/Pci/Library/PciHostBridgeLibSimple/PciHostBridgeLibSimple.c
@@ -2,13 +2,7 @@
SA PciHostBridge Library
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include <PiDxe.h>
diff --git a/Platform/Intel/MinPlatformPkg/Pci/Library/PciHostBridgeLibSimple/PciHostBridgeLibSimple.inf b/Platform/Intel/MinPlatformPkg/Pci/Library/PciHostBridgeLibSimple/PciHostBridgeLibSimple.inf
index f9a769155b..d8894a069e 100644
--- a/Platform/Intel/MinPlatformPkg/Pci/Library/PciHostBridgeLibSimple/PciHostBridgeLibSimple.inf
+++ b/Platform/Intel/MinPlatformPkg/Pci/Library/PciHostBridgeLibSimple/PciHostBridgeLibSimple.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/MinPlatformPkg/Pci/Library/PciSegmentInfoLibSimple/PciSegmentInfoLibSimple.c b/Platform/Intel/MinPlatformPkg/Pci/Library/PciSegmentInfoLibSimple/PciSegmentInfoLibSimple.c
index f216f224cd..6a6218d906 100644
--- a/Platform/Intel/MinPlatformPkg/Pci/Library/PciSegmentInfoLibSimple/PciSegmentInfoLibSimple.c
+++ b/Platform/Intel/MinPlatformPkg/Pci/Library/PciSegmentInfoLibSimple/PciSegmentInfoLibSimple.c
@@ -3,14 +3,7 @@
segment base address equals to PcdPciExpressBaseAddress.
Copyright (c) 2017, 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 distribution. The full
- text of the license may be found at
- http://opensource.org/licenses/bsd-license.php.
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Pci/Library/PciSegmentInfoLibSimple/PciSegmentInfoLibSimple.inf b/Platform/Intel/MinPlatformPkg/Pci/Library/PciSegmentInfoLibSimple/PciSegmentInfoLibSimple.inf
index f41523efa2..da63105450 100644
--- a/Platform/Intel/MinPlatformPkg/Pci/Library/PciSegmentInfoLibSimple/PciSegmentInfoLibSimple.inf
+++ b/Platform/Intel/MinPlatformPkg/Pci/Library/PciSegmentInfoLibSimple/PciSegmentInfoLibSimple.inf
@@ -3,12 +3,7 @@
#
# Copyright (c) 2017, 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 distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php.
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#
##
diff --git a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/BoardInitLibNull/BoardInitLib.c b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/BoardInitLibNull/BoardInitLib.c
index 61dc830579..5da5d1f677 100644
--- a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/BoardInitLibNull/BoardInitLib.c
+++ b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/BoardInitLibNull/BoardInitLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017 - 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/BoardInitLibNull/BoardInitLibNull.inf b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/BoardInitLibNull/BoardInitLibNull.inf
index 65a445b0f7..54b30026c7 100644
--- a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/BoardInitLibNull/BoardInitLibNull.inf
+++ b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/BoardInitLibNull/BoardInitLibNull.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSupportLib/DxeBoardInitLib.c b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSupportLib/DxeBoardInitLib.c
index 25ecb37e46..a1c7e51dc8 100644
--- a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSupportLib/DxeBoardInitLib.c
+++ b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSupportLib/DxeBoardInitLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017 - 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSupportLib/DxeMultiBoardInitSupportLib.c b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSupportLib/DxeMultiBoardInitSupportLib.c
index f7a4c5b5a1..90aabdbbc7 100644
--- a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSupportLib/DxeMultiBoardInitSupportLib.c
+++ b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSupportLib/DxeMultiBoardInitSupportLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSupportLib/DxeMultiBoardInitSupportLib.inf b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSupportLib/DxeMultiBoardInitSupportLib.inf
index 188c98db0a..602cfb4e95 100644
--- a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSupportLib/DxeMultiBoardInitSupportLib.inf
+++ b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSupportLib/DxeMultiBoardInitSupportLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSupportLib/PeiBoardInitLib.c b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSupportLib/PeiBoardInitLib.c
index b83f8076af..a6768f2b53 100644
--- a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSupportLib/PeiBoardInitLib.c
+++ b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSupportLib/PeiBoardInitLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017 - 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSupportLib/PeiMultiBoardInitSupportLib.c b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSupportLib/PeiMultiBoardInitSupportLib.c
index 2056782181..f1cd735e41 100644
--- a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSupportLib/PeiMultiBoardInitSupportLib.c
+++ b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSupportLib/PeiMultiBoardInitSupportLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSupportLib/PeiMultiBoardInitSupportLib.inf b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSupportLib/PeiMultiBoardInitSupportLib.inf
index de769bf504..f2ee4c818c 100644
--- a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSupportLib/PeiMultiBoardInitSupportLib.inf
+++ b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSupportLib/PeiMultiBoardInitSupportLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/PeiReportFvLib/PeiReportFvLib.c b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/PeiReportFvLib/PeiReportFvLib.c
index 4860d72110..6e49b1239d 100644
--- a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/PeiReportFvLib/PeiReportFvLib.c
+++ b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/PeiReportFvLib/PeiReportFvLib.c
@@ -2,13 +2,7 @@
Source code file for Report Firmware Volume (FV) library
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/PeiReportFvLib/PeiReportFvLib.inf b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/PeiReportFvLib/PeiReportFvLib.inf
index a497132173..4d96c9cf31 100644
--- a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/PeiReportFvLib/PeiReportFvLib.inf
+++ b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/PeiReportFvLib/PeiReportFvLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SecBoardInitLibNull/Ia32/SecBoardInit.nasm b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SecBoardInitLibNull/Ia32/SecBoardInit.nasm
index 71bf82933b..404c03fe06 100644
--- a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SecBoardInitLibNull/Ia32/SecBoardInit.nasm
+++ b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SecBoardInitLibNull/Ia32/SecBoardInit.nasm
@@ -9,13 +9,7 @@
; It consumes the reset vector, calls TempRamInit API from FSP binary.
;
; Copyright (c) 2017, 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 that accompanies this distribution.
-; The full text of the license may be found at
-; http://opensource.org/licenses/bsd-license.php.
-;
-; THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-; WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+; SPDX-License-Identifier: BSD-2-Clause-Patent
;
;;
diff --git a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SecBoardInitLibNull/SecBoardInitLib.c b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SecBoardInitLibNull/SecBoardInitLib.c
index 990e9c9b3a..a8fc76a8fa 100644
--- a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SecBoardInitLibNull/SecBoardInitLib.c
+++ b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SecBoardInitLibNull/SecBoardInitLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SecBoardInitLibNull/SecBoardInitLibNull.inf b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SecBoardInitLibNull/SecBoardInitLibNull.inf
index 186814925a..5ba6db5c75 100644
--- a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SecBoardInitLibNull/SecBoardInitLibNull.inf
+++ b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SecBoardInitLibNull/SecBoardInitLibNull.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SiliconPolicyInitLibNull/SiliconPolicyInitLibNull.c b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SiliconPolicyInitLibNull/SiliconPolicyInitLibNull.c
index 41025a5b7b..755cc036b8 100644
--- a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SiliconPolicyInitLibNull/SiliconPolicyInitLibNull.c
+++ b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SiliconPolicyInitLibNull/SiliconPolicyInitLibNull.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SiliconPolicyInitLibNull/SiliconPolicyInitLibNull.inf b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SiliconPolicyInitLibNull/SiliconPolicyInitLibNull.inf
index ae696ccc90..73f602619c 100644
--- a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SiliconPolicyInitLibNull/SiliconPolicyInitLibNull.inf
+++ b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SiliconPolicyInitLibNull/SiliconPolicyInitLibNull.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017 - 2019, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SiliconPolicyUpdateLibNull/SiliconPolicyUpdateLibNull.c b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SiliconPolicyUpdateLibNull/SiliconPolicyUpdateLibNull.c
index 3c73d02018..8516434f93 100644
--- a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SiliconPolicyUpdateLibNull/SiliconPolicyUpdateLibNull.c
+++ b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SiliconPolicyUpdateLibNull/SiliconPolicyUpdateLibNull.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SiliconPolicyUpdateLibNull/SiliconPolicyUpdateLibNull.inf b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SiliconPolicyUpdateLibNull/SiliconPolicyUpdateLibNull.inf
index d2018881bb..79f39cd884 100644
--- a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SiliconPolicyUpdateLibNull/SiliconPolicyUpdateLibNull.inf
+++ b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SiliconPolicyUpdateLibNull/SiliconPolicyUpdateLibNull.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017 - 2019, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitDxe/PlatformInitDxe.c b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitDxe/PlatformInitDxe.c
index ed3ef951c0..e9ae055f47 100644
--- a/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitDxe/PlatformInitDxe.c
+++ b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitDxe/PlatformInitDxe.c
@@ -2,13 +2,7 @@
This driver will register two callbacks to call fsp's notifies.
Copyright (c) 2014 - 2016, 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php.
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitDxe/PlatformInitDxe.inf b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitDxe/PlatformInitDxe.inf
index 18546d0da0..e3d93bb7eb 100644
--- a/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitDxe/PlatformInitDxe.inf
+++ b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitDxe/PlatformInitDxe.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInitPostMem.c b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInitPostMem.c
index f27bd09351..00877593bc 100644
--- a/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInitPostMem.c
+++ b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInitPostMem.c
@@ -2,13 +2,7 @@
Source code file for Platform Init PEI module
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInitPostMem.inf b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInitPostMem.inf
index 9fc4d1a612..32d67a0a34 100644
--- a/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInitPostMem.inf
+++ b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInitPostMem.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInitPreMem.c b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInitPreMem.c
index bbb138f2d2..2690511abe 100644
--- a/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInitPreMem.c
+++ b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInitPreMem.c
@@ -2,13 +2,7 @@
Source code file for Platform Init Pre-Memory PEI module
Copyright (c) 2017 - 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInitPreMem.inf b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInitPreMem.inf
index 8a41a4dd72..2c3a13106e 100644
--- a/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInitPreMem.inf
+++ b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInitPreMem.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017 - 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitSmm/PlatformInitSmm.c b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitSmm/PlatformInitSmm.c
index 685e2b5386..224e183f81 100644
--- a/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitSmm/PlatformInitSmm.c
+++ b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitSmm/PlatformInitSmm.c
@@ -2,13 +2,7 @@
This driver will register two callbacks to call fsp's notifies.
Copyright (c) 2014 - 2016, 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php.
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitSmm/PlatformInitSmm.inf b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitSmm/PlatformInitSmm.inf
index d845a63467..90d205ceaa 100644
--- a/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitSmm/PlatformInitSmm.inf
+++ b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitSmm/PlatformInitSmm.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/MinPlatformPkg/PlatformInit/ReportFv/ReportFvPei.c b/Platform/Intel/MinPlatformPkg/PlatformInit/ReportFv/ReportFvPei.c
index 95548f3278..c144a38c8a 100644
--- a/Platform/Intel/MinPlatformPkg/PlatformInit/ReportFv/ReportFvPei.c
+++ b/Platform/Intel/MinPlatformPkg/PlatformInit/ReportFv/ReportFvPei.c
@@ -2,13 +2,7 @@
Source code file for Report Firmware Volume (FV) PEI module
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/PlatformInit/ReportFv/ReportFvPei.inf b/Platform/Intel/MinPlatformPkg/PlatformInit/ReportFv/ReportFvPei.inf
index 664514f9f9..d6655e05b9 100644
--- a/Platform/Intel/MinPlatformPkg/PlatformInit/ReportFv/ReportFvPei.inf
+++ b/Platform/Intel/MinPlatformPkg/PlatformInit/ReportFv/ReportFvPei.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyDxe/SiliconPolicyDxe.c b/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyDxe/SiliconPolicyDxe.c
index 01cc22a973..b436aa35e8 100644
--- a/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyDxe/SiliconPolicyDxe.c
+++ b/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyDxe/SiliconPolicyDxe.c
@@ -2,13 +2,7 @@
Silicon DXE policy.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyDxe/SiliconPolicyDxe.inf b/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyDxe/SiliconPolicyDxe.inf
index 4081a10dfb..9faf72d460 100644
--- a/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyDxe/SiliconPolicyDxe.inf
+++ b/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyDxe/SiliconPolicyDxe.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyPei/SiliconPolicyPeiPostMem.c b/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyPei/SiliconPolicyPeiPostMem.c
index d5cf7bf05a..535fcfe799 100644
--- a/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyPei/SiliconPolicyPeiPostMem.c
+++ b/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyPei/SiliconPolicyPeiPostMem.c
@@ -2,13 +2,7 @@
Silicon post-mem policy PEIM.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyPei/SiliconPolicyPeiPostMem.inf b/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyPei/SiliconPolicyPeiPostMem.inf
index 41433274c9..076a17d911 100644
--- a/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyPei/SiliconPolicyPeiPostMem.inf
+++ b/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyPei/SiliconPolicyPeiPostMem.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyPei/SiliconPolicyPeiPreMem.c b/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyPei/SiliconPolicyPeiPreMem.c
index 3bc260e999..d565c08f68 100644
--- a/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyPei/SiliconPolicyPeiPreMem.c
+++ b/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyPei/SiliconPolicyPeiPreMem.c
@@ -2,13 +2,7 @@
Silicon pre-mem policy PEIM.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyPei/SiliconPolicyPeiPreMem.inf b/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyPei/SiliconPolicyPeiPreMem.inf
index 08192cdac3..745691e0a7 100644
--- a/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyPei/SiliconPolicyPeiPreMem.inf
+++ b/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyPei/SiliconPolicyPeiPreMem.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/MinPlatformPkg/Services/StallServicePei/StallServicePei.c b/Platform/Intel/MinPlatformPkg/Services/StallServicePei/StallServicePei.c
index 8b0f5027b4..10dc2caab8 100644
--- a/Platform/Intel/MinPlatformPkg/Services/StallServicePei/StallServicePei.c
+++ b/Platform/Intel/MinPlatformPkg/Services/StallServicePei/StallServicePei.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Services/StallServicePei/StallServicePei.inf b/Platform/Intel/MinPlatformPkg/Services/StallServicePei/StallServicePei.inf
index 522902e8f7..e9b4137b47 100644
--- a/Platform/Intel/MinPlatformPkg/Services/StallServicePei/StallServicePei.inf
+++ b/Platform/Intel/MinPlatformPkg/Services/StallServicePei/StallServicePei.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/MinPlatformPkg/Tcg/Tcg2PlatformDxe/Tcg2PlatformDxe.c b/Platform/Intel/MinPlatformPkg/Tcg/Tcg2PlatformDxe/Tcg2PlatformDxe.c
index d33c651a91..d0d88b2e91 100644
--- a/Platform/Intel/MinPlatformPkg/Tcg/Tcg2PlatformDxe/Tcg2PlatformDxe.c
+++ b/Platform/Intel/MinPlatformPkg/Tcg/Tcg2PlatformDxe/Tcg2PlatformDxe.c
@@ -2,13 +2,7 @@
Platform specific TPM2 component.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Tcg/Tcg2PlatformDxe/Tcg2PlatformDxe.inf b/Platform/Intel/MinPlatformPkg/Tcg/Tcg2PlatformDxe/Tcg2PlatformDxe.inf
index f5b083b1fb..e8ab5f35a0 100644
--- a/Platform/Intel/MinPlatformPkg/Tcg/Tcg2PlatformDxe/Tcg2PlatformDxe.inf
+++ b/Platform/Intel/MinPlatformPkg/Tcg/Tcg2PlatformDxe/Tcg2PlatformDxe.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/MinPlatformPkg/Tcg/Tcg2PlatformPei/Tcg2PlatformPei.c b/Platform/Intel/MinPlatformPkg/Tcg/Tcg2PlatformPei/Tcg2PlatformPei.c
index b05da87ab6..3a2d7d31e9 100644
--- a/Platform/Intel/MinPlatformPkg/Tcg/Tcg2PlatformPei/Tcg2PlatformPei.c
+++ b/Platform/Intel/MinPlatformPkg/Tcg/Tcg2PlatformPei/Tcg2PlatformPei.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Tcg/Tcg2PlatformPei/Tcg2PlatformPei.inf b/Platform/Intel/MinPlatformPkg/Tcg/Tcg2PlatformPei/Tcg2PlatformPei.inf
index 43b8e835f0..1aabfe7ba8 100644
--- a/Platform/Intel/MinPlatformPkg/Tcg/Tcg2PlatformPei/Tcg2PlatformPei.inf
+++ b/Platform/Intel/MinPlatformPkg/Tcg/Tcg2PlatformPei/Tcg2PlatformPei.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAcpi.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAcpi.c
index c2fe38df54..263781a29a 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAcpi.c
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAcpi.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAcpiDmar.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAcpiDmar.c
index 394eeb3613..b2279966d8 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAcpiDmar.c
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAcpiDmar.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAcpiHpet.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAcpiHpet.c
index 5747f51edb..c72b23b82f 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAcpiHpet.c
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAcpiHpet.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAcpiMadt.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAcpiMadt.c
index 92032d5712..b743bad6dd 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAcpiMadt.c
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAcpiMadt.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAcpiMcfg.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAcpiMcfg.c
index c4d3472af9..b38e8214db 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAcpiMcfg.c
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAcpiMcfg.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAcpiTpm.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAcpiTpm.c
index 31aef8f4bf..f1446c9ba3 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAcpiTpm.c
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAcpiTpm.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAcpiWsmt.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAcpiWsmt.c
index 525150dc01..ee63e94fcc 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAcpiWsmt.c
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAcpiWsmt.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckBootVariable.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckBootVariable.c
index c50b2a5752..85bd5b3de4 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckBootVariable.c
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckBootVariable.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckConsoleVariable.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckConsoleVariable.c
index 312dc643f4..ce76b33505 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckConsoleVariable.c
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckConsoleVariable.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckDevicePath.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckDevicePath.c
index aee43aa051..5c36c352a0 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckDevicePath.c
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckDevicePath.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckDmaProtection.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckDmaProtection.c
index 17d58bf3f5..10b44fe8b9 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckDmaProtection.c
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckDmaProtection.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckEsrt.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckEsrt.c
index 6b53ab7a37..d31a06b9ab 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckEsrt.c
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckEsrt.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckGcd.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckGcd.c
index c6dceaed46..82709d44eb 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckGcd.c
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckGcd.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckHsti.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckHsti.c
index 34b2083d4e..7756369ae1 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckHsti.c
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckHsti.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckLoadedImage.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckLoadedImage.c
index 7e9393245f..9e3ebc1324 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckLoadedImage.c
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckLoadedImage.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckMemoryAttribute.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckMemoryAttribute.c
index f222019e72..453210fbdc 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckMemoryAttribute.c
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckMemoryAttribute.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckMemoryMap.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckMemoryMap.c
index 32be9db013..fce44bf73e 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckMemoryMap.c
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckMemoryMap.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckMemoryTypeInformation.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckMemoryTypeInformation.c
index 3c9342c893..9ee9dd252c 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckMemoryTypeInformation.c
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckMemoryTypeInformation.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckPci.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckPci.c
index cfa8c425f2..5140039447 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckPci.c
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckPci.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckPiSignedFvBoot.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckPiSignedFvBoot.c
index 377ca8f853..17302a6496 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckPiSignedFvBoot.c
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckPiSignedFvBoot.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckSmiHandlerInstrument.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckSmiHandlerInstrument.c
index 427d502633..3ceeb821fb 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckSmiHandlerInstrument.c
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckSmiHandlerInstrument.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckSmmInfo.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckSmmInfo.c
index 3300a33f45..c493750a27 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckSmmInfo.c
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckSmmInfo.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckTcgMor.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckTcgMor.c
index b612f9c7b9..776f7bb09e 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckTcgMor.c
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckTcgMor.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckTcgTrustedBoot.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckTcgTrustedBoot.c
index 3fbaa22686..2a04f86fed 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckTcgTrustedBoot.c
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckTcgTrustedBoot.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckUefiSecureBoot.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckUefiSecureBoot.c
index 8915adfc3e..b53a09abca 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckUefiSecureBoot.c
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckUefiSecureBoot.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckVariable.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckVariable.c
index 68c25efc22..67e6a1916d 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckVariable.c
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckVariable.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeTestPointCheckLib.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeTestPointCheckLib.c
index 22026cd430..c012e0afcb 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeTestPointCheckLib.c
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeTestPointCheckLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017 - 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeTestPointCheckLib.inf b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeTestPointCheckLib.inf
index 015aa579d8..62fceffbec 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeTestPointCheckLib.inf
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeTestPointCheckLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckDmaProtection.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckDmaProtection.c
index 4639e9ffaa..cb764b3633 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckDmaProtection.c
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckDmaProtection.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckFvInfo.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckFvInfo.c
index 9adbe40fd6..571743448e 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckFvInfo.c
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckFvInfo.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckHob.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckHob.c
index 4ce0137a1e..b05f7ebab6 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckHob.c
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckHob.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckMtrr.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckMtrr.c
index ea176511f8..536f5c2d83 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckMtrr.c
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckMtrr.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckPci.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckPci.c
index 5ea13a407d..1061f8ac1c 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckPci.c
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckPci.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckSmmInfo.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckSmmInfo.c
index e93e4123a3..d04baf7663 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckSmmInfo.c
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckSmmInfo.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiTestPointCheckLib.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiTestPointCheckLib.c
index e2cd7a999a..752230f4db 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiTestPointCheckLib.c
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiTestPointCheckLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017 - 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiTestPointCheckLib.inf b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiTestPointCheckLib.inf
index d218adb2c5..51369fcedc 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiTestPointCheckLib.inf
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiTestPointCheckLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SecCheckCpuInfo.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SecCheckCpuInfo.c
index a57ca2c05e..8696153a11 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SecCheckCpuInfo.c
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SecCheckCpuInfo.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SecTestPointCheckLib.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SecTestPointCheckLib.c
index 7b4130d1d2..23a5c462ce 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SecTestPointCheckLib.c
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SecTestPointCheckLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017 - 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SecTestPointCheckLib.inf b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SecTestPointCheckLib.inf
index f1cae85cb1..ed37faf960 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SecTestPointCheckLib.inf
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SecTestPointCheckLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmCheckCommunicationBuffer.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmCheckCommunicationBuffer.c
index acc61ceaf7..17e792e947 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmCheckCommunicationBuffer.c
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmCheckCommunicationBuffer.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmCheckLoadedImage.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmCheckLoadedImage.c
index a9f8c6b939..479e3e72e2 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmCheckLoadedImage.c
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmCheckLoadedImage.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmCheckMemoryAttribute.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmCheckMemoryAttribute.c
index 7011d77c7b..f2b6908955 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmCheckMemoryAttribute.c
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmCheckMemoryAttribute.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmCheckPaging.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmCheckPaging.c
index c978d2694c..67a73c5456 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmCheckPaging.c
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmCheckPaging.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmCheckSmrr.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmCheckSmrr.c
index b954e32c4c..4ea279ad8a 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmCheckSmrr.c
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmCheckSmrr.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmTestPointCheckLib.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmTestPointCheckLib.c
index 2d051bb6bb..4b4f874c7b 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmTestPointCheckLib.c
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmTestPointCheckLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017 - 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmTestPointCheckLib.inf b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmTestPointCheckLib.inf
index ac79431649..6007fbc9d2 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmTestPointCheckLib.inf
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmTestPointCheckLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/TestPointHelp.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/TestPointHelp.c
index d631eaf193..06c00b9d2a 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/TestPointHelp.c
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/TestPointHelp.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/TestPointInternal.h b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/TestPointInternal.h
index 0a5d5113aa..b1c2fae8d7 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/TestPointInternal.h
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/TestPointInternal.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLibNull/TestPointCheckLibNull.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLibNull/TestPointCheckLibNull.c
index 82fd08ab02..a52fac9fb2 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLibNull/TestPointCheckLibNull.c
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLibNull/TestPointCheckLibNull.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017 - 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLibNull/TestPointCheckLibNull.inf b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLibNull/TestPointCheckLibNull.inf
index 9801c2d68f..bead6ba35b 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLibNull/TestPointCheckLibNull.inf
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLibNull/TestPointCheckLibNull.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/DxeTestPoint.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/DxeTestPoint.c
index 812eb54af3..289d052af8 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/DxeTestPoint.c
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/DxeTestPoint.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/DxeTestPoint.h b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/DxeTestPoint.h
index 2629e698b5..6bde9883c8 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/DxeTestPoint.h
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/DxeTestPoint.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/DxeTestPointAip.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/DxeTestPointAip.c
index 4f59727911..a7fe9530cf 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/DxeTestPointAip.c
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/DxeTestPointAip.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/DxeTestPointLib.inf b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/DxeTestPointLib.inf
index 5c394645d7..17e5b75626 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/DxeTestPointLib.inf
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/DxeTestPointLib.inf
@@ -3,12 +3,7 @@
#
# Copyright (c) 2017, 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 distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php.
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/PeiTestPoint.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/PeiTestPoint.c
index fac07c52f5..6d6e9caa55 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/PeiTestPoint.c
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/PeiTestPoint.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/PeiTestPoint.h b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/PeiTestPoint.h
index c2aa72e0ee..63d7e53b3e 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/PeiTestPoint.h
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/PeiTestPoint.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/PeiTestPointLib.inf b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/PeiTestPointLib.inf
index 7fa2a471b4..75be715637 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/PeiTestPointLib.inf
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/PeiTestPointLib.inf
@@ -3,12 +3,7 @@
#
# Copyright (c) 2017, 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 distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php.
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPoint.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPoint.c
index 8603ea1608..c7bf9d73cc 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPoint.c
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPoint.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPoint.h b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPoint.h
index 6dc3077981..9c0a582b79 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPoint.h
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPoint.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPointAip.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPointAip.c
index 075d67cb76..84c3f8292e 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPointAip.c
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPointAip.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPointCommunication.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPointCommunication.c
index d2387f6244..5b14b49046 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPointCommunication.c
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPointCommunication.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPointLib.inf b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPointLib.inf
index 4a03657d4f..3a4adeb2e3 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPointLib.inf
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPointLib.inf
@@ -3,12 +3,7 @@
#
# Copyright (c) 2017, 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 distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php.
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/MinPlatformPkg/Test/TestPointDumpApp/TestPointDump.c b/Platform/Intel/MinPlatformPkg/Test/TestPointDumpApp/TestPointDump.c
index 2dc03429e3..b2432e919b 100644
--- a/Platform/Intel/MinPlatformPkg/Test/TestPointDumpApp/TestPointDump.c
+++ b/Platform/Intel/MinPlatformPkg/Test/TestPointDumpApp/TestPointDump.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 distribution. The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Test/TestPointDumpApp/TestPointDumpApp.inf b/Platform/Intel/MinPlatformPkg/Test/TestPointDumpApp/TestPointDumpApp.inf
index c1e7cc8b22..fef9761e57 100644
--- a/Platform/Intel/MinPlatformPkg/Test/TestPointDumpApp/TestPointDumpApp.inf
+++ b/Platform/Intel/MinPlatformPkg/Test/TestPointDumpApp/TestPointDumpApp.inf
@@ -1,13 +1,7 @@
## @file
#
# Copyright (c) 2017, 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 that accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php.
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/MinPlatformPkg/Test/TestPointStubDxe/TestPointStubDxe.c b/Platform/Intel/MinPlatformPkg/Test/TestPointStubDxe/TestPointStubDxe.c
index d6878f45de..3cc5ccfef6 100644
--- a/Platform/Intel/MinPlatformPkg/Test/TestPointStubDxe/TestPointStubDxe.c
+++ b/Platform/Intel/MinPlatformPkg/Test/TestPointStubDxe/TestPointStubDxe.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php.
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/MinPlatformPkg/Test/TestPointStubDxe/TestPointStubDxe.inf b/Platform/Intel/MinPlatformPkg/Test/TestPointStubDxe/TestPointStubDxe.inf
index de7aa8a10f..a6c1888ec7 100644
--- a/Platform/Intel/MinPlatformPkg/Test/TestPointStubDxe/TestPointStubDxe.inf
+++ b/Platform/Intel/MinPlatformPkg/Test/TestPointStubDxe/TestPointStubDxe.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/MinPlatformPkg/Tools/AmlGenOffset/AmlGenOffset.py b/Platform/Intel/MinPlatformPkg/Tools/AmlGenOffset/AmlGenOffset.py
index 312c1abb75..e13ca06471 100644
--- a/Platform/Intel/MinPlatformPkg/Tools/AmlGenOffset/AmlGenOffset.py
+++ b/Platform/Intel/MinPlatformPkg/Tools/AmlGenOffset/AmlGenOffset.py
@@ -1,13 +1,7 @@
## @file
#
# Copyright (c) 2017, 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 distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
'''
diff --git a/Platform/Intel/MinPlatformPkg/Tools/Fsp/PatchFspBinFvsBaseAddress.py b/Platform/Intel/MinPlatformPkg/Tools/Fsp/PatchFspBinFvsBaseAddress.py
index 63d2f88946..b559915e93 100644
--- a/Platform/Intel/MinPlatformPkg/Tools/Fsp/PatchFspBinFvsBaseAddress.py
+++ b/Platform/Intel/MinPlatformPkg/Tools/Fsp/PatchFspBinFvsBaseAddress.py
@@ -1,13 +1,7 @@
## @ PatchFspBinBaseAddress.py
#
# Copyright (c) 2017, 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 that accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php.
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/MinPlatformPkg/Tools/Help/CheckCodeBase.py b/Platform/Intel/MinPlatformPkg/Tools/Help/CheckCodeBase.py
index f97de4f522..1d78eb78e4 100644
--- a/Platform/Intel/MinPlatformPkg/Tools/Help/CheckCodeBase.py
+++ b/Platform/Intel/MinPlatformPkg/Tools/Help/CheckCodeBase.py
@@ -1,13 +1,7 @@
## @ CheckCodeBase.py
#
# Copyright (c) 2017, 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 that accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php.
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/MinPlatformPkg/Tools/ParseVar/ParseVar.py b/Platform/Intel/MinPlatformPkg/Tools/ParseVar/ParseVar.py
index b70b01fd14..2c8be416a8 100644
--- a/Platform/Intel/MinPlatformPkg/Tools/ParseVar/ParseVar.py
+++ b/Platform/Intel/MinPlatformPkg/Tools/ParseVar/ParseVar.py
@@ -1,13 +1,7 @@
## @file
#
# Copyright (c) 2017, 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 distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
'''
diff --git a/Platform/Intel/MinPlatformPkg/Tools/PatchFv/PatchBfv.py b/Platform/Intel/MinPlatformPkg/Tools/PatchFv/PatchBfv.py
index bb9d280863..1312bfc328 100644
--- a/Platform/Intel/MinPlatformPkg/Tools/PatchFv/PatchBfv.py
+++ b/Platform/Intel/MinPlatformPkg/Tools/PatchFv/PatchBfv.py
@@ -1,13 +1,7 @@
## @ PatchBfv.py
#
# Copyright (c) 2017, 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 that accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php.
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/MinPlatformPkg/Tools/PatchFv/PatchBinFv.py b/Platform/Intel/MinPlatformPkg/Tools/PatchFv/PatchBinFv.py
index e1facd1117..5b49b6b968 100644
--- a/Platform/Intel/MinPlatformPkg/Tools/PatchFv/PatchBinFv.py
+++ b/Platform/Intel/MinPlatformPkg/Tools/PatchFv/PatchBinFv.py
@@ -1,13 +1,7 @@
## @ PatchBinFv.py
#
# Copyright (c) 2017, 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 that accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php.
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/MinPlatformPkg/Tools/PatchFv/RebaseBinFv.py b/Platform/Intel/MinPlatformPkg/Tools/PatchFv/RebaseBinFv.py
index 4d194b3c7b..321f7c5746 100644
--- a/Platform/Intel/MinPlatformPkg/Tools/PatchFv/RebaseBinFv.py
+++ b/Platform/Intel/MinPlatformPkg/Tools/PatchFv/RebaseBinFv.py
@@ -1,13 +1,7 @@
## @ PatchBinFv.py
#
# Copyright (c) 2017, 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 that accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php.
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Intel/MinPlatformPkg/Tools/PatchFv/SyncBinFvInf.py b/Platform/Intel/MinPlatformPkg/Tools/PatchFv/SyncBinFvInf.py
index 19c6e04c50..af70fb664c 100644
--- a/Platform/Intel/MinPlatformPkg/Tools/PatchFv/SyncBinFvInf.py
+++ b/Platform/Intel/MinPlatformPkg/Tools/PatchFv/SyncBinFvInf.py
@@ -1,13 +1,7 @@
## @ SyncBinFvInf.py
#
# Copyright (c) 2017, 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 that accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php.
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
--
2.21.0.windows.1
^ permalink raw reply related [flat|nested] 63+ messages in thread* Re: [[edk2-platforms][PATCH V2] 11/30] Platform/Intel/MinPlatformPkg: Replace BSD License with BSD+Patent License
2019-05-15 23:09 ` [[edk2-platforms][PATCH V2] 11/30] Platform/Intel/MinPlatformPkg: " Michael D Kinney
@ 2019-05-16 0:22 ` Chiu, Chasel
2019-05-17 6:52 ` Kubacki, Michael A
1 sibling, 0 replies; 63+ messages in thread
From: Chiu, Chasel @ 2019-05-16 0:22 UTC (permalink / raw)
To: Kinney, Michael D, devel@edk2.groups.io; +Cc: Kubacki, Michael A
Reviewed-by: Chasel Chiu <chasel.chiu@intel.com>
> -----Original Message-----
> From: Kinney, Michael D
> Sent: Thursday, May 16, 2019 7:10 AM
> To: devel@edk2.groups.io
> Cc: Kubacki, Michael A <michael.a.kubacki@intel.com>; Chiu, Chasel
> <chasel.chiu@intel.com>
> Subject: [[edk2-platforms][PATCH V2] 11/30] Platform/Intel/MinPlatformPkg:
> Replace BSD License with BSD+Patent License
>
> https://bugzilla.tianocore.org/show_bug.cgi?id=1373
>
> Replace BSD 2-Clause License with BSD+Patent License. This change is
> based on the following emails:
>
> https://lists.01.org/pipermail/edk2-devel/2019-February/036260.html
> https://lists.01.org/pipermail/edk2-devel/2018-October/030385.html
>
> RFCs with detailed process for the license change:
>
> V3: https://lists.01.org/pipermail/edk2-devel/2019-March/038116.html
> V2: https://lists.01.org/pipermail/edk2-devel/2019-March/037669.html
> V1: https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html
>
> Cc: Michael Kubacki <michael.a.kubacki@intel.com>
> Cc: Chasel Chiu <chasel.chiu@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
> ---
> Platform/Intel/MinPlatformPkg/Acpi/AcpiSmm/AcpiSmm.c | 8 +-------
> Platform/Intel/MinPlatformPkg/Acpi/AcpiSmm/AcpiSmm.h | 8 +-------
> Platform/Intel/MinPlatformPkg/Acpi/AcpiSmm/AcpiSmm.inf | 8 +-------
> .../Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c | 8 +-------
> .../Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.h | 8 +-------
> .../MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.inf | 8 +-------
> .../Intel/MinPlatformPkg/Acpi/AcpiTables/Facs/Facs.c | 8 +-------
> .../Intel/MinPlatformPkg/Acpi/AcpiTables/Fadt/Fadt.c | 8 +-------
> .../Intel/MinPlatformPkg/Acpi/AcpiTables/Hpet/Hpet.c | 8 +-------
> .../Intel/MinPlatformPkg/Acpi/AcpiTables/Wsmt/Wsmt.c | 8 +-------
> .../Acpi/Library/BoardAcpiLibNull/BoardAcpiEnableLib.c | 8 +-------
> .../Library/BoardAcpiLibNull/BoardAcpiEnableLibNull.inf | 8 +-------
> .../Acpi/Library/BoardAcpiLibNull/BoardAcpiTableLib.c | 8 +-------
> .../Library/BoardAcpiLibNull/BoardAcpiTableLibNull.inf | 8 +-------
> .../Acpi/Library/DxeAslUpdateLib/DxeAslUpdateLib.c | 8 +-------
> .../Acpi/Library/DxeAslUpdateLib/DxeAslUpdateLib.inf | 8 +-------
> .../MultiBoardAcpiSupportLib/DxeBoardAcpiTableLib.c | 8 +-------
> .../DxeMultiBoardAcpiSupportLib.c | 8 +-------
> .../DxeMultiBoardAcpiSupportLib.inf | 8 +-------
> .../MultiBoardAcpiSupportLib/SmmBoardAcpiEnableLib.c | 8 +-------
> .../SmmMultiBoardAcpiSupportLib.c | 8 +-------
> .../SmmMultiBoardAcpiSupportLib.inf | 8 +-------
> Platform/Intel/MinPlatformPkg/Acpi/MinDsdt/MinDsdt.asl | 8 +-------
> Platform/Intel/MinPlatformPkg/Acpi/MinDsdt/MinDsdt.c | 8 +-------
> Platform/Intel/MinPlatformPkg/Acpi/MinDsdt/MinDsdt.inf | 8 +-------
> .../Bds/Library/DxePlatformBootManagerLib/BdsPlatform.c | 8 +-------
> .../Bds/Library/DxePlatformBootManagerLib/BdsPlatform.h | 8 +-------
> .../DxePlatformBootManagerLib.inf | 8 +-------
> .../Bds/Library/DxePlatformBootManagerLib/MemoryTest.c | 8 +-------
> .../DxePlatformBootManagerLib/PlatformBootOption.c | 8 +-------
> .../SpiFlashCommonLibNull/SpiFlashCommonLibNull.c | 8 +-------
> .../SpiFlashCommonLibNull/SpiFlashCommonLibNull.inf | 8 +-------
> .../MinPlatformPkg/Flash/SpiFvbService/Common/FvbInfo.c | 8 +-------
> .../Flash/SpiFvbService/Common/SpiFvbServiceCommon.c | 8 +-------
> .../Flash/SpiFvbService/Common/SpiFvbServiceCommon.h | 8 +-------
> .../Flash/SpiFvbService/Smm/SpiFvbServiceSmm.c | 8 +-------
> .../Flash/SpiFvbService/SpiFvbServiceSmm.inf | 8 +-------
> .../DxeFspWrapperPlatformLib.inf | 8 +-------
> .../DxeFspWrapperPlatformResetLib.c | 8 +-------
> .../PeiFspWrapperHobProcessLib/FspWrapperHobProcessLib.c | 8 +-------
> .../PeiFspWrapperHobProcessLib.inf | 8 +-------
> .../PeiFspWrapperPlatformLib/PeiFspWrapperPlatformLib.c | 8 +-------
> .../PeiFspWrapperPlatformLib.inf | 8 +-------
> .../PeiFspWrapperPlatformResetLib.c | 8 +-------
> .../FspWrapperPlatformSecLib.c | 8 +-------
> .../Library/SecFspWrapperPlatformSecLib/FsptCoreUpd.h | 8 +-------
> .../Library/SecFspWrapperPlatformSecLib/Ia32/Fsp.h | 8 +-------
> .../SecFspWrapperPlatformSecLib/Ia32/PeiCoreEntry.S | 8 +-------
> .../SecFspWrapperPlatformSecLib/Ia32/PeiCoreEntry.asm | 8 +-------
> .../Library/SecFspWrapperPlatformSecLib/Ia32/SecEntry.S | 8 +-------
> .../SecFspWrapperPlatformSecLib/Ia32/SecEntry.asm | 8 +-------
> .../Library/SecFspWrapperPlatformSecLib/Ia32/Stack.S | 8 +-------
> .../Library/SecFspWrapperPlatformSecLib/Ia32/Stack.asm | 8 +-------
> .../Library/SecFspWrapperPlatformSecLib/PlatformInit.c | 8 +-------
> .../SecFspWrapperPlatformSecLib.inf | 8 +-------
> .../SecFspWrapperPlatformSecLib/SecGetPerformance.c | 8 +-------
> .../SecFspWrapperPlatformSecLib/SecPlatformInformation.c | 8 +-------
> .../Library/SecFspWrapperPlatformSecLib/SecRamInitData.c | 8 +-------
> .../Library/SecFspWrapperPlatformSecLib/SecTempRamDone.c | 8 +-------
> .../FspWrapper/SaveMemoryConfig/SaveMemoryConfig.c | 8 +-------
> .../FspWrapper/SaveMemoryConfig/SaveMemoryConfig.inf | 8 +-------
> .../HstiIbvPlatformDxe/ExternalDeviceDmaProtection.c | 8 +-------
> .../FirmwareTrustConfigurationCryptoStrength.c | 8 +-------
> .../FirmwareVersionRollbackProtection.c | 8 +-------
> .../Hsti/HstiIbvPlatformDxe/HstiIbvPlatformDxe.c | 8 +-------
> .../Hsti/HstiIbvPlatformDxe/HstiIbvPlatformDxe.h | 8 +-------
> .../Hsti/HstiIbvPlatformDxe/HstiIbvPlatformDxe.inf | 8 +-------
> .../MinPlatformPkg/Hsti/HstiIbvPlatformDxe/MorSupport.c | 8 +-------
> .../Hsti/HstiIbvPlatformDxe/NoTestKeyVerification.c | 8 +-------
> .../Hsti/HstiIbvPlatformDxe/SecureBootBypass.c | 8 +-------
> .../Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc | 8 +-------
> .../Intel/MinPlatformPkg/Include/Dsc/CoreDxeInclude.dsc | 8 +-------
> Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc | 8 +-------
> .../Intel/MinPlatformPkg/Include/Dsc/CorePeiInclude.dsc | 8 +-------
> Platform/Intel/MinPlatformPkg/Include/Dsc/CorePeiLib.dsc | 8 +-------
> .../MinPlatformPkg/Include/Fdf/CoreOsBootInclude.fdf | 8 +-------
> .../MinPlatformPkg/Include/Fdf/CorePostMemoryInclude.fdf | 8 +-------
> .../MinPlatformPkg/Include/Fdf/CorePreMemoryInclude.fdf | 8 +-------
> .../Include/Fdf/CoreSecurityLateInclude.fdf | 8 +-------
> .../Include/Fdf/CoreSecurityPostMemoryInclude.fdf | 8 +-------
> .../Include/Fdf/CoreSecurityPreMemoryInclude.fdf | 8 +-------
> .../MinPlatformPkg/Include/Fdf/CoreUefiBootInclude.fdf | 8 +-------
> .../Intel/MinPlatformPkg/Include/Fdf/RuleInclude.fdf | 8 +-------
> .../MinPlatformPkg/Include/Guid/SmramMemoryReserve.h | 8 +-------
> .../Intel/MinPlatformPkg/Include/HstiIbvFeatureBit.h | 8 +-------
> .../Intel/MinPlatformPkg/Include/Library/AslUpdateLib.h | 8 +-------
> .../MinPlatformPkg/Include/Library/BoardAcpiEnableLib.h | 8 +-------
> .../MinPlatformPkg/Include/Library/BoardAcpiTableLib.h | 8 +-------
> .../Intel/MinPlatformPkg/Include/Library/BoardInitLib.h | 8 +-------
> .../Intel/MinPlatformPkg/Include/Library/CompressLib.h | 8 +-------
> .../MinPlatformPkg/Include/Library/HobVariableLib.h | 8 +-------
> .../Include/Library/MultiBoardAcpiSupportLib.h | 8 +-------
> .../Include/Library/MultiBoardInitSupportLib.h | 8 +-------
> Platform/Intel/MinPlatformPkg/Include/Library/PeiLib.h | 8 +-------
> .../Intel/MinPlatformPkg/Include/Library/ReportFvLib.h | 8 +-------
> .../MinPlatformPkg/Include/Library/SecBoardInitLib.h | 8 +-------
> .../Include/Library/SiliconPolicyInitLib.h | 8 +-------
> .../Include/Library/SiliconPolicyUpdateLib.h | 8 +-------
> .../MinPlatformPkg/Include/Library/SpiFlashCommonLib.h | 8 +-------
> .../MinPlatformPkg/Include/Library/TestPointCheckLib.h | 8 +-------
> .../Intel/MinPlatformPkg/Include/Library/TestPointLib.h | 8 +-------
> .../Intel/MinPlatformPkg/Include/Ppi/BaseMemoryTest.h | 8 +-------
> .../MinPlatformPkg/Include/Ppi/PlatformMemorySize.h | 8 +-------
> .../MinPlatformPkg/Library/CompressLib/CompressLib.c | 8 +-------
> .../MinPlatformPkg/Library/CompressLib/CompressLib.inf | 7 +------
> .../MinPlatformPkg/Library/PeiHobVariableLibFce/Fce.h | 8 +-------
> .../Library/PeiHobVariableLibFce/InternalCommonLib.c | 8 +-------
> .../Library/PeiHobVariableLibFce/PeiHobVariableLibFce.c | 8 +-------
> .../PeiHobVariableLibFce/PeiHobVariableLibFce.inf | 8 +-------
> .../PeiHobVariableLibFce/PeiHobVariableLibFceOptSize.c | 8 +-------
> .../PeiHobVariableLibFce/PeiHobVariableLibFceOptSize.inf | 8 +-------
> .../Library/PeiHobVariableLibFce/Variable.h | 8 +-------
> Platform/Intel/MinPlatformPkg/Library/PeiLib/PeiLib.c | 8 +-------
> Platform/Intel/MinPlatformPkg/Library/PeiLib/PeiLib.inf | 8 +-------
> Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec | 8 +-------
> Platform/Intel/MinPlatformPkg/MinPlatformPkg.dsc | 8 +-------
> .../PciHostBridgeLibSimple/PciHostBridgeLibSimple.c | 8 +-------
> .../PciHostBridgeLibSimple/PciHostBridgeLibSimple.inf | 8 +-------
> .../PciSegmentInfoLibSimple/PciSegmentInfoLibSimple.c | 9 +--------
> .../PciSegmentInfoLibSimple/PciSegmentInfoLibSimple.inf | 7 +------
> .../PlatformInit/Library/BoardInitLibNull/BoardInitLib.c | 8 +-------
> .../Library/BoardInitLibNull/BoardInitLibNull.inf | 8 +-------
> .../Library/MultiBoardInitSupportLib/DxeBoardInitLib.c | 8 +-------
> .../DxeMultiBoardInitSupportLib.c | 8 +-------
> .../DxeMultiBoardInitSupportLib.inf | 8 +-------
> .../Library/MultiBoardInitSupportLib/PeiBoardInitLib.c | 8 +-------
> .../PeiMultiBoardInitSupportLib.c | 8 +-------
> .../PeiMultiBoardInitSupportLib.inf | 8 +-------
> .../PlatformInit/Library/PeiReportFvLib/PeiReportFvLib.c | 8 +-------
> .../Library/PeiReportFvLib/PeiReportFvLib.inf | 8 +-------
> .../Library/SecBoardInitLibNull/Ia32/SecBoardInit.nasm | 8 +-------
> .../Library/SecBoardInitLibNull/SecBoardInitLib.c | 8 +-------
> .../Library/SecBoardInitLibNull/SecBoardInitLibNull.inf | 8 +-------
> .../SiliconPolicyInitLibNull/SiliconPolicyInitLibNull.c | 8 +-------
> .../SiliconPolicyInitLibNull.inf | 8 +-------
> .../SiliconPolicyUpdateLibNull.c | 8 +-------
> .../SiliconPolicyUpdateLibNull.inf | 8 +-------
> .../PlatformInit/PlatformInitDxe/PlatformInitDxe.c | 8 +-------
> .../PlatformInit/PlatformInitDxe/PlatformInitDxe.inf | 8 +-------
> .../PlatformInit/PlatformInitPei/PlatformInitPostMem.c | 8 +-------
> .../PlatformInit/PlatformInitPei/PlatformInitPostMem.inf | 8 +-------
> .../PlatformInit/PlatformInitPei/PlatformInitPreMem.c | 8 +-------
> .../PlatformInit/PlatformInitPei/PlatformInitPreMem.inf | 8 +-------
> .../PlatformInit/PlatformInitSmm/PlatformInitSmm.c | 8 +-------
> .../PlatformInit/PlatformInitSmm/PlatformInitSmm.inf | 8 +-------
> .../MinPlatformPkg/PlatformInit/ReportFv/ReportFvPei.c | 8 +-------
> .../MinPlatformPkg/PlatformInit/ReportFv/ReportFvPei.inf | 8 +-------
> .../PlatformInit/SiliconPolicyDxe/SiliconPolicyDxe.c | 8 +-------
> .../PlatformInit/SiliconPolicyDxe/SiliconPolicyDxe.inf | 8 +-------
> .../SiliconPolicyPei/SiliconPolicyPeiPostMem.c | 8 +-------
> .../SiliconPolicyPei/SiliconPolicyPeiPostMem.inf | 8 +-------
> .../SiliconPolicyPei/SiliconPolicyPeiPreMem.c | 8 +-------
> .../SiliconPolicyPei/SiliconPolicyPeiPreMem.inf | 8 +-------
> .../Services/StallServicePei/StallServicePei.c | 8 +-------
> .../Services/StallServicePei/StallServicePei.inf | 8 +-------
> .../MinPlatformPkg/Tcg/Tcg2PlatformDxe/Tcg2PlatformDxe.c | 8 +-------
> .../Tcg/Tcg2PlatformDxe/Tcg2PlatformDxe.inf | 8 +-------
> .../MinPlatformPkg/Tcg/Tcg2PlatformPei/Tcg2PlatformPei.c | 8 +-------
> .../Tcg/Tcg2PlatformPei/Tcg2PlatformPei.inf | 8 +-------
> .../Test/Library/TestPointCheckLib/DxeCheckAcpi.c | 8 +-------
> .../Test/Library/TestPointCheckLib/DxeCheckAcpiDmar.c | 8 +-------
> .../Test/Library/TestPointCheckLib/DxeCheckAcpiHpet.c | 8 +-------
> .../Test/Library/TestPointCheckLib/DxeCheckAcpiMadt.c | 8 +-------
> .../Test/Library/TestPointCheckLib/DxeCheckAcpiMcfg.c | 8 +-------
> .../Test/Library/TestPointCheckLib/DxeCheckAcpiTpm.c | 8 +-------
> .../Test/Library/TestPointCheckLib/DxeCheckAcpiWsmt.c | 8 +-------
> .../Library/TestPointCheckLib/DxeCheckBootVariable.c | 8 +-------
> .../Library/TestPointCheckLib/DxeCheckConsoleVariable.c | 8 +-------
> .../Test/Library/TestPointCheckLib/DxeCheckDevicePath.c | 8 +-------
> .../Library/TestPointCheckLib/DxeCheckDmaProtection.c | 8 +-------
> .../Test/Library/TestPointCheckLib/DxeCheckEsrt.c | 8 +-------
> .../Test/Library/TestPointCheckLib/DxeCheckGcd.c | 8 +-------
> .../Test/Library/TestPointCheckLib/DxeCheckHsti.c | 8 +-------
> .../Test/Library/TestPointCheckLib/DxeCheckLoadedImage.c | 8 +-------
> .../Library/TestPointCheckLib/DxeCheckMemoryAttribute.c | 8 +-------
> .../Test/Library/TestPointCheckLib/DxeCheckMemoryMap.c | 8 +-------
> .../TestPointCheckLib/DxeCheckMemoryTypeInformation.c | 8 +-------
> .../Test/Library/TestPointCheckLib/DxeCheckPci.c | 8 +-------
> .../Library/TestPointCheckLib/DxeCheckPiSignedFvBoot.c | 8 +-------
> .../TestPointCheckLib/DxeCheckSmiHandlerInstrument.c | 8 +-------
> .../Test/Library/TestPointCheckLib/DxeCheckSmmInfo.c | 8 +-------
> .../Test/Library/TestPointCheckLib/DxeCheckTcgMor.c | 8 +-------
> .../Library/TestPointCheckLib/DxeCheckTcgTrustedBoot.c | 8 +-------
> .../Library/TestPointCheckLib/DxeCheckUefiSecureBoot.c | 8 +-------
> .../Test/Library/TestPointCheckLib/DxeCheckVariable.c | 8 +-------
> .../Library/TestPointCheckLib/DxeTestPointCheckLib.c | 8 +-------
> .../Library/TestPointCheckLib/DxeTestPointCheckLib.inf | 8 +-------
> .../Library/TestPointCheckLib/PeiCheckDmaProtection.c | 8 +-------
> .../Test/Library/TestPointCheckLib/PeiCheckFvInfo.c | 8 +-------
> .../Test/Library/TestPointCheckLib/PeiCheckHob.c | 8 +-------
> .../Test/Library/TestPointCheckLib/PeiCheckMtrr.c | 8 +-------
> .../Test/Library/TestPointCheckLib/PeiCheckPci.c | 8 +-------
> .../Test/Library/TestPointCheckLib/PeiCheckSmmInfo.c | 8 +-------
> .../Library/TestPointCheckLib/PeiTestPointCheckLib.c | 8 +-------
> .../Library/TestPointCheckLib/PeiTestPointCheckLib.inf | 8 +-------
> .../Test/Library/TestPointCheckLib/SecCheckCpuInfo.c | 8 +-------
> .../Library/TestPointCheckLib/SecTestPointCheckLib.c | 8 +-------
> .../Library/TestPointCheckLib/SecTestPointCheckLib.inf | 8 +-------
> .../TestPointCheckLib/SmmCheckCommunicationBuffer.c | 8 +-------
> .../Test/Library/TestPointCheckLib/SmmCheckLoadedImage.c | 8 +-------
> .../Library/TestPointCheckLib/SmmCheckMemoryAttribute.c | 8 +-------
> .../Test/Library/TestPointCheckLib/SmmCheckPaging.c | 8 +-------
> .../Test/Library/TestPointCheckLib/SmmCheckSmrr.c | 8 +-------
> .../Library/TestPointCheckLib/SmmTestPointCheckLib.c | 8 +-------
> .../Library/TestPointCheckLib/SmmTestPointCheckLib.inf | 8 +-------
> .../Test/Library/TestPointCheckLib/TestPointHelp.c | 8 +-------
> .../Test/Library/TestPointCheckLib/TestPointInternal.h | 8 +-------
> .../TestPointCheckLibNull/TestPointCheckLibNull.c | 8 +-------
> .../TestPointCheckLibNull/TestPointCheckLibNull.inf | 8 +-------
> .../Test/Library/TestPointLib/DxeTestPoint.c | 8 +-------
> .../Test/Library/TestPointLib/DxeTestPoint.h | 8 +-------
> .../Test/Library/TestPointLib/DxeTestPointAip.c | 8 +-------
> .../Test/Library/TestPointLib/DxeTestPointLib.inf | 7 +------
> .../Test/Library/TestPointLib/PeiTestPoint.c | 8 +-------
> .../Test/Library/TestPointLib/PeiTestPoint.h | 8 +-------
> .../Test/Library/TestPointLib/PeiTestPointLib.inf | 7 +------
> .../Test/Library/TestPointLib/SmmTestPoint.c | 8 +-------
> .../Test/Library/TestPointLib/SmmTestPoint.h | 8 +-------
> .../Test/Library/TestPointLib/SmmTestPointAip.c | 8 +-------
> .../Library/TestPointLib/SmmTestPointCommunication.c | 8 +-------
> .../Test/Library/TestPointLib/SmmTestPointLib.inf | 7 +------
> .../MinPlatformPkg/Test/TestPointDumpApp/TestPointDump.c | 8 +-------
> .../Test/TestPointDumpApp/TestPointDumpApp.inf | 8 +-------
> .../Test/TestPointStubDxe/TestPointStubDxe.c | 8 +-------
> .../Test/TestPointStubDxe/TestPointStubDxe.inf | 8 +-------
> .../MinPlatformPkg/Tools/AmlGenOffset/AmlGenOffset.py | 8 +-------
> .../Tools/Fsp/PatchFspBinFvsBaseAddress.py | 8 +-------
> .../Intel/MinPlatformPkg/Tools/Help/CheckCodeBase.py | 8 +-------
> Platform/Intel/MinPlatformPkg/Tools/ParseVar/ParseVar.py | 8 +-------
> Platform/Intel/MinPlatformPkg/Tools/PatchFv/PatchBfv.py | 8 +-------
> .../Intel/MinPlatformPkg/Tools/PatchFv/PatchBinFv.py | 8 +-------
> .../Intel/MinPlatformPkg/Tools/PatchFv/RebaseBinFv.py | 8 +-------
> .../Intel/MinPlatformPkg/Tools/PatchFv/SyncBinFvInf.py | 8 +-------
> 233 files changed, 233 insertions(+), 1627 deletions(-)
>
> diff --git a/Platform/Intel/MinPlatformPkg/Acpi/AcpiSmm/AcpiSmm.c
> b/Platform/Intel/MinPlatformPkg/Acpi/AcpiSmm/AcpiSmm.c
> index 74c1678bc8..809f75d3c5 100644
> --- a/Platform/Intel/MinPlatformPkg/Acpi/AcpiSmm/AcpiSmm.c
> +++ b/Platform/Intel/MinPlatformPkg/Acpi/AcpiSmm/AcpiSmm.c
> @@ -2,13 +2,7 @@
> Acpi Smm driver.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/Intel/MinPlatformPkg/Acpi/AcpiSmm/AcpiSmm.h
> b/Platform/Intel/MinPlatformPkg/Acpi/AcpiSmm/AcpiSmm.h
> index a34d87250f..e34ffb1b75 100644
> --- a/Platform/Intel/MinPlatformPkg/Acpi/AcpiSmm/AcpiSmm.h
> +++ b/Platform/Intel/MinPlatformPkg/Acpi/AcpiSmm/AcpiSmm.h
> @@ -2,13 +2,7 @@
> Header file for the Smm platform driver.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/Intel/MinPlatformPkg/Acpi/AcpiSmm/AcpiSmm.inf
> b/Platform/Intel/MinPlatformPkg/Acpi/AcpiSmm/AcpiSmm.inf
> index 8675a45b7a..fbaf467525 100644
> --- a/Platform/Intel/MinPlatformPkg/Acpi/AcpiSmm/AcpiSmm.inf
> +++ b/Platform/Intel/MinPlatformPkg/Acpi/AcpiSmm/AcpiSmm.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c
> b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c
> index ade65d8ab7..5eb727929b 100644
> --- a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c
> +++ b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c
> @@ -2,13 +2,7 @@
> ACPI Platform Driver
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.h
> b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.h
> index 6a314f5733..bd11f9e988 100644
> --- a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.h
> +++ b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.h
> @@ -2,13 +2,7 @@
> This is an implementation of the ACPI platform driver.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.inf
> b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.inf
> index 6a5b94ef28..5d9c8cab50 100644
> --- a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.inf
> +++ b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Facs/Facs.c
> b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Facs/Facs.c
> index b454a8ddc1..cde6e478c6 100644
> --- a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Facs/Facs.c
> +++ b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Facs/Facs.c
> @@ -4,13 +4,7 @@
> for bug fixes, no porting is required.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Fadt/Fadt.c
> b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Fadt/Fadt.c
> index 0def9f6c2b..6efb38cda4 100644
> --- a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Fadt/Fadt.c
> +++ b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Fadt/Fadt.c
> @@ -4,13 +4,7 @@
> for bug fixes, no porting is required.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Hpet/Hpet.c
> b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Hpet/Hpet.c
> index 2512793158..8721beb03f 100644
> --- a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Hpet/Hpet.c
> +++ b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Hpet/Hpet.c
> @@ -4,13 +4,7 @@
> for bug fixes, no porting is required.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Wsmt/Wsmt.c
> b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Wsmt/Wsmt.c
> index 6d25de2ae7..6880f47fa6 100644
> --- a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Wsmt/Wsmt.c
> +++ b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Wsmt/Wsmt.c
> @@ -2,13 +2,7 @@
> ACPI WSMT table
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Acpi/Library/BoardAcpiLibNull/BoardAcpiEn
> ableLib.c
> b/Platform/Intel/MinPlatformPkg/Acpi/Library/BoardAcpiLibNull/BoardAcpiEn
> ableLib.c
> index ff284fc404..334cb21714 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Acpi/Library/BoardAcpiLibNull/BoardAcpiEn
> ableLib.c
> +++
> b/Platform/Intel/MinPlatformPkg/Acpi/Library/BoardAcpiLibNull/BoardAcpiEn
> ableLib.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Acpi/Library/BoardAcpiLibNull/BoardAcpiEn
> ableLibNull.inf
> b/Platform/Intel/MinPlatformPkg/Acpi/Library/BoardAcpiLibNull/BoardAcpiEn
> ableLibNull.inf
> index 10cc8fffff..54985ee50d 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Acpi/Library/BoardAcpiLibNull/BoardAcpiEn
> ableLibNull.inf
> +++
> b/Platform/Intel/MinPlatformPkg/Acpi/Library/BoardAcpiLibNull/BoardAcpiEn
> ableLibNull.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Acpi/Library/BoardAcpiLibNull/BoardAcpiTa
> bleLib.c
> b/Platform/Intel/MinPlatformPkg/Acpi/Library/BoardAcpiLibNull/BoardAcpiTa
> bleLib.c
> index 59a27c29a9..e49e6ad441 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Acpi/Library/BoardAcpiLibNull/BoardAcpiTa
> bleLib.c
> +++
> b/Platform/Intel/MinPlatformPkg/Acpi/Library/BoardAcpiLibNull/BoardAcpiTa
> bleLib.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Acpi/Library/BoardAcpiLibNull/BoardAcpiTa
> bleLibNull.inf
> b/Platform/Intel/MinPlatformPkg/Acpi/Library/BoardAcpiLibNull/BoardAcpiTa
> bleLibNull.inf
> index 1564c8546f..04f55b49d5 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Acpi/Library/BoardAcpiLibNull/BoardAcpiTa
> bleLibNull.inf
> +++
> b/Platform/Intel/MinPlatformPkg/Acpi/Library/BoardAcpiLibNull/BoardAcpiTa
> bleLibNull.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Acpi/Library/DxeAslUpdateLib/DxeAslUpdat
> eLib.c
> b/Platform/Intel/MinPlatformPkg/Acpi/Library/DxeAslUpdateLib/DxeAslUpdat
> eLib.c
> index ea85be4a11..e6ab43db6d 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Acpi/Library/DxeAslUpdateLib/DxeAslUpdat
> eLib.c
> +++
> b/Platform/Intel/MinPlatformPkg/Acpi/Library/DxeAslUpdateLib/DxeAslUpdat
> eLib.c
> @@ -7,13 +7,7 @@
> This library uses the ACPI Support protocol.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include <Base.h>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Acpi/Library/DxeAslUpdateLib/DxeAslUpdat
> eLib.inf
> b/Platform/Intel/MinPlatformPkg/Acpi/Library/DxeAslUpdateLib/DxeAslUpdat
> eLib.inf
> index 20fcc4e63c..1ddca75e97 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Acpi/Library/DxeAslUpdateLib/DxeAslUpdat
> eLib.inf
> +++
> b/Platform/Intel/MinPlatformPkg/Acpi/Library/DxeAslUpdateLib/DxeAslUpdat
> eLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/Dxe
> BoardAcpiTableLib.c
> b/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/Dxe
> BoardAcpiTableLib.c
> index 700d5e0773..dff47aad79 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/Dxe
> BoardAcpiTableLib.c
> +++
> b/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/Dxe
> BoardAcpiTableLib.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/Dxe
> MultiBoardAcpiSupportLib.c
> b/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/Dxe
> MultiBoardAcpiSupportLib.c
> index d054d724d6..43318236e0 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/Dxe
> MultiBoardAcpiSupportLib.c
> +++
> b/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/Dxe
> MultiBoardAcpiSupportLib.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/Dxe
> MultiBoardAcpiSupportLib.inf
> b/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/Dxe
> MultiBoardAcpiSupportLib.inf
> index 8422faf62a..826c7f4008 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/Dxe
> MultiBoardAcpiSupportLib.inf
> +++
> b/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/Dxe
> MultiBoardAcpiSupportLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/Sm
> mBoardAcpiEnableLib.c
> b/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/Sm
> mBoardAcpiEnableLib.c
> index a0c6b20e13..54af6a8c3c 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/Sm
> mBoardAcpiEnableLib.c
> +++
> b/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/Sm
> mBoardAcpiEnableLib.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/Sm
> mMultiBoardAcpiSupportLib.c
> b/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/Sm
> mMultiBoardAcpiSupportLib.c
> index d858e8ae27..ac253eec84 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/Sm
> mMultiBoardAcpiSupportLib.c
> +++
> b/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/Sm
> mMultiBoardAcpiSupportLib.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/Sm
> mMultiBoardAcpiSupportLib.inf
> b/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/Sm
> mMultiBoardAcpiSupportLib.inf
> index 0ce45b25cb..5415446b57 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/Sm
> mMultiBoardAcpiSupportLib.inf
> +++
> b/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/Sm
> mMultiBoardAcpiSupportLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Platform/Intel/MinPlatformPkg/Acpi/MinDsdt/MinDsdt.asl
> b/Platform/Intel/MinPlatformPkg/Acpi/MinDsdt/MinDsdt.asl
> index aed770a39d..0d94472450 100644
> --- a/Platform/Intel/MinPlatformPkg/Acpi/MinDsdt/MinDsdt.asl
> +++ b/Platform/Intel/MinPlatformPkg/Acpi/MinDsdt/MinDsdt.asl
> @@ -2,13 +2,7 @@
> ACPI minimum DSDT table
>
> Copyright (c) 2018, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/Intel/MinPlatformPkg/Acpi/MinDsdt/MinDsdt.c
> b/Platform/Intel/MinPlatformPkg/Acpi/MinDsdt/MinDsdt.c
> index ef40e97b7c..9bc2224538 100644
> --- a/Platform/Intel/MinPlatformPkg/Acpi/MinDsdt/MinDsdt.c
> +++ b/Platform/Intel/MinPlatformPkg/Acpi/MinDsdt/MinDsdt.c
> @@ -2,13 +2,7 @@
> Min DSDT Driver
>
> Copyright (c) 2018, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/Intel/MinPlatformPkg/Acpi/MinDsdt/MinDsdt.inf
> b/Platform/Intel/MinPlatformPkg/Acpi/MinDsdt/MinDsdt.inf
> index 3ffa79c966..1066f13cfe 100644
> --- a/Platform/Intel/MinPlatformPkg/Acpi/MinDsdt/MinDsdt.inf
> +++ b/Platform/Intel/MinPlatformPkg/Acpi/MinDsdt/MinDsdt.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2018, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/B
> dsPlatform.c
> b/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/B
> dsPlatform.c
> index 41fe3f2cca..491fb0f26f 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/B
> dsPlatform.c
> +++
> b/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/B
> dsPlatform.c
> @@ -2,13 +2,7 @@
> This file include all platform action which can be customized by IBV/OEM.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/B
> dsPlatform.h
> b/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/B
> dsPlatform.h
> index 779ba9a98d..360a00d7d7 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/B
> dsPlatform.h
> +++
> b/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/B
> dsPlatform.h
> @@ -2,13 +2,7 @@
> Header file for BDS Platform specific code
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/D
> xePlatformBootManagerLib.inf
> b/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/D
> xePlatformBootManagerLib.inf
> index bd9c0467b9..388ffd808b 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/D
> xePlatformBootManagerLib.inf
> +++
> b/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/D
> xePlatformBootManagerLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/M
> emoryTest.c
> b/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/
> MemoryTest.c
> index 0a47f9252d..654845349a 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/M
> emoryTest.c
> +++
> b/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/
> MemoryTest.c
> @@ -2,13 +2,7 @@
> Perform the platform memory test
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/Pl
> atformBootOption.c
> b/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/Pl
> atformBootOption.c
> index ea30de0540..84aa097d58 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/Pl
> atformBootOption.c
> +++
> b/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/Pl
> atformBootOption.c
> @@ -2,13 +2,7 @@
> Driver for Platform Boot Options support.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Flash/Library/SpiFlashCommonLibNull/SpiFl
> ashCommonLibNull.c
> b/Platform/Intel/MinPlatformPkg/Flash/Library/SpiFlashCommonLibNull/SpiFl
> ashCommonLibNull.c
> index bacc440630..403b16a1b4 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Flash/Library/SpiFlashCommonLibNull/SpiFl
> ashCommonLibNull.c
> +++
> b/Platform/Intel/MinPlatformPkg/Flash/Library/SpiFlashCommonLibNull/SpiFl
> ashCommonLibNull.c
> @@ -2,13 +2,7 @@
> Null Library instance of SPI Flash Common Library Class
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Flash/Library/SpiFlashCommonLibNull/SpiFl
> ashCommonLibNull.inf
> b/Platform/Intel/MinPlatformPkg/Flash/Library/SpiFlashCommonLibNull/SpiFl
> ashCommonLibNull.inf
> index 73853c0d1c..d4964681de 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Flash/Library/SpiFlashCommonLibNull/SpiFl
> ashCommonLibNull.inf
> +++
> b/Platform/Intel/MinPlatformPkg/Flash/Library/SpiFlashCommonLibNull/SpiFl
> ashCommonLibNull.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/Common/FvbInfo.c
> b/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/Common/FvbInfo.c
> index bd4366ea7c..7f2678fa9e 100644
> --- a/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/Common/FvbInfo.c
> +++ b/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/Common/FvbInfo.c
> @@ -3,13 +3,7 @@
> These data is intent to decouple FVB driver with FV header.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/Common/SpiFvbServic
> eCommon.c
> b/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/Common/SpiFvbServic
> eCommon.c
> index 20ad9a3a38..113c749d04 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/Common/SpiFvbServic
> eCommon.c
> +++
> b/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/Common/SpiFvbServic
> eCommon.c
> @@ -3,13 +3,7 @@
> which are compliant with the Intel(R) Serial Flash Interface Compatibility
> Specification.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/Common/SpiFvbServic
> eCommon.h
> b/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/Common/SpiFvbServic
> eCommon.h
> index 876f14dc8c..6379fc86d5 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/Common/SpiFvbServic
> eCommon.h
> +++
> b/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/Common/SpiFvbServic
> eCommon.h
> @@ -2,13 +2,7 @@
> Common source definitions used in serial flash drivers
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/Smm/SpiFvbServiceSm
> m.c
> b/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/Smm/SpiFvbServiceSm
> m.c
> index f0c2a1df8b..251fcae30b 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/Smm/SpiFvbServiceSm
> m.c
> +++
> b/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/Smm/SpiFvbServiceSm
> m.c
> @@ -3,13 +3,7 @@
> which are compliant with the Intel(R) Serial Flash Interface Compatibility
> Specification.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/SpiFvbServiceSmm.inf
> b/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/SpiFvbServiceSmm.inf
> index eb3519fb6a..cca7de94a0 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/SpiFvbServiceSmm.inf
> +++
> b/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/SpiFvbServiceSmm.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/DxeFspWrapperPlatfor
> mLib/DxeFspWrapperPlatformLib.inf
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/DxeFspWrapperPlatfor
> mLib/DxeFspWrapperPlatformLib.inf
> index 48c4433b01..a1226dbcfe 100644
> ---
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/DxeFspWrapperPlatfor
> mLib/DxeFspWrapperPlatformLib.inf
> +++
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/DxeFspWrapperPlatfor
> mLib/DxeFspWrapperPlatformLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/DxeFspWrapperPlatfor
> mLib/DxeFspWrapperPlatformResetLib.c
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/DxeFspWrapperPlatfor
> mLib/DxeFspWrapperPlatformResetLib.c
> index 395f189ee9..b4d509db85 100644
> ---
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/DxeFspWrapperPlatfor
> mLib/DxeFspWrapperPlatformResetLib.c
> +++
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/DxeFspWrapperPlatfor
> mLib/DxeFspWrapperPlatformResetLib.c
> @@ -2,13 +2,7 @@
> Dxe library function to reset the system from FSP wrapper.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include <PiDxe.h>
> diff --git
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperHobPro
> cessLib/FspWrapperHobProcessLib.c
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperHobPro
> cessLib/FspWrapperHobProcessLib.c
> index 7323a46da4..e8df06dfb7 100644
> ---
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperHobPro
> cessLib/FspWrapperHobProcessLib.c
> +++
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperHobPro
> cessLib/FspWrapperHobProcessLib.c
> @@ -2,13 +2,7 @@
> Provide FSP wrapper hob process related function.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperHobPro
> cessLib/PeiFspWrapperHobProcessLib.inf
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperHobPro
> cessLib/PeiFspWrapperHobProcessLib.inf
> index 362851e128..a76e3195d6 100644
> ---
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperHobPro
> cessLib/PeiFspWrapperHobProcessLib.inf
> +++
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperHobPro
> cessLib/PeiFspWrapperHobProcessLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperPlatfor
> mLib/PeiFspWrapperPlatformLib.c
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperPlatfor
> mLib/PeiFspWrapperPlatformLib.c
> index 2c6c026ee5..0def288805 100644
> ---
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperPlatfor
> mLib/PeiFspWrapperPlatformLib.c
> +++
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperPlatfor
> mLib/PeiFspWrapperPlatformLib.c
> @@ -2,13 +2,7 @@
> Provide FSP wrapper platform related function.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperPlatfor
> mLib/PeiFspWrapperPlatformLib.inf
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperPlatfor
> mLib/PeiFspWrapperPlatformLib.inf
> index f7e82d81d7..dafd17dc11 100644
> ---
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperPlatfor
> mLib/PeiFspWrapperPlatformLib.inf
> +++
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperPlatfor
> mLib/PeiFspWrapperPlatformLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperPlatfor
> mLib/PeiFspWrapperPlatformResetLib.c
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperPlatfor
> mLib/PeiFspWrapperPlatformResetLib.c
> index 501197c709..191bcb2fbb 100644
> ---
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperPlatfor
> mLib/PeiFspWrapperPlatformResetLib.c
> +++
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperPlatfor
> mLib/PeiFspWrapperPlatformResetLib.c
> @@ -2,13 +2,7 @@
> Pei library function to reset the system from FSP wrapper.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfor
> mSecLib/FspWrapperPlatformSecLib.c
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfor
> mSecLib/FspWrapperPlatformSecLib.c
> index 27096fec32..303f3aac40 100644
> ---
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfor
> mSecLib/FspWrapperPlatformSecLib.c
> +++
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfor
> mSecLib/FspWrapperPlatformSecLib.c
> @@ -2,13 +2,7 @@
> Provide FSP wrapper platform sec related function.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfor
> mSecLib/FsptCoreUpd.h
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfor
> mSecLib/FsptCoreUpd.h
> index bfdc279c4a..7c0f605b92 100644
> ---
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfor
> mSecLib/FsptCoreUpd.h
> +++
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfor
> mSecLib/FsptCoreUpd.h
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfor
> mSecLib/Ia32/Fsp.h
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfor
> mSecLib/Ia32/Fsp.h
> index ba5219198c..9f6cdcf476 100644
> ---
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfor
> mSecLib/Ia32/Fsp.h
> +++
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfor
> mSecLib/Ia32/Fsp.h
> @@ -2,13 +2,7 @@
> Fsp related definitions
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfor
> mSecLib/Ia32/PeiCoreEntry.S
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfor
> mSecLib/Ia32/PeiCoreEntry.S
> index 8923577263..8c8356f3a0 100644
> ---
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfor
> mSecLib/Ia32/PeiCoreEntry.S
> +++
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfor
> mSecLib/Ia32/PeiCoreEntry.S
> @@ -2,13 +2,7 @@
> # Find and call SecStartup
> #
> # Copyright (c) 2017, 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 that accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php.
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfor
> mSecLib/Ia32/PeiCoreEntry.asm
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfor
> mSecLib/Ia32/PeiCoreEntry.asm
> index d4703dc8ba..c854067db1 100644
> ---
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfor
> mSecLib/Ia32/PeiCoreEntry.asm
> +++
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfor
> mSecLib/Ia32/PeiCoreEntry.asm
> @@ -2,13 +2,7 @@
> ; Find and call SecStartup
> ;
> ; Copyright (c) 2017, 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 that accompanies this distribution.
> -; The full text of the license may be found at
> -; http://opensource.org/licenses/bsd-license.php.
> -;
> -; THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -; WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +; SPDX-License-Identifier: BSD-2-Clause-Patent
> ;
> ;;
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfor
> mSecLib/Ia32/SecEntry.S
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfor
> mSecLib/Ia32/SecEntry.S
> index 396e7a4c16..63c420a8dc 100644
> ---
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfor
> mSecLib/Ia32/SecEntry.S
> +++
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfor
> mSecLib/Ia32/SecEntry.S
> @@ -3,13 +3,7 @@
> # It consumes the reset vector, calls TempRamInit API from FSP binary.
> #
> # Copyright (c) 2017, 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 that accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php.
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfor
> mSecLib/Ia32/SecEntry.asm
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfor
> mSecLib/Ia32/SecEntry.asm
> index 7b82cbaa0e..2886a37d73 100644
> ---
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfor
> mSecLib/Ia32/SecEntry.asm
> +++
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfor
> mSecLib/Ia32/SecEntry.asm
> @@ -3,13 +3,7 @@
> ; It consumes the reset vector, calls TempRamInit API from FSP binary.
> ;
> ; Copyright (c) 2017, 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 that accompanies this distribution.
> -; The full text of the license may be found at
> -; http://opensource.org/licenses/bsd-license.php.
> -;
> -; THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -; WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +; SPDX-License-Identifier: BSD-2-Clause-Patent
> ;
> ;;
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfor
> mSecLib/Ia32/Stack.S
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfor
> mSecLib/Ia32/Stack.S
> index e0eb80ad9a..9953daa195 100644
> ---
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfor
> mSecLib/Ia32/Stack.S
> +++
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfor
> mSecLib/Ia32/Stack.S
> @@ -2,13 +2,7 @@
> # Switch the stack from temporary memory to permenent memory.
> #
> # Copyright (c) 2017, 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 that accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php.
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfor
> mSecLib/Ia32/Stack.asm
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfor
> mSecLib/Ia32/Stack.asm
> index 27ae218e63..183024066a 100644
> ---
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfor
> mSecLib/Ia32/Stack.asm
> +++
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfor
> mSecLib/Ia32/Stack.asm
> @@ -2,13 +2,7 @@
> ; Switch the stack from temporary memory to permenent memory.
> ;
> ; Copyright (c) 2017, 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 that accompanies this distribution.
> -; The full text of the license may be found at
> -; http://opensource.org/licenses/bsd-license.php.
> -;
> -; THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -; WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +; SPDX-License-Identifier: BSD-2-Clause-Patent
> ;
> ;;
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfor
> mSecLib/PlatformInit.c
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfor
> mSecLib/PlatformInit.c
> index 6d810686f3..ef89e3f310 100644
> ---
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfor
> mSecLib/PlatformInit.c
> +++
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfor
> mSecLib/PlatformInit.c
> @@ -2,13 +2,7 @@
> Provide platform init function.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfor
> mSecLib/SecFspWrapperPlatformSecLib.inf
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfor
> mSecLib/SecFspWrapperPlatformSecLib.inf
> index 9c133577cd..6f2c95adb7 100644
> ---
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfor
> mSecLib/SecFspWrapperPlatformSecLib.inf
> +++
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfor
> mSecLib/SecFspWrapperPlatformSecLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfor
> mSecLib/SecGetPerformance.c
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfor
> mSecLib/SecGetPerformance.c
> index 7d06b4e985..c4eeb2b188 100644
> ---
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfor
> mSecLib/SecGetPerformance.c
> +++
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfor
> mSecLib/SecGetPerformance.c
> @@ -2,13 +2,7 @@
> Sample to provide SecGetPerformance function.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfor
> mSecLib/SecPlatformInformation.c
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfor
> mSecLib/SecPlatformInformation.c
> index 3b8189fadd..5b94ed2bef 100644
> ---
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfor
> mSecLib/SecPlatformInformation.c
> +++
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfor
> mSecLib/SecPlatformInformation.c
> @@ -2,13 +2,7 @@
> Provide SecPlatformInformation function.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfor
> mSecLib/SecRamInitData.c
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfor
> mSecLib/SecRamInitData.c
> index 485f198db4..b356327b4c 100644
> ---
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfor
> mSecLib/SecRamInitData.c
> +++
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfor
> mSecLib/SecRamInitData.c
> @@ -2,13 +2,7 @@
> Provide TempRamInitParams data.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfor
> mSecLib/SecTempRamDone.c
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfor
> mSecLib/SecTempRamDone.c
> index 98bec31013..cde8a80a4e 100644
> ---
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfor
> mSecLib/SecTempRamDone.c
> +++
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfor
> mSecLib/SecTempRamDone.c
> @@ -2,13 +2,7 @@
> Provide SecTemporaryRamDone function.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/FspWrapper/SaveMemoryConfig/SaveMem
> oryConfig.c
> b/Platform/Intel/MinPlatformPkg/FspWrapper/SaveMemoryConfig/SaveMem
> oryConfig.c
> index b01c610bf5..41ed2550bd 100644
> ---
> a/Platform/Intel/MinPlatformPkg/FspWrapper/SaveMemoryConfig/SaveMem
> oryConfig.c
> +++
> b/Platform/Intel/MinPlatformPkg/FspWrapper/SaveMemoryConfig/SaveMem
> oryConfig.c
> @@ -3,13 +3,7 @@
> exists, and saves the data to nvRAM.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/FspWrapper/SaveMemoryConfig/SaveMem
> oryConfig.inf
> b/Platform/Intel/MinPlatformPkg/FspWrapper/SaveMemoryConfig/SaveMem
> oryConfig.inf
> index 0b6eda9d25..0c8689a6f6 100644
> ---
> a/Platform/Intel/MinPlatformPkg/FspWrapper/SaveMemoryConfig/SaveMem
> oryConfig.inf
> +++
> b/Platform/Intel/MinPlatformPkg/FspWrapper/SaveMemoryConfig/SaveMem
> oryConfig.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/ExternalDeviceDma
> Protection.c
> b/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/ExternalDeviceDma
> Protection.c
> index 197813fe66..f96c2f07ec 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/ExternalDeviceDma
> Protection.c
> +++
> b/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/ExternalDeviceDma
> Protection.c
> @@ -4,13 +4,7 @@
> in this sample driver.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/FirmwareTrustConf
> igurationCryptoStrength.c
> b/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/FirmwareTrustConf
> igurationCryptoStrength.c
> index 6e2f5f4c10..dd0a53ff48 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/FirmwareTrustConf
> igurationCryptoStrength.c
> +++
> b/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/FirmwareTrustConf
> igurationCryptoStrength.c
> @@ -4,13 +4,7 @@
> in this sample driver.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/FirmwareVersionRo
> llbackProtection.c
> b/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/FirmwareVersionR
> ollbackProtection.c
> index a22836c8a5..3f66e67054 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/FirmwareVersionRo
> llbackProtection.c
> +++
> b/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/FirmwareVersionR
> ollbackProtection.c
> @@ -4,13 +4,7 @@
> in this sample driver.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/HstiIbvPlatformDxe
> .c
> b/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/HstiIbvPlatformDxe
> .c
> index 02af6dbbe7..8be9e98eae 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/HstiIbvPlatformDxe
> .c
> +++
> b/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/HstiIbvPlatformDxe
> .c
> @@ -4,13 +4,7 @@
> publishes the IBV role HSTI structure indicating all tests pass
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/HstiIbvPlatformDxe
> .h
> b/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/HstiIbvPlatformDxe
> .h
> index 1e32229895..1dff22363d 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/HstiIbvPlatformDxe
> .h
> +++
> b/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/HstiIbvPlatformDxe
> .h
> @@ -3,13 +3,7 @@
> and publishing IBV HSTI
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/HstiIbvPlatformDxe
> .inf
> b/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/HstiIbvPlatformDxe
> .inf
> index 97356620f5..6481452860 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/HstiIbvPlatformDxe
> .inf
> +++
> b/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/HstiIbvPlatformDxe
> .inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/MorSupport.c
> b/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/MorSupport.c
> index 9a1e8a0385..0358b546ee 100644
> --- a/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/MorSupport.c
> +++ b/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/MorSupport.c
> @@ -4,13 +4,7 @@
> in this sample driver.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/NoTestKeyVerificati
> on.c
> b/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/NoTestKeyVerificati
> on.c
> index 6f03495572..55beb7860a 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/NoTestKeyVerificati
> on.c
> +++
> b/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/NoTestKeyVerificati
> on.c
> @@ -4,13 +4,7 @@
> in this sample driver.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/SecureBootBypass.
> c
> b/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/SecureBootBypass.
> c
> index 472ec42673..4936b305ab 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/SecureBootBypass.
> c
> +++
> b/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/SecureBootBypass.
> c
> @@ -4,13 +4,7 @@
> in this sample driver.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc
> b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc
> index dd0173a1af..efe02c99f3 100644
> --- a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc
> +++ b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017 - 2018, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeInclude.dsc
> b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeInclude.dsc
> index 6bd526a27b..f0e578f8cc 100644
> --- a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeInclude.dsc
> +++ b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeInclude.dsc
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017 - 2019, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc
> b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc
> index 1ed3591f36..5b3679bb4e 100644
> --- a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc
> +++ b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017 - 2018, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Platform/Intel/MinPlatformPkg/Include/Dsc/CorePeiInclude.dsc
> b/Platform/Intel/MinPlatformPkg/Include/Dsc/CorePeiInclude.dsc
> index 231eb60e41..08e50cac07 100644
> --- a/Platform/Intel/MinPlatformPkg/Include/Dsc/CorePeiInclude.dsc
> +++ b/Platform/Intel/MinPlatformPkg/Include/Dsc/CorePeiInclude.dsc
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Platform/Intel/MinPlatformPkg/Include/Dsc/CorePeiLib.dsc
> b/Platform/Intel/MinPlatformPkg/Include/Dsc/CorePeiLib.dsc
> index 6855d1e5b7..3f784d58c9 100644
> --- a/Platform/Intel/MinPlatformPkg/Include/Dsc/CorePeiLib.dsc
> +++ b/Platform/Intel/MinPlatformPkg/Include/Dsc/CorePeiLib.dsc
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreOsBootInclude.fdf
> b/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreOsBootInclude.fdf
> index 0f975a8923..24f1a0c508 100644
> --- a/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreOsBootInclude.fdf
> +++ b/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreOsBootInclude.fdf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Include/Fdf/CorePostMemoryInclude.fdf
> b/Platform/Intel/MinPlatformPkg/Include/Fdf/CorePostMemoryInclude.fdf
> index 013c10146b..3c2716d672 100644
> --- a/Platform/Intel/MinPlatformPkg/Include/Fdf/CorePostMemoryInclude.fdf
> +++
> b/Platform/Intel/MinPlatformPkg/Include/Fdf/CorePostMemoryInclude.fdf
> @@ -3,12 +3,6 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
> diff --git
> a/Platform/Intel/MinPlatformPkg/Include/Fdf/CorePreMemoryInclude.fdf
> b/Platform/Intel/MinPlatformPkg/Include/Fdf/CorePreMemoryInclude.fdf
> index e1b195d4d7..c0828997cf 100644
> --- a/Platform/Intel/MinPlatformPkg/Include/Fdf/CorePreMemoryInclude.fdf
> +++ b/Platform/Intel/MinPlatformPkg/Include/Fdf/CorePreMemoryInclude.fdf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreSecurityLateInclude.fdf
> b/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreSecurityLateInclude.fdf
> index 2171fe12e5..45dda7ea0a 100644
> --- a/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreSecurityLateInclude.fdf
> +++
> b/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreSecurityLateInclude.fdf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017 - 2019, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreSecurityPostMemoryInclud
> e.fdf
> b/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreSecurityPostMemoryInclu
> de.fdf
> index 013c10146b..3c2716d672 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreSecurityPostMemoryInclud
> e.fdf
> +++
> b/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreSecurityPostMemoryInclu
> de.fdf
> @@ -3,12 +3,6 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
> diff --git
> a/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreSecurityPreMemoryInclud
> e.fdf
> b/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreSecurityPreMemoryInclud
> e.fdf
> index d0a4d39d57..af5d032fce 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreSecurityPreMemoryInclud
> e.fdf
> +++
> b/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreSecurityPreMemoryInclud
> e.fdf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreUefiBootInclude.fdf
> b/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreUefiBootInclude.fdf
> index be3caad402..7859c0b1a5 100644
> --- a/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreUefiBootInclude.fdf
> +++ b/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreUefiBootInclude.fdf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017 - 2019, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Platform/Intel/MinPlatformPkg/Include/Fdf/RuleInclude.fdf
> b/Platform/Intel/MinPlatformPkg/Include/Fdf/RuleInclude.fdf
> index 1b20442fa6..c4c4315ad8 100644
> --- a/Platform/Intel/MinPlatformPkg/Include/Fdf/RuleInclude.fdf
> +++ b/Platform/Intel/MinPlatformPkg/Include/Fdf/RuleInclude.fdf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Include/Guid/SmramMemoryReserve.h
> b/Platform/Intel/MinPlatformPkg/Include/Guid/SmramMemoryReserve.h
> index 04589cf040..9918c768ba 100644
> --- a/Platform/Intel/MinPlatformPkg/Include/Guid/SmramMemoryReserve.h
> +++ b/Platform/Intel/MinPlatformPkg/Include/Guid/SmramMemoryReserve.h
> @@ -9,13 +9,7 @@
> This GUIDed HOB can be used to convey the existence of the T-SEG
> reservation and H-SEG usage
>
> Copyright (c) 2007 - 2010, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> @par Revision Reference:
> GUIDs defined in SmmCis spec version 0.9.
> diff --git a/Platform/Intel/MinPlatformPkg/Include/HstiIbvFeatureBit.h
> b/Platform/Intel/MinPlatformPkg/Include/HstiIbvFeatureBit.h
> index 3a17c494b2..fa0cf30370 100644
> --- a/Platform/Intel/MinPlatformPkg/Include/HstiIbvFeatureBit.h
> +++ b/Platform/Intel/MinPlatformPkg/Include/HstiIbvFeatureBit.h
> @@ -3,13 +3,7 @@
> including error string definitions
>
> Copyright (c) 2017 -2018, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/Intel/MinPlatformPkg/Include/Library/AslUpdateLib.h
> b/Platform/Intel/MinPlatformPkg/Include/Library/AslUpdateLib.h
> index dc76e33557..d58b6d6458 100644
> --- a/Platform/Intel/MinPlatformPkg/Include/Library/AslUpdateLib.h
> +++ b/Platform/Intel/MinPlatformPkg/Include/Library/AslUpdateLib.h
> @@ -6,13 +6,7 @@
> restrictions, etc).
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Include/Library/BoardAcpiEnableLib.h
> b/Platform/Intel/MinPlatformPkg/Include/Library/BoardAcpiEnableLib.h
> index 48de84cfed..edd8dbbd9d 100644
> --- a/Platform/Intel/MinPlatformPkg/Include/Library/BoardAcpiEnableLib.h
> +++ b/Platform/Intel/MinPlatformPkg/Include/Library/BoardAcpiEnableLib.h
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Include/Library/BoardAcpiTableLib.h
> b/Platform/Intel/MinPlatformPkg/Include/Library/BoardAcpiTableLib.h
> index d001393654..119661a42e 100644
> --- a/Platform/Intel/MinPlatformPkg/Include/Library/BoardAcpiTableLib.h
> +++ b/Platform/Intel/MinPlatformPkg/Include/Library/BoardAcpiTableLib.h
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/Intel/MinPlatformPkg/Include/Library/BoardInitLib.h
> b/Platform/Intel/MinPlatformPkg/Include/Library/BoardInitLib.h
> index 914bef1382..32dce7fb17 100644
> --- a/Platform/Intel/MinPlatformPkg/Include/Library/BoardInitLib.h
> +++ b/Platform/Intel/MinPlatformPkg/Include/Library/BoardInitLib.h
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017 - 2018, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/Intel/MinPlatformPkg/Include/Library/CompressLib.h
> b/Platform/Intel/MinPlatformPkg/Include/Library/CompressLib.h
> index e7db7bc8c5..95ead25679 100644
> --- a/Platform/Intel/MinPlatformPkg/Include/Library/CompressLib.h
> +++ b/Platform/Intel/MinPlatformPkg/Include/Library/CompressLib.h
> @@ -2,13 +2,7 @@
> Header file for compression routine.
>
> Copyright (c) 2005 - 2014, 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 distribution. The full text of the license may be found
> at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/Intel/MinPlatformPkg/Include/Library/HobVariableLib.h
> b/Platform/Intel/MinPlatformPkg/Include/Library/HobVariableLib.h
> index 8b5e1dc858..d5d84e6deb 100644
> --- a/Platform/Intel/MinPlatformPkg/Include/Library/HobVariableLib.h
> +++ b/Platform/Intel/MinPlatformPkg/Include/Library/HobVariableLib.h
> @@ -1,13 +1,7 @@
> /**@file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Include/Library/MultiBoardAcpiSupportLib.
> h
> b/Platform/Intel/MinPlatformPkg/Include/Library/MultiBoardAcpiSupportLib.
> h
> index 15087428e8..a8bb99250c 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Include/Library/MultiBoardAcpiSupportLib.
> h
> +++
> b/Platform/Intel/MinPlatformPkg/Include/Library/MultiBoardAcpiSupportLib.
> h
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Include/Library/MultiBoardInitSupportLib.h
> b/Platform/Intel/MinPlatformPkg/Include/Library/MultiBoardInitSupportLib.h
> index c4c36216fe..6c14b5677d 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Include/Library/MultiBoardInitSupportLib.h
> +++
> b/Platform/Intel/MinPlatformPkg/Include/Library/MultiBoardInitSupportLib.h
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/Intel/MinPlatformPkg/Include/Library/PeiLib.h
> b/Platform/Intel/MinPlatformPkg/Include/Library/PeiLib.h
> index 8889f97d59..d8b1a47c58 100644
> --- a/Platform/Intel/MinPlatformPkg/Include/Library/PeiLib.h
> +++ b/Platform/Intel/MinPlatformPkg/Include/Library/PeiLib.h
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/Intel/MinPlatformPkg/Include/Library/ReportFvLib.h
> b/Platform/Intel/MinPlatformPkg/Include/Library/ReportFvLib.h
> index 08b3e85bc3..5c40bd0e6e 100644
> --- a/Platform/Intel/MinPlatformPkg/Include/Library/ReportFvLib.h
> +++ b/Platform/Intel/MinPlatformPkg/Include/Library/ReportFvLib.h
> @@ -5,13 +5,7 @@
> This library installs pre-memory and post-memory firmware volumes.
>
> Copyright (c) 2018, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/Intel/MinPlatformPkg/Include/Library/SecBoardInitLib.h
> b/Platform/Intel/MinPlatformPkg/Include/Library/SecBoardInitLib.h
> index 9142b14335..f90d6f2ff2 100644
> --- a/Platform/Intel/MinPlatformPkg/Include/Library/SecBoardInitLib.h
> +++ b/Platform/Intel/MinPlatformPkg/Include/Library/SecBoardInitLib.h
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Include/Library/SiliconPolicyInitLib.h
> b/Platform/Intel/MinPlatformPkg/Include/Library/SiliconPolicyInitLib.h
> index cc9a825f40..506fb4faf1 100644
> --- a/Platform/Intel/MinPlatformPkg/Include/Library/SiliconPolicyInitLib.h
> +++ b/Platform/Intel/MinPlatformPkg/Include/Library/SiliconPolicyInitLib.h
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Include/Library/SiliconPolicyUpdateLib.h
> b/Platform/Intel/MinPlatformPkg/Include/Library/SiliconPolicyUpdateLib.h
> index 0e166f1dc9..80be3e6056 100644
> --- a/Platform/Intel/MinPlatformPkg/Include/Library/SiliconPolicyUpdateLib.h
> +++
> b/Platform/Intel/MinPlatformPkg/Include/Library/SiliconPolicyUpdateLib.h
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Include/Library/SpiFlashCommonLib.h
> b/Platform/Intel/MinPlatformPkg/Include/Library/SpiFlashCommonLib.h
> index 12dfaeb440..0c5e72258c 100644
> --- a/Platform/Intel/MinPlatformPkg/Include/Library/SpiFlashCommonLib.h
> +++ b/Platform/Intel/MinPlatformPkg/Include/Library/SpiFlashCommonLib.h
> @@ -3,13 +3,7 @@
> internal structure and functions used by SpiFlashCommonLib.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/Intel/MinPlatformPkg/Include/Library/TestPointCheckLib.h
> b/Platform/Intel/MinPlatformPkg/Include/Library/TestPointCheckLib.h
> index 6c7c9f4798..7265e22689 100644
> --- a/Platform/Intel/MinPlatformPkg/Include/Library/TestPointCheckLib.h
> +++ b/Platform/Intel/MinPlatformPkg/Include/Library/TestPointCheckLib.h
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017 - 2018, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/Intel/MinPlatformPkg/Include/Library/TestPointLib.h
> b/Platform/Intel/MinPlatformPkg/Include/Library/TestPointLib.h
> index a8b21ca001..36a8757260 100644
> --- a/Platform/Intel/MinPlatformPkg/Include/Library/TestPointLib.h
> +++ b/Platform/Intel/MinPlatformPkg/Include/Library/TestPointLib.h
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/Intel/MinPlatformPkg/Include/Ppi/BaseMemoryTest.h
> b/Platform/Intel/MinPlatformPkg/Include/Ppi/BaseMemoryTest.h
> index 2e0dfbaab7..1e3c8632a6 100644
> --- a/Platform/Intel/MinPlatformPkg/Include/Ppi/BaseMemoryTest.h
> +++ b/Platform/Intel/MinPlatformPkg/Include/Ppi/BaseMemoryTest.h
> @@ -3,13 +3,7 @@
> of the PEIM being initialized by the PEI Dispatcher.
>
> Copyright (c) 2018, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/Intel/MinPlatformPkg/Include/Ppi/PlatformMemorySize.h
> b/Platform/Intel/MinPlatformPkg/Include/Ppi/PlatformMemorySize.h
> index e778d27743..d4599cc811 100644
> --- a/Platform/Intel/MinPlatformPkg/Include/Ppi/PlatformMemorySize.h
> +++ b/Platform/Intel/MinPlatformPkg/Include/Ppi/PlatformMemorySize.h
> @@ -3,13 +3,7 @@
> pass control into DXE
>
> Copyright (c) 2018, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/Intel/MinPlatformPkg/Library/CompressLib/CompressLib.c
> b/Platform/Intel/MinPlatformPkg/Library/CompressLib/CompressLib.c
> index 52ce2cde15..9f93e1ee2d 100644
> --- a/Platform/Intel/MinPlatformPkg/Library/CompressLib/CompressLib.c
> +++ b/Platform/Intel/MinPlatformPkg/Library/CompressLib/CompressLib.c
> @@ -8,13 +8,7 @@
> are applied to each Block.
>
> Copyright (c) 2007 - 2014, 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 distribution. The full text of the license may be found
> at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Library/CompressLib/CompressLib.inf
> b/Platform/Intel/MinPlatformPkg/Library/CompressLib/CompressLib.inf
> index 86f41f1651..6a8ac3c588 100644
> --- a/Platform/Intel/MinPlatformPkg/Library/CompressLib/CompressLib.inf
> +++ b/Platform/Intel/MinPlatformPkg/Library/CompressLib/CompressLib.inf
> @@ -3,12 +3,7 @@
> #
> # Copyright (c) 2007 - 2014, 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 distribution. The full text of the license may be found
> at
> -# http://opensource.org/licenses/bsd-license.php.
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> #
> ##
> diff --git a/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/Fce.h
> b/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/Fce.h
> index a9010a2763..92c63f8920 100644
> --- a/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/Fce.h
> +++ b/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/Fce.h
> @@ -1,13 +1,7 @@
> /**@file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/InternalCom
> monLib.c
> b/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/InternalCom
> monLib.c
> index cb7f928426..9acc2141d1 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/InternalCom
> monLib.c
> +++
> b/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/InternalCom
> monLib.c
> @@ -1,13 +1,7 @@
> /**@file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/PeiHobVariabl
> eLibFce.c
> b/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/PeiHobVariabl
> eLibFce.c
> index 7ae65c08d6..6e19ee0be2 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/PeiHobVariabl
> eLibFce.c
> +++
> b/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/PeiHobVariabl
> eLibFce.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/PeiHobVariabl
> eLibFce.inf
> b/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/PeiHobVariabl
> eLibFce.inf
> index 66526b3fbd..fd80c6112f 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/PeiHobVariabl
> eLibFce.inf
> +++
> b/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/PeiHobVariabl
> eLibFce.inf
> @@ -4,13 +4,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/PeiHobVariabl
> eLibFceOptSize.c
> b/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/PeiHobVariabl
> eLibFceOptSize.c
> index cd93898d25..3502bbe12d 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/PeiHobVariabl
> eLibFceOptSize.c
> +++
> b/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/PeiHobVariabl
> eLibFceOptSize.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/PeiHobVariabl
> eLibFceOptSize.inf
> b/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/PeiHobVariabl
> eLibFceOptSize.inf
> index 9f6d60622d..82d81c989d 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/PeiHobVariabl
> eLibFceOptSize.inf
> +++
> b/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/PeiHobVariabl
> eLibFceOptSize.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/Variable.h
> b/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/Variable.h
> index fa9fb0292c..84e55e8835 100644
> --- a/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/Variable.h
> +++ b/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/Variable.h
> @@ -1,13 +1,7 @@
> /**@file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/Intel/MinPlatformPkg/Library/PeiLib/PeiLib.c
> b/Platform/Intel/MinPlatformPkg/Library/PeiLib/PeiLib.c
> index 22b19df832..96dfd588dc 100644
> --- a/Platform/Intel/MinPlatformPkg/Library/PeiLib/PeiLib.c
> +++ b/Platform/Intel/MinPlatformPkg/Library/PeiLib/PeiLib.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/Intel/MinPlatformPkg/Library/PeiLib/PeiLib.inf
> b/Platform/Intel/MinPlatformPkg/Library/PeiLib/PeiLib.inf
> index 2ad74bf058..86b1628c9f 100644
> --- a/Platform/Intel/MinPlatformPkg/Library/PeiLib/PeiLib.inf
> +++ b/Platform/Intel/MinPlatformPkg/Library/PeiLib/PeiLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec
> b/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec
> index 3185776ac3..8efbf322f2 100644
> --- a/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec
> +++ b/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec
> @@ -8,13 +8,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dsc
> b/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dsc
> index 0875f6589e..8a3638b7e6 100644
> --- a/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dsc
> +++ b/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dsc
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017 - 2018, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Pci/Library/PciHostBridgeLibSimple/PciHost
> BridgeLibSimple.c
> b/Platform/Intel/MinPlatformPkg/Pci/Library/PciHostBridgeLibSimple/PciHost
> BridgeLibSimple.c
> index 557ac2a5b3..f7df32da1c 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Pci/Library/PciHostBridgeLibSimple/PciHost
> BridgeLibSimple.c
> +++
> b/Platform/Intel/MinPlatformPkg/Pci/Library/PciHostBridgeLibSimple/PciHost
> BridgeLibSimple.c
> @@ -2,13 +2,7 @@
> SA PciHostBridge Library
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include <PiDxe.h>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Pci/Library/PciHostBridgeLibSimple/PciHost
> BridgeLibSimple.inf
> b/Platform/Intel/MinPlatformPkg/Pci/Library/PciHostBridgeLibSimple/PciHost
> BridgeLibSimple.inf
> index f9a769155b..d8894a069e 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Pci/Library/PciHostBridgeLibSimple/PciHost
> BridgeLibSimple.inf
> +++
> b/Platform/Intel/MinPlatformPkg/Pci/Library/PciHostBridgeLibSimple/PciHost
> BridgeLibSimple.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Pci/Library/PciSegmentInfoLibSimple/PciSeg
> mentInfoLibSimple.c
> b/Platform/Intel/MinPlatformPkg/Pci/Library/PciSegmentInfoLibSimple/PciSeg
> mentInfoLibSimple.c
> index f216f224cd..6a6218d906 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Pci/Library/PciSegmentInfoLibSimple/PciSeg
> mentInfoLibSimple.c
> +++
> b/Platform/Intel/MinPlatformPkg/Pci/Library/PciSegmentInfoLibSimple/PciSeg
> mentInfoLibSimple.c
> @@ -3,14 +3,7 @@
> segment base address equals to PcdPciExpressBaseAddress.
>
> Copyright (c) 2017, 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 distribution. The full
> - text of the license may be found at
> - http://opensource.org/licenses/bsd-license.php.
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Pci/Library/PciSegmentInfoLibSimple/PciSeg
> mentInfoLibSimple.inf
> b/Platform/Intel/MinPlatformPkg/Pci/Library/PciSegmentInfoLibSimple/PciSeg
> mentInfoLibSimple.inf
> index f41523efa2..da63105450 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Pci/Library/PciSegmentInfoLibSimple/PciSeg
> mentInfoLibSimple.inf
> +++
> b/Platform/Intel/MinPlatformPkg/Pci/Library/PciSegmentInfoLibSimple/PciSeg
> mentInfoLibSimple.inf
> @@ -3,12 +3,7 @@
> #
> # Copyright (c) 2017, 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 distribution. The full text of the license may be found
> at
> -# http://opensource.org/licenses/bsd-license.php.
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> #
> ##
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/BoardInitLibNull/BoardI
> nitLib.c
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/BoardInitLibNull/BoardI
> nitLib.c
> index 61dc830579..5da5d1f677 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/BoardInitLibNull/BoardI
> nitLib.c
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/BoardInitLibNull/BoardI
> nitLib.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017 - 2018, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/BoardInitLibNull/BoardI
> nitLibNull.inf
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/BoardInitLibNull/BoardI
> nitLibNull.inf
> index 65a445b0f7..54b30026c7 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/BoardInitLibNull/BoardI
> nitLibNull.inf
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/BoardInitLibNull/BoardI
> nitLibNull.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSupportL
> ib/DxeBoardInitLib.c
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSupportL
> ib/DxeBoardInitLib.c
> index 25ecb37e46..a1c7e51dc8 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSupportL
> ib/DxeBoardInitLib.c
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSupportL
> ib/DxeBoardInitLib.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017 - 2018, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSupportL
> ib/DxeMultiBoardInitSupportLib.c
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSupportL
> ib/DxeMultiBoardInitSupportLib.c
> index f7a4c5b5a1..90aabdbbc7 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSupportL
> ib/DxeMultiBoardInitSupportLib.c
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSupportL
> ib/DxeMultiBoardInitSupportLib.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSupportL
> ib/DxeMultiBoardInitSupportLib.inf
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSupportL
> ib/DxeMultiBoardInitSupportLib.inf
> index 188c98db0a..602cfb4e95 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSupportL
> ib/DxeMultiBoardInitSupportLib.inf
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSupportL
> ib/DxeMultiBoardInitSupportLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSupportL
> ib/PeiBoardInitLib.c
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSupportL
> ib/PeiBoardInitLib.c
> index b83f8076af..a6768f2b53 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSupportL
> ib/PeiBoardInitLib.c
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSupportL
> ib/PeiBoardInitLib.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017 - 2018, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSupportL
> ib/PeiMultiBoardInitSupportLib.c
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSupportL
> ib/PeiMultiBoardInitSupportLib.c
> index 2056782181..f1cd735e41 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSupportL
> ib/PeiMultiBoardInitSupportLib.c
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSupportL
> ib/PeiMultiBoardInitSupportLib.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSupportL
> ib/PeiMultiBoardInitSupportLib.inf
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSupportL
> ib/PeiMultiBoardInitSupportLib.inf
> index de769bf504..f2ee4c818c 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSupportL
> ib/PeiMultiBoardInitSupportLib.inf
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSupportL
> ib/PeiMultiBoardInitSupportLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/PeiReportFvLib/PeiRep
> ortFvLib.c
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/PeiReportFvLib/PeiRep
> ortFvLib.c
> index 4860d72110..6e49b1239d 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/PeiReportFvLib/PeiRep
> ortFvLib.c
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/PeiReportFvLib/PeiRep
> ortFvLib.c
> @@ -2,13 +2,7 @@
> Source code file for Report Firmware Volume (FV) library
>
> Copyright (c) 2018, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/PeiReportFvLib/PeiRep
> ortFvLib.inf
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/PeiReportFvLib/PeiRep
> ortFvLib.inf
> index a497132173..4d96c9cf31 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/PeiReportFvLib/PeiRep
> ortFvLib.inf
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/PeiReportFvLib/PeiRep
> ortFvLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2018, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SecBoardInitLibNull/Ia3
> 2/SecBoardInit.nasm
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SecBoardInitLibNull/Ia3
> 2/SecBoardInit.nasm
> index 71bf82933b..404c03fe06 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SecBoardInitLibNull/Ia3
> 2/SecBoardInit.nasm
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SecBoardInitLibNull/Ia3
> 2/SecBoardInit.nasm
> @@ -9,13 +9,7 @@
> ; It consumes the reset vector, calls TempRamInit API from FSP binary.
> ;
> ; Copyright (c) 2017, 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 that accompanies this distribution.
> -; The full text of the license may be found at
> -; http://opensource.org/licenses/bsd-license.php.
> -;
> -; THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -; WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +; SPDX-License-Identifier: BSD-2-Clause-Patent
> ;
> ;;
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SecBoardInitLibNull/Se
> cBoardInitLib.c
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SecBoardInitLibNull/Se
> cBoardInitLib.c
> index 990e9c9b3a..a8fc76a8fa 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SecBoardInitLibNull/Se
> cBoardInitLib.c
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SecBoardInitLibNull/Se
> cBoardInitLib.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SecBoardInitLibNull/Se
> cBoardInitLibNull.inf
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SecBoardInitLibNull/Se
> cBoardInitLibNull.inf
> index 186814925a..5ba6db5c75 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SecBoardInitLibNull/Se
> cBoardInitLibNull.inf
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SecBoardInitLibNull/Se
> cBoardInitLibNull.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SiliconPolicyInitLibNull/
> SiliconPolicyInitLibNull.c
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SiliconPolicyInitLibNull/
> SiliconPolicyInitLibNull.c
> index 41025a5b7b..755cc036b8 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SiliconPolicyInitLibNull/
> SiliconPolicyInitLibNull.c
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SiliconPolicyInitLibNull/
> SiliconPolicyInitLibNull.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SiliconPolicyInitLibNull/
> SiliconPolicyInitLibNull.inf
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SiliconPolicyInitLibNull/
> SiliconPolicyInitLibNull.inf
> index ae696ccc90..73f602619c 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SiliconPolicyInitLibNull/
> SiliconPolicyInitLibNull.inf
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SiliconPolicyInitLibNull/
> SiliconPolicyInitLibNull.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017 - 2019, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SiliconPolicyUpdateLib
> Null/SiliconPolicyUpdateLibNull.c
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SiliconPolicyUpdateLib
> Null/SiliconPolicyUpdateLibNull.c
> index 3c73d02018..8516434f93 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SiliconPolicyUpdateLib
> Null/SiliconPolicyUpdateLibNull.c
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SiliconPolicyUpdateLib
> Null/SiliconPolicyUpdateLibNull.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SiliconPolicyUpdateLib
> Null/SiliconPolicyUpdateLibNull.inf
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SiliconPolicyUpdateLib
> Null/SiliconPolicyUpdateLibNull.inf
> index d2018881bb..79f39cd884 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SiliconPolicyUpdateLib
> Null/SiliconPolicyUpdateLibNull.inf
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SiliconPolicyUpdateLib
> Null/SiliconPolicyUpdateLibNull.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017 - 2019, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitDxe/PlatformInitDx
> e.c
> b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitDxe/PlatformInitDx
> e.c
> index ed3ef951c0..e9ae055f47 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitDxe/PlatformInitDx
> e.c
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitDxe/PlatformInitDx
> e.c
> @@ -2,13 +2,7 @@
> This driver will register two callbacks to call fsp's notifies.
>
> Copyright (c) 2014 - 2016, 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 distribution. The full text of the license may be found
> at
> - http://opensource.org/licenses/bsd-license.php.
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitDxe/PlatformInitDx
> e.inf
> b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitDxe/PlatformInitDx
> e.inf
> index 18546d0da0..e3d93bb7eb 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitDxe/PlatformInitDx
> e.inf
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitDxe/PlatformInitDx
> e.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInitPos
> tMem.c
> b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInitPos
> tMem.c
> index f27bd09351..00877593bc 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInitPos
> tMem.c
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInitPos
> tMem.c
> @@ -2,13 +2,7 @@
> Source code file for Platform Init PEI module
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInitPos
> tMem.inf
> b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInitPos
> tMem.inf
> index 9fc4d1a612..32d67a0a34 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInitPos
> tMem.inf
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInitPos
> tMem.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInitPre
> Mem.c
> b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInitPre
> Mem.c
> index bbb138f2d2..2690511abe 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInitPre
> Mem.c
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInitPre
> Mem.c
> @@ -2,13 +2,7 @@
> Source code file for Platform Init Pre-Memory PEI module
>
> Copyright (c) 2017 - 2018, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInitPre
> Mem.inf
> b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInitPre
> Mem.inf
> index 8a41a4dd72..2c3a13106e 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInitPre
> Mem.inf
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInitPre
> Mem.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017 - 2018, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitSmm/PlatformInitS
> mm.c
> b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitSmm/PlatformInitS
> mm.c
> index 685e2b5386..224e183f81 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitSmm/PlatformInitS
> mm.c
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitSmm/PlatformInitS
> mm.c
> @@ -2,13 +2,7 @@
> This driver will register two callbacks to call fsp's notifies.
>
> Copyright (c) 2014 - 2016, 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 distribution. The full text of the license may be found
> at
> - http://opensource.org/licenses/bsd-license.php.
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitSmm/PlatformInitS
> mm.inf
> b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitSmm/PlatformInitS
> mm.inf
> index d845a63467..90d205ceaa 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitSmm/PlatformInitS
> mm.inf
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitSmm/PlatformInitS
> mm.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/ReportFv/ReportFvPei.c
> b/Platform/Intel/MinPlatformPkg/PlatformInit/ReportFv/ReportFvPei.c
> index 95548f3278..c144a38c8a 100644
> --- a/Platform/Intel/MinPlatformPkg/PlatformInit/ReportFv/ReportFvPei.c
> +++ b/Platform/Intel/MinPlatformPkg/PlatformInit/ReportFv/ReportFvPei.c
> @@ -2,13 +2,7 @@
> Source code file for Report Firmware Volume (FV) PEI module
>
> Copyright (c) 2018, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/ReportFv/ReportFvPei.inf
> b/Platform/Intel/MinPlatformPkg/PlatformInit/ReportFv/ReportFvPei.inf
> index 664514f9f9..d6655e05b9 100644
> --- a/Platform/Intel/MinPlatformPkg/PlatformInit/ReportFv/ReportFvPei.inf
> +++ b/Platform/Intel/MinPlatformPkg/PlatformInit/ReportFv/ReportFvPei.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2018, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyDxe/SiliconPolicyDx
> e.c
> b/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyDxe/SiliconPolicyD
> xe.c
> index 01cc22a973..b436aa35e8 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyDxe/SiliconPolicyDx
> e.c
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyDxe/SiliconPolicyD
> xe.c
> @@ -2,13 +2,7 @@
> Silicon DXE policy.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyDxe/SiliconPolicyDx
> e.inf
> b/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyDxe/SiliconPolicyD
> xe.inf
> index 4081a10dfb..9faf72d460 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyDxe/SiliconPolicyDx
> e.inf
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyDxe/SiliconPolicyD
> xe.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyPei/SiliconPolicyPei
> PostMem.c
> b/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyPei/SiliconPolicyPei
> PostMem.c
> index d5cf7bf05a..535fcfe799 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyPei/SiliconPolicyPei
> PostMem.c
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyPei/SiliconPolicyPei
> PostMem.c
> @@ -2,13 +2,7 @@
> Silicon post-mem policy PEIM.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyPei/SiliconPolicyPei
> PostMem.inf
> b/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyPei/SiliconPolicyPei
> PostMem.inf
> index 41433274c9..076a17d911 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyPei/SiliconPolicyPei
> PostMem.inf
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyPei/SiliconPolicyPei
> PostMem.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyPei/SiliconPolicyPei
> PreMem.c
> b/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyPei/SiliconPolicyPei
> PreMem.c
> index 3bc260e999..d565c08f68 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyPei/SiliconPolicyPei
> PreMem.c
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyPei/SiliconPolicyPei
> PreMem.c
> @@ -2,13 +2,7 @@
> Silicon pre-mem policy PEIM.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyPei/SiliconPolicyPei
> PreMem.inf
> b/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyPei/SiliconPolicyPei
> PreMem.inf
> index 08192cdac3..745691e0a7 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyPei/SiliconPolicyPei
> PreMem.inf
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyPei/SiliconPolicyPei
> PreMem.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Services/StallServicePei/StallServicePei.c
> b/Platform/Intel/MinPlatformPkg/Services/StallServicePei/StallServicePei.c
> index 8b0f5027b4..10dc2caab8 100644
> --- a/Platform/Intel/MinPlatformPkg/Services/StallServicePei/StallServicePei.c
> +++
> b/Platform/Intel/MinPlatformPkg/Services/StallServicePei/StallServicePei.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2018, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Services/StallServicePei/StallServicePei.inf
> b/Platform/Intel/MinPlatformPkg/Services/StallServicePei/StallServicePei.inf
> index 522902e8f7..e9b4137b47 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Services/StallServicePei/StallServicePei.inf
> +++
> b/Platform/Intel/MinPlatformPkg/Services/StallServicePei/StallServicePei.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2018, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Tcg/Tcg2PlatformDxe/Tcg2PlatformDxe.c
> b/Platform/Intel/MinPlatformPkg/Tcg/Tcg2PlatformDxe/Tcg2PlatformDxe.c
> index d33c651a91..d0d88b2e91 100644
> --- a/Platform/Intel/MinPlatformPkg/Tcg/Tcg2PlatformDxe/Tcg2PlatformDxe.c
> +++
> b/Platform/Intel/MinPlatformPkg/Tcg/Tcg2PlatformDxe/Tcg2PlatformDxe.c
> @@ -2,13 +2,7 @@
> Platform specific TPM2 component.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Tcg/Tcg2PlatformDxe/Tcg2PlatformDxe.inf
> b/Platform/Intel/MinPlatformPkg/Tcg/Tcg2PlatformDxe/Tcg2PlatformDxe.inf
> index f5b083b1fb..e8ab5f35a0 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Tcg/Tcg2PlatformDxe/Tcg2PlatformDxe.inf
> +++
> b/Platform/Intel/MinPlatformPkg/Tcg/Tcg2PlatformDxe/Tcg2PlatformDxe.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Tcg/Tcg2PlatformPei/Tcg2PlatformPei.c
> b/Platform/Intel/MinPlatformPkg/Tcg/Tcg2PlatformPei/Tcg2PlatformPei.c
> index b05da87ab6..3a2d7d31e9 100644
> --- a/Platform/Intel/MinPlatformPkg/Tcg/Tcg2PlatformPei/Tcg2PlatformPei.c
> +++ b/Platform/Intel/MinPlatformPkg/Tcg/Tcg2PlatformPei/Tcg2PlatformPei.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Tcg/Tcg2PlatformPei/Tcg2PlatformPei.inf
> b/Platform/Intel/MinPlatformPkg/Tcg/Tcg2PlatformPei/Tcg2PlatformPei.inf
> index 43b8e835f0..1aabfe7ba8 100644
> --- a/Platform/Intel/MinPlatformPkg/Tcg/Tcg2PlatformPei/Tcg2PlatformPei.inf
> +++
> b/Platform/Intel/MinPlatformPkg/Tcg/Tcg2PlatformPei/Tcg2PlatformPei.inf
> @@ -2,13 +2,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAc
> pi.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAc
> pi.c
> index c2fe38df54..263781a29a 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAc
> pi.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAc
> pi.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAc
> piDmar.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAc
> piDmar.c
> index 394eeb3613..b2279966d8 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAc
> piDmar.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAc
> piDmar.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAc
> piHpet.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAc
> piHpet.c
> index 5747f51edb..c72b23b82f 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAc
> piHpet.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAc
> piHpet.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAc
> piMadt.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAc
> piMadt.c
> index 92032d5712..b743bad6dd 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAc
> piMadt.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAc
> piMadt.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAc
> piMcfg.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAc
> piMcfg.c
> index c4d3472af9..b38e8214db 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAc
> piMcfg.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAc
> piMcfg.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAc
> piTpm.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAc
> piTpm.c
> index 31aef8f4bf..f1446c9ba3 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAc
> piTpm.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAc
> piTpm.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAc
> piWsmt.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAc
> piWsmt.c
> index 525150dc01..ee63e94fcc 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAc
> piWsmt.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAc
> piWsmt.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckBo
> otVariable.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckB
> ootVariable.c
> index c50b2a5752..85bd5b3de4 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckBo
> otVariable.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckB
> ootVariable.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckCo
> nsoleVariable.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckC
> onsoleVariable.c
> index 312dc643f4..ce76b33505 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckCo
> nsoleVariable.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckC
> onsoleVariable.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckDe
> vicePath.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckD
> evicePath.c
> index aee43aa051..5c36c352a0 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckDe
> vicePath.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckD
> evicePath.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckD
> maProtection.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckD
> maProtection.c
> index 17d58bf3f5..10b44fe8b9 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckD
> maProtection.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckD
> maProtection.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckEs
> rt.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckEs
> rt.c
> index 6b53ab7a37..d31a06b9ab 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckEs
> rt.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckEs
> rt.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckGc
> d.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckG
> cd.c
> index c6dceaed46..82709d44eb 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckGc
> d.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckG
> cd.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckHs
> ti.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckHs
> ti.c
> index 34b2083d4e..7756369ae1 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckHs
> ti.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckHs
> ti.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckLo
> adedImage.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckLo
> adedImage.c
> index 7e9393245f..9e3ebc1324 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckLo
> adedImage.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckLo
> adedImage.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckM
> emoryAttribute.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckM
> emoryAttribute.c
> index f222019e72..453210fbdc 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckM
> emoryAttribute.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckM
> emoryAttribute.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckM
> emoryMap.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckM
> emoryMap.c
> index 32be9db013..fce44bf73e 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckM
> emoryMap.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckM
> emoryMap.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckM
> emoryTypeInformation.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckM
> emoryTypeInformation.c
> index 3c9342c893..9ee9dd252c 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckM
> emoryTypeInformation.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckM
> emoryTypeInformation.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckPc
> i.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckPc
> i.c
> index cfa8c425f2..5140039447 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckPc
> i.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckPc
> i.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckPi
> SignedFvBoot.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckPi
> SignedFvBoot.c
> index 377ca8f853..17302a6496 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckPi
> SignedFvBoot.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckPi
> SignedFvBoot.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckS
> miHandlerInstrument.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckS
> miHandlerInstrument.c
> index 427d502633..3ceeb821fb 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckS
> miHandlerInstrument.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckS
> miHandlerInstrument.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckS
> mmInfo.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckS
> mmInfo.c
> index 3300a33f45..c493750a27 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckS
> mmInfo.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckS
> mmInfo.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckTc
> gMor.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckTc
> gMor.c
> index b612f9c7b9..776f7bb09e 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckTc
> gMor.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckTc
> gMor.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckTc
> gTrustedBoot.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckTc
> gTrustedBoot.c
> index 3fbaa22686..2a04f86fed 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckTc
> gTrustedBoot.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckTc
> gTrustedBoot.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckU
> efiSecureBoot.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckU
> efiSecureBoot.c
> index 8915adfc3e..b53a09abca 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckU
> efiSecureBoot.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckU
> efiSecureBoot.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckVa
> riable.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckVa
> riable.c
> index 68c25efc22..67e6a1916d 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckVa
> riable.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckVa
> riable.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeTestPoin
> tCheckLib.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeTestPoin
> tCheckLib.c
> index 22026cd430..c012e0afcb 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeTestPoin
> tCheckLib.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeTestPoin
> tCheckLib.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017 - 2018, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeTestPoin
> tCheckLib.inf
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeTestPoin
> tCheckLib.inf
> index 015aa579d8..62fceffbec 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeTestPoin
> tCheckLib.inf
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeTestPoin
> tCheckLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckDm
> aProtection.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckD
> maProtection.c
> index 4639e9ffaa..cb764b3633 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckDm
> aProtection.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckD
> maProtection.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckFvI
> nfo.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckFvI
> nfo.c
> index 9adbe40fd6..571743448e 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckFvI
> nfo.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckFvI
> nfo.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckHo
> b.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckHo
> b.c
> index 4ce0137a1e..b05f7ebab6 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckHo
> b.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckHo
> b.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckMt
> rr.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckMt
> rr.c
> index ea176511f8..536f5c2d83 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckMt
> rr.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckMt
> rr.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckPci.
> c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckPci
> .c
> index 5ea13a407d..1061f8ac1c 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckPci.
> c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckPci
> .c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckSm
> mInfo.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckSm
> mInfo.c
> index e93e4123a3..d04baf7663 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckSm
> mInfo.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckSm
> mInfo.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiTestPoint
> CheckLib.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiTestPoint
> CheckLib.c
> index e2cd7a999a..752230f4db 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiTestPoint
> CheckLib.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiTestPoint
> CheckLib.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017 - 2018, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiTestPoint
> CheckLib.inf
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiTestPoint
> CheckLib.inf
> index d218adb2c5..51369fcedc 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiTestPoint
> CheckLib.inf
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiTestPoint
> CheckLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SecCheckCp
> uInfo.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SecCheckCp
> uInfo.c
> index a57ca2c05e..8696153a11 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SecCheckCp
> uInfo.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SecCheckCp
> uInfo.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SecTestPoin
> tCheckLib.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SecTestPoin
> tCheckLib.c
> index 7b4130d1d2..23a5c462ce 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SecTestPoin
> tCheckLib.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SecTestPoin
> tCheckLib.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017 - 2018, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SecTestPoin
> tCheckLib.inf
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SecTestPoin
> tCheckLib.inf
> index f1cae85cb1..ed37faf960 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SecTestPoin
> tCheckLib.inf
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SecTestPoin
> tCheckLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmCheckC
> ommunicationBuffer.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmCheck
> CommunicationBuffer.c
> index acc61ceaf7..17e792e947 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmCheckC
> ommunicationBuffer.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmCheck
> CommunicationBuffer.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmCheckL
> oadedImage.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmCheckL
> oadedImage.c
> index a9f8c6b939..479e3e72e2 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmCheckL
> oadedImage.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmCheckL
> oadedImage.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmCheck
> MemoryAttribute.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmCheck
> MemoryAttribute.c
> index 7011d77c7b..f2b6908955 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmCheck
> MemoryAttribute.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmCheck
> MemoryAttribute.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmCheckP
> aging.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmCheckP
> aging.c
> index c978d2694c..67a73c5456 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmCheckP
> aging.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmCheckP
> aging.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmCheckS
> mrr.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmCheckS
> mrr.c
> index b954e32c4c..4ea279ad8a 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmCheckS
> mrr.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmCheckS
> mrr.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmTestPoi
> ntCheckLib.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmTestPoi
> ntCheckLib.c
> index 2d051bb6bb..4b4f874c7b 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmTestPoi
> ntCheckLib.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmTestPoi
> ntCheckLib.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017 - 2018, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmTestPoi
> ntCheckLib.inf
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmTestPoi
> ntCheckLib.inf
> index ac79431649..6007fbc9d2 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmTestPoi
> ntCheckLib.inf
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmTestPoi
> ntCheckLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/TestPointHel
> p.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/TestPointHe
> lp.c
> index d631eaf193..06c00b9d2a 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/TestPointHel
> p.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/TestPointHe
> lp.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/TestPointInt
> ernal.h
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/TestPointInt
> ernal.h
> index 0a5d5113aa..b1c2fae8d7 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/TestPointInt
> ernal.h
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/TestPointInt
> ernal.h
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLibNull/TestPoin
> tCheckLibNull.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLibNull/TestPoi
> ntCheckLibNull.c
> index 82fd08ab02..a52fac9fb2 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLibNull/TestPoin
> tCheckLibNull.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLibNull/TestPoi
> ntCheckLibNull.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017 - 2018, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLibNull/TestPoin
> tCheckLibNull.inf
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLibNull/TestPoi
> ntCheckLibNull.inf
> index 9801c2d68f..bead6ba35b 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLibNull/TestPoin
> tCheckLibNull.inf
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLibNull/TestPoi
> ntCheckLibNull.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/DxeTestPoint.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/DxeTestPoint.c
> index 812eb54af3..289d052af8 100644
> --- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/DxeTestPoint.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/DxeTestPoint.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 distribution. The full text of the license may be found
> at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/DxeTestPoint.h
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/DxeTestPoint.h
> index 2629e698b5..6bde9883c8 100644
> --- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/DxeTestPoint.h
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/DxeTestPoint.h
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 distribution. The full text of the license may be found
> at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/DxeTestPointAip.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/DxeTestPointAip.c
> index 4f59727911..a7fe9530cf 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/DxeTestPointAip.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/DxeTestPointAip.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 distribution. The full text of the license may be found
> at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/DxeTestPointLib.in
> f
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/DxeTestPointLib.in
> f
> index 5c394645d7..17e5b75626 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/DxeTestPointLib.in
> f
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/DxeTestPointLib.in
> f
> @@ -3,12 +3,7 @@
> #
> # Copyright (c) 2017, 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 distribution. The full text of the license may be found
> at
> -# http://opensource.org/licenses/bsd-license.php.
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/PeiTestPoint.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/PeiTestPoint.c
> index fac07c52f5..6d6e9caa55 100644
> --- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/PeiTestPoint.c
> +++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/PeiTestPoint.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 distribution. The full text of the license may be found
> at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/PeiTestPoint.h
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/PeiTestPoint.h
> index c2aa72e0ee..63d7e53b3e 100644
> --- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/PeiTestPoint.h
> +++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/PeiTestPoint.h
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 distribution. The full text of the license may be found
> at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/PeiTestPointLib.inf
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/PeiTestPointLib.inf
> index 7fa2a471b4..75be715637 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/PeiTestPointLib.inf
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/PeiTestPointLib.inf
> @@ -3,12 +3,7 @@
> #
> # Copyright (c) 2017, 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 distribution. The full text of the license may be found
> at
> -# http://opensource.org/licenses/bsd-license.php.
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPoint.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPoint.c
> index 8603ea1608..c7bf9d73cc 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPoint.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPoint.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 distribution. The full text of the license may be found
> at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPoint.h
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPoint.h
> index 6dc3077981..9c0a582b79 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPoint.h
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPoint.h
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 distribution. The full text of the license may be found
> at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPointAip.
> c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPointAip.
> c
> index 075d67cb76..84c3f8292e 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPointAip.
> c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPointAip.
> c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 distribution. The full text of the license may be found
> at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPointCo
> mmunication.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPointCo
> mmunication.c
> index d2387f6244..5b14b49046 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPointCo
> mmunication.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPointCo
> mmunication.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 distribution. The full text of the license may be found
> at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPointLib.i
> nf
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPointLib.i
> nf
> index 4a03657d4f..3a4adeb2e3 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPointLib.i
> nf
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPointLib.i
> nf
> @@ -3,12 +3,7 @@
> #
> # Copyright (c) 2017, 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 distribution. The full text of the license may be found
> at
> -# http://opensource.org/licenses/bsd-license.php.
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/TestPointDumpApp/TestPointDump.c
> b/Platform/Intel/MinPlatformPkg/Test/TestPointDumpApp/TestPointDump.c
> index 2dc03429e3..b2432e919b 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/TestPointDumpApp/TestPointDump.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/TestPointDumpApp/TestPointDump.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 distribution. The full text of the license may be found
> at
> -http://opensource.org/licenses/bsd-license.php
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/TestPointDumpApp/TestPointDumpAp
> p.inf
> b/Platform/Intel/MinPlatformPkg/Test/TestPointDumpApp/TestPointDumpAp
> p.inf
> index c1e7cc8b22..fef9761e57 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/TestPointDumpApp/TestPointDumpAp
> p.inf
> +++
> b/Platform/Intel/MinPlatformPkg/Test/TestPointDumpApp/TestPointDumpAp
> p.inf
> @@ -1,13 +1,7 @@
> ## @file
> #
> # Copyright (c) 2017, 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 that accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php.
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/TestPointStubDxe/TestPointStubDxe.c
> b/Platform/Intel/MinPlatformPkg/Test/TestPointStubDxe/TestPointStubDxe.c
> index d6878f45de..3cc5ccfef6 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/TestPointStubDxe/TestPointStubDxe.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/TestPointStubDxe/TestPointStubDxe.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 distribution. The full text of the license may be found
> at
> - http://opensource.org/licenses/bsd-license.php.
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/TestPointStubDxe/TestPointStubDxe.inf
> b/Platform/Intel/MinPlatformPkg/Test/TestPointStubDxe/TestPointStubDxe.inf
> index de7aa8a10f..a6c1888ec7 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/TestPointStubDxe/TestPointStubDxe.inf
> +++
> b/Platform/Intel/MinPlatformPkg/Test/TestPointStubDxe/TestPointStubDxe.inf
> @@ -2,13 +2,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Tools/AmlGenOffset/AmlGenOffset.py
> b/Platform/Intel/MinPlatformPkg/Tools/AmlGenOffset/AmlGenOffset.py
> index 312c1abb75..e13ca06471 100644
> --- a/Platform/Intel/MinPlatformPkg/Tools/AmlGenOffset/AmlGenOffset.py
> +++ b/Platform/Intel/MinPlatformPkg/Tools/AmlGenOffset/AmlGenOffset.py
> @@ -1,13 +1,7 @@
> ## @file
> #
> # Copyright (c) 2017, 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 distribution. The full text of the license may be found
> at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
>
> '''
> diff --git
> a/Platform/Intel/MinPlatformPkg/Tools/Fsp/PatchFspBinFvsBaseAddress.py
> b/Platform/Intel/MinPlatformPkg/Tools/Fsp/PatchFspBinFvsBaseAddress.py
> index 63d2f88946..b559915e93 100644
> --- a/Platform/Intel/MinPlatformPkg/Tools/Fsp/PatchFspBinFvsBaseAddress.py
> +++
> b/Platform/Intel/MinPlatformPkg/Tools/Fsp/PatchFspBinFvsBaseAddress.py
> @@ -1,13 +1,7 @@
> ## @ PatchFspBinBaseAddress.py
> #
> # Copyright (c) 2017, 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 that accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php.
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Platform/Intel/MinPlatformPkg/Tools/Help/CheckCodeBase.py
> b/Platform/Intel/MinPlatformPkg/Tools/Help/CheckCodeBase.py
> index f97de4f522..1d78eb78e4 100644
> --- a/Platform/Intel/MinPlatformPkg/Tools/Help/CheckCodeBase.py
> +++ b/Platform/Intel/MinPlatformPkg/Tools/Help/CheckCodeBase.py
> @@ -1,13 +1,7 @@
> ## @ CheckCodeBase.py
> #
> # Copyright (c) 2017, 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 that accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php.
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Platform/Intel/MinPlatformPkg/Tools/ParseVar/ParseVar.py
> b/Platform/Intel/MinPlatformPkg/Tools/ParseVar/ParseVar.py
> index b70b01fd14..2c8be416a8 100644
> --- a/Platform/Intel/MinPlatformPkg/Tools/ParseVar/ParseVar.py
> +++ b/Platform/Intel/MinPlatformPkg/Tools/ParseVar/ParseVar.py
> @@ -1,13 +1,7 @@
> ## @file
> #
> # Copyright (c) 2017, 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 distribution. The full text of the license may be found
> at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
>
> '''
> diff --git a/Platform/Intel/MinPlatformPkg/Tools/PatchFv/PatchBfv.py
> b/Platform/Intel/MinPlatformPkg/Tools/PatchFv/PatchBfv.py
> index bb9d280863..1312bfc328 100644
> --- a/Platform/Intel/MinPlatformPkg/Tools/PatchFv/PatchBfv.py
> +++ b/Platform/Intel/MinPlatformPkg/Tools/PatchFv/PatchBfv.py
> @@ -1,13 +1,7 @@
> ## @ PatchBfv.py
> #
> # Copyright (c) 2017, 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 that accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php.
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Platform/Intel/MinPlatformPkg/Tools/PatchFv/PatchBinFv.py
> b/Platform/Intel/MinPlatformPkg/Tools/PatchFv/PatchBinFv.py
> index e1facd1117..5b49b6b968 100644
> --- a/Platform/Intel/MinPlatformPkg/Tools/PatchFv/PatchBinFv.py
> +++ b/Platform/Intel/MinPlatformPkg/Tools/PatchFv/PatchBinFv.py
> @@ -1,13 +1,7 @@
> ## @ PatchBinFv.py
> #
> # Copyright (c) 2017, 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 that accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php.
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Platform/Intel/MinPlatformPkg/Tools/PatchFv/RebaseBinFv.py
> b/Platform/Intel/MinPlatformPkg/Tools/PatchFv/RebaseBinFv.py
> index 4d194b3c7b..321f7c5746 100644
> --- a/Platform/Intel/MinPlatformPkg/Tools/PatchFv/RebaseBinFv.py
> +++ b/Platform/Intel/MinPlatformPkg/Tools/PatchFv/RebaseBinFv.py
> @@ -1,13 +1,7 @@
> ## @ PatchBinFv.py
> #
> # Copyright (c) 2017, 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 that accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php.
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Platform/Intel/MinPlatformPkg/Tools/PatchFv/SyncBinFvInf.py
> b/Platform/Intel/MinPlatformPkg/Tools/PatchFv/SyncBinFvInf.py
> index 19c6e04c50..af70fb664c 100644
> --- a/Platform/Intel/MinPlatformPkg/Tools/PatchFv/SyncBinFvInf.py
> +++ b/Platform/Intel/MinPlatformPkg/Tools/PatchFv/SyncBinFvInf.py
> @@ -1,13 +1,7 @@
> ## @ SyncBinFvInf.py
> #
> # Copyright (c) 2017, 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 that accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php.
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> --
> 2.21.0.windows.1
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: [[edk2-platforms][PATCH V2] 11/30] Platform/Intel/MinPlatformPkg: Replace BSD License with BSD+Patent License
2019-05-15 23:09 ` [[edk2-platforms][PATCH V2] 11/30] Platform/Intel/MinPlatformPkg: " Michael D Kinney
2019-05-16 0:22 ` Chiu, Chasel
@ 2019-05-17 6:52 ` Kubacki, Michael A
1 sibling, 0 replies; 63+ messages in thread
From: Kubacki, Michael A @ 2019-05-17 6:52 UTC (permalink / raw)
To: Kinney, Michael D, devel@edk2.groups.io; +Cc: Chiu, Chasel
Reviewed-by: Michael Kubacki <michael.a.kubacki@intel.com>
> -----Original Message-----
> From: Kinney, Michael D
> Sent: Wednesday, May 15, 2019 4:10 PM
> To: devel@edk2.groups.io
> Cc: Kubacki, Michael A <michael.a.kubacki@intel.com>; Chiu, Chasel
> <chasel.chiu@intel.com>
> Subject: [[edk2-platforms][PATCH V2] 11/30]
> Platform/Intel/MinPlatformPkg: Replace BSD License with BSD+Patent
> License
>
> https://bugzilla.tianocore.org/show_bug.cgi?id=1373
>
> Replace BSD 2-Clause License with BSD+Patent License. This change is
> based on the following emails:
>
> https://lists.01.org/pipermail/edk2-devel/2019-February/036260.html
> https://lists.01.org/pipermail/edk2-devel/2018-October/030385.html
>
> RFCs with detailed process for the license change:
>
> V3: https://lists.01.org/pipermail/edk2-devel/2019-March/038116.html
> V2: https://lists.01.org/pipermail/edk2-devel/2019-March/037669.html
> V1: https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html
>
> Cc: Michael Kubacki <michael.a.kubacki@intel.com>
> Cc: Chasel Chiu <chasel.chiu@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
> ---
> Platform/Intel/MinPlatformPkg/Acpi/AcpiSmm/AcpiSmm.c | 8 +-------
> Platform/Intel/MinPlatformPkg/Acpi/AcpiSmm/AcpiSmm.h | 8 +-------
> Platform/Intel/MinPlatformPkg/Acpi/AcpiSmm/AcpiSmm.inf | 8 +-------
> .../Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c | 8 +-------
> .../Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.h | 8 +-------
> .../MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.inf | 8 +-------
> .../Intel/MinPlatformPkg/Acpi/AcpiTables/Facs/Facs.c | 8 +-------
> .../Intel/MinPlatformPkg/Acpi/AcpiTables/Fadt/Fadt.c | 8 +-------
> .../Intel/MinPlatformPkg/Acpi/AcpiTables/Hpet/Hpet.c | 8 +-------
> .../Intel/MinPlatformPkg/Acpi/AcpiTables/Wsmt/Wsmt.c | 8 +-------
> .../Acpi/Library/BoardAcpiLibNull/BoardAcpiEnableLib.c | 8 +-------
> .../Library/BoardAcpiLibNull/BoardAcpiEnableLibNull.inf | 8 +-------
> .../Acpi/Library/BoardAcpiLibNull/BoardAcpiTableLib.c | 8 +-------
> .../Library/BoardAcpiLibNull/BoardAcpiTableLibNull.inf | 8 +-------
> .../Acpi/Library/DxeAslUpdateLib/DxeAslUpdateLib.c | 8 +-------
> .../Acpi/Library/DxeAslUpdateLib/DxeAslUpdateLib.inf | 8 +-------
> .../MultiBoardAcpiSupportLib/DxeBoardAcpiTableLib.c | 8 +-------
> .../DxeMultiBoardAcpiSupportLib.c | 8 +-------
> .../DxeMultiBoardAcpiSupportLib.inf | 8 +-------
> .../MultiBoardAcpiSupportLib/SmmBoardAcpiEnableLib.c | 8 +-------
> .../SmmMultiBoardAcpiSupportLib.c | 8 +-------
> .../SmmMultiBoardAcpiSupportLib.inf | 8 +-------
> Platform/Intel/MinPlatformPkg/Acpi/MinDsdt/MinDsdt.asl | 8 +-------
> Platform/Intel/MinPlatformPkg/Acpi/MinDsdt/MinDsdt.c | 8 +-------
> Platform/Intel/MinPlatformPkg/Acpi/MinDsdt/MinDsdt.inf | 8 +-------
> .../Bds/Library/DxePlatformBootManagerLib/BdsPlatform.c | 8 +-------
> .../Bds/Library/DxePlatformBootManagerLib/BdsPlatform.h | 8 +-------
> .../DxePlatformBootManagerLib.inf | 8 +-------
> .../Bds/Library/DxePlatformBootManagerLib/MemoryTest.c | 8 +-------
> .../DxePlatformBootManagerLib/PlatformBootOption.c | 8 +-------
> .../SpiFlashCommonLibNull/SpiFlashCommonLibNull.c | 8 +-------
> .../SpiFlashCommonLibNull/SpiFlashCommonLibNull.inf | 8 +-------
> .../MinPlatformPkg/Flash/SpiFvbService/Common/FvbInfo.c | 8 +-------
> .../Flash/SpiFvbService/Common/SpiFvbServiceCommon.c | 8 +-------
> .../Flash/SpiFvbService/Common/SpiFvbServiceCommon.h | 8 +-------
> .../Flash/SpiFvbService/Smm/SpiFvbServiceSmm.c | 8 +-------
> .../Flash/SpiFvbService/SpiFvbServiceSmm.inf | 8 +-------
> .../DxeFspWrapperPlatformLib.inf | 8 +-------
> .../DxeFspWrapperPlatformResetLib.c | 8 +-------
> .../PeiFspWrapperHobProcessLib/FspWrapperHobProcessLib.c | 8 +-------
> .../PeiFspWrapperHobProcessLib.inf | 8 +-------
> .../PeiFspWrapperPlatformLib/PeiFspWrapperPlatformLib.c | 8 +-------
> .../PeiFspWrapperPlatformLib.inf | 8 +-------
> .../PeiFspWrapperPlatformResetLib.c | 8 +-------
> .../FspWrapperPlatformSecLib.c | 8 +-------
> .../Library/SecFspWrapperPlatformSecLib/FsptCoreUpd.h | 8 +-------
> .../Library/SecFspWrapperPlatformSecLib/Ia32/Fsp.h | 8 +-------
> .../SecFspWrapperPlatformSecLib/Ia32/PeiCoreEntry.S | 8 +-------
> .../SecFspWrapperPlatformSecLib/Ia32/PeiCoreEntry.asm | 8 +-------
> .../Library/SecFspWrapperPlatformSecLib/Ia32/SecEntry.S | 8 +-------
> .../SecFspWrapperPlatformSecLib/Ia32/SecEntry.asm | 8 +-------
> .../Library/SecFspWrapperPlatformSecLib/Ia32/Stack.S | 8 +-------
> .../Library/SecFspWrapperPlatformSecLib/Ia32/Stack.asm | 8 +-------
> .../Library/SecFspWrapperPlatformSecLib/PlatformInit.c | 8 +-------
> .../SecFspWrapperPlatformSecLib.inf | 8 +-------
> .../SecFspWrapperPlatformSecLib/SecGetPerformance.c | 8 +-------
> .../SecFspWrapperPlatformSecLib/SecPlatformInformation.c | 8 +-------
> .../Library/SecFspWrapperPlatformSecLib/SecRamInitData.c | 8 +-------
> .../Library/SecFspWrapperPlatformSecLib/SecTempRamDone.c | 8 +-------
> .../FspWrapper/SaveMemoryConfig/SaveMemoryConfig.c | 8 +-------
> .../FspWrapper/SaveMemoryConfig/SaveMemoryConfig.inf | 8 +-------
> .../HstiIbvPlatformDxe/ExternalDeviceDmaProtection.c | 8 +-------
> .../FirmwareTrustConfigurationCryptoStrength.c | 8 +-------
> .../FirmwareVersionRollbackProtection.c | 8 +-------
> .../Hsti/HstiIbvPlatformDxe/HstiIbvPlatformDxe.c | 8 +-------
> .../Hsti/HstiIbvPlatformDxe/HstiIbvPlatformDxe.h | 8 +-------
> .../Hsti/HstiIbvPlatformDxe/HstiIbvPlatformDxe.inf | 8 +-------
> .../MinPlatformPkg/Hsti/HstiIbvPlatformDxe/MorSupport.c | 8 +-------
> .../Hsti/HstiIbvPlatformDxe/NoTestKeyVerification.c | 8 +-------
> .../Hsti/HstiIbvPlatformDxe/SecureBootBypass.c | 8 +-------
> .../Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc | 8 +-------
> .../Intel/MinPlatformPkg/Include/Dsc/CoreDxeInclude.dsc | 8 +-------
> Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc | 8 +-------
> .../Intel/MinPlatformPkg/Include/Dsc/CorePeiInclude.dsc | 8 +-------
> Platform/Intel/MinPlatformPkg/Include/Dsc/CorePeiLib.dsc | 8 +-------
> .../MinPlatformPkg/Include/Fdf/CoreOsBootInclude.fdf | 8 +-------
> .../MinPlatformPkg/Include/Fdf/CorePostMemoryInclude.fdf | 8 +-------
> .../MinPlatformPkg/Include/Fdf/CorePreMemoryInclude.fdf | 8 +-------
> .../Include/Fdf/CoreSecurityLateInclude.fdf | 8 +-------
> .../Include/Fdf/CoreSecurityPostMemoryInclude.fdf | 8 +-------
> .../Include/Fdf/CoreSecurityPreMemoryInclude.fdf | 8 +-------
> .../MinPlatformPkg/Include/Fdf/CoreUefiBootInclude.fdf | 8 +-------
> .../Intel/MinPlatformPkg/Include/Fdf/RuleInclude.fdf | 8 +-------
> .../MinPlatformPkg/Include/Guid/SmramMemoryReserve.h | 8 +-------
> .../Intel/MinPlatformPkg/Include/HstiIbvFeatureBit.h | 8 +-------
> .../Intel/MinPlatformPkg/Include/Library/AslUpdateLib.h | 8 +-------
> .../MinPlatformPkg/Include/Library/BoardAcpiEnableLib.h | 8 +-------
> .../MinPlatformPkg/Include/Library/BoardAcpiTableLib.h | 8 +-------
> .../Intel/MinPlatformPkg/Include/Library/BoardInitLib.h | 8 +-------
> .../Intel/MinPlatformPkg/Include/Library/CompressLib.h | 8 +-------
> .../MinPlatformPkg/Include/Library/HobVariableLib.h | 8 +-------
> .../Include/Library/MultiBoardAcpiSupportLib.h | 8 +-------
> .../Include/Library/MultiBoardInitSupportLib.h | 8 +-------
> Platform/Intel/MinPlatformPkg/Include/Library/PeiLib.h | 8 +-------
> .../Intel/MinPlatformPkg/Include/Library/ReportFvLib.h | 8 +-------
> .../MinPlatformPkg/Include/Library/SecBoardInitLib.h | 8 +-------
> .../Include/Library/SiliconPolicyInitLib.h | 8 +-------
> .../Include/Library/SiliconPolicyUpdateLib.h | 8 +-------
> .../MinPlatformPkg/Include/Library/SpiFlashCommonLib.h | 8 +-------
> .../MinPlatformPkg/Include/Library/TestPointCheckLib.h | 8 +-------
> .../Intel/MinPlatformPkg/Include/Library/TestPointLib.h | 8 +-------
> .../Intel/MinPlatformPkg/Include/Ppi/BaseMemoryTest.h | 8 +-------
> .../MinPlatformPkg/Include/Ppi/PlatformMemorySize.h | 8 +-------
> .../MinPlatformPkg/Library/CompressLib/CompressLib.c | 8 +-------
> .../MinPlatformPkg/Library/CompressLib/CompressLib.inf | 7 +------
> .../MinPlatformPkg/Library/PeiHobVariableLibFce/Fce.h | 8 +-------
> .../Library/PeiHobVariableLibFce/InternalCommonLib.c | 8 +-------
> .../Library/PeiHobVariableLibFce/PeiHobVariableLibFce.c | 8 +-------
> .../PeiHobVariableLibFce/PeiHobVariableLibFce.inf | 8 +-------
> .../PeiHobVariableLibFce/PeiHobVariableLibFceOptSize.c | 8 +-------
> .../PeiHobVariableLibFce/PeiHobVariableLibFceOptSize.inf | 8 +-------
> .../Library/PeiHobVariableLibFce/Variable.h | 8 +-------
> Platform/Intel/MinPlatformPkg/Library/PeiLib/PeiLib.c | 8 +-------
> Platform/Intel/MinPlatformPkg/Library/PeiLib/PeiLib.inf | 8 +-------
> Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec | 8 +-------
> Platform/Intel/MinPlatformPkg/MinPlatformPkg.dsc | 8 +-------
> .../PciHostBridgeLibSimple/PciHostBridgeLibSimple.c | 8 +-------
> .../PciHostBridgeLibSimple/PciHostBridgeLibSimple.inf | 8 +-------
> .../PciSegmentInfoLibSimple/PciSegmentInfoLibSimple.c | 9 +--------
> .../PciSegmentInfoLibSimple/PciSegmentInfoLibSimple.inf | 7 +------
> .../PlatformInit/Library/BoardInitLibNull/BoardInitLib.c | 8 +-------
> .../Library/BoardInitLibNull/BoardInitLibNull.inf | 8 +-------
> .../Library/MultiBoardInitSupportLib/DxeBoardInitLib.c | 8 +-------
> .../DxeMultiBoardInitSupportLib.c | 8 +-------
> .../DxeMultiBoardInitSupportLib.inf | 8 +-------
> .../Library/MultiBoardInitSupportLib/PeiBoardInitLib.c | 8 +-------
> .../PeiMultiBoardInitSupportLib.c | 8 +-------
> .../PeiMultiBoardInitSupportLib.inf | 8 +-------
> .../PlatformInit/Library/PeiReportFvLib/PeiReportFvLib.c | 8 +-------
> .../Library/PeiReportFvLib/PeiReportFvLib.inf | 8 +-------
> .../Library/SecBoardInitLibNull/Ia32/SecBoardInit.nasm | 8 +-------
> .../Library/SecBoardInitLibNull/SecBoardInitLib.c | 8 +-------
> .../Library/SecBoardInitLibNull/SecBoardInitLibNull.inf | 8 +-------
> .../SiliconPolicyInitLibNull/SiliconPolicyInitLibNull.c | 8 +-------
> .../SiliconPolicyInitLibNull.inf | 8 +-------
> .../SiliconPolicyUpdateLibNull.c | 8 +-------
> .../SiliconPolicyUpdateLibNull.inf | 8 +-------
> .../PlatformInit/PlatformInitDxe/PlatformInitDxe.c | 8 +-------
> .../PlatformInit/PlatformInitDxe/PlatformInitDxe.inf | 8 +-------
> .../PlatformInit/PlatformInitPei/PlatformInitPostMem.c | 8 +-------
> .../PlatformInit/PlatformInitPei/PlatformInitPostMem.inf | 8 +-------
> .../PlatformInit/PlatformInitPei/PlatformInitPreMem.c | 8 +-------
> .../PlatformInit/PlatformInitPei/PlatformInitPreMem.inf | 8 +-------
> .../PlatformInit/PlatformInitSmm/PlatformInitSmm.c | 8 +-------
> .../PlatformInit/PlatformInitSmm/PlatformInitSmm.inf | 8 +-------
> .../MinPlatformPkg/PlatformInit/ReportFv/ReportFvPei.c | 8 +-------
> .../MinPlatformPkg/PlatformInit/ReportFv/ReportFvPei.inf | 8 +-------
> .../PlatformInit/SiliconPolicyDxe/SiliconPolicyDxe.c | 8 +-------
> .../PlatformInit/SiliconPolicyDxe/SiliconPolicyDxe.inf | 8 +-------
> .../SiliconPolicyPei/SiliconPolicyPeiPostMem.c | 8 +-------
> .../SiliconPolicyPei/SiliconPolicyPeiPostMem.inf | 8 +-------
> .../SiliconPolicyPei/SiliconPolicyPeiPreMem.c | 8 +-------
> .../SiliconPolicyPei/SiliconPolicyPeiPreMem.inf | 8 +-------
> .../Services/StallServicePei/StallServicePei.c | 8 +-------
> .../Services/StallServicePei/StallServicePei.inf | 8 +-------
> .../MinPlatformPkg/Tcg/Tcg2PlatformDxe/Tcg2PlatformDxe.c | 8 +-------
> .../Tcg/Tcg2PlatformDxe/Tcg2PlatformDxe.inf | 8 +-------
> .../MinPlatformPkg/Tcg/Tcg2PlatformPei/Tcg2PlatformPei.c | 8 +-------
> .../Tcg/Tcg2PlatformPei/Tcg2PlatformPei.inf | 8 +-------
> .../Test/Library/TestPointCheckLib/DxeCheckAcpi.c | 8 +-------
> .../Test/Library/TestPointCheckLib/DxeCheckAcpiDmar.c | 8 +-------
> .../Test/Library/TestPointCheckLib/DxeCheckAcpiHpet.c | 8 +-------
> .../Test/Library/TestPointCheckLib/DxeCheckAcpiMadt.c | 8 +-------
> .../Test/Library/TestPointCheckLib/DxeCheckAcpiMcfg.c | 8 +-------
> .../Test/Library/TestPointCheckLib/DxeCheckAcpiTpm.c | 8 +-------
> .../Test/Library/TestPointCheckLib/DxeCheckAcpiWsmt.c | 8 +-------
> .../Library/TestPointCheckLib/DxeCheckBootVariable.c | 8 +-------
> .../Library/TestPointCheckLib/DxeCheckConsoleVariable.c | 8 +-------
> .../Test/Library/TestPointCheckLib/DxeCheckDevicePath.c | 8 +-------
> .../Library/TestPointCheckLib/DxeCheckDmaProtection.c | 8 +-------
> .../Test/Library/TestPointCheckLib/DxeCheckEsrt.c | 8 +-------
> .../Test/Library/TestPointCheckLib/DxeCheckGcd.c | 8 +-------
> .../Test/Library/TestPointCheckLib/DxeCheckHsti.c | 8 +-------
> .../Test/Library/TestPointCheckLib/DxeCheckLoadedImage.c | 8 +-------
> .../Library/TestPointCheckLib/DxeCheckMemoryAttribute.c | 8 +-------
> .../Test/Library/TestPointCheckLib/DxeCheckMemoryMap.c | 8 +-------
> .../TestPointCheckLib/DxeCheckMemoryTypeInformation.c | 8 +-------
> .../Test/Library/TestPointCheckLib/DxeCheckPci.c | 8 +-------
> .../Library/TestPointCheckLib/DxeCheckPiSignedFvBoot.c | 8 +-------
> .../TestPointCheckLib/DxeCheckSmiHandlerInstrument.c | 8 +-------
> .../Test/Library/TestPointCheckLib/DxeCheckSmmInfo.c | 8 +-------
> .../Test/Library/TestPointCheckLib/DxeCheckTcgMor.c | 8 +-------
> .../Library/TestPointCheckLib/DxeCheckTcgTrustedBoot.c | 8 +-------
> .../Library/TestPointCheckLib/DxeCheckUefiSecureBoot.c | 8 +-------
> .../Test/Library/TestPointCheckLib/DxeCheckVariable.c | 8 +-------
> .../Library/TestPointCheckLib/DxeTestPointCheckLib.c | 8 +-------
> .../Library/TestPointCheckLib/DxeTestPointCheckLib.inf | 8 +-------
> .../Library/TestPointCheckLib/PeiCheckDmaProtection.c | 8 +-------
> .../Test/Library/TestPointCheckLib/PeiCheckFvInfo.c | 8 +-------
> .../Test/Library/TestPointCheckLib/PeiCheckHob.c | 8 +-------
> .../Test/Library/TestPointCheckLib/PeiCheckMtrr.c | 8 +-------
> .../Test/Library/TestPointCheckLib/PeiCheckPci.c | 8 +-------
> .../Test/Library/TestPointCheckLib/PeiCheckSmmInfo.c | 8 +-------
> .../Library/TestPointCheckLib/PeiTestPointCheckLib.c | 8 +-------
> .../Library/TestPointCheckLib/PeiTestPointCheckLib.inf | 8 +-------
> .../Test/Library/TestPointCheckLib/SecCheckCpuInfo.c | 8 +-------
> .../Library/TestPointCheckLib/SecTestPointCheckLib.c | 8 +-------
> .../Library/TestPointCheckLib/SecTestPointCheckLib.inf | 8 +-------
> .../TestPointCheckLib/SmmCheckCommunicationBuffer.c | 8 +-------
> .../Test/Library/TestPointCheckLib/SmmCheckLoadedImage.c | 8 +-------
> .../Library/TestPointCheckLib/SmmCheckMemoryAttribute.c | 8 +-------
> .../Test/Library/TestPointCheckLib/SmmCheckPaging.c | 8 +-------
> .../Test/Library/TestPointCheckLib/SmmCheckSmrr.c | 8 +-------
> .../Library/TestPointCheckLib/SmmTestPointCheckLib.c | 8 +-------
> .../Library/TestPointCheckLib/SmmTestPointCheckLib.inf | 8 +-------
> .../Test/Library/TestPointCheckLib/TestPointHelp.c | 8 +-------
> .../Test/Library/TestPointCheckLib/TestPointInternal.h | 8 +-------
> .../TestPointCheckLibNull/TestPointCheckLibNull.c | 8 +-------
> .../TestPointCheckLibNull/TestPointCheckLibNull.inf | 8 +-------
> .../Test/Library/TestPointLib/DxeTestPoint.c | 8 +-------
> .../Test/Library/TestPointLib/DxeTestPoint.h | 8 +-------
> .../Test/Library/TestPointLib/DxeTestPointAip.c | 8 +-------
> .../Test/Library/TestPointLib/DxeTestPointLib.inf | 7 +------
> .../Test/Library/TestPointLib/PeiTestPoint.c | 8 +-------
> .../Test/Library/TestPointLib/PeiTestPoint.h | 8 +-------
> .../Test/Library/TestPointLib/PeiTestPointLib.inf | 7 +------
> .../Test/Library/TestPointLib/SmmTestPoint.c | 8 +-------
> .../Test/Library/TestPointLib/SmmTestPoint.h | 8 +-------
> .../Test/Library/TestPointLib/SmmTestPointAip.c | 8 +-------
> .../Library/TestPointLib/SmmTestPointCommunication.c | 8 +-------
> .../Test/Library/TestPointLib/SmmTestPointLib.inf | 7 +------
> .../MinPlatformPkg/Test/TestPointDumpApp/TestPointDump.c | 8 +-------
> .../Test/TestPointDumpApp/TestPointDumpApp.inf | 8 +-------
> .../Test/TestPointStubDxe/TestPointStubDxe.c | 8 +-------
> .../Test/TestPointStubDxe/TestPointStubDxe.inf | 8 +-------
> .../MinPlatformPkg/Tools/AmlGenOffset/AmlGenOffset.py | 8 +-------
> .../Tools/Fsp/PatchFspBinFvsBaseAddress.py | 8 +-------
> .../Intel/MinPlatformPkg/Tools/Help/CheckCodeBase.py | 8 +-------
> Platform/Intel/MinPlatformPkg/Tools/ParseVar/ParseVar.py | 8 +-------
> Platform/Intel/MinPlatformPkg/Tools/PatchFv/PatchBfv.py | 8 +-------
> .../Intel/MinPlatformPkg/Tools/PatchFv/PatchBinFv.py | 8 +-------
> .../Intel/MinPlatformPkg/Tools/PatchFv/RebaseBinFv.py | 8 +-------
> .../Intel/MinPlatformPkg/Tools/PatchFv/SyncBinFvInf.py | 8 +-------
> 233 files changed, 233 insertions(+), 1627 deletions(-)
>
> diff --git a/Platform/Intel/MinPlatformPkg/Acpi/AcpiSmm/AcpiSmm.c
> b/Platform/Intel/MinPlatformPkg/Acpi/AcpiSmm/AcpiSmm.c
> index 74c1678bc8..809f75d3c5 100644
> --- a/Platform/Intel/MinPlatformPkg/Acpi/AcpiSmm/AcpiSmm.c
> +++ b/Platform/Intel/MinPlatformPkg/Acpi/AcpiSmm/AcpiSmm.c
> @@ -2,13 +2,7 @@
> Acpi Smm driver.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/Intel/MinPlatformPkg/Acpi/AcpiSmm/AcpiSmm.h
> b/Platform/Intel/MinPlatformPkg/Acpi/AcpiSmm/AcpiSmm.h
> index a34d87250f..e34ffb1b75 100644
> --- a/Platform/Intel/MinPlatformPkg/Acpi/AcpiSmm/AcpiSmm.h
> +++ b/Platform/Intel/MinPlatformPkg/Acpi/AcpiSmm/AcpiSmm.h
> @@ -2,13 +2,7 @@
> Header file for the Smm platform driver.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/Intel/MinPlatformPkg/Acpi/AcpiSmm/AcpiSmm.inf
> b/Platform/Intel/MinPlatformPkg/Acpi/AcpiSmm/AcpiSmm.inf
> index 8675a45b7a..fbaf467525 100644
> --- a/Platform/Intel/MinPlatformPkg/Acpi/AcpiSmm/AcpiSmm.inf
> +++ b/Platform/Intel/MinPlatformPkg/Acpi/AcpiSmm/AcpiSmm.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c
> b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c
> index ade65d8ab7..5eb727929b 100644
> --- a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c
> +++ b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c
> @@ -2,13 +2,7 @@
> ACPI Platform Driver
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.h
> b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.h
> index 6a314f5733..bd11f9e988 100644
> --- a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.h
> +++ b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.h
> @@ -2,13 +2,7 @@
> This is an implementation of the ACPI platform driver.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.inf
> b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.inf
> index 6a5b94ef28..5d9c8cab50 100644
> --- a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.inf
> +++ b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Facs/Facs.c
> b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Facs/Facs.c
> index b454a8ddc1..cde6e478c6 100644
> --- a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Facs/Facs.c
> +++ b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Facs/Facs.c
> @@ -4,13 +4,7 @@
> for bug fixes, no porting is required.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Fadt/Fadt.c
> b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Fadt/Fadt.c
> index 0def9f6c2b..6efb38cda4 100644
> --- a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Fadt/Fadt.c
> +++ b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Fadt/Fadt.c
> @@ -4,13 +4,7 @@
> for bug fixes, no porting is required.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Hpet/Hpet.c
> b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Hpet/Hpet.c
> index 2512793158..8721beb03f 100644
> --- a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Hpet/Hpet.c
> +++ b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Hpet/Hpet.c
> @@ -4,13 +4,7 @@
> for bug fixes, no porting is required.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Wsmt/Wsmt.c
> b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Wsmt/Wsmt.c
> index 6d25de2ae7..6880f47fa6 100644
> --- a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Wsmt/Wsmt.c
> +++ b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Wsmt/Wsmt.c
> @@ -2,13 +2,7 @@
> ACPI WSMT table
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Acpi/Library/BoardAcpiLibNull/BoardAcpiE
> nableLib.c
> b/Platform/Intel/MinPlatformPkg/Acpi/Library/BoardAcpiLibNull/BoardAcpiE
> nableLib.c
> index ff284fc404..334cb21714 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Acpi/Library/BoardAcpiLibNull/BoardAcpiE
> nableLib.c
> +++
> b/Platform/Intel/MinPlatformPkg/Acpi/Library/BoardAcpiLibNull/BoardAcpiE
> nableLib.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Acpi/Library/BoardAcpiLibNull/BoardAcpiE
> nableLibNull.inf
> b/Platform/Intel/MinPlatformPkg/Acpi/Library/BoardAcpiLibNull/BoardAcpiE
> nableLibNull.inf
> index 10cc8fffff..54985ee50d 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Acpi/Library/BoardAcpiLibNull/BoardAcpiE
> nableLibNull.inf
> +++
> b/Platform/Intel/MinPlatformPkg/Acpi/Library/BoardAcpiLibNull/BoardAcpiE
> nableLibNull.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Acpi/Library/BoardAcpiLibNull/BoardAcpiT
> ableLib.c
> b/Platform/Intel/MinPlatformPkg/Acpi/Library/BoardAcpiLibNull/BoardAcpiT
> ableLib.c
> index 59a27c29a9..e49e6ad441 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Acpi/Library/BoardAcpiLibNull/BoardAcpiT
> ableLib.c
> +++
> b/Platform/Intel/MinPlatformPkg/Acpi/Library/BoardAcpiLibNull/BoardAcpiT
> ableLib.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Acpi/Library/BoardAcpiLibNull/BoardAcpiT
> ableLibNull.inf
> b/Platform/Intel/MinPlatformPkg/Acpi/Library/BoardAcpiLibNull/BoardAcpiT
> ableLibNull.inf
> index 1564c8546f..04f55b49d5 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Acpi/Library/BoardAcpiLibNull/BoardAcpiT
> ableLibNull.inf
> +++
> b/Platform/Intel/MinPlatformPkg/Acpi/Library/BoardAcpiLibNull/BoardAcpiT
> ableLibNull.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Acpi/Library/DxeAslUpdateLib/DxeAslUpd
> ateLib.c
> b/Platform/Intel/MinPlatformPkg/Acpi/Library/DxeAslUpdateLib/DxeAslUpd
> ateLib.c
> index ea85be4a11..e6ab43db6d 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Acpi/Library/DxeAslUpdateLib/DxeAslUpd
> ateLib.c
> +++
> b/Platform/Intel/MinPlatformPkg/Acpi/Library/DxeAslUpdateLib/DxeAslUpd
> ateLib.c
> @@ -7,13 +7,7 @@
> This library uses the ACPI Support protocol.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include <Base.h>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Acpi/Library/DxeAslUpdateLib/DxeAslUpd
> ateLib.inf
> b/Platform/Intel/MinPlatformPkg/Acpi/Library/DxeAslUpdateLib/DxeAslUpd
> ateLib.inf
> index 20fcc4e63c..1ddca75e97 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Acpi/Library/DxeAslUpdateLib/DxeAslUpd
> ateLib.inf
> +++
> b/Platform/Intel/MinPlatformPkg/Acpi/Library/DxeAslUpdateLib/DxeAslUpd
> ateLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/D
> xeBoardAcpiTableLib.c
> b/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/D
> xeBoardAcpiTableLib.c
> index 700d5e0773..dff47aad79 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/D
> xeBoardAcpiTableLib.c
> +++
> b/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/D
> xeBoardAcpiTableLib.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/D
> xeMultiBoardAcpiSupportLib.c
> b/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/D
> xeMultiBoardAcpiSupportLib.c
> index d054d724d6..43318236e0 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/D
> xeMultiBoardAcpiSupportLib.c
> +++
> b/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/D
> xeMultiBoardAcpiSupportLib.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/D
> xeMultiBoardAcpiSupportLib.inf
> b/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/D
> xeMultiBoardAcpiSupportLib.inf
> index 8422faf62a..826c7f4008 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/D
> xeMultiBoardAcpiSupportLib.inf
> +++
> b/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/D
> xeMultiBoardAcpiSupportLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/S
> mmBoardAcpiEnableLib.c
> b/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/S
> mmBoardAcpiEnableLib.c
> index a0c6b20e13..54af6a8c3c 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/S
> mmBoardAcpiEnableLib.c
> +++
> b/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/S
> mmBoardAcpiEnableLib.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/S
> mmMultiBoardAcpiSupportLib.c
> b/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/S
> mmMultiBoardAcpiSupportLib.c
> index d858e8ae27..ac253eec84 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/S
> mmMultiBoardAcpiSupportLib.c
> +++
> b/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/S
> mmMultiBoardAcpiSupportLib.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/S
> mmMultiBoardAcpiSupportLib.inf
> b/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/S
> mmMultiBoardAcpiSupportLib.inf
> index 0ce45b25cb..5415446b57 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/S
> mmMultiBoardAcpiSupportLib.inf
> +++
> b/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/S
> mmMultiBoardAcpiSupportLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Platform/Intel/MinPlatformPkg/Acpi/MinDsdt/MinDsdt.asl
> b/Platform/Intel/MinPlatformPkg/Acpi/MinDsdt/MinDsdt.asl
> index aed770a39d..0d94472450 100644
> --- a/Platform/Intel/MinPlatformPkg/Acpi/MinDsdt/MinDsdt.asl
> +++ b/Platform/Intel/MinPlatformPkg/Acpi/MinDsdt/MinDsdt.asl
> @@ -2,13 +2,7 @@
> ACPI minimum DSDT table
>
> Copyright (c) 2018, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/Intel/MinPlatformPkg/Acpi/MinDsdt/MinDsdt.c
> b/Platform/Intel/MinPlatformPkg/Acpi/MinDsdt/MinDsdt.c
> index ef40e97b7c..9bc2224538 100644
> --- a/Platform/Intel/MinPlatformPkg/Acpi/MinDsdt/MinDsdt.c
> +++ b/Platform/Intel/MinPlatformPkg/Acpi/MinDsdt/MinDsdt.c
> @@ -2,13 +2,7 @@
> Min DSDT Driver
>
> Copyright (c) 2018, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/Intel/MinPlatformPkg/Acpi/MinDsdt/MinDsdt.inf
> b/Platform/Intel/MinPlatformPkg/Acpi/MinDsdt/MinDsdt.inf
> index 3ffa79c966..1066f13cfe 100644
> --- a/Platform/Intel/MinPlatformPkg/Acpi/MinDsdt/MinDsdt.inf
> +++ b/Platform/Intel/MinPlatformPkg/Acpi/MinDsdt/MinDsdt.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2018, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib
> /BdsPlatform.c
> b/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib
> /BdsPlatform.c
> index 41fe3f2cca..491fb0f26f 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib
> /BdsPlatform.c
> +++
> b/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib
> /BdsPlatform.c
> @@ -2,13 +2,7 @@
> This file include all platform action which can be customized by IBV/OEM.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib
> /BdsPlatform.h
> b/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib
> /BdsPlatform.h
> index 779ba9a98d..360a00d7d7 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib
> /BdsPlatform.h
> +++
> b/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib
> /BdsPlatform.h
> @@ -2,13 +2,7 @@
> Header file for BDS Platform specific code
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib
> /DxePlatformBootManagerLib.inf
> b/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib
> /DxePlatformBootManagerLib.inf
> index bd9c0467b9..388ffd808b 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib
> /DxePlatformBootManagerLib.inf
> +++
> b/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib
> /DxePlatformBootManagerLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib
> /MemoryTest.c
> b/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib
> /MemoryTest.c
> index 0a47f9252d..654845349a 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib
> /MemoryTest.c
> +++
> b/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib
> /MemoryTest.c
> @@ -2,13 +2,7 @@
> Perform the platform memory test
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib
> /PlatformBootOption.c
> b/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib
> /PlatformBootOption.c
> index ea30de0540..84aa097d58 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib
> /PlatformBootOption.c
> +++
> b/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib
> /PlatformBootOption.c
> @@ -2,13 +2,7 @@
> Driver for Platform Boot Options support.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Flash/Library/SpiFlashCommonLibNull/Spi
> FlashCommonLibNull.c
> b/Platform/Intel/MinPlatformPkg/Flash/Library/SpiFlashCommonLibNull/Spi
> FlashCommonLibNull.c
> index bacc440630..403b16a1b4 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Flash/Library/SpiFlashCommonLibNull/Spi
> FlashCommonLibNull.c
> +++
> b/Platform/Intel/MinPlatformPkg/Flash/Library/SpiFlashCommonLibNull/Spi
> FlashCommonLibNull.c
> @@ -2,13 +2,7 @@
> Null Library instance of SPI Flash Common Library Class
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Flash/Library/SpiFlashCommonLibNull/Spi
> FlashCommonLibNull.inf
> b/Platform/Intel/MinPlatformPkg/Flash/Library/SpiFlashCommonLibNull/Spi
> FlashCommonLibNull.inf
> index 73853c0d1c..d4964681de 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Flash/Library/SpiFlashCommonLibNull/Spi
> FlashCommonLibNull.inf
> +++
> b/Platform/Intel/MinPlatformPkg/Flash/Library/SpiFlashCommonLibNull/Spi
> FlashCommonLibNull.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/Common/FvbInfo.c
> b/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/Common/FvbInfo.c
> index bd4366ea7c..7f2678fa9e 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/Common/FvbInfo.c
> +++
> b/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/Common/FvbInfo.c
> @@ -3,13 +3,7 @@
> These data is intent to decouple FVB driver with FV header.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/Common/SpiFvbServi
> ceCommon.c
> b/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/Common/SpiFvbServi
> ceCommon.c
> index 20ad9a3a38..113c749d04 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/Common/SpiFvbServi
> ceCommon.c
> +++
> b/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/Common/SpiFvbServi
> ceCommon.c
> @@ -3,13 +3,7 @@
> which are compliant with the Intel(R) Serial Flash Interface Compatibility
> Specification.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/Common/SpiFvbServi
> ceCommon.h
> b/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/Common/SpiFvbServi
> ceCommon.h
> index 876f14dc8c..6379fc86d5 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/Common/SpiFvbServi
> ceCommon.h
> +++
> b/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/Common/SpiFvbServi
> ceCommon.h
> @@ -2,13 +2,7 @@
> Common source definitions used in serial flash drivers
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/Smm/SpiFvbServiceS
> mm.c
> b/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/Smm/SpiFvbServiceS
> mm.c
> index f0c2a1df8b..251fcae30b 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/Smm/SpiFvbServiceS
> mm.c
> +++
> b/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/Smm/SpiFvbServiceS
> mm.c
> @@ -3,13 +3,7 @@
> which are compliant with the Intel(R) Serial Flash Interface Compatibility
> Specification.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/SpiFvbServiceSmm.inf
> b/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/SpiFvbServiceSmm.inf
> index eb3519fb6a..cca7de94a0 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/SpiFvbServiceSmm.inf
> +++
> b/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/SpiFvbServiceSmm.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/DxeFspWrapperPlatf
> ormLib/DxeFspWrapperPlatformLib.inf
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/DxeFspWrapperPlatf
> ormLib/DxeFspWrapperPlatformLib.inf
> index 48c4433b01..a1226dbcfe 100644
> ---
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/DxeFspWrapperPlatf
> ormLib/DxeFspWrapperPlatformLib.inf
> +++
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/DxeFspWrapperPlatf
> ormLib/DxeFspWrapperPlatformLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/DxeFspWrapperPlatf
> ormLib/DxeFspWrapperPlatformResetLib.c
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/DxeFspWrapperPlatf
> ormLib/DxeFspWrapperPlatformResetLib.c
> index 395f189ee9..b4d509db85 100644
> ---
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/DxeFspWrapperPlatf
> ormLib/DxeFspWrapperPlatformResetLib.c
> +++
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/DxeFspWrapperPlatf
> ormLib/DxeFspWrapperPlatformResetLib.c
> @@ -2,13 +2,7 @@
> Dxe library function to reset the system from FSP wrapper.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include <PiDxe.h>
> diff --git
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperHobPr
> ocessLib/FspWrapperHobProcessLib.c
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperHobPr
> ocessLib/FspWrapperHobProcessLib.c
> index 7323a46da4..e8df06dfb7 100644
> ---
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperHobPr
> ocessLib/FspWrapperHobProcessLib.c
> +++
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperHobPr
> ocessLib/FspWrapperHobProcessLib.c
> @@ -2,13 +2,7 @@
> Provide FSP wrapper hob process related function.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperHobPr
> ocessLib/PeiFspWrapperHobProcessLib.inf
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperHobPr
> ocessLib/PeiFspWrapperHobProcessLib.inf
> index 362851e128..a76e3195d6 100644
> ---
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperHobPr
> ocessLib/PeiFspWrapperHobProcessLib.inf
> +++
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperHobPr
> ocessLib/PeiFspWrapperHobProcessLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperPlatfo
> rmLib/PeiFspWrapperPlatformLib.c
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperPlatfo
> rmLib/PeiFspWrapperPlatformLib.c
> index 2c6c026ee5..0def288805 100644
> ---
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperPlatfo
> rmLib/PeiFspWrapperPlatformLib.c
> +++
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperPlatfo
> rmLib/PeiFspWrapperPlatformLib.c
> @@ -2,13 +2,7 @@
> Provide FSP wrapper platform related function.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperPlatfo
> rmLib/PeiFspWrapperPlatformLib.inf
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperPlatfo
> rmLib/PeiFspWrapperPlatformLib.inf
> index f7e82d81d7..dafd17dc11 100644
> ---
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperPlatfo
> rmLib/PeiFspWrapperPlatformLib.inf
> +++
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperPlatfo
> rmLib/PeiFspWrapperPlatformLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperPlatfo
> rmLib/PeiFspWrapperPlatformResetLib.c
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperPlatfo
> rmLib/PeiFspWrapperPlatformResetLib.c
> index 501197c709..191bcb2fbb 100644
> ---
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperPlatfo
> rmLib/PeiFspWrapperPlatformResetLib.c
> +++
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperPlatfo
> rmLib/PeiFspWrapperPlatformResetLib.c
> @@ -2,13 +2,7 @@
> Pei library function to reset the system from FSP wrapper.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/FspWrapperPlatformSecLib.c
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/FspWrapperPlatformSecLib.c
> index 27096fec32..303f3aac40 100644
> ---
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/FspWrapperPlatformSecLib.c
> +++
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/FspWrapperPlatformSecLib.c
> @@ -2,13 +2,7 @@
> Provide FSP wrapper platform sec related function.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/FsptCoreUpd.h
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/FsptCoreUpd.h
> index bfdc279c4a..7c0f605b92 100644
> ---
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/FsptCoreUpd.h
> +++
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/FsptCoreUpd.h
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/Ia32/Fsp.h
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/Ia32/Fsp.h
> index ba5219198c..9f6cdcf476 100644
> ---
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/Ia32/Fsp.h
> +++
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/Ia32/Fsp.h
> @@ -2,13 +2,7 @@
> Fsp related definitions
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/Ia32/PeiCoreEntry.S
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/Ia32/PeiCoreEntry.S
> index 8923577263..8c8356f3a0 100644
> ---
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/Ia32/PeiCoreEntry.S
> +++
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/Ia32/PeiCoreEntry.S
> @@ -2,13 +2,7 @@
> # Find and call SecStartup
> #
> # Copyright (c) 2017, 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 that accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php.
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/Ia32/PeiCoreEntry.asm
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/Ia32/PeiCoreEntry.asm
> index d4703dc8ba..c854067db1 100644
> ---
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/Ia32/PeiCoreEntry.asm
> +++
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/Ia32/PeiCoreEntry.asm
> @@ -2,13 +2,7 @@
> ; Find and call SecStartup
> ;
> ; Copyright (c) 2017, 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 that accompanies this
> distribution.
> -; The full text of the license may be found at
> -; http://opensource.org/licenses/bsd-license.php.
> -;
> -; THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -; WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +; SPDX-License-Identifier: BSD-2-Clause-Patent
> ;
> ;;
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/Ia32/SecEntry.S
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/Ia32/SecEntry.S
> index 396e7a4c16..63c420a8dc 100644
> ---
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/Ia32/SecEntry.S
> +++
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/Ia32/SecEntry.S
> @@ -3,13 +3,7 @@
> # It consumes the reset vector, calls TempRamInit API from FSP binary.
> #
> # Copyright (c) 2017, 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 that accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php.
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/Ia32/SecEntry.asm
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/Ia32/SecEntry.asm
> index 7b82cbaa0e..2886a37d73 100644
> ---
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/Ia32/SecEntry.asm
> +++
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/Ia32/SecEntry.asm
> @@ -3,13 +3,7 @@
> ; It consumes the reset vector, calls TempRamInit API from FSP binary.
> ;
> ; Copyright (c) 2017, 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 that accompanies this
> distribution.
> -; The full text of the license may be found at
> -; http://opensource.org/licenses/bsd-license.php.
> -;
> -; THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -; WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +; SPDX-License-Identifier: BSD-2-Clause-Patent
> ;
> ;;
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/Ia32/Stack.S
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/Ia32/Stack.S
> index e0eb80ad9a..9953daa195 100644
> ---
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/Ia32/Stack.S
> +++
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/Ia32/Stack.S
> @@ -2,13 +2,7 @@
> # Switch the stack from temporary memory to permenent memory.
> #
> # Copyright (c) 2017, 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 that accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php.
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/Ia32/Stack.asm
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/Ia32/Stack.asm
> index 27ae218e63..183024066a 100644
> ---
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/Ia32/Stack.asm
> +++
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/Ia32/Stack.asm
> @@ -2,13 +2,7 @@
> ; Switch the stack from temporary memory to permenent memory.
> ;
> ; Copyright (c) 2017, 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 that accompanies this
> distribution.
> -; The full text of the license may be found at
> -; http://opensource.org/licenses/bsd-license.php.
> -;
> -; THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -; WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +; SPDX-License-Identifier: BSD-2-Clause-Patent
> ;
> ;;
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/PlatformInit.c
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/PlatformInit.c
> index 6d810686f3..ef89e3f310 100644
> ---
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/PlatformInit.c
> +++
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/PlatformInit.c
> @@ -2,13 +2,7 @@
> Provide platform init function.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/SecFspWrapperPlatformSecLib.inf
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/SecFspWrapperPlatformSecLib.inf
> index 9c133577cd..6f2c95adb7 100644
> ---
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/SecFspWrapperPlatformSecLib.inf
> +++
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/SecFspWrapperPlatformSecLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/SecGetPerformance.c
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/SecGetPerformance.c
> index 7d06b4e985..c4eeb2b188 100644
> ---
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/SecGetPerformance.c
> +++
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/SecGetPerformance.c
> @@ -2,13 +2,7 @@
> Sample to provide SecGetPerformance function.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/SecPlatformInformation.c
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/SecPlatformInformation.c
> index 3b8189fadd..5b94ed2bef 100644
> ---
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/SecPlatformInformation.c
> +++
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/SecPlatformInformation.c
> @@ -2,13 +2,7 @@
> Provide SecPlatformInformation function.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/SecRamInitData.c
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/SecRamInitData.c
> index 485f198db4..b356327b4c 100644
> ---
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/SecRamInitData.c
> +++
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/SecRamInitData.c
> @@ -2,13 +2,7 @@
> Provide TempRamInitParams data.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/SecTempRamDone.c
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/SecTempRamDone.c
> index 98bec31013..cde8a80a4e 100644
> ---
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/SecTempRamDone.c
> +++
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/SecTempRamDone.c
> @@ -2,13 +2,7 @@
> Provide SecTemporaryRamDone function.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/FspWrapper/SaveMemoryConfig/SaveMe
> moryConfig.c
> b/Platform/Intel/MinPlatformPkg/FspWrapper/SaveMemoryConfig/SaveMe
> moryConfig.c
> index b01c610bf5..41ed2550bd 100644
> ---
> a/Platform/Intel/MinPlatformPkg/FspWrapper/SaveMemoryConfig/SaveMe
> moryConfig.c
> +++
> b/Platform/Intel/MinPlatformPkg/FspWrapper/SaveMemoryConfig/SaveMe
> moryConfig.c
> @@ -3,13 +3,7 @@
> exists, and saves the data to nvRAM.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/FspWrapper/SaveMemoryConfig/SaveMe
> moryConfig.inf
> b/Platform/Intel/MinPlatformPkg/FspWrapper/SaveMemoryConfig/SaveMe
> moryConfig.inf
> index 0b6eda9d25..0c8689a6f6 100644
> ---
> a/Platform/Intel/MinPlatformPkg/FspWrapper/SaveMemoryConfig/SaveMe
> moryConfig.inf
> +++
> b/Platform/Intel/MinPlatformPkg/FspWrapper/SaveMemoryConfig/SaveMe
> moryConfig.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/ExternalDeviceD
> maProtection.c
> b/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/ExternalDeviceD
> maProtection.c
> index 197813fe66..f96c2f07ec 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/ExternalDeviceD
> maProtection.c
> +++
> b/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/ExternalDeviceD
> maProtection.c
> @@ -4,13 +4,7 @@
> in this sample driver.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/FirmwareTrustCo
> nfigurationCryptoStrength.c
> b/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/FirmwareTrustCo
> nfigurationCryptoStrength.c
> index 6e2f5f4c10..dd0a53ff48 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/FirmwareTrustCo
> nfigurationCryptoStrength.c
> +++
> b/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/FirmwareTrustCo
> nfigurationCryptoStrength.c
> @@ -4,13 +4,7 @@
> in this sample driver.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/FirmwareVersion
> RollbackProtection.c
> b/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/FirmwareVersion
> RollbackProtection.c
> index a22836c8a5..3f66e67054 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/FirmwareVersion
> RollbackProtection.c
> +++
> b/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/FirmwareVersion
> RollbackProtection.c
> @@ -4,13 +4,7 @@
> in this sample driver.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/HstiIbvPlatformD
> xe.c
> b/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/HstiIbvPlatformD
> xe.c
> index 02af6dbbe7..8be9e98eae 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/HstiIbvPlatformD
> xe.c
> +++
> b/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/HstiIbvPlatformD
> xe.c
> @@ -4,13 +4,7 @@
> publishes the IBV role HSTI structure indicating all tests pass
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/HstiIbvPlatformD
> xe.h
> b/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/HstiIbvPlatformD
> xe.h
> index 1e32229895..1dff22363d 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/HstiIbvPlatformD
> xe.h
> +++
> b/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/HstiIbvPlatformD
> xe.h
> @@ -3,13 +3,7 @@
> and publishing IBV HSTI
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/HstiIbvPlatformD
> xe.inf
> b/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/HstiIbvPlatformD
> xe.inf
> index 97356620f5..6481452860 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/HstiIbvPlatformD
> xe.inf
> +++
> b/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/HstiIbvPlatformD
> xe.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/MorSupport.c
> b/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/MorSupport.c
> index 9a1e8a0385..0358b546ee 100644
> --- a/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/MorSupport.c
> +++
> b/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/MorSupport.c
> @@ -4,13 +4,7 @@
> in this sample driver.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/NoTestKeyVerific
> ation.c
> b/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/NoTestKeyVerific
> ation.c
> index 6f03495572..55beb7860a 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/NoTestKeyVerific
> ation.c
> +++
> b/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/NoTestKeyVerific
> ation.c
> @@ -4,13 +4,7 @@
> in this sample driver.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/SecureBootBypa
> ss.c
> b/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/SecureBootBypa
> ss.c
> index 472ec42673..4936b305ab 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/SecureBootBypa
> ss.c
> +++
> b/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/SecureBootBypa
> ss.c
> @@ -4,13 +4,7 @@
> in this sample driver.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc
> b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc
> index dd0173a1af..efe02c99f3 100644
> --- a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc
> +++ b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017 - 2018, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeInclude.dsc
> b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeInclude.dsc
> index 6bd526a27b..f0e578f8cc 100644
> --- a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeInclude.dsc
> +++ b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeInclude.dsc
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017 - 2019, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc
> b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc
> index 1ed3591f36..5b3679bb4e 100644
> --- a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc
> +++ b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017 - 2018, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Platform/Intel/MinPlatformPkg/Include/Dsc/CorePeiInclude.dsc
> b/Platform/Intel/MinPlatformPkg/Include/Dsc/CorePeiInclude.dsc
> index 231eb60e41..08e50cac07 100644
> --- a/Platform/Intel/MinPlatformPkg/Include/Dsc/CorePeiInclude.dsc
> +++ b/Platform/Intel/MinPlatformPkg/Include/Dsc/CorePeiInclude.dsc
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Platform/Intel/MinPlatformPkg/Include/Dsc/CorePeiLib.dsc
> b/Platform/Intel/MinPlatformPkg/Include/Dsc/CorePeiLib.dsc
> index 6855d1e5b7..3f784d58c9 100644
> --- a/Platform/Intel/MinPlatformPkg/Include/Dsc/CorePeiLib.dsc
> +++ b/Platform/Intel/MinPlatformPkg/Include/Dsc/CorePeiLib.dsc
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreOsBootInclude.fdf
> b/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreOsBootInclude.fdf
> index 0f975a8923..24f1a0c508 100644
> --- a/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreOsBootInclude.fdf
> +++ b/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreOsBootInclude.fdf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Include/Fdf/CorePostMemoryInclude.fdf
> b/Platform/Intel/MinPlatformPkg/Include/Fdf/CorePostMemoryInclude.fdf
> index 013c10146b..3c2716d672 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Include/Fdf/CorePostMemoryInclude.fdf
> +++
> b/Platform/Intel/MinPlatformPkg/Include/Fdf/CorePostMemoryInclude.fdf
> @@ -3,12 +3,6 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
> diff --git
> a/Platform/Intel/MinPlatformPkg/Include/Fdf/CorePreMemoryInclude.fdf
> b/Platform/Intel/MinPlatformPkg/Include/Fdf/CorePreMemoryInclude.fdf
> index e1b195d4d7..c0828997cf 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Include/Fdf/CorePreMemoryInclude.fdf
> +++
> b/Platform/Intel/MinPlatformPkg/Include/Fdf/CorePreMemoryInclude.fdf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreSecurityLateInclude.fdf
> b/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreSecurityLateInclude.fdf
> index 2171fe12e5..45dda7ea0a 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreSecurityLateInclude.fdf
> +++
> b/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreSecurityLateInclude.fdf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017 - 2019, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreSecurityPostMemoryIncl
> ude.fdf
> b/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreSecurityPostMemoryIncl
> ude.fdf
> index 013c10146b..3c2716d672 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreSecurityPostMemoryIncl
> ude.fdf
> +++
> b/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreSecurityPostMemoryIncl
> ude.fdf
> @@ -3,12 +3,6 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
> diff --git
> a/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreSecurityPreMemoryInclu
> de.fdf
> b/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreSecurityPreMemoryInclu
> de.fdf
> index d0a4d39d57..af5d032fce 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreSecurityPreMemoryInclu
> de.fdf
> +++
> b/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreSecurityPreMemoryInclu
> de.fdf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreUefiBootInclude.fdf
> b/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreUefiBootInclude.fdf
> index be3caad402..7859c0b1a5 100644
> --- a/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreUefiBootInclude.fdf
> +++ b/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreUefiBootInclude.fdf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017 - 2019, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Platform/Intel/MinPlatformPkg/Include/Fdf/RuleInclude.fdf
> b/Platform/Intel/MinPlatformPkg/Include/Fdf/RuleInclude.fdf
> index 1b20442fa6..c4c4315ad8 100644
> --- a/Platform/Intel/MinPlatformPkg/Include/Fdf/RuleInclude.fdf
> +++ b/Platform/Intel/MinPlatformPkg/Include/Fdf/RuleInclude.fdf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Include/Guid/SmramMemoryReserve.h
> b/Platform/Intel/MinPlatformPkg/Include/Guid/SmramMemoryReserve.h
> index 04589cf040..9918c768ba 100644
> --- a/Platform/Intel/MinPlatformPkg/Include/Guid/SmramMemoryReserve.h
> +++
> b/Platform/Intel/MinPlatformPkg/Include/Guid/SmramMemoryReserve.h
> @@ -9,13 +9,7 @@
> This GUIDed HOB can be used to convey the existence of the T-SEG
> reservation and H-SEG usage
>
> Copyright (c) 2007 - 2010, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> @par Revision Reference:
> GUIDs defined in SmmCis spec version 0.9.
> diff --git a/Platform/Intel/MinPlatformPkg/Include/HstiIbvFeatureBit.h
> b/Platform/Intel/MinPlatformPkg/Include/HstiIbvFeatureBit.h
> index 3a17c494b2..fa0cf30370 100644
> --- a/Platform/Intel/MinPlatformPkg/Include/HstiIbvFeatureBit.h
> +++ b/Platform/Intel/MinPlatformPkg/Include/HstiIbvFeatureBit.h
> @@ -3,13 +3,7 @@
> including error string definitions
>
> Copyright (c) 2017 -2018, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/Intel/MinPlatformPkg/Include/Library/AslUpdateLib.h
> b/Platform/Intel/MinPlatformPkg/Include/Library/AslUpdateLib.h
> index dc76e33557..d58b6d6458 100644
> --- a/Platform/Intel/MinPlatformPkg/Include/Library/AslUpdateLib.h
> +++ b/Platform/Intel/MinPlatformPkg/Include/Library/AslUpdateLib.h
> @@ -6,13 +6,7 @@
> restrictions, etc).
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Include/Library/BoardAcpiEnableLib.h
> b/Platform/Intel/MinPlatformPkg/Include/Library/BoardAcpiEnableLib.h
> index 48de84cfed..edd8dbbd9d 100644
> --- a/Platform/Intel/MinPlatformPkg/Include/Library/BoardAcpiEnableLib.h
> +++ b/Platform/Intel/MinPlatformPkg/Include/Library/BoardAcpiEnableLib.h
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Include/Library/BoardAcpiTableLib.h
> b/Platform/Intel/MinPlatformPkg/Include/Library/BoardAcpiTableLib.h
> index d001393654..119661a42e 100644
> --- a/Platform/Intel/MinPlatformPkg/Include/Library/BoardAcpiTableLib.h
> +++ b/Platform/Intel/MinPlatformPkg/Include/Library/BoardAcpiTableLib.h
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/Intel/MinPlatformPkg/Include/Library/BoardInitLib.h
> b/Platform/Intel/MinPlatformPkg/Include/Library/BoardInitLib.h
> index 914bef1382..32dce7fb17 100644
> --- a/Platform/Intel/MinPlatformPkg/Include/Library/BoardInitLib.h
> +++ b/Platform/Intel/MinPlatformPkg/Include/Library/BoardInitLib.h
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017 - 2018, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/Intel/MinPlatformPkg/Include/Library/CompressLib.h
> b/Platform/Intel/MinPlatformPkg/Include/Library/CompressLib.h
> index e7db7bc8c5..95ead25679 100644
> --- a/Platform/Intel/MinPlatformPkg/Include/Library/CompressLib.h
> +++ b/Platform/Intel/MinPlatformPkg/Include/Library/CompressLib.h
> @@ -2,13 +2,7 @@
> Header file for compression routine.
>
> Copyright (c) 2005 - 2014, 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 distribution. The full text of the license may be
> found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/Intel/MinPlatformPkg/Include/Library/HobVariableLib.h
> b/Platform/Intel/MinPlatformPkg/Include/Library/HobVariableLib.h
> index 8b5e1dc858..d5d84e6deb 100644
> --- a/Platform/Intel/MinPlatformPkg/Include/Library/HobVariableLib.h
> +++ b/Platform/Intel/MinPlatformPkg/Include/Library/HobVariableLib.h
> @@ -1,13 +1,7 @@
> /**@file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Include/Library/MultiBoardAcpiSupportLib
> .h
> b/Platform/Intel/MinPlatformPkg/Include/Library/MultiBoardAcpiSupportLib
> .h
> index 15087428e8..a8bb99250c 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Include/Library/MultiBoardAcpiSupportLib
> .h
> +++
> b/Platform/Intel/MinPlatformPkg/Include/Library/MultiBoardAcpiSupportLib
> .h
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Include/Library/MultiBoardInitSupportLib.
> h
> b/Platform/Intel/MinPlatformPkg/Include/Library/MultiBoardInitSupportLib.
> h
> index c4c36216fe..6c14b5677d 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Include/Library/MultiBoardInitSupportLib.
> h
> +++
> b/Platform/Intel/MinPlatformPkg/Include/Library/MultiBoardInitSupportLib.
> h
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/Intel/MinPlatformPkg/Include/Library/PeiLib.h
> b/Platform/Intel/MinPlatformPkg/Include/Library/PeiLib.h
> index 8889f97d59..d8b1a47c58 100644
> --- a/Platform/Intel/MinPlatformPkg/Include/Library/PeiLib.h
> +++ b/Platform/Intel/MinPlatformPkg/Include/Library/PeiLib.h
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/Intel/MinPlatformPkg/Include/Library/ReportFvLib.h
> b/Platform/Intel/MinPlatformPkg/Include/Library/ReportFvLib.h
> index 08b3e85bc3..5c40bd0e6e 100644
> --- a/Platform/Intel/MinPlatformPkg/Include/Library/ReportFvLib.h
> +++ b/Platform/Intel/MinPlatformPkg/Include/Library/ReportFvLib.h
> @@ -5,13 +5,7 @@
> This library installs pre-memory and post-memory firmware volumes.
>
> Copyright (c) 2018, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/Intel/MinPlatformPkg/Include/Library/SecBoardInitLib.h
> b/Platform/Intel/MinPlatformPkg/Include/Library/SecBoardInitLib.h
> index 9142b14335..f90d6f2ff2 100644
> --- a/Platform/Intel/MinPlatformPkg/Include/Library/SecBoardInitLib.h
> +++ b/Platform/Intel/MinPlatformPkg/Include/Library/SecBoardInitLib.h
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Include/Library/SiliconPolicyInitLib.h
> b/Platform/Intel/MinPlatformPkg/Include/Library/SiliconPolicyInitLib.h
> index cc9a825f40..506fb4faf1 100644
> --- a/Platform/Intel/MinPlatformPkg/Include/Library/SiliconPolicyInitLib.h
> +++ b/Platform/Intel/MinPlatformPkg/Include/Library/SiliconPolicyInitLib.h
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Include/Library/SiliconPolicyUpdateLib.h
> b/Platform/Intel/MinPlatformPkg/Include/Library/SiliconPolicyUpdateLib.h
> index 0e166f1dc9..80be3e6056 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Include/Library/SiliconPolicyUpdateLib.h
> +++
> b/Platform/Intel/MinPlatformPkg/Include/Library/SiliconPolicyUpdateLib.h
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Include/Library/SpiFlashCommonLib.h
> b/Platform/Intel/MinPlatformPkg/Include/Library/SpiFlashCommonLib.h
> index 12dfaeb440..0c5e72258c 100644
> --- a/Platform/Intel/MinPlatformPkg/Include/Library/SpiFlashCommonLib.h
> +++ b/Platform/Intel/MinPlatformPkg/Include/Library/SpiFlashCommonLib.h
> @@ -3,13 +3,7 @@
> internal structure and functions used by SpiFlashCommonLib.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Include/Library/TestPointCheckLib.h
> b/Platform/Intel/MinPlatformPkg/Include/Library/TestPointCheckLib.h
> index 6c7c9f4798..7265e22689 100644
> --- a/Platform/Intel/MinPlatformPkg/Include/Library/TestPointCheckLib.h
> +++ b/Platform/Intel/MinPlatformPkg/Include/Library/TestPointCheckLib.h
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017 - 2018, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/Intel/MinPlatformPkg/Include/Library/TestPointLib.h
> b/Platform/Intel/MinPlatformPkg/Include/Library/TestPointLib.h
> index a8b21ca001..36a8757260 100644
> --- a/Platform/Intel/MinPlatformPkg/Include/Library/TestPointLib.h
> +++ b/Platform/Intel/MinPlatformPkg/Include/Library/TestPointLib.h
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/Intel/MinPlatformPkg/Include/Ppi/BaseMemoryTest.h
> b/Platform/Intel/MinPlatformPkg/Include/Ppi/BaseMemoryTest.h
> index 2e0dfbaab7..1e3c8632a6 100644
> --- a/Platform/Intel/MinPlatformPkg/Include/Ppi/BaseMemoryTest.h
> +++ b/Platform/Intel/MinPlatformPkg/Include/Ppi/BaseMemoryTest.h
> @@ -3,13 +3,7 @@
> of the PEIM being initialized by the PEI Dispatcher.
>
> Copyright (c) 2018, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Include/Ppi/PlatformMemorySize.h
> b/Platform/Intel/MinPlatformPkg/Include/Ppi/PlatformMemorySize.h
> index e778d27743..d4599cc811 100644
> --- a/Platform/Intel/MinPlatformPkg/Include/Ppi/PlatformMemorySize.h
> +++ b/Platform/Intel/MinPlatformPkg/Include/Ppi/PlatformMemorySize.h
> @@ -3,13 +3,7 @@
> pass control into DXE
>
> Copyright (c) 2018, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Library/CompressLib/CompressLib.c
> b/Platform/Intel/MinPlatformPkg/Library/CompressLib/CompressLib.c
> index 52ce2cde15..9f93e1ee2d 100644
> --- a/Platform/Intel/MinPlatformPkg/Library/CompressLib/CompressLib.c
> +++ b/Platform/Intel/MinPlatformPkg/Library/CompressLib/CompressLib.c
> @@ -8,13 +8,7 @@
> are applied to each Block.
>
> Copyright (c) 2007 - 2014, 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 distribution. The full text of the license may be
> found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Library/CompressLib/CompressLib.inf
> b/Platform/Intel/MinPlatformPkg/Library/CompressLib/CompressLib.inf
> index 86f41f1651..6a8ac3c588 100644
> --- a/Platform/Intel/MinPlatformPkg/Library/CompressLib/CompressLib.inf
> +++ b/Platform/Intel/MinPlatformPkg/Library/CompressLib/CompressLib.inf
> @@ -3,12 +3,7 @@
> #
> # Copyright (c) 2007 - 2014, 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 distribution. The full text of the license may be
> found at
> -# http://opensource.org/licenses/bsd-license.php.
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> #
> ##
> diff --git
> a/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/Fce.h
> b/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/Fce.h
> index a9010a2763..92c63f8920 100644
> --- a/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/Fce.h
> +++ b/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/Fce.h
> @@ -1,13 +1,7 @@
> /**@file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/InternalCo
> mmonLib.c
> b/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/InternalCo
> mmonLib.c
> index cb7f928426..9acc2141d1 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/InternalCo
> mmonLib.c
> +++
> b/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/InternalCo
> mmonLib.c
> @@ -1,13 +1,7 @@
> /**@file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/PeiHobVari
> ableLibFce.c
> b/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/PeiHobVari
> ableLibFce.c
> index 7ae65c08d6..6e19ee0be2 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/PeiHobVari
> ableLibFce.c
> +++
> b/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/PeiHobVari
> ableLibFce.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/PeiHobVari
> ableLibFce.inf
> b/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/PeiHobVari
> ableLibFce.inf
> index 66526b3fbd..fd80c6112f 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/PeiHobVari
> ableLibFce.inf
> +++
> b/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/PeiHobVari
> ableLibFce.inf
> @@ -4,13 +4,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/PeiHobVari
> ableLibFceOptSize.c
> b/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/PeiHobVari
> ableLibFceOptSize.c
> index cd93898d25..3502bbe12d 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/PeiHobVari
> ableLibFceOptSize.c
> +++
> b/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/PeiHobVari
> ableLibFceOptSize.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/PeiHobVari
> ableLibFceOptSize.inf
> b/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/PeiHobVari
> ableLibFceOptSize.inf
> index 9f6d60622d..82d81c989d 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/PeiHobVari
> ableLibFceOptSize.inf
> +++
> b/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/PeiHobVari
> ableLibFceOptSize.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/Variable.h
> b/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/Variable.h
> index fa9fb0292c..84e55e8835 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/Variable.h
> +++
> b/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/Variable.h
> @@ -1,13 +1,7 @@
> /**@file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/Intel/MinPlatformPkg/Library/PeiLib/PeiLib.c
> b/Platform/Intel/MinPlatformPkg/Library/PeiLib/PeiLib.c
> index 22b19df832..96dfd588dc 100644
> --- a/Platform/Intel/MinPlatformPkg/Library/PeiLib/PeiLib.c
> +++ b/Platform/Intel/MinPlatformPkg/Library/PeiLib/PeiLib.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Platform/Intel/MinPlatformPkg/Library/PeiLib/PeiLib.inf
> b/Platform/Intel/MinPlatformPkg/Library/PeiLib/PeiLib.inf
> index 2ad74bf058..86b1628c9f 100644
> --- a/Platform/Intel/MinPlatformPkg/Library/PeiLib/PeiLib.inf
> +++ b/Platform/Intel/MinPlatformPkg/Library/PeiLib/PeiLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec
> b/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec
> index 3185776ac3..8efbf322f2 100644
> --- a/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec
> +++ b/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec
> @@ -8,13 +8,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dsc
> b/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dsc
> index 0875f6589e..8a3638b7e6 100644
> --- a/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dsc
> +++ b/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dsc
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017 - 2018, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Pci/Library/PciHostBridgeLibSimple/PciHo
> stBridgeLibSimple.c
> b/Platform/Intel/MinPlatformPkg/Pci/Library/PciHostBridgeLibSimple/PciHo
> stBridgeLibSimple.c
> index 557ac2a5b3..f7df32da1c 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Pci/Library/PciHostBridgeLibSimple/PciHo
> stBridgeLibSimple.c
> +++
> b/Platform/Intel/MinPlatformPkg/Pci/Library/PciHostBridgeLibSimple/PciHo
> stBridgeLibSimple.c
> @@ -2,13 +2,7 @@
> SA PciHostBridge Library
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include <PiDxe.h>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Pci/Library/PciHostBridgeLibSimple/PciHo
> stBridgeLibSimple.inf
> b/Platform/Intel/MinPlatformPkg/Pci/Library/PciHostBridgeLibSimple/PciHo
> stBridgeLibSimple.inf
> index f9a769155b..d8894a069e 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Pci/Library/PciHostBridgeLibSimple/PciHo
> stBridgeLibSimple.inf
> +++
> b/Platform/Intel/MinPlatformPkg/Pci/Library/PciHostBridgeLibSimple/PciHo
> stBridgeLibSimple.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Pci/Library/PciSegmentInfoLibSimple/PciS
> egmentInfoLibSimple.c
> b/Platform/Intel/MinPlatformPkg/Pci/Library/PciSegmentInfoLibSimple/PciS
> egmentInfoLibSimple.c
> index f216f224cd..6a6218d906 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Pci/Library/PciSegmentInfoLibSimple/PciS
> egmentInfoLibSimple.c
> +++
> b/Platform/Intel/MinPlatformPkg/Pci/Library/PciSegmentInfoLibSimple/PciS
> egmentInfoLibSimple.c
> @@ -3,14 +3,7 @@
> segment base address equals to PcdPciExpressBaseAddress.
>
> Copyright (c) 2017, 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 distribution. The full
> - text of the license may be found at
> - http://opensource.org/licenses/bsd-license.php.
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Pci/Library/PciSegmentInfoLibSimple/PciS
> egmentInfoLibSimple.inf
> b/Platform/Intel/MinPlatformPkg/Pci/Library/PciSegmentInfoLibSimple/PciS
> egmentInfoLibSimple.inf
> index f41523efa2..da63105450 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Pci/Library/PciSegmentInfoLibSimple/PciS
> egmentInfoLibSimple.inf
> +++
> b/Platform/Intel/MinPlatformPkg/Pci/Library/PciSegmentInfoLibSimple/PciS
> egmentInfoLibSimple.inf
> @@ -3,12 +3,7 @@
> #
> # Copyright (c) 2017, 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 distribution. The full text of the license may be
> found at
> -# http://opensource.org/licenses/bsd-license.php.
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> #
> ##
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/BoardInitLibNull/Boa
> rdInitLib.c
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/BoardInitLibNull/Boa
> rdInitLib.c
> index 61dc830579..5da5d1f677 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/BoardInitLibNull/Boa
> rdInitLib.c
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/BoardInitLibNull/Boa
> rdInitLib.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017 - 2018, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/BoardInitLibNull/Boa
> rdInitLibNull.inf
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/BoardInitLibNull/Boa
> rdInitLibNull.inf
> index 65a445b0f7..54b30026c7 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/BoardInitLibNull/Boa
> rdInitLibNull.inf
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/BoardInitLibNull/Boa
> rdInitLibNull.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSuppor
> tLib/DxeBoardInitLib.c
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSuppor
> tLib/DxeBoardInitLib.c
> index 25ecb37e46..a1c7e51dc8 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSuppor
> tLib/DxeBoardInitLib.c
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSuppor
> tLib/DxeBoardInitLib.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017 - 2018, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSuppor
> tLib/DxeMultiBoardInitSupportLib.c
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSuppor
> tLib/DxeMultiBoardInitSupportLib.c
> index f7a4c5b5a1..90aabdbbc7 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSuppor
> tLib/DxeMultiBoardInitSupportLib.c
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSuppor
> tLib/DxeMultiBoardInitSupportLib.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSuppor
> tLib/DxeMultiBoardInitSupportLib.inf
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSuppor
> tLib/DxeMultiBoardInitSupportLib.inf
> index 188c98db0a..602cfb4e95 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSuppor
> tLib/DxeMultiBoardInitSupportLib.inf
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSuppor
> tLib/DxeMultiBoardInitSupportLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSuppor
> tLib/PeiBoardInitLib.c
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSuppor
> tLib/PeiBoardInitLib.c
> index b83f8076af..a6768f2b53 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSuppor
> tLib/PeiBoardInitLib.c
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSuppor
> tLib/PeiBoardInitLib.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017 - 2018, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSuppor
> tLib/PeiMultiBoardInitSupportLib.c
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSuppor
> tLib/PeiMultiBoardInitSupportLib.c
> index 2056782181..f1cd735e41 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSuppor
> tLib/PeiMultiBoardInitSupportLib.c
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSuppor
> tLib/PeiMultiBoardInitSupportLib.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSuppor
> tLib/PeiMultiBoardInitSupportLib.inf
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSuppor
> tLib/PeiMultiBoardInitSupportLib.inf
> index de769bf504..f2ee4c818c 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSuppor
> tLib/PeiMultiBoardInitSupportLib.inf
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSuppor
> tLib/PeiMultiBoardInitSupportLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/PeiReportFvLib/PeiRe
> portFvLib.c
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/PeiReportFvLib/PeiRe
> portFvLib.c
> index 4860d72110..6e49b1239d 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/PeiReportFvLib/PeiRe
> portFvLib.c
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/PeiReportFvLib/PeiRe
> portFvLib.c
> @@ -2,13 +2,7 @@
> Source code file for Report Firmware Volume (FV) library
>
> Copyright (c) 2018, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/PeiReportFvLib/PeiRe
> portFvLib.inf
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/PeiReportFvLib/PeiRe
> portFvLib.inf
> index a497132173..4d96c9cf31 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/PeiReportFvLib/PeiRe
> portFvLib.inf
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/PeiReportFvLib/PeiRe
> portFvLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2018, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SecBoardInitLibNull/I
> a32/SecBoardInit.nasm
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SecBoardInitLibNull/I
> a32/SecBoardInit.nasm
> index 71bf82933b..404c03fe06 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SecBoardInitLibNull/I
> a32/SecBoardInit.nasm
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SecBoardInitLibNull/I
> a32/SecBoardInit.nasm
> @@ -9,13 +9,7 @@
> ; It consumes the reset vector, calls TempRamInit API from FSP binary.
> ;
> ; Copyright (c) 2017, 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 that accompanies this
> distribution.
> -; The full text of the license may be found at
> -; http://opensource.org/licenses/bsd-license.php.
> -;
> -; THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -; WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +; SPDX-License-Identifier: BSD-2-Clause-Patent
> ;
> ;;
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SecBoardInitLibNull/S
> ecBoardInitLib.c
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SecBoardInitLibNull/S
> ecBoardInitLib.c
> index 990e9c9b3a..a8fc76a8fa 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SecBoardInitLibNull/S
> ecBoardInitLib.c
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SecBoardInitLibNull/S
> ecBoardInitLib.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SecBoardInitLibNull/S
> ecBoardInitLibNull.inf
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SecBoardInitLibNull/S
> ecBoardInitLibNull.inf
> index 186814925a..5ba6db5c75 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SecBoardInitLibNull/S
> ecBoardInitLibNull.inf
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SecBoardInitLibNull/S
> ecBoardInitLibNull.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SiliconPolicyInitLibNu
> ll/SiliconPolicyInitLibNull.c
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SiliconPolicyInitLibNu
> ll/SiliconPolicyInitLibNull.c
> index 41025a5b7b..755cc036b8 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SiliconPolicyInitLibNu
> ll/SiliconPolicyInitLibNull.c
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SiliconPolicyInitLibNu
> ll/SiliconPolicyInitLibNull.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SiliconPolicyInitLibNu
> ll/SiliconPolicyInitLibNull.inf
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SiliconPolicyInitLibNu
> ll/SiliconPolicyInitLibNull.inf
> index ae696ccc90..73f602619c 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SiliconPolicyInitLibNu
> ll/SiliconPolicyInitLibNull.inf
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SiliconPolicyInitLibNu
> ll/SiliconPolicyInitLibNull.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017 - 2019, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SiliconPolicyUpdateLi
> bNull/SiliconPolicyUpdateLibNull.c
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SiliconPolicyUpdateLi
> bNull/SiliconPolicyUpdateLibNull.c
> index 3c73d02018..8516434f93 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SiliconPolicyUpdateLi
> bNull/SiliconPolicyUpdateLibNull.c
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SiliconPolicyUpdateLi
> bNull/SiliconPolicyUpdateLibNull.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SiliconPolicyUpdateLi
> bNull/SiliconPolicyUpdateLibNull.inf
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SiliconPolicyUpdateLi
> bNull/SiliconPolicyUpdateLibNull.inf
> index d2018881bb..79f39cd884 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SiliconPolicyUpdateLi
> bNull/SiliconPolicyUpdateLibNull.inf
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SiliconPolicyUpdateLi
> bNull/SiliconPolicyUpdateLibNull.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017 - 2019, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitDxe/PlatformInit
> Dxe.c
> b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitDxe/PlatformInit
> Dxe.c
> index ed3ef951c0..e9ae055f47 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitDxe/PlatformInit
> Dxe.c
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitDxe/PlatformInit
> Dxe.c
> @@ -2,13 +2,7 @@
> This driver will register two callbacks to call fsp's notifies.
>
> Copyright (c) 2014 - 2016, 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 distribution. The full text of the license may be
> found at
> - http://opensource.org/licenses/bsd-license.php.
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitDxe/PlatformInit
> Dxe.inf
> b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitDxe/PlatformInit
> Dxe.inf
> index 18546d0da0..e3d93bb7eb 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitDxe/PlatformInit
> Dxe.inf
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitDxe/PlatformInit
> Dxe.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInitP
> ostMem.c
> b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInitP
> ostMem.c
> index f27bd09351..00877593bc 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInitP
> ostMem.c
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInitP
> ostMem.c
> @@ -2,13 +2,7 @@
> Source code file for Platform Init PEI module
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInitP
> ostMem.inf
> b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInitP
> ostMem.inf
> index 9fc4d1a612..32d67a0a34 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInitP
> ostMem.inf
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInitP
> ostMem.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInitP
> reMem.c
> b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInitP
> reMem.c
> index bbb138f2d2..2690511abe 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInitP
> reMem.c
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInitP
> reMem.c
> @@ -2,13 +2,7 @@
> Source code file for Platform Init Pre-Memory PEI module
>
> Copyright (c) 2017 - 2018, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInitP
> reMem.inf
> b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInitP
> reMem.inf
> index 8a41a4dd72..2c3a13106e 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInitP
> reMem.inf
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInitP
> reMem.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017 - 2018, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitSmm/PlatformIni
> tSmm.c
> b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitSmm/PlatformIni
> tSmm.c
> index 685e2b5386..224e183f81 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitSmm/PlatformIni
> tSmm.c
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitSmm/PlatformIni
> tSmm.c
> @@ -2,13 +2,7 @@
> This driver will register two callbacks to call fsp's notifies.
>
> Copyright (c) 2014 - 2016, 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 distribution. The full text of the license may be
> found at
> - http://opensource.org/licenses/bsd-license.php.
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitSmm/PlatformIni
> tSmm.inf
> b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitSmm/PlatformIni
> tSmm.inf
> index d845a63467..90d205ceaa 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitSmm/PlatformIni
> tSmm.inf
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitSmm/PlatformIni
> tSmm.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/ReportFv/ReportFvPei.c
> b/Platform/Intel/MinPlatformPkg/PlatformInit/ReportFv/ReportFvPei.c
> index 95548f3278..c144a38c8a 100644
> --- a/Platform/Intel/MinPlatformPkg/PlatformInit/ReportFv/ReportFvPei.c
> +++ b/Platform/Intel/MinPlatformPkg/PlatformInit/ReportFv/ReportFvPei.c
> @@ -2,13 +2,7 @@
> Source code file for Report Firmware Volume (FV) PEI module
>
> Copyright (c) 2018, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/ReportFv/ReportFvPei.inf
> b/Platform/Intel/MinPlatformPkg/PlatformInit/ReportFv/ReportFvPei.inf
> index 664514f9f9..d6655e05b9 100644
> --- a/Platform/Intel/MinPlatformPkg/PlatformInit/ReportFv/ReportFvPei.inf
> +++ b/Platform/Intel/MinPlatformPkg/PlatformInit/ReportFv/ReportFvPei.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2018, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyDxe/SiliconPolicy
> Dxe.c
> b/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyDxe/SiliconPolicy
> Dxe.c
> index 01cc22a973..b436aa35e8 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyDxe/SiliconPolicy
> Dxe.c
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyDxe/SiliconPolicy
> Dxe.c
> @@ -2,13 +2,7 @@
> Silicon DXE policy.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyDxe/SiliconPolicy
> Dxe.inf
> b/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyDxe/SiliconPolicy
> Dxe.inf
> index 4081a10dfb..9faf72d460 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyDxe/SiliconPolicy
> Dxe.inf
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyDxe/SiliconPolicy
> Dxe.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyPei/SiliconPolicy
> PeiPostMem.c
> b/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyPei/SiliconPolicy
> PeiPostMem.c
> index d5cf7bf05a..535fcfe799 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyPei/SiliconPolicy
> PeiPostMem.c
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyPei/SiliconPolicy
> PeiPostMem.c
> @@ -2,13 +2,7 @@
> Silicon post-mem policy PEIM.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyPei/SiliconPolicy
> PeiPostMem.inf
> b/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyPei/SiliconPolicy
> PeiPostMem.inf
> index 41433274c9..076a17d911 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyPei/SiliconPolicy
> PeiPostMem.inf
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyPei/SiliconPolicy
> PeiPostMem.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyPei/SiliconPolicy
> PeiPreMem.c
> b/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyPei/SiliconPolicy
> PeiPreMem.c
> index 3bc260e999..d565c08f68 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyPei/SiliconPolicy
> PeiPreMem.c
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyPei/SiliconPolicy
> PeiPreMem.c
> @@ -2,13 +2,7 @@
> Silicon pre-mem policy PEIM.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyPei/SiliconPolicy
> PeiPreMem.inf
> b/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyPei/SiliconPolicy
> PeiPreMem.inf
> index 08192cdac3..745691e0a7 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyPei/SiliconPolicy
> PeiPreMem.inf
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyPei/SiliconPolicy
> PeiPreMem.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Services/StallServicePei/StallServicePei.c
> b/Platform/Intel/MinPlatformPkg/Services/StallServicePei/StallServicePei.c
> index 8b0f5027b4..10dc2caab8 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Services/StallServicePei/StallServicePei.c
> +++
> b/Platform/Intel/MinPlatformPkg/Services/StallServicePei/StallServicePei.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2018, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Services/StallServicePei/StallServicePei.inf
> b/Platform/Intel/MinPlatformPkg/Services/StallServicePei/StallServicePei.inf
> index 522902e8f7..e9b4137b47 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Services/StallServicePei/StallServicePei.inf
> +++
> b/Platform/Intel/MinPlatformPkg/Services/StallServicePei/StallServicePei.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2018, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Tcg/Tcg2PlatformDxe/Tcg2PlatformDxe.c
> b/Platform/Intel/MinPlatformPkg/Tcg/Tcg2PlatformDxe/Tcg2PlatformDxe.c
> index d33c651a91..d0d88b2e91 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Tcg/Tcg2PlatformDxe/Tcg2PlatformDxe.c
> +++
> b/Platform/Intel/MinPlatformPkg/Tcg/Tcg2PlatformDxe/Tcg2PlatformDxe.c
> @@ -2,13 +2,7 @@
> Platform specific TPM2 component.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Tcg/Tcg2PlatformDxe/Tcg2PlatformDxe.i
> nf
> b/Platform/Intel/MinPlatformPkg/Tcg/Tcg2PlatformDxe/Tcg2PlatformDxe.i
> nf
> index f5b083b1fb..e8ab5f35a0 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Tcg/Tcg2PlatformDxe/Tcg2PlatformDxe.i
> nf
> +++
> b/Platform/Intel/MinPlatformPkg/Tcg/Tcg2PlatformDxe/Tcg2PlatformDxe.i
> nf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Tcg/Tcg2PlatformPei/Tcg2PlatformPei.c
> b/Platform/Intel/MinPlatformPkg/Tcg/Tcg2PlatformPei/Tcg2PlatformPei.c
> index b05da87ab6..3a2d7d31e9 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Tcg/Tcg2PlatformPei/Tcg2PlatformPei.c
> +++
> b/Platform/Intel/MinPlatformPkg/Tcg/Tcg2PlatformPei/Tcg2PlatformPei.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Tcg/Tcg2PlatformPei/Tcg2PlatformPei.inf
> b/Platform/Intel/MinPlatformPkg/Tcg/Tcg2PlatformPei/Tcg2PlatformPei.inf
> index 43b8e835f0..1aabfe7ba8 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Tcg/Tcg2PlatformPei/Tcg2PlatformPei.inf
> +++
> b/Platform/Intel/MinPlatformPkg/Tcg/Tcg2PlatformPei/Tcg2PlatformPei.inf
> @@ -2,13 +2,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> Acpi.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> Acpi.c
> index c2fe38df54..263781a29a 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> Acpi.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> Acpi.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> AcpiDmar.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> AcpiDmar.c
> index 394eeb3613..b2279966d8 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> AcpiDmar.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> AcpiDmar.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> AcpiHpet.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> AcpiHpet.c
> index 5747f51edb..c72b23b82f 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> AcpiHpet.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> AcpiHpet.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> AcpiMadt.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> AcpiMadt.c
> index 92032d5712..b743bad6dd 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> AcpiMadt.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> AcpiMadt.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> AcpiMcfg.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> AcpiMcfg.c
> index c4d3472af9..b38e8214db 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> AcpiMcfg.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> AcpiMcfg.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> AcpiTpm.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> AcpiTpm.c
> index 31aef8f4bf..f1446c9ba3 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> AcpiTpm.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> AcpiTpm.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> AcpiWsmt.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> AcpiWsmt.c
> index 525150dc01..ee63e94fcc 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> AcpiWsmt.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> AcpiWsmt.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> BootVariable.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> BootVariable.c
> index c50b2a5752..85bd5b3de4 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> BootVariable.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> BootVariable.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> ConsoleVariable.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> ConsoleVariable.c
> index 312dc643f4..ce76b33505 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> ConsoleVariable.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> ConsoleVariable.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> DevicePath.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> DevicePath.c
> index aee43aa051..5c36c352a0 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> DevicePath.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> DevicePath.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> DmaProtection.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> DmaProtection.c
> index 17d58bf3f5..10b44fe8b9 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> DmaProtection.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> DmaProtection.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> Esrt.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> Esrt.c
> index 6b53ab7a37..d31a06b9ab 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> Esrt.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> Esrt.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> Gcd.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> Gcd.c
> index c6dceaed46..82709d44eb 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> Gcd.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> Gcd.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> Hsti.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> Hsti.c
> index 34b2083d4e..7756369ae1 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> Hsti.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> Hsti.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> LoadedImage.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> LoadedImage.c
> index 7e9393245f..9e3ebc1324 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> LoadedImage.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> LoadedImage.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> MemoryAttribute.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> MemoryAttribute.c
> index f222019e72..453210fbdc 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> MemoryAttribute.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> MemoryAttribute.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> MemoryMap.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> MemoryMap.c
> index 32be9db013..fce44bf73e 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> MemoryMap.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> MemoryMap.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> MemoryTypeInformation.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> MemoryTypeInformation.c
> index 3c9342c893..9ee9dd252c 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> MemoryTypeInformation.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> MemoryTypeInformation.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> Pci.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> Pci.c
> index cfa8c425f2..5140039447 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> Pci.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> Pci.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> PiSignedFvBoot.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> PiSignedFvBoot.c
> index 377ca8f853..17302a6496 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> PiSignedFvBoot.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> PiSignedFvBoot.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> SmiHandlerInstrument.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> SmiHandlerInstrument.c
> index 427d502633..3ceeb821fb 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> SmiHandlerInstrument.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> SmiHandlerInstrument.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> SmmInfo.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> SmmInfo.c
> index 3300a33f45..c493750a27 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> SmmInfo.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> SmmInfo.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> TcgMor.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> TcgMor.c
> index b612f9c7b9..776f7bb09e 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> TcgMor.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> TcgMor.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> TcgTrustedBoot.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> TcgTrustedBoot.c
> index 3fbaa22686..2a04f86fed 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> TcgTrustedBoot.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> TcgTrustedBoot.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> UefiSecureBoot.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> UefiSecureBoot.c
> index 8915adfc3e..b53a09abca 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> UefiSecureBoot.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> UefiSecureBoot.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> Variable.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> Variable.c
> index 68c25efc22..67e6a1916d 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> Variable.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> Variable.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeTestP
> ointCheckLib.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeTestP
> ointCheckLib.c
> index 22026cd430..c012e0afcb 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeTestP
> ointCheckLib.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeTestP
> ointCheckLib.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017 - 2018, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeTestP
> ointCheckLib.inf
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeTestP
> ointCheckLib.inf
> index 015aa579d8..62fceffbec 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeTestP
> ointCheckLib.inf
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeTestP
> ointCheckLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheck
> DmaProtection.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheck
> DmaProtection.c
> index 4639e9ffaa..cb764b3633 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheck
> DmaProtection.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheck
> DmaProtection.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckF
> vInfo.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckF
> vInfo.c
> index 9adbe40fd6..571743448e 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckF
> vInfo.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckF
> vInfo.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheck
> Hob.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheck
> Hob.c
> index 4ce0137a1e..b05f7ebab6 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheck
> Hob.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheck
> Hob.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheck
> Mtrr.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheck
> Mtrr.c
> index ea176511f8..536f5c2d83 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheck
> Mtrr.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheck
> Mtrr.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckP
> ci.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckP
> ci.c
> index 5ea13a407d..1061f8ac1c 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckP
> ci.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckP
> ci.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckS
> mmInfo.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckS
> mmInfo.c
> index e93e4123a3..d04baf7663 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckS
> mmInfo.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckS
> mmInfo.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiTestPo
> intCheckLib.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiTestPo
> intCheckLib.c
> index e2cd7a999a..752230f4db 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiTestPo
> intCheckLib.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiTestPo
> intCheckLib.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017 - 2018, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiTestPo
> intCheckLib.inf
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiTestPo
> intCheckLib.inf
> index d218adb2c5..51369fcedc 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiTestPo
> intCheckLib.inf
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiTestPo
> intCheckLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SecCheck
> CpuInfo.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SecCheck
> CpuInfo.c
> index a57ca2c05e..8696153a11 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SecCheck
> CpuInfo.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SecCheck
> CpuInfo.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SecTestPo
> intCheckLib.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SecTestPo
> intCheckLib.c
> index 7b4130d1d2..23a5c462ce 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SecTestPo
> intCheckLib.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SecTestPo
> intCheckLib.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017 - 2018, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SecTestPo
> intCheckLib.inf
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SecTestPo
> intCheckLib.inf
> index f1cae85cb1..ed37faf960 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SecTestPo
> intCheckLib.inf
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SecTestPo
> intCheckLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmChec
> kCommunicationBuffer.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmChec
> kCommunicationBuffer.c
> index acc61ceaf7..17e792e947 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmChec
> kCommunicationBuffer.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmChec
> kCommunicationBuffer.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmChec
> kLoadedImage.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmChec
> kLoadedImage.c
> index a9f8c6b939..479e3e72e2 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmChec
> kLoadedImage.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmChec
> kLoadedImage.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmChec
> kMemoryAttribute.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmChec
> kMemoryAttribute.c
> index 7011d77c7b..f2b6908955 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmChec
> kMemoryAttribute.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmChec
> kMemoryAttribute.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmChec
> kPaging.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmChec
> kPaging.c
> index c978d2694c..67a73c5456 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmChec
> kPaging.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmChec
> kPaging.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmChec
> kSmrr.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmChec
> kSmrr.c
> index b954e32c4c..4ea279ad8a 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmChec
> kSmrr.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmChec
> kSmrr.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmTest
> PointCheckLib.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmTest
> PointCheckLib.c
> index 2d051bb6bb..4b4f874c7b 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmTest
> PointCheckLib.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmTest
> PointCheckLib.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017 - 2018, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmTest
> PointCheckLib.inf
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmTest
> PointCheckLib.inf
> index ac79431649..6007fbc9d2 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmTest
> PointCheckLib.inf
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmTest
> PointCheckLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/TestPoint
> Help.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/TestPoint
> Help.c
> index d631eaf193..06c00b9d2a 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/TestPoint
> Help.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/TestPoint
> Help.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/TestPointI
> nternal.h
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/TestPointI
> nternal.h
> index 0a5d5113aa..b1c2fae8d7 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/TestPointI
> nternal.h
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/TestPointI
> nternal.h
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLibNull/TestP
> ointCheckLibNull.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLibNull/TestP
> ointCheckLibNull.c
> index 82fd08ab02..a52fac9fb2 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLibNull/TestP
> ointCheckLibNull.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLibNull/TestP
> ointCheckLibNull.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017 - 2018, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLibNull/TestP
> ointCheckLibNull.inf
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLibNull/TestP
> ointCheckLibNull.inf
> index 9801c2d68f..bead6ba35b 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLibNull/TestP
> ointCheckLibNull.inf
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLibNull/TestP
> ointCheckLibNull.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/DxeTestPoint.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/DxeTestPoint.c
> index 812eb54af3..289d052af8 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/DxeTestPoint.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/DxeTestPoint.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 distribution. The full text of the license may be
> found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/DxeTestPoint.h
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/DxeTestPoint.h
> index 2629e698b5..6bde9883c8 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/DxeTestPoint.h
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/DxeTestPoint.h
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 distribution. The full text of the license may be
> found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/DxeTestPointAi
> p.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/DxeTestPointAi
> p.c
> index 4f59727911..a7fe9530cf 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/DxeTestPointAi
> p.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/DxeTestPointAi
> p.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 distribution. The full text of the license may be
> found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/DxeTestPointLib
> .inf
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/DxeTestPointLib
> .inf
> index 5c394645d7..17e5b75626 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/DxeTestPointLib
> .inf
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/DxeTestPointLib
> .inf
> @@ -3,12 +3,7 @@
> #
> # Copyright (c) 2017, 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 distribution. The full text of the license may be
> found at
> -# http://opensource.org/licenses/bsd-license.php.
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/PeiTestPoint.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/PeiTestPoint.c
> index fac07c52f5..6d6e9caa55 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/PeiTestPoint.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/PeiTestPoint.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 distribution. The full text of the license may be
> found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/PeiTestPoint.h
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/PeiTestPoint.h
> index c2aa72e0ee..63d7e53b3e 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/PeiTestPoint.h
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/PeiTestPoint.h
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 distribution. The full text of the license may be
> found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/PeiTestPointLib.
> inf
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/PeiTestPointLib.
> inf
> index 7fa2a471b4..75be715637 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/PeiTestPointLib.
> inf
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/PeiTestPointLib.
> inf
> @@ -3,12 +3,7 @@
> #
> # Copyright (c) 2017, 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 distribution. The full text of the license may be
> found at
> -# http://opensource.org/licenses/bsd-license.php.
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPoint.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPoint.c
> index 8603ea1608..c7bf9d73cc 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPoint.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPoint.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 distribution. The full text of the license may be
> found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPoint.h
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPoint.h
> index 6dc3077981..9c0a582b79 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPoint.h
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPoint.h
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 distribution. The full text of the license may be
> found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPointAi
> p.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPointAi
> p.c
> index 075d67cb76..84c3f8292e 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPointAi
> p.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPointAi
> p.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 distribution. The full text of the license may be
> found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPointC
> ommunication.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPointC
> ommunication.c
> index d2387f6244..5b14b49046 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPointC
> ommunication.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPointC
> ommunication.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 distribution. The full text of the license may be
> found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPointLi
> b.inf
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPointLi
> b.inf
> index 4a03657d4f..3a4adeb2e3 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPointLi
> b.inf
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPointLi
> b.inf
> @@ -3,12 +3,7 @@
> #
> # Copyright (c) 2017, 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 distribution. The full text of the license may be
> found at
> -# http://opensource.org/licenses/bsd-license.php.
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/TestPointDumpApp/TestPointDump.c
> b/Platform/Intel/MinPlatformPkg/Test/TestPointDumpApp/TestPointDump.c
> index 2dc03429e3..b2432e919b 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/TestPointDumpApp/TestPointDump.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/TestPointDumpApp/TestPointDump.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 distribution. The full text of the license may be
> found at
> -http://opensource.org/licenses/bsd-license.php
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/TestPointDumpApp/TestPointDumpA
> pp.inf
> b/Platform/Intel/MinPlatformPkg/Test/TestPointDumpApp/TestPointDumpA
> pp.inf
> index c1e7cc8b22..fef9761e57 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/TestPointDumpApp/TestPointDumpA
> pp.inf
> +++
> b/Platform/Intel/MinPlatformPkg/Test/TestPointDumpApp/TestPointDumpA
> pp.inf
> @@ -1,13 +1,7 @@
> ## @file
> #
> # Copyright (c) 2017, 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 that accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php.
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/TestPointStubDxe/TestPointStubDxe.
> c
> b/Platform/Intel/MinPlatformPkg/Test/TestPointStubDxe/TestPointStubDxe.
> c
> index d6878f45de..3cc5ccfef6 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/TestPointStubDxe/TestPointStubDxe.
> c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/TestPointStubDxe/TestPointStubDxe.
> c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 distribution. The full text of the license may be
> found at
> - http://opensource.org/licenses/bsd-license.php.
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/TestPointStubDxe/TestPointStubDxe.
> inf
> b/Platform/Intel/MinPlatformPkg/Test/TestPointStubDxe/TestPointStubDxe.
> inf
> index de7aa8a10f..a6c1888ec7 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/TestPointStubDxe/TestPointStubDxe.
> inf
> +++
> b/Platform/Intel/MinPlatformPkg/Test/TestPointStubDxe/TestPointStubDxe.
> inf
> @@ -2,13 +2,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Tools/AmlGenOffset/AmlGenOffset.py
> b/Platform/Intel/MinPlatformPkg/Tools/AmlGenOffset/AmlGenOffset.py
> index 312c1abb75..e13ca06471 100644
> --- a/Platform/Intel/MinPlatformPkg/Tools/AmlGenOffset/AmlGenOffset.py
> +++
> b/Platform/Intel/MinPlatformPkg/Tools/AmlGenOffset/AmlGenOffset.py
> @@ -1,13 +1,7 @@
> ## @file
> #
> # Copyright (c) 2017, 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 distribution. The full text of the license may be
> found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
>
> '''
> diff --git
> a/Platform/Intel/MinPlatformPkg/Tools/Fsp/PatchFspBinFvsBaseAddress.py
> b/Platform/Intel/MinPlatformPkg/Tools/Fsp/PatchFspBinFvsBaseAddress.py
> index 63d2f88946..b559915e93 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Tools/Fsp/PatchFspBinFvsBaseAddress.py
> +++
> b/Platform/Intel/MinPlatformPkg/Tools/Fsp/PatchFspBinFvsBaseAddress.py
> @@ -1,13 +1,7 @@
> ## @ PatchFspBinBaseAddress.py
> #
> # Copyright (c) 2017, 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 that accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php.
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Platform/Intel/MinPlatformPkg/Tools/Help/CheckCodeBase.py
> b/Platform/Intel/MinPlatformPkg/Tools/Help/CheckCodeBase.py
> index f97de4f522..1d78eb78e4 100644
> --- a/Platform/Intel/MinPlatformPkg/Tools/Help/CheckCodeBase.py
> +++ b/Platform/Intel/MinPlatformPkg/Tools/Help/CheckCodeBase.py
> @@ -1,13 +1,7 @@
> ## @ CheckCodeBase.py
> #
> # Copyright (c) 2017, 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 that accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php.
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Platform/Intel/MinPlatformPkg/Tools/ParseVar/ParseVar.py
> b/Platform/Intel/MinPlatformPkg/Tools/ParseVar/ParseVar.py
> index b70b01fd14..2c8be416a8 100644
> --- a/Platform/Intel/MinPlatformPkg/Tools/ParseVar/ParseVar.py
> +++ b/Platform/Intel/MinPlatformPkg/Tools/ParseVar/ParseVar.py
> @@ -1,13 +1,7 @@
> ## @file
> #
> # Copyright (c) 2017, 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 distribution. The full text of the license may be
> found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
>
> '''
> diff --git a/Platform/Intel/MinPlatformPkg/Tools/PatchFv/PatchBfv.py
> b/Platform/Intel/MinPlatformPkg/Tools/PatchFv/PatchBfv.py
> index bb9d280863..1312bfc328 100644
> --- a/Platform/Intel/MinPlatformPkg/Tools/PatchFv/PatchBfv.py
> +++ b/Platform/Intel/MinPlatformPkg/Tools/PatchFv/PatchBfv.py
> @@ -1,13 +1,7 @@
> ## @ PatchBfv.py
> #
> # Copyright (c) 2017, 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 that accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php.
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Platform/Intel/MinPlatformPkg/Tools/PatchFv/PatchBinFv.py
> b/Platform/Intel/MinPlatformPkg/Tools/PatchFv/PatchBinFv.py
> index e1facd1117..5b49b6b968 100644
> --- a/Platform/Intel/MinPlatformPkg/Tools/PatchFv/PatchBinFv.py
> +++ b/Platform/Intel/MinPlatformPkg/Tools/PatchFv/PatchBinFv.py
> @@ -1,13 +1,7 @@
> ## @ PatchBinFv.py
> #
> # Copyright (c) 2017, 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 that accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php.
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Platform/Intel/MinPlatformPkg/Tools/PatchFv/RebaseBinFv.py
> b/Platform/Intel/MinPlatformPkg/Tools/PatchFv/RebaseBinFv.py
> index 4d194b3c7b..321f7c5746 100644
> --- a/Platform/Intel/MinPlatformPkg/Tools/PatchFv/RebaseBinFv.py
> +++ b/Platform/Intel/MinPlatformPkg/Tools/PatchFv/RebaseBinFv.py
> @@ -1,13 +1,7 @@
> ## @ PatchBinFv.py
> #
> # Copyright (c) 2017, 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 that accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php.
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Platform/Intel/MinPlatformPkg/Tools/PatchFv/SyncBinFvInf.py
> b/Platform/Intel/MinPlatformPkg/Tools/PatchFv/SyncBinFvInf.py
> index 19c6e04c50..af70fb664c 100644
> --- a/Platform/Intel/MinPlatformPkg/Tools/PatchFv/SyncBinFvInf.py
> +++ b/Platform/Intel/MinPlatformPkg/Tools/PatchFv/SyncBinFvInf.py
> @@ -1,13 +1,7 @@
> ## @ SyncBinFvInf.py
> #
> # Copyright (c) 2017, 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 that accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php.
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> --
> 2.21.0.windows.1
^ permalink raw reply [flat|nested] 63+ messages in thread
* [[edk2-platforms][PATCH V2] 12/30] Platform/Intel/PurleyOpenBoardPkg: Replace BSD License with BSD+Patent License
2019-05-15 23:09 [[edk2-platforms][PATCH V2] 00/30] Change edk2-platforms/master to BSD+Patent License Michael D Kinney
` (10 preceding siblings ...)
2019-05-15 23:09 ` [[edk2-platforms][PATCH V2] 11/30] Platform/Intel/MinPlatformPkg: " Michael D Kinney
@ 2019-05-15 23:09 ` Michael D Kinney
2019-05-17 19:58 ` [edk2-devel] " Oram, Isaac W
2019-05-15 23:09 ` [[edk2-platforms][PATCH V2] 13/30] Platform/LeMaker: " Michael D Kinney
` (18 subsequent siblings)
30 siblings, 1 reply; 63+ messages in thread
From: Michael D Kinney @ 2019-05-15 23:09 UTC (permalink / raw)
To: devel; +Cc: Shifei A Lu, Xiaohu Zhou, Isaac W Oram
https://bugzilla.tianocore.org/show_bug.cgi?id=1373
Replace BSD 2-Clause License with BSD+Patent License. This change is
based on the following emails:
https://lists.01.org/pipermail/edk2-devel/2019-February/036260.html
https://lists.01.org/pipermail/edk2-devel/2018-October/030385.html
RFCs with detailed process for the license change:
V3: https://lists.01.org/pipermail/edk2-devel/2019-March/038116.html
V2: https://lists.01.org/pipermail/edk2-devel/2019-March/037669.html
V1: https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html
Cc: Shifei A Lu <shifei.a.lu@intel.com>
Cc: Xiaohu Zhou <bowen.zhou@intel.com>
Cc: Isaac W Oram <isaac.w.oram@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe.c | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe.h | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe.inf | 8 +-------
.../Acpi/BoardAcpiDxe/BoardAcpiDxeDsdt.c | 8 +-------
.../Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt.inf | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/AMLUPD.asl | 8 +-------
.../Acpi/BoardAcpiDxe/Dsdt/CommonPlatform.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/DSDT.asl | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Gpe.asl | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/HostBus.asl | 8 +-------
.../Acpi/BoardAcpiDxe/Dsdt/IioPcieHotPlugGpeHandler.asl | 8 +-------
.../Acpi/BoardAcpiDxe/Dsdt/IioPcieRootPortHotPlug.asl | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Itss.asl | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Mother.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Os.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC00.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC01.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC02.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC03.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC04.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC05.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC06.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC06Ejd.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC07.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC08.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC09.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC10.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC11.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC12.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC12Ejd.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC13.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC14.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC15.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC16.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC17.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC18.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC18Ejd.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC19.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC20.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC21.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC22.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC23.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC24.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC25.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC26.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC27.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC28.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC29.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC30.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC31.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC32.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC33.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC34.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC35.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC36.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC37.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC38.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC39.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC40.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC41.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC42.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC43.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC44.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC45.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC46.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC47.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Pch.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PchApic.asi | 8 +-------
.../Acpi/BoardAcpiDxe/Dsdt/PchEhci1.asi | 8 +-------
.../Acpi/BoardAcpiDxe/Dsdt/PchEhci2.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PchGbe.asl | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PchLpc.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PchSata.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PchXhci.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PciCrs.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PciIrq.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PcieHp.asi | 8 +-------
.../Acpi/BoardAcpiDxe/Dsdt/PcieHpDev.asi | 8 +-------
.../Acpi/BoardAcpiDxe/Dsdt/PcieNonHpDev.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PcieSeg.asi | 8 +-------
.../Acpi/BoardAcpiDxe/Dsdt/Platform.asl | 8 +-------
.../Acpi/BoardAcpiDxe/Dsdt/PlatformGpe.asi | 8 +-------
.../Acpi/BoardAcpiDxe/Dsdt/PlatformPciTree_WFP.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Sck1Ejd.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Sck2Ejd.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Sck3Ejd.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Uncore0.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Uncore1.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Uncore2.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Uncore3.asi | 8 +-------
.../Acpi/BoardAcpiDxe/Dsdt/WFPPlatform.asl | 8 +-------
.../BoardMtOlympus/GitEdk2MinMtOlympus.bat | 8 +-------
.../Library/BasePlatformHookLib/BasePlatformHookLib.c | 8 +-------
.../Library/BasePlatformHookLib/BasePlatformHookLib.inf | 8 +-------
.../Library/BoardAcpiLib/DxeBoardAcpiTableLib.c | 8 +-------
.../Library/BoardAcpiLib/DxeBoardAcpiTableLib.inf | 8 +-------
.../Library/BoardAcpiLib/DxeMtOlympusAcpiTableLib.c | 8 +-------
.../Library/BoardAcpiLib/SmmBoardAcpiEnableLib.c | 8 +-------
.../Library/BoardAcpiLib/SmmBoardAcpiEnableLib.inf | 8 +-------
.../Library/BoardAcpiLib/SmmMtOlympusAcpiEnableLib.c | 8 +-------
.../Library/BoardAcpiLib/SmmSiliconAcpiEnableLib.c | 8 +-------
.../BoardMtOlympus/Library/BoardInitLib/AllLanesEparam.c | 8 +-------
.../BoardMtOlympus/Library/BoardInitLib/GpioTable.c | 8 +-------
.../BoardMtOlympus/Library/BoardInitLib/IioBifur.c | 8 +-------
.../Library/BoardInitLib/PeiBoardInitPostMemLib.c | 8 +-------
.../Library/BoardInitLib/PeiBoardInitPostMemLib.inf | 8 +-------
.../Library/BoardInitLib/PeiBoardInitPreMemLib.c | 8 +-------
.../Library/BoardInitLib/PeiBoardInitPreMemLib.inf | 8 +-------
.../Library/BoardInitLib/PeiMtOlympusDetect.c | 8 +-------
.../Library/BoardInitLib/PeiMtOlympusInitLib.h | 8 +-------
.../Library/BoardInitLib/PeiMtOlympusInitPostMemLib.c | 8 +-------
.../Library/BoardInitLib/PeiMtOlympusInitPreMemLib.c | 8 +-------
.../BoardMtOlympus/Library/BoardInitLib/UsbOC.c | 8 +-------
.../PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkg.dsc | 8 +-------
.../PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkg.fdf | 8 +-------
.../BoardMtOlympus/PlatformPkgBuildOption.dsc | 8 +-------
.../BoardMtOlympus/PlatformPkgConfig.dsc | 8 +-------
.../PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkgPcd.dsc | 8 +-------
.../PurleyOpenBoardPkg/BoardMtOlympus/StructureConfig.dsc | 8 +-------
Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/bld.bat | 8 +-------
.../Intel/PurleyOpenBoardPkg/BoardMtOlympus/postbuild.bat | 8 +-------
.../Intel/PurleyOpenBoardPkg/BoardMtOlympus/prebuild.bat | 8 +-------
.../Features/Ipmi/Library/IpmiLibKcs/IpmiLibKcs.c | 8 +-------
.../Features/Ipmi/Library/IpmiLibKcs/IpmiLibKcs.inf | 8 +-------
.../Features/Ipmi/Library/IpmiLibKcs/KcsBmc.c | 8 +-------
.../Features/Ipmi/Library/IpmiLibKcs/KcsBmc.h | 8 +-------
.../Library/IpmiPlatformHookLib/IpmiPlatformHookLib.c | 8 +-------
.../Library/IpmiPlatformHookLib/IpmiPlatformHookLib.inf | 8 +-------
.../Intel/PurleyOpenBoardPkg/Include/Acpi/GlobalNvs.asi | 8 +-------
.../PurleyOpenBoardPkg/Include/Acpi/GlobalNvsAreaDef.h | 8 +-------
.../Intel/PurleyOpenBoardPkg/Include/Guid/PchRcVariable.h | 8 +-------
.../Intel/PurleyOpenBoardPkg/Include/Guid/SetupVariable.h | 8 +-------
.../PurleyOpenBoardPkg/Include/IioBifurcationSlotTable.h | 8 +-------
Platform/Intel/PurleyOpenBoardPkg/Include/Platform.h | 8 +-------
.../Intel/PurleyOpenBoardPkg/Include/Ppi/SystemBoard.h | 8 +-------
.../PurleyOpenBoardPkg/Include/Protocol/PciIovPlatform.h | 8 +-------
Platform/Intel/PurleyOpenBoardPkg/Include/SetupTable.h | 8 +-------
Platform/Intel/PurleyOpenBoardPkg/Include/SioRegs.h | 8 +-------
.../Bds/Library/DxePlatformBootManagerLib/BdsPlatform.c | 8 +-------
.../Bds/Library/DxePlatformBootManagerLib/BdsPlatform.h | 8 +-------
.../DxePlatformBootManagerLib.inf | 8 +-------
.../Bds/Library/DxePlatformBootManagerLib/MemoryTest.c | 8 +-------
.../DxePlatformBootManagerLib/PlatformBootOption.c | 8 +-------
.../Intel/PurleyOpenBoardPkg/Pci/PciPlatform/IoApic.h | 8 +-------
.../Pci/PciPlatform/PciIovPlatformPolicy.c | 8 +-------
.../Pci/PciPlatform/PciIovPlatformPolicy.h | 8 +-------
.../PurleyOpenBoardPkg/Pci/PciPlatform/PciPlatform.c | 8 +-------
.../PurleyOpenBoardPkg/Pci/PciPlatform/PciPlatform.h | 8 +-------
.../PurleyOpenBoardPkg/Pci/PciPlatform/PciPlatform.inf | 8 +-------
.../PurleyOpenBoardPkg/Pci/PciPlatform/PciPlatformHooks.c | 8 +-------
.../PurleyOpenBoardPkg/Pci/PciPlatform/PciPlatformHooks.h | 8 +-------
.../PurleyOpenBoardPkg/Pci/PciPlatform/PciSupportLib.c | 8 +-------
.../PurleyOpenBoardPkg/Pci/PciPlatform/PciSupportLib.h | 8 +-------
Platform/Intel/PurleyOpenBoardPkg/PlatPkg.dec | 8 +-------
.../Policy/IioUdsDataDxe/IioUdsDataDxe.c | 8 +-------
.../Policy/IioUdsDataDxe/IioUdsDataDxe.h | 8 +-------
.../Policy/IioUdsDataDxe/IioUdsDataDxe.inf | 8 +-------
.../Library/SiliconPolicyInitLib/SiliconPolicyInitLib.c | 8 +-------
.../Library/SiliconPolicyInitLib/SiliconPolicyInitLib.inf | 8 +-------
.../Library/SiliconPolicyUpdateLib/PchPolicyUpdateUsb.c | 8 +-------
.../SiliconPolicyUpdateLib/SiliconPolicyUpdateLib.c | 8 +-------
.../SiliconPolicyUpdateLib/SiliconPolicyUpdateLib.inf | 8 +-------
.../Policy/PlatformCpuPolicy/PlatformCpuPolicy.c | 8 +-------
.../Policy/PlatformCpuPolicy/PlatformCpuPolicy.inf | 8 +-------
.../PurleyOpenBoardPkg/Policy/S3NvramSave/S3NvramSave.c | 8 +-------
.../PurleyOpenBoardPkg/Policy/S3NvramSave/S3NvramSave.h | 8 +-------
.../PurleyOpenBoardPkg/Policy/S3NvramSave/S3NvramSave.inf | 8 +-------
.../Policy/SystemBoard/SystemBoardCommon.c | 8 +-------
.../Policy/SystemBoard/SystemBoardPei.c | 8 +-------
.../Policy/SystemBoard/SystemBoardPei.h | 8 +-------
.../Policy/SystemBoard/SystemBoardPei.inf | 8 +-------
171 files changed, 171 insertions(+), 1197 deletions(-)
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe.c b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe.c
index b69bd8ace8..2b9e6e477d 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe.c
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe.h b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe.h
index 5e4f293844..fbfd9abc7f 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe.h
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe.inf b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe.inf
index c4ec05b15d..2f937fd59e 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe.inf
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxeDsdt.c b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxeDsdt.c
index df4c62403d..a4d58cab60 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxeDsdt.c
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxeDsdt.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt.inf b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt.inf
index 2c53d67d49..a480379213 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt.inf
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/AMLUPD.asl b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/AMLUPD.asl
index e7986b8670..b76b062a94 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/AMLUPD.asl
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/AMLUPD.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/CommonPlatform.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/CommonPlatform.asi
index 8e9f2d5375..f5317cff86 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/CommonPlatform.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/CommonPlatform.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/DSDT.asl b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/DSDT.asl
index 427be161b5..55b4c11741 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/DSDT.asl
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/DSDT.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Gpe.asl b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Gpe.asl
index b2986a16a7..97a3ba0eb3 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Gpe.asl
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Gpe.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/HostBus.asl b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/HostBus.asl
index 27a997cbfb..daf80171a1 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/HostBus.asl
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/HostBus.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/IioPcieHotPlugGpeHandler.asl b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/IioPcieHotPlugGpeHandler.asl
index 03a7d13c2e..9631d8cee3 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/IioPcieHotPlugGpeHandler.asl
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/IioPcieHotPlugGpeHandler.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/IioPcieRootPortHotPlug.asl b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/IioPcieRootPortHotPlug.asl
index c3cf1d2a0b..2dd9357359 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/IioPcieRootPortHotPlug.asl
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/IioPcieRootPortHotPlug.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Itss.asl b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Itss.asl
index b6a7188cbb..af3f6581db 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Itss.asl
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Itss.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Mother.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Mother.asi
index 46abd5706c..863518b3a5 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Mother.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Mother.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Os.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Os.asi
index 2492a1726c..532e5ba448 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Os.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Os.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC00.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC00.asi
index bebf4e0fcb..aaf1237835 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC00.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC00.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC01.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC01.asi
index aeb0d2ef83..1e61aac3f6 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC01.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC01.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC02.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC02.asi
index f92d2eea84..65035cf70e 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC02.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC02.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC03.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC03.asi
index 466537d014..c1af96c1b7 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC03.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC03.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC04.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC04.asi
index 2ff1c2f64d..f73f55d60f 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC04.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC04.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC05.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC05.asi
index f2b9bce5e3..7334dc56f1 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC05.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC05.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC06.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC06.asi
index bc856473bb..c4ddd10612 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC06.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC06.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC06Ejd.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC06Ejd.asi
index 1921d0e157..bd53705140 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC06Ejd.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC06Ejd.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC07.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC07.asi
index 50c1269e4e..c2011b6ed2 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC07.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC07.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC08.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC08.asi
index 18c737a55a..373575105a 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC08.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC08.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC09.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC09.asi
index 66730a27e9..4908507c19 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC09.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC09.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC10.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC10.asi
index a12136c053..274280715c 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC10.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC10.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC11.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC11.asi
index efafb7ea99..a3fcda98e0 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC11.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC11.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC12.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC12.asi
index bd860fe411..8d0ea8c4b2 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC12.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC12.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC12Ejd.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC12Ejd.asi
index 7a9aedf818..6969f3f503 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC12Ejd.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC12Ejd.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC13.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC13.asi
index 3183a62ff2..f53903cad1 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC13.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC13.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC14.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC14.asi
index 24b1d0e35c..6eee61de72 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC14.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC14.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC15.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC15.asi
index 77f5aa8185..b9b0349d34 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC15.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC15.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC16.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC16.asi
index 1d4e6d89df..6d288be750 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC16.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC16.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC17.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC17.asi
index 4e04769467..ecee6b9937 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC17.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC17.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC18.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC18.asi
index ca8f18ecd2..bf8ad0ca3a 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC18.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC18.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC18Ejd.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC18Ejd.asi
index 6e0a48b128..466163cacc 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC18Ejd.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC18Ejd.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC19.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC19.asi
index 121645a3cd..d54e11fc64 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC19.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC19.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC20.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC20.asi
index fcdb44071b..6a3c340378 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC20.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC20.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC21.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC21.asi
index 3ae6e1c8d8..b4600b9476 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC21.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC21.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC22.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC22.asi
index e3d64db58c..aaf798453e 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC22.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC22.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC23.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC23.asi
index e64380e4e8..8d4ff618cb 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC23.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC23.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC24.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC24.asi
index bed4dfbc2b..e62913a7cf 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC24.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC24.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC25.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC25.asi
index 8c2b3b288c..43779e6b56 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC25.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC25.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC26.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC26.asi
index 95aeb03b0d..28a6784e0e 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC26.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC26.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC27.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC27.asi
index 750b4eaa24..c6657242a4 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC27.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC27.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC28.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC28.asi
index 3e8b3b24bd..1d5a489cd2 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC28.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC28.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC29.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC29.asi
index f10ec64b94..3678f10cc0 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC29.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC29.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC30.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC30.asi
index ec46cccc38..d0bec9972d 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC30.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC30.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC31.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC31.asi
index 382e75f644..e141868896 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC31.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC31.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC32.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC32.asi
index 6c921b52db..6b16fb096e 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC32.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC32.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC33.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC33.asi
index 39097f45d2..1b4566d4f5 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC33.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC33.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC34.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC34.asi
index 3335a9f77a..fa58f4e60c 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC34.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC34.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC35.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC35.asi
index 03503ce5ee..e0bbe6adf2 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC35.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC35.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC36.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC36.asi
index 606c9132a8..a3d906aafd 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC36.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC36.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC37.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC37.asi
index 8544b4bb9f..8cd169311c 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC37.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC37.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC38.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC38.asi
index c64a085a9c..d0d766954d 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC38.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC38.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC39.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC39.asi
index 24562e7688..5c37da53ec 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC39.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC39.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC40.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC40.asi
index 85b0ded149..d16d46b466 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC40.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC40.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC41.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC41.asi
index a6221b7eba..73dd6567fc 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC41.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC41.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC42.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC42.asi
index 6da3a3e15a..7efc2854dc 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC42.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC42.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC43.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC43.asi
index d56c84d8ea..c3a9e250a6 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC43.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC43.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC44.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC44.asi
index 2b9eaebf90..aecee85a33 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC44.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC44.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC45.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC45.asi
index efd01f1a28..dc7d050938 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC45.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC45.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC46.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC46.asi
index bf845cbb9f..4ad40d819a 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC46.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC46.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC47.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC47.asi
index 67c41e76e8..b2daca6242 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC47.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC47.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Pch.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Pch.asi
index 77c4f1797b..6b9ae9b3e7 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Pch.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Pch.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PchApic.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PchApic.asi
index 8c5787c44c..57bc9f2ba1 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PchApic.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PchApic.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PchEhci1.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PchEhci1.asi
index bb6d1fc8c9..c25af50ed8 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PchEhci1.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PchEhci1.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PchEhci2.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PchEhci2.asi
index 027a362ee5..8caae9bbac 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PchEhci2.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PchEhci2.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PchGbe.asl b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PchGbe.asl
index 9919367878..8ae7c7b8be 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PchGbe.asl
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PchGbe.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PchLpc.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PchLpc.asi
index 51b4f99d3c..d62d5044b4 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PchLpc.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PchLpc.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PchSata.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PchSata.asi
index 2fdfd2cb1d..a74c9b9aae 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PchSata.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PchSata.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PchXhci.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PchXhci.asi
index 22a4ab5234..d2563e0487 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PchXhci.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PchXhci.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PciCrs.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PciCrs.asi
index 6b1613b800..6fb2cb589d 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PciCrs.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PciCrs.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PciIrq.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PciIrq.asi
index b64b70b76a..fe7c2b8753 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PciIrq.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PciIrq.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PcieHp.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PcieHp.asi
index 98656cd2a3..ced2b3ecd1 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PcieHp.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PcieHp.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PcieHpDev.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PcieHpDev.asi
index d9a4565519..34feaa8137 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PcieHpDev.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PcieHpDev.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PcieNonHpDev.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PcieNonHpDev.asi
index 4f90be3373..c990898e87 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PcieNonHpDev.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PcieNonHpDev.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PcieSeg.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PcieSeg.asi
index 781d764bb8..51c919f5e5 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PcieSeg.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PcieSeg.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Platform.asl b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Platform.asl
index 69ad6e0382..40cc31b86a 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Platform.asl
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Platform.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PlatformGpe.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PlatformGpe.asi
index ec7c3e3315..1f3087a7b3 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PlatformGpe.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PlatformGpe.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PlatformPciTree_WFP.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PlatformPciTree_WFP.asi
index 28344b9aa2..457b8bba4a 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PlatformPciTree_WFP.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PlatformPciTree_WFP.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Sck1Ejd.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Sck1Ejd.asi
index 4bb04b1e23..2cbe3aa5cc 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Sck1Ejd.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Sck1Ejd.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Sck2Ejd.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Sck2Ejd.asi
index 46da40ef3f..4a89bb99d6 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Sck2Ejd.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Sck2Ejd.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Sck3Ejd.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Sck3Ejd.asi
index 2c8608960b..8cbaeffeb5 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Sck3Ejd.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Sck3Ejd.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Uncore0.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Uncore0.asi
index c07eb6d288..a5a447d037 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Uncore0.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Uncore0.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Uncore1.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Uncore1.asi
index f404ff64c0..a86aaa7b3f 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Uncore1.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Uncore1.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Uncore2.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Uncore2.asi
index 577a3c2537..dc7453c294 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Uncore2.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Uncore2.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Uncore3.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Uncore3.asi
index 7f20255d04..f59e04539b 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Uncore3.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Uncore3.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/WFPPlatform.asl b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/WFPPlatform.asl
index d995817140..254806cbc8 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/WFPPlatform.asl
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/WFPPlatform.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/GitEdk2MinMtOlympus.bat b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/GitEdk2MinMtOlympus.bat
index d1d488c131..02ed458236 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/GitEdk2MinMtOlympus.bat
+++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/GitEdk2MinMtOlympus.bat
@@ -1,13 +1,7 @@
@REM @file
@REM
@REM Copyright (c) 2018, Intel Corporation. All rights reserved.<BR>
-@REM This program and the accompanying materials
-@REM are licensed and made available under the terms and conditions of the BSD License
-@REM which accompanies this distribution. The full text of the license may be found at
-@REM http://opensource.org/licenses/bsd-license.php
-@REM
-@REM THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-@REM WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+@REM SPDX-License-Identifier: BSD-2-Clause-Patent
@REM
@echo off
diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BasePlatformHookLib/BasePlatformHookLib.c b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BasePlatformHookLib/BasePlatformHookLib.c
index 038fe7ad71..8051e33311 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BasePlatformHookLib/BasePlatformHookLib.c
+++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BasePlatformHookLib/BasePlatformHookLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BasePlatformHookLib/BasePlatformHookLib.inf b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BasePlatformHookLib/BasePlatformHookLib.inf
index ebd4421ea4..d86a8f6cd0 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BasePlatformHookLib/BasePlatformHookLib.inf
+++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BasePlatformHookLib/BasePlatformHookLib.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardAcpiLib/DxeBoardAcpiTableLib.c b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardAcpiLib/DxeBoardAcpiTableLib.c
index c1926d4924..ff497540de 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardAcpiLib/DxeBoardAcpiTableLib.c
+++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardAcpiLib/DxeBoardAcpiTableLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardAcpiLib/DxeBoardAcpiTableLib.inf b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardAcpiLib/DxeBoardAcpiTableLib.inf
index 031e6576bf..d4f63fa7e1 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardAcpiLib/DxeBoardAcpiTableLib.inf
+++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardAcpiLib/DxeBoardAcpiTableLib.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardAcpiLib/DxeMtOlympusAcpiTableLib.c b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardAcpiLib/DxeMtOlympusAcpiTableLib.c
index 310740e6fb..297de88047 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardAcpiLib/DxeMtOlympusAcpiTableLib.c
+++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardAcpiLib/DxeMtOlympusAcpiTableLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardAcpiLib/SmmBoardAcpiEnableLib.c b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardAcpiLib/SmmBoardAcpiEnableLib.c
index f8b6aab8f9..b2a82560b8 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardAcpiLib/SmmBoardAcpiEnableLib.c
+++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardAcpiLib/SmmBoardAcpiEnableLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardAcpiLib/SmmBoardAcpiEnableLib.inf b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardAcpiLib/SmmBoardAcpiEnableLib.inf
index 22c7fbe335..6b463a544b 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardAcpiLib/SmmBoardAcpiEnableLib.inf
+++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardAcpiLib/SmmBoardAcpiEnableLib.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardAcpiLib/SmmMtOlympusAcpiEnableLib.c b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardAcpiLib/SmmMtOlympusAcpiEnableLib.c
index 19b1fd7bb7..b97b2992cb 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardAcpiLib/SmmMtOlympusAcpiEnableLib.c
+++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardAcpiLib/SmmMtOlympusAcpiEnableLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardAcpiLib/SmmSiliconAcpiEnableLib.c b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardAcpiLib/SmmSiliconAcpiEnableLib.c
index 65aa7b067a..ff803aa5ce 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardAcpiLib/SmmSiliconAcpiEnableLib.c
+++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardAcpiLib/SmmSiliconAcpiEnableLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/AllLanesEparam.c b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/AllLanesEparam.c
index ef1675d7a9..a245721277 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/AllLanesEparam.c
+++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/AllLanesEparam.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/GpioTable.c b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/GpioTable.c
index e278156afa..21d83a0c02 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/GpioTable.c
+++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/GpioTable.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/IioBifur.c b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/IioBifur.c
index f64e016dda..fa2a4d36ce 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/IioBifur.c
+++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/IioBifur.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/PeiBoardInitPostMemLib.c b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/PeiBoardInitPostMemLib.c
index 54a1ad6edf..f04f1e7c40 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/PeiBoardInitPostMemLib.c
+++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/PeiBoardInitPostMemLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/PeiBoardInitPostMemLib.inf b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/PeiBoardInitPostMemLib.inf
index 50d52af4d6..1948a97925 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/PeiBoardInitPostMemLib.inf
+++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/PeiBoardInitPostMemLib.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/PeiBoardInitPreMemLib.c b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/PeiBoardInitPreMemLib.c
index 306465c8af..511bc01339 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/PeiBoardInitPreMemLib.c
+++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/PeiBoardInitPreMemLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/PeiBoardInitPreMemLib.inf b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/PeiBoardInitPreMemLib.inf
index 2451e6aa79..f3f671c20a 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/PeiBoardInitPreMemLib.inf
+++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/PeiBoardInitPreMemLib.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/PeiMtOlympusDetect.c b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/PeiMtOlympusDetect.c
index 6968969f54..11221828da 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/PeiMtOlympusDetect.c
+++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/PeiMtOlympusDetect.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/PeiMtOlympusInitLib.h b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/PeiMtOlympusInitLib.h
index 6996cbfc50..bada6aef36 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/PeiMtOlympusInitLib.h
+++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/PeiMtOlympusInitLib.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/PeiMtOlympusInitPostMemLib.c b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/PeiMtOlympusInitPostMemLib.c
index 95101fe473..7bcbe6e4a4 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/PeiMtOlympusInitPostMemLib.c
+++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/PeiMtOlympusInitPostMemLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/PeiMtOlympusInitPreMemLib.c b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/PeiMtOlympusInitPreMemLib.c
index d0453ad10d..42858ed74b 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/PeiMtOlympusInitPreMemLib.c
+++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/PeiMtOlympusInitPreMemLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018 - 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/UsbOC.c b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/UsbOC.c
index 7ff9d875ad..a9375b116e 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/UsbOC.c
+++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/UsbOC.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkg.dsc b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkg.dsc
index ded1201a86..de1a3965d7 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkg.dsc
+++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkg.dsc
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkg.fdf b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkg.fdf
index 9902e04df9..e7523da74e 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkg.fdf
+++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkg.fdf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkgBuildOption.dsc b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkgBuildOption.dsc
index 7c373374ed..1237bf95f2 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkgBuildOption.dsc
+++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkgBuildOption.dsc
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkgConfig.dsc b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkgConfig.dsc
index 4f9e0a9702..d9c443a915 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkgConfig.dsc
+++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkgConfig.dsc
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkgPcd.dsc b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkgPcd.dsc
index fc63ca628a..83b0f53fa1 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkgPcd.dsc
+++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkgPcd.dsc
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/StructureConfig.dsc b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/StructureConfig.dsc
index 121179fa8e..98527b1a05 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/StructureConfig.dsc
+++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/StructureConfig.dsc
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/bld.bat b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/bld.bat
index a66d19e66e..f624be03a9 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/bld.bat
+++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/bld.bat
@@ -1,13 +1,7 @@
@REM @file
@REM
@REM Copyright (c) 2018, Intel Corporation. All rights reserved.<BR>
-@REM This program and the accompanying materials
-@REM are licensed and made available under the terms and conditions of the BSD License
-@REM which accompanies this distribution. The full text of the license may be found at
-@REM http://opensource.org/licenses/bsd-license.php
-@REM
-@REM THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-@REM WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+@REM SPDX-License-Identifier: BSD-2-Clause-Patent
@REM
@echo off
diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/postbuild.bat b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/postbuild.bat
index 5c787bb647..e7e272b208 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/postbuild.bat
+++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/postbuild.bat
@@ -1,13 +1,7 @@
@REM @file
@REM
@REM Copyright (c) 2018, Intel Corporation. All rights reserved.<BR>
-@REM This program and the accompanying materials
-@REM are licensed and made available under the terms and conditions of the BSD License
-@REM which accompanies this distribution. The full text of the license may be found at
-@REM http://opensource.org/licenses/bsd-license.php
-@REM
-@REM THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-@REM WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+@REM SPDX-License-Identifier: BSD-2-Clause-Patent
@REM
@set SCRIPT_ERROR=0
diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/prebuild.bat b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/prebuild.bat
index 81a9634d51..d9c1442ea1 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/prebuild.bat
+++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/prebuild.bat
@@ -1,13 +1,7 @@
@REM @file
@REM
@REM Copyright (c) 2018, Intel Corporation. All rights reserved.<BR>
-@REM This program and the accompanying materials
-@REM are licensed and made available under the terms and conditions of the BSD License
-@REM which accompanies this distribution. The full text of the license may be found at
-@REM http://opensource.org/licenses/bsd-license.php
-@REM
-@REM THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-@REM WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+@REM SPDX-License-Identifier: BSD-2-Clause-Patent
@REM
@set SCRIPT_ERROR=0
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Features/Ipmi/Library/IpmiLibKcs/IpmiLibKcs.c b/Platform/Intel/PurleyOpenBoardPkg/Features/Ipmi/Library/IpmiLibKcs/IpmiLibKcs.c
index 62114fb3e5..700e413aa6 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Features/Ipmi/Library/IpmiLibKcs/IpmiLibKcs.c
+++ b/Platform/Intel/PurleyOpenBoardPkg/Features/Ipmi/Library/IpmiLibKcs/IpmiLibKcs.c
@@ -2,13 +2,7 @@
IPMI library - KCS.
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Features/Ipmi/Library/IpmiLibKcs/IpmiLibKcs.inf b/Platform/Intel/PurleyOpenBoardPkg/Features/Ipmi/Library/IpmiLibKcs/IpmiLibKcs.inf
index c4796d594a..f46a8fcac6 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Features/Ipmi/Library/IpmiLibKcs/IpmiLibKcs.inf
+++ b/Platform/Intel/PurleyOpenBoardPkg/Features/Ipmi/Library/IpmiLibKcs/IpmiLibKcs.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Features/Ipmi/Library/IpmiLibKcs/KcsBmc.c b/Platform/Intel/PurleyOpenBoardPkg/Features/Ipmi/Library/IpmiLibKcs/KcsBmc.c
index 4f766517ec..483843c6da 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Features/Ipmi/Library/IpmiLibKcs/KcsBmc.c
+++ b/Platform/Intel/PurleyOpenBoardPkg/Features/Ipmi/Library/IpmiLibKcs/KcsBmc.c
@@ -2,13 +2,7 @@
KCS Transport Hook.
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Features/Ipmi/Library/IpmiLibKcs/KcsBmc.h b/Platform/Intel/PurleyOpenBoardPkg/Features/Ipmi/Library/IpmiLibKcs/KcsBmc.h
index 8a7e90a108..bf8ae6b63d 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Features/Ipmi/Library/IpmiLibKcs/KcsBmc.h
+++ b/Platform/Intel/PurleyOpenBoardPkg/Features/Ipmi/Library/IpmiLibKcs/KcsBmc.h
@@ -2,13 +2,7 @@
KCS Transport Hook head file.
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Features/Ipmi/Library/IpmiPlatformHookLib/IpmiPlatformHookLib.c b/Platform/Intel/PurleyOpenBoardPkg/Features/Ipmi/Library/IpmiPlatformHookLib/IpmiPlatformHookLib.c
index 988e5f24ce..1cdd39c79a 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Features/Ipmi/Library/IpmiPlatformHookLib/IpmiPlatformHookLib.c
+++ b/Platform/Intel/PurleyOpenBoardPkg/Features/Ipmi/Library/IpmiPlatformHookLib/IpmiPlatformHookLib.c
@@ -2,13 +2,7 @@
IPMI platform hook.
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Features/Ipmi/Library/IpmiPlatformHookLib/IpmiPlatformHookLib.inf b/Platform/Intel/PurleyOpenBoardPkg/Features/Ipmi/Library/IpmiPlatformHookLib/IpmiPlatformHookLib.inf
index 73427edeea..4047130b3d 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Features/Ipmi/Library/IpmiPlatformHookLib/IpmiPlatformHookLib.inf
+++ b/Platform/Intel/PurleyOpenBoardPkg/Features/Ipmi/Library/IpmiPlatformHookLib/IpmiPlatformHookLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Include/Acpi/GlobalNvs.asi b/Platform/Intel/PurleyOpenBoardPkg/Include/Acpi/GlobalNvs.asi
index fa97877d69..3e049cca8e 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Include/Acpi/GlobalNvs.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Include/Acpi/GlobalNvs.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Include/Acpi/GlobalNvsAreaDef.h b/Platform/Intel/PurleyOpenBoardPkg/Include/Acpi/GlobalNvsAreaDef.h
index 65dbf7cebb..8af401de99 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Include/Acpi/GlobalNvsAreaDef.h
+++ b/Platform/Intel/PurleyOpenBoardPkg/Include/Acpi/GlobalNvsAreaDef.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Include/Guid/PchRcVariable.h b/Platform/Intel/PurleyOpenBoardPkg/Include/Guid/PchRcVariable.h
index fd0b553337..79b7429052 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Include/Guid/PchRcVariable.h
+++ b/Platform/Intel/PurleyOpenBoardPkg/Include/Guid/PchRcVariable.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Include/Guid/SetupVariable.h b/Platform/Intel/PurleyOpenBoardPkg/Include/Guid/SetupVariable.h
index 3d6267fac1..f8ea067b50 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Include/Guid/SetupVariable.h
+++ b/Platform/Intel/PurleyOpenBoardPkg/Include/Guid/SetupVariable.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Include/IioBifurcationSlotTable.h b/Platform/Intel/PurleyOpenBoardPkg/Include/IioBifurcationSlotTable.h
index 92b3057cdb..76450ec21f 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Include/IioBifurcationSlotTable.h
+++ b/Platform/Intel/PurleyOpenBoardPkg/Include/IioBifurcationSlotTable.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Include/Platform.h b/Platform/Intel/PurleyOpenBoardPkg/Include/Platform.h
index 8871b01fd0..160506039a 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Include/Platform.h
+++ b/Platform/Intel/PurleyOpenBoardPkg/Include/Platform.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Include/Ppi/SystemBoard.h b/Platform/Intel/PurleyOpenBoardPkg/Include/Ppi/SystemBoard.h
index 902c8931b9..ce0ebaf973 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Include/Ppi/SystemBoard.h
+++ b/Platform/Intel/PurleyOpenBoardPkg/Include/Ppi/SystemBoard.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Include/Protocol/PciIovPlatform.h b/Platform/Intel/PurleyOpenBoardPkg/Include/Protocol/PciIovPlatform.h
index cce27a5fe7..43762cf9ee 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Include/Protocol/PciIovPlatform.h
+++ b/Platform/Intel/PurleyOpenBoardPkg/Include/Protocol/PciIovPlatform.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Include/SetupTable.h b/Platform/Intel/PurleyOpenBoardPkg/Include/SetupTable.h
index 99ada898c7..7d8742ad4d 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Include/SetupTable.h
+++ b/Platform/Intel/PurleyOpenBoardPkg/Include/SetupTable.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Include/SioRegs.h b/Platform/Intel/PurleyOpenBoardPkg/Include/SioRegs.h
index d3ac4c95a5..8b25ad3162 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Include/SioRegs.h
+++ b/Platform/Intel/PurleyOpenBoardPkg/Include/SioRegs.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Override/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/BdsPlatform.c b/Platform/Intel/PurleyOpenBoardPkg/Override/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/BdsPlatform.c
index 831d325037..b3b8ceba6f 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Override/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/BdsPlatform.c
+++ b/Platform/Intel/PurleyOpenBoardPkg/Override/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/BdsPlatform.c
@@ -2,13 +2,7 @@
This file include all platform action which can be customized by IBV/OEM.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Override/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/BdsPlatform.h b/Platform/Intel/PurleyOpenBoardPkg/Override/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/BdsPlatform.h
index 779ba9a98d..360a00d7d7 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Override/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/BdsPlatform.h
+++ b/Platform/Intel/PurleyOpenBoardPkg/Override/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/BdsPlatform.h
@@ -2,13 +2,7 @@
Header file for BDS Platform specific code
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Override/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/DxePlatformBootManagerLib.inf b/Platform/Intel/PurleyOpenBoardPkg/Override/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/DxePlatformBootManagerLib.inf
index 563c8a25b2..09b7fd906a 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Override/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/DxePlatformBootManagerLib.inf
+++ b/Platform/Intel/PurleyOpenBoardPkg/Override/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/DxePlatformBootManagerLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Override/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/MemoryTest.c b/Platform/Intel/PurleyOpenBoardPkg/Override/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/MemoryTest.c
index 6c36e7d28b..e6445fecf8 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Override/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/MemoryTest.c
+++ b/Platform/Intel/PurleyOpenBoardPkg/Override/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/MemoryTest.c
@@ -2,13 +2,7 @@
Perform the platform memory test
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Override/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/PlatformBootOption.c b/Platform/Intel/PurleyOpenBoardPkg/Override/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/PlatformBootOption.c
index ea30de0540..84aa097d58 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Override/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/PlatformBootOption.c
+++ b/Platform/Intel/PurleyOpenBoardPkg/Override/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/PlatformBootOption.c
@@ -2,13 +2,7 @@
Driver for Platform Boot Options support.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Pci/PciPlatform/IoApic.h b/Platform/Intel/PurleyOpenBoardPkg/Pci/PciPlatform/IoApic.h
index 55ca9f68fd..3ec3baa207 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Pci/PciPlatform/IoApic.h
+++ b/Platform/Intel/PurleyOpenBoardPkg/Pci/PciPlatform/IoApic.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Pci/PciPlatform/PciIovPlatformPolicy.c b/Platform/Intel/PurleyOpenBoardPkg/Pci/PciPlatform/PciIovPlatformPolicy.c
index 6737bbbcf0..0b941ccb07 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Pci/PciPlatform/PciIovPlatformPolicy.c
+++ b/Platform/Intel/PurleyOpenBoardPkg/Pci/PciPlatform/PciIovPlatformPolicy.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Pci/PciPlatform/PciIovPlatformPolicy.h b/Platform/Intel/PurleyOpenBoardPkg/Pci/PciPlatform/PciIovPlatformPolicy.h
index 8b358d14a3..f7a8cb06a0 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Pci/PciPlatform/PciIovPlatformPolicy.h
+++ b/Platform/Intel/PurleyOpenBoardPkg/Pci/PciPlatform/PciIovPlatformPolicy.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Pci/PciPlatform/PciPlatform.c b/Platform/Intel/PurleyOpenBoardPkg/Pci/PciPlatform/PciPlatform.c
index 9f042c2b76..b479ec5992 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Pci/PciPlatform/PciPlatform.c
+++ b/Platform/Intel/PurleyOpenBoardPkg/Pci/PciPlatform/PciPlatform.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Pci/PciPlatform/PciPlatform.h b/Platform/Intel/PurleyOpenBoardPkg/Pci/PciPlatform/PciPlatform.h
index f36fdda6e6..353715688a 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Pci/PciPlatform/PciPlatform.h
+++ b/Platform/Intel/PurleyOpenBoardPkg/Pci/PciPlatform/PciPlatform.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Pci/PciPlatform/PciPlatform.inf b/Platform/Intel/PurleyOpenBoardPkg/Pci/PciPlatform/PciPlatform.inf
index b46bbf713a..3cc1b045a0 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Pci/PciPlatform/PciPlatform.inf
+++ b/Platform/Intel/PurleyOpenBoardPkg/Pci/PciPlatform/PciPlatform.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Pci/PciPlatform/PciPlatformHooks.c b/Platform/Intel/PurleyOpenBoardPkg/Pci/PciPlatform/PciPlatformHooks.c
index 9310df3e67..2556d46407 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Pci/PciPlatform/PciPlatformHooks.c
+++ b/Platform/Intel/PurleyOpenBoardPkg/Pci/PciPlatform/PciPlatformHooks.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Pci/PciPlatform/PciPlatformHooks.h b/Platform/Intel/PurleyOpenBoardPkg/Pci/PciPlatform/PciPlatformHooks.h
index 8d4734bb80..a5cee1b3a5 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Pci/PciPlatform/PciPlatformHooks.h
+++ b/Platform/Intel/PurleyOpenBoardPkg/Pci/PciPlatform/PciPlatformHooks.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Pci/PciPlatform/PciSupportLib.c b/Platform/Intel/PurleyOpenBoardPkg/Pci/PciPlatform/PciSupportLib.c
index dbd744b9d2..d8bf65439f 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Pci/PciPlatform/PciSupportLib.c
+++ b/Platform/Intel/PurleyOpenBoardPkg/Pci/PciPlatform/PciSupportLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Pci/PciPlatform/PciSupportLib.h b/Platform/Intel/PurleyOpenBoardPkg/Pci/PciPlatform/PciSupportLib.h
index 78fd013498..dc123b0d42 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Pci/PciPlatform/PciSupportLib.h
+++ b/Platform/Intel/PurleyOpenBoardPkg/Pci/PciPlatform/PciSupportLib.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/PlatPkg.dec b/Platform/Intel/PurleyOpenBoardPkg/PlatPkg.dec
index c203716029..5fc4de6f24 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/PlatPkg.dec
+++ b/Platform/Intel/PurleyOpenBoardPkg/PlatPkg.dec
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Policy/IioUdsDataDxe/IioUdsDataDxe.c b/Platform/Intel/PurleyOpenBoardPkg/Policy/IioUdsDataDxe/IioUdsDataDxe.c
index 132731a38c..6c626cf05d 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Policy/IioUdsDataDxe/IioUdsDataDxe.c
+++ b/Platform/Intel/PurleyOpenBoardPkg/Policy/IioUdsDataDxe/IioUdsDataDxe.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Policy/IioUdsDataDxe/IioUdsDataDxe.h b/Platform/Intel/PurleyOpenBoardPkg/Policy/IioUdsDataDxe/IioUdsDataDxe.h
index 9453ac618d..62da06d605 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Policy/IioUdsDataDxe/IioUdsDataDxe.h
+++ b/Platform/Intel/PurleyOpenBoardPkg/Policy/IioUdsDataDxe/IioUdsDataDxe.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Policy/IioUdsDataDxe/IioUdsDataDxe.inf b/Platform/Intel/PurleyOpenBoardPkg/Policy/IioUdsDataDxe/IioUdsDataDxe.inf
index 74a2453bbd..faafe39bf9 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Policy/IioUdsDataDxe/IioUdsDataDxe.inf
+++ b/Platform/Intel/PurleyOpenBoardPkg/Policy/IioUdsDataDxe/IioUdsDataDxe.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Policy/Library/SiliconPolicyInitLib/SiliconPolicyInitLib.c b/Platform/Intel/PurleyOpenBoardPkg/Policy/Library/SiliconPolicyInitLib/SiliconPolicyInitLib.c
index 429bda6ae4..ae7720cfb1 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Policy/Library/SiliconPolicyInitLib/SiliconPolicyInitLib.c
+++ b/Platform/Intel/PurleyOpenBoardPkg/Policy/Library/SiliconPolicyInitLib/SiliconPolicyInitLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Policy/Library/SiliconPolicyInitLib/SiliconPolicyInitLib.inf b/Platform/Intel/PurleyOpenBoardPkg/Policy/Library/SiliconPolicyInitLib/SiliconPolicyInitLib.inf
index 69c32d39bf..d039717b54 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Policy/Library/SiliconPolicyInitLib/SiliconPolicyInitLib.inf
+++ b/Platform/Intel/PurleyOpenBoardPkg/Policy/Library/SiliconPolicyInitLib/SiliconPolicyInitLib.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Policy/Library/SiliconPolicyUpdateLib/PchPolicyUpdateUsb.c b/Platform/Intel/PurleyOpenBoardPkg/Policy/Library/SiliconPolicyUpdateLib/PchPolicyUpdateUsb.c
index a2780dcd5f..73b90fd6d9 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Policy/Library/SiliconPolicyUpdateLib/PchPolicyUpdateUsb.c
+++ b/Platform/Intel/PurleyOpenBoardPkg/Policy/Library/SiliconPolicyUpdateLib/PchPolicyUpdateUsb.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Policy/Library/SiliconPolicyUpdateLib/SiliconPolicyUpdateLib.c b/Platform/Intel/PurleyOpenBoardPkg/Policy/Library/SiliconPolicyUpdateLib/SiliconPolicyUpdateLib.c
index 53466d0c1b..cac6409719 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Policy/Library/SiliconPolicyUpdateLib/SiliconPolicyUpdateLib.c
+++ b/Platform/Intel/PurleyOpenBoardPkg/Policy/Library/SiliconPolicyUpdateLib/SiliconPolicyUpdateLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Policy/Library/SiliconPolicyUpdateLib/SiliconPolicyUpdateLib.inf b/Platform/Intel/PurleyOpenBoardPkg/Policy/Library/SiliconPolicyUpdateLib/SiliconPolicyUpdateLib.inf
index ffa9eed0da..cefb2ad36c 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Policy/Library/SiliconPolicyUpdateLib/SiliconPolicyUpdateLib.inf
+++ b/Platform/Intel/PurleyOpenBoardPkg/Policy/Library/SiliconPolicyUpdateLib/SiliconPolicyUpdateLib.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Policy/PlatformCpuPolicy/PlatformCpuPolicy.c b/Platform/Intel/PurleyOpenBoardPkg/Policy/PlatformCpuPolicy/PlatformCpuPolicy.c
index 4b8a979fc2..38b872fff7 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Policy/PlatformCpuPolicy/PlatformCpuPolicy.c
+++ b/Platform/Intel/PurleyOpenBoardPkg/Policy/PlatformCpuPolicy/PlatformCpuPolicy.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Policy/PlatformCpuPolicy/PlatformCpuPolicy.inf b/Platform/Intel/PurleyOpenBoardPkg/Policy/PlatformCpuPolicy/PlatformCpuPolicy.inf
index a06647e9e3..5b8784c5d0 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Policy/PlatformCpuPolicy/PlatformCpuPolicy.inf
+++ b/Platform/Intel/PurleyOpenBoardPkg/Policy/PlatformCpuPolicy/PlatformCpuPolicy.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Policy/S3NvramSave/S3NvramSave.c b/Platform/Intel/PurleyOpenBoardPkg/Policy/S3NvramSave/S3NvramSave.c
index 27d5efbeef..158b19c169 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Policy/S3NvramSave/S3NvramSave.c
+++ b/Platform/Intel/PurleyOpenBoardPkg/Policy/S3NvramSave/S3NvramSave.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Policy/S3NvramSave/S3NvramSave.h b/Platform/Intel/PurleyOpenBoardPkg/Policy/S3NvramSave/S3NvramSave.h
index 2627266fd5..ad8efe572a 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Policy/S3NvramSave/S3NvramSave.h
+++ b/Platform/Intel/PurleyOpenBoardPkg/Policy/S3NvramSave/S3NvramSave.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Policy/S3NvramSave/S3NvramSave.inf b/Platform/Intel/PurleyOpenBoardPkg/Policy/S3NvramSave/S3NvramSave.inf
index a06c1ff2c5..2df78fe321 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Policy/S3NvramSave/S3NvramSave.inf
+++ b/Platform/Intel/PurleyOpenBoardPkg/Policy/S3NvramSave/S3NvramSave.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Policy/SystemBoard/SystemBoardCommon.c b/Platform/Intel/PurleyOpenBoardPkg/Policy/SystemBoard/SystemBoardCommon.c
index 6f28e1e7d4..6b9efae0f6 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Policy/SystemBoard/SystemBoardCommon.c
+++ b/Platform/Intel/PurleyOpenBoardPkg/Policy/SystemBoard/SystemBoardCommon.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Policy/SystemBoard/SystemBoardPei.c b/Platform/Intel/PurleyOpenBoardPkg/Policy/SystemBoard/SystemBoardPei.c
index 5a1d4618e4..9d05a39c68 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Policy/SystemBoard/SystemBoardPei.c
+++ b/Platform/Intel/PurleyOpenBoardPkg/Policy/SystemBoard/SystemBoardPei.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Policy/SystemBoard/SystemBoardPei.h b/Platform/Intel/PurleyOpenBoardPkg/Policy/SystemBoard/SystemBoardPei.h
index bf2c9201c1..1adc59cb3d 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Policy/SystemBoard/SystemBoardPei.h
+++ b/Platform/Intel/PurleyOpenBoardPkg/Policy/SystemBoard/SystemBoardPei.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Policy/SystemBoard/SystemBoardPei.inf b/Platform/Intel/PurleyOpenBoardPkg/Policy/SystemBoard/SystemBoardPei.inf
index 6b1202bfa8..0439dc2847 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Policy/SystemBoard/SystemBoardPei.inf
+++ b/Platform/Intel/PurleyOpenBoardPkg/Policy/SystemBoard/SystemBoardPei.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
--
2.21.0.windows.1
^ permalink raw reply related [flat|nested] 63+ messages in thread* Re: [edk2-devel] [[edk2-platforms][PATCH V2] 12/30] Platform/Intel/PurleyOpenBoardPkg: Replace BSD License with BSD+Patent License
2019-05-15 23:09 ` [[edk2-platforms][PATCH V2] 12/30] Platform/Intel/PurleyOpenBoardPkg: " Michael D Kinney
@ 2019-05-17 19:58 ` Oram, Isaac W
0 siblings, 0 replies; 63+ messages in thread
From: Oram, Isaac W @ 2019-05-17 19:58 UTC (permalink / raw)
To: devel@edk2.groups.io, Kinney, Michael D; +Cc: Lu, Shifei A, Zhou, Bowen
Reviewed-by: Isaac W Oram<Isaac.w.oram@intel.com>
-----Original Message-----
From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Kinney, Michael D
Sent: Wednesday, May 15, 2019 4:10 PM
To: devel@edk2.groups.io
Cc: Lu, Shifei A <shifei.a.lu@intel.com>; Zhou, Bowen <bowen.zhou@intel.com>; Oram, Isaac W <isaac.w.oram@intel.com>
Subject: [edk2-devel] [[edk2-platforms][PATCH V2] 12/30] Platform/Intel/PurleyOpenBoardPkg: Replace BSD License with BSD+Patent License
https://bugzilla.tianocore.org/show_bug.cgi?id=1373
Replace BSD 2-Clause License with BSD+Patent License. This change is
based on the following emails:
https://lists.01.org/pipermail/edk2-devel/2019-February/036260.html
https://lists.01.org/pipermail/edk2-devel/2018-October/030385.html
RFCs with detailed process for the license change:
V3: https://lists.01.org/pipermail/edk2-devel/2019-March/038116.html
V2: https://lists.01.org/pipermail/edk2-devel/2019-March/037669.html
V1: https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html
Cc: Shifei A Lu <shifei.a.lu@intel.com>
Cc: Xiaohu Zhou <bowen.zhou@intel.com>
Cc: Isaac W Oram <isaac.w.oram@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe.c | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe.h | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe.inf | 8 +-------
.../Acpi/BoardAcpiDxe/BoardAcpiDxeDsdt.c | 8 +-------
.../Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt.inf | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/AMLUPD.asl | 8 +-------
.../Acpi/BoardAcpiDxe/Dsdt/CommonPlatform.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/DSDT.asl | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Gpe.asl | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/HostBus.asl | 8 +-------
.../Acpi/BoardAcpiDxe/Dsdt/IioPcieHotPlugGpeHandler.asl | 8 +-------
.../Acpi/BoardAcpiDxe/Dsdt/IioPcieRootPortHotPlug.asl | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Itss.asl | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Mother.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Os.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC00.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC01.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC02.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC03.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC04.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC05.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC06.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC06Ejd.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC07.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC08.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC09.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC10.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC11.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC12.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC12Ejd.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC13.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC14.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC15.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC16.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC17.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC18.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC18Ejd.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC19.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC20.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC21.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC22.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC23.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC24.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC25.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC26.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC27.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC28.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC29.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC30.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC31.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC32.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC33.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC34.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC35.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC36.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC37.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC38.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC39.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC40.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC41.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC42.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC43.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC44.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC45.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC46.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC47.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Pch.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PchApic.asi | 8 +-------
.../Acpi/BoardAcpiDxe/Dsdt/PchEhci1.asi | 8 +-------
.../Acpi/BoardAcpiDxe/Dsdt/PchEhci2.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PchGbe.asl | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PchLpc.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PchSata.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PchXhci.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PciCrs.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PciIrq.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PcieHp.asi | 8 +-------
.../Acpi/BoardAcpiDxe/Dsdt/PcieHpDev.asi | 8 +-------
.../Acpi/BoardAcpiDxe/Dsdt/PcieNonHpDev.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PcieSeg.asi | 8 +-------
.../Acpi/BoardAcpiDxe/Dsdt/Platform.asl | 8 +-------
.../Acpi/BoardAcpiDxe/Dsdt/PlatformGpe.asi | 8 +-------
.../Acpi/BoardAcpiDxe/Dsdt/PlatformPciTree_WFP.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Sck1Ejd.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Sck2Ejd.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Sck3Ejd.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Uncore0.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Uncore1.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Uncore2.asi | 8 +-------
.../PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Uncore3.asi | 8 +-------
.../Acpi/BoardAcpiDxe/Dsdt/WFPPlatform.asl | 8 +-------
.../BoardMtOlympus/GitEdk2MinMtOlympus.bat | 8 +-------
.../Library/BasePlatformHookLib/BasePlatformHookLib.c | 8 +-------
.../Library/BasePlatformHookLib/BasePlatformHookLib.inf | 8 +-------
.../Library/BoardAcpiLib/DxeBoardAcpiTableLib.c | 8 +-------
.../Library/BoardAcpiLib/DxeBoardAcpiTableLib.inf | 8 +-------
.../Library/BoardAcpiLib/DxeMtOlympusAcpiTableLib.c | 8 +-------
.../Library/BoardAcpiLib/SmmBoardAcpiEnableLib.c | 8 +-------
.../Library/BoardAcpiLib/SmmBoardAcpiEnableLib.inf | 8 +-------
.../Library/BoardAcpiLib/SmmMtOlympusAcpiEnableLib.c | 8 +-------
.../Library/BoardAcpiLib/SmmSiliconAcpiEnableLib.c | 8 +-------
.../BoardMtOlympus/Library/BoardInitLib/AllLanesEparam.c | 8 +-------
.../BoardMtOlympus/Library/BoardInitLib/GpioTable.c | 8 +-------
.../BoardMtOlympus/Library/BoardInitLib/IioBifur.c | 8 +-------
.../Library/BoardInitLib/PeiBoardInitPostMemLib.c | 8 +-------
.../Library/BoardInitLib/PeiBoardInitPostMemLib.inf | 8 +-------
.../Library/BoardInitLib/PeiBoardInitPreMemLib.c | 8 +-------
.../Library/BoardInitLib/PeiBoardInitPreMemLib.inf | 8 +-------
.../Library/BoardInitLib/PeiMtOlympusDetect.c | 8 +-------
.../Library/BoardInitLib/PeiMtOlympusInitLib.h | 8 +-------
.../Library/BoardInitLib/PeiMtOlympusInitPostMemLib.c | 8 +-------
.../Library/BoardInitLib/PeiMtOlympusInitPreMemLib.c | 8 +-------
.../BoardMtOlympus/Library/BoardInitLib/UsbOC.c | 8 +-------
.../PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkg.dsc | 8 +-------
.../PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkg.fdf | 8 +-------
.../BoardMtOlympus/PlatformPkgBuildOption.dsc | 8 +-------
.../BoardMtOlympus/PlatformPkgConfig.dsc | 8 +-------
.../PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkgPcd.dsc | 8 +-------
.../PurleyOpenBoardPkg/BoardMtOlympus/StructureConfig.dsc | 8 +-------
Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/bld.bat | 8 +-------
.../Intel/PurleyOpenBoardPkg/BoardMtOlympus/postbuild.bat | 8 +-------
.../Intel/PurleyOpenBoardPkg/BoardMtOlympus/prebuild.bat | 8 +-------
.../Features/Ipmi/Library/IpmiLibKcs/IpmiLibKcs.c | 8 +-------
.../Features/Ipmi/Library/IpmiLibKcs/IpmiLibKcs.inf | 8 +-------
.../Features/Ipmi/Library/IpmiLibKcs/KcsBmc.c | 8 +-------
.../Features/Ipmi/Library/IpmiLibKcs/KcsBmc.h | 8 +-------
.../Library/IpmiPlatformHookLib/IpmiPlatformHookLib.c | 8 +-------
.../Library/IpmiPlatformHookLib/IpmiPlatformHookLib.inf | 8 +-------
.../Intel/PurleyOpenBoardPkg/Include/Acpi/GlobalNvs.asi | 8 +-------
.../PurleyOpenBoardPkg/Include/Acpi/GlobalNvsAreaDef.h | 8 +-------
.../Intel/PurleyOpenBoardPkg/Include/Guid/PchRcVariable.h | 8 +-------
.../Intel/PurleyOpenBoardPkg/Include/Guid/SetupVariable.h | 8 +-------
.../PurleyOpenBoardPkg/Include/IioBifurcationSlotTable.h | 8 +-------
Platform/Intel/PurleyOpenBoardPkg/Include/Platform.h | 8 +-------
.../Intel/PurleyOpenBoardPkg/Include/Ppi/SystemBoard.h | 8 +-------
.../PurleyOpenBoardPkg/Include/Protocol/PciIovPlatform.h | 8 +-------
Platform/Intel/PurleyOpenBoardPkg/Include/SetupTable.h | 8 +-------
Platform/Intel/PurleyOpenBoardPkg/Include/SioRegs.h | 8 +-------
.../Bds/Library/DxePlatformBootManagerLib/BdsPlatform.c | 8 +-------
.../Bds/Library/DxePlatformBootManagerLib/BdsPlatform.h | 8 +-------
.../DxePlatformBootManagerLib.inf | 8 +-------
.../Bds/Library/DxePlatformBootManagerLib/MemoryTest.c | 8 +-------
.../DxePlatformBootManagerLib/PlatformBootOption.c | 8 +-------
.../Intel/PurleyOpenBoardPkg/Pci/PciPlatform/IoApic.h | 8 +-------
.../Pci/PciPlatform/PciIovPlatformPolicy.c | 8 +-------
.../Pci/PciPlatform/PciIovPlatformPolicy.h | 8 +-------
.../PurleyOpenBoardPkg/Pci/PciPlatform/PciPlatform.c | 8 +-------
.../PurleyOpenBoardPkg/Pci/PciPlatform/PciPlatform.h | 8 +-------
.../PurleyOpenBoardPkg/Pci/PciPlatform/PciPlatform.inf | 8 +-------
.../PurleyOpenBoardPkg/Pci/PciPlatform/PciPlatformHooks.c | 8 +-------
.../PurleyOpenBoardPkg/Pci/PciPlatform/PciPlatformHooks.h | 8 +-------
.../PurleyOpenBoardPkg/Pci/PciPlatform/PciSupportLib.c | 8 +-------
.../PurleyOpenBoardPkg/Pci/PciPlatform/PciSupportLib.h | 8 +-------
Platform/Intel/PurleyOpenBoardPkg/PlatPkg.dec | 8 +-------
.../Policy/IioUdsDataDxe/IioUdsDataDxe.c | 8 +-------
.../Policy/IioUdsDataDxe/IioUdsDataDxe.h | 8 +-------
.../Policy/IioUdsDataDxe/IioUdsDataDxe.inf | 8 +-------
.../Library/SiliconPolicyInitLib/SiliconPolicyInitLib.c | 8 +-------
.../Library/SiliconPolicyInitLib/SiliconPolicyInitLib.inf | 8 +-------
.../Library/SiliconPolicyUpdateLib/PchPolicyUpdateUsb.c | 8 +-------
.../SiliconPolicyUpdateLib/SiliconPolicyUpdateLib.c | 8 +-------
.../SiliconPolicyUpdateLib/SiliconPolicyUpdateLib.inf | 8 +-------
.../Policy/PlatformCpuPolicy/PlatformCpuPolicy.c | 8 +-------
.../Policy/PlatformCpuPolicy/PlatformCpuPolicy.inf | 8 +-------
.../PurleyOpenBoardPkg/Policy/S3NvramSave/S3NvramSave.c | 8 +-------
.../PurleyOpenBoardPkg/Policy/S3NvramSave/S3NvramSave.h | 8 +-------
.../PurleyOpenBoardPkg/Policy/S3NvramSave/S3NvramSave.inf | 8 +-------
.../Policy/SystemBoard/SystemBoardCommon.c | 8 +-------
.../Policy/SystemBoard/SystemBoardPei.c | 8 +-------
.../Policy/SystemBoard/SystemBoardPei.h | 8 +-------
.../Policy/SystemBoard/SystemBoardPei.inf | 8 +-------
171 files changed, 171 insertions(+), 1197 deletions(-)
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe.c b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe.c
index b69bd8ace8..2b9e6e477d 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe.c
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe.h b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe.h
index 5e4f293844..fbfd9abc7f 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe.h
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe.inf b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe.inf
index c4ec05b15d..2f937fd59e 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe.inf
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxeDsdt.c b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxeDsdt.c
index df4c62403d..a4d58cab60 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxeDsdt.c
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxeDsdt.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt.inf b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt.inf
index 2c53d67d49..a480379213 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt.inf
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/AMLUPD.asl b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/AMLUPD.asl
index e7986b8670..b76b062a94 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/AMLUPD.asl
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/AMLUPD.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/CommonPlatform.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/CommonPlatform.asi
index 8e9f2d5375..f5317cff86 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/CommonPlatform.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/CommonPlatform.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/DSDT.asl b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/DSDT.asl
index 427be161b5..55b4c11741 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/DSDT.asl
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/DSDT.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Gpe.asl b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Gpe.asl
index b2986a16a7..97a3ba0eb3 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Gpe.asl
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Gpe.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/HostBus.asl b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/HostBus.asl
index 27a997cbfb..daf80171a1 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/HostBus.asl
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/HostBus.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/IioPcieHotPlugGpeHandler.asl b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/IioPcieHotPlugGpeHandler.asl
index 03a7d13c2e..9631d8cee3 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/IioPcieHotPlugGpeHandler.asl
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/IioPcieHotPlugGpeHandler.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/IioPcieRootPortHotPlug.asl b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/IioPcieRootPortHotPlug.asl
index c3cf1d2a0b..2dd9357359 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/IioPcieRootPortHotPlug.asl
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/IioPcieRootPortHotPlug.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Itss.asl b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Itss.asl
index b6a7188cbb..af3f6581db 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Itss.asl
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Itss.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Mother.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Mother.asi
index 46abd5706c..863518b3a5 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Mother.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Mother.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Os.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Os.asi
index 2492a1726c..532e5ba448 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Os.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Os.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC00.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC00.asi
index bebf4e0fcb..aaf1237835 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC00.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC00.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC01.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC01.asi
index aeb0d2ef83..1e61aac3f6 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC01.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC01.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC02.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC02.asi
index f92d2eea84..65035cf70e 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC02.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC02.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC03.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC03.asi
index 466537d014..c1af96c1b7 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC03.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC03.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC04.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC04.asi
index 2ff1c2f64d..f73f55d60f 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC04.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC04.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC05.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC05.asi
index f2b9bce5e3..7334dc56f1 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC05.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC05.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC06.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC06.asi
index bc856473bb..c4ddd10612 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC06.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC06.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC06Ejd.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC06Ejd.asi
index 1921d0e157..bd53705140 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC06Ejd.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC06Ejd.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC07.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC07.asi
index 50c1269e4e..c2011b6ed2 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC07.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC07.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC08.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC08.asi
index 18c737a55a..373575105a 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC08.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC08.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC09.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC09.asi
index 66730a27e9..4908507c19 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC09.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC09.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC10.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC10.asi
index a12136c053..274280715c 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC10.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC10.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC11.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC11.asi
index efafb7ea99..a3fcda98e0 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC11.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC11.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC12.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC12.asi
index bd860fe411..8d0ea8c4b2 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC12.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC12.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC12Ejd.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC12Ejd.asi
index 7a9aedf818..6969f3f503 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC12Ejd.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC12Ejd.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC13.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC13.asi
index 3183a62ff2..f53903cad1 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC13.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC13.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC14.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC14.asi
index 24b1d0e35c..6eee61de72 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC14.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC14.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC15.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC15.asi
index 77f5aa8185..b9b0349d34 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC15.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC15.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC16.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC16.asi
index 1d4e6d89df..6d288be750 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC16.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC16.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC17.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC17.asi
index 4e04769467..ecee6b9937 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC17.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC17.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC18.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC18.asi
index ca8f18ecd2..bf8ad0ca3a 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC18.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC18.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC18Ejd.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC18Ejd.asi
index 6e0a48b128..466163cacc 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC18Ejd.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC18Ejd.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC19.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC19.asi
index 121645a3cd..d54e11fc64 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC19.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC19.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC20.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC20.asi
index fcdb44071b..6a3c340378 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC20.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC20.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC21.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC21.asi
index 3ae6e1c8d8..b4600b9476 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC21.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC21.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC22.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC22.asi
index e3d64db58c..aaf798453e 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC22.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC22.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC23.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC23.asi
index e64380e4e8..8d4ff618cb 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC23.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC23.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC24.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC24.asi
index bed4dfbc2b..e62913a7cf 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC24.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC24.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC25.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC25.asi
index 8c2b3b288c..43779e6b56 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC25.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC25.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC26.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC26.asi
index 95aeb03b0d..28a6784e0e 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC26.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC26.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC27.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC27.asi
index 750b4eaa24..c6657242a4 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC27.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC27.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC28.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC28.asi
index 3e8b3b24bd..1d5a489cd2 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC28.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC28.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC29.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC29.asi
index f10ec64b94..3678f10cc0 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC29.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC29.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC30.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC30.asi
index ec46cccc38..d0bec9972d 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC30.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC30.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC31.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC31.asi
index 382e75f644..e141868896 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC31.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC31.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC32.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC32.asi
index 6c921b52db..6b16fb096e 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC32.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC32.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC33.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC33.asi
index 39097f45d2..1b4566d4f5 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC33.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC33.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC34.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC34.asi
index 3335a9f77a..fa58f4e60c 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC34.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC34.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC35.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC35.asi
index 03503ce5ee..e0bbe6adf2 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC35.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC35.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC36.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC36.asi
index 606c9132a8..a3d906aafd 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC36.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC36.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC37.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC37.asi
index 8544b4bb9f..8cd169311c 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC37.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC37.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC38.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC38.asi
index c64a085a9c..d0d766954d 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC38.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC38.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC39.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC39.asi
index 24562e7688..5c37da53ec 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC39.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC39.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC40.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC40.asi
index 85b0ded149..d16d46b466 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC40.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC40.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC41.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC41.asi
index a6221b7eba..73dd6567fc 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC41.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC41.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC42.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC42.asi
index 6da3a3e15a..7efc2854dc 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC42.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC42.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC43.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC43.asi
index d56c84d8ea..c3a9e250a6 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC43.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC43.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC44.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC44.asi
index 2b9eaebf90..aecee85a33 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC44.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC44.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC45.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC45.asi
index efd01f1a28..dc7d050938 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC45.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC45.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC46.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC46.asi
index bf845cbb9f..4ad40d819a 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC46.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC46.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC47.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC47.asi
index 67c41e76e8..b2daca6242 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC47.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PC47.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Pch.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Pch.asi
index 77c4f1797b..6b9ae9b3e7 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Pch.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Pch.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PchApic.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PchApic.asi
index 8c5787c44c..57bc9f2ba1 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PchApic.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PchApic.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PchEhci1.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PchEhci1.asi
index bb6d1fc8c9..c25af50ed8 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PchEhci1.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PchEhci1.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PchEhci2.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PchEhci2.asi
index 027a362ee5..8caae9bbac 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PchEhci2.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PchEhci2.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PchGbe.asl b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PchGbe.asl
index 9919367878..8ae7c7b8be 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PchGbe.asl
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PchGbe.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PchLpc.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PchLpc.asi
index 51b4f99d3c..d62d5044b4 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PchLpc.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PchLpc.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PchSata.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PchSata.asi
index 2fdfd2cb1d..a74c9b9aae 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PchSata.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PchSata.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PchXhci.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PchXhci.asi
index 22a4ab5234..d2563e0487 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PchXhci.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PchXhci.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PciCrs.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PciCrs.asi
index 6b1613b800..6fb2cb589d 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PciCrs.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PciCrs.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PciIrq.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PciIrq.asi
index b64b70b76a..fe7c2b8753 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PciIrq.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PciIrq.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PcieHp.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PcieHp.asi
index 98656cd2a3..ced2b3ecd1 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PcieHp.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PcieHp.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PcieHpDev.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PcieHpDev.asi
index d9a4565519..34feaa8137 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PcieHpDev.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PcieHpDev.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PcieNonHpDev.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PcieNonHpDev.asi
index 4f90be3373..c990898e87 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PcieNonHpDev.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PcieNonHpDev.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PcieSeg.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PcieSeg.asi
index 781d764bb8..51c919f5e5 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PcieSeg.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PcieSeg.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Platform.asl b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Platform.asl
index 69ad6e0382..40cc31b86a 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Platform.asl
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Platform.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PlatformGpe.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PlatformGpe.asi
index ec7c3e3315..1f3087a7b3 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PlatformGpe.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PlatformGpe.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PlatformPciTree_WFP.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PlatformPciTree_WFP.asi
index 28344b9aa2..457b8bba4a 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PlatformPciTree_WFP.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/PlatformPciTree_WFP.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Sck1Ejd.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Sck1Ejd.asi
index 4bb04b1e23..2cbe3aa5cc 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Sck1Ejd.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Sck1Ejd.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Sck2Ejd.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Sck2Ejd.asi
index 46da40ef3f..4a89bb99d6 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Sck2Ejd.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Sck2Ejd.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Sck3Ejd.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Sck3Ejd.asi
index 2c8608960b..8cbaeffeb5 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Sck3Ejd.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Sck3Ejd.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Uncore0.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Uncore0.asi
index c07eb6d288..a5a447d037 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Uncore0.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Uncore0.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Uncore1.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Uncore1.asi
index f404ff64c0..a86aaa7b3f 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Uncore1.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Uncore1.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Uncore2.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Uncore2.asi
index 577a3c2537..dc7453c294 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Uncore2.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Uncore2.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Uncore3.asi b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Uncore3.asi
index 7f20255d04..f59e04539b 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Uncore3.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/Uncore3.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/WFPPlatform.asl b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/WFPPlatform.asl
index d995817140..254806cbc8 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/WFPPlatform.asl
+++ b/Platform/Intel/PurleyOpenBoardPkg/Acpi/BoardAcpiDxe/Dsdt/WFPPlatform.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/GitEdk2MinMtOlympus.bat b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/GitEdk2MinMtOlympus.bat
index d1d488c131..02ed458236 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/GitEdk2MinMtOlympus.bat
+++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/GitEdk2MinMtOlympus.bat
@@ -1,13 +1,7 @@
@REM @file
@REM
@REM Copyright (c) 2018, Intel Corporation. All rights reserved.<BR>
-@REM This program and the accompanying materials
-@REM are licensed and made available under the terms and conditions of the BSD License
-@REM which accompanies this distribution. The full text of the license may be found at
-@REM http://opensource.org/licenses/bsd-license.php
-@REM
-@REM THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-@REM WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+@REM SPDX-License-Identifier: BSD-2-Clause-Patent
@REM
@echo off
diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BasePlatformHookLib/BasePlatformHookLib.c b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BasePlatformHookLib/BasePlatformHookLib.c
index 038fe7ad71..8051e33311 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BasePlatformHookLib/BasePlatformHookLib.c
+++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BasePlatformHookLib/BasePlatformHookLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BasePlatformHookLib/BasePlatformHookLib.inf b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BasePlatformHookLib/BasePlatformHookLib.inf
index ebd4421ea4..d86a8f6cd0 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BasePlatformHookLib/BasePlatformHookLib.inf
+++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BasePlatformHookLib/BasePlatformHookLib.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardAcpiLib/DxeBoardAcpiTableLib.c b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardAcpiLib/DxeBoardAcpiTableLib.c
index c1926d4924..ff497540de 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardAcpiLib/DxeBoardAcpiTableLib.c
+++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardAcpiLib/DxeBoardAcpiTableLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardAcpiLib/DxeBoardAcpiTableLib.inf b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardAcpiLib/DxeBoardAcpiTableLib.inf
index 031e6576bf..d4f63fa7e1 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardAcpiLib/DxeBoardAcpiTableLib.inf
+++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardAcpiLib/DxeBoardAcpiTableLib.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardAcpiLib/DxeMtOlympusAcpiTableLib.c b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardAcpiLib/DxeMtOlympusAcpiTableLib.c
index 310740e6fb..297de88047 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardAcpiLib/DxeMtOlympusAcpiTableLib.c
+++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardAcpiLib/DxeMtOlympusAcpiTableLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardAcpiLib/SmmBoardAcpiEnableLib.c b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardAcpiLib/SmmBoardAcpiEnableLib.c
index f8b6aab8f9..b2a82560b8 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardAcpiLib/SmmBoardAcpiEnableLib.c
+++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardAcpiLib/SmmBoardAcpiEnableLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardAcpiLib/SmmBoardAcpiEnableLib.inf b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardAcpiLib/SmmBoardAcpiEnableLib.inf
index 22c7fbe335..6b463a544b 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardAcpiLib/SmmBoardAcpiEnableLib.inf
+++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardAcpiLib/SmmBoardAcpiEnableLib.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardAcpiLib/SmmMtOlympusAcpiEnableLib.c b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardAcpiLib/SmmMtOlympusAcpiEnableLib.c
index 19b1fd7bb7..b97b2992cb 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardAcpiLib/SmmMtOlympusAcpiEnableLib.c
+++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardAcpiLib/SmmMtOlympusAcpiEnableLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardAcpiLib/SmmSiliconAcpiEnableLib.c b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardAcpiLib/SmmSiliconAcpiEnableLib.c
index 65aa7b067a..ff803aa5ce 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardAcpiLib/SmmSiliconAcpiEnableLib.c
+++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardAcpiLib/SmmSiliconAcpiEnableLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/AllLanesEparam.c b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/AllLanesEparam.c
index ef1675d7a9..a245721277 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/AllLanesEparam.c
+++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/AllLanesEparam.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/GpioTable.c b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/GpioTable.c
index e278156afa..21d83a0c02 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/GpioTable.c
+++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/GpioTable.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/IioBifur.c b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/IioBifur.c
index f64e016dda..fa2a4d36ce 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/IioBifur.c
+++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/IioBifur.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/PeiBoardInitPostMemLib.c b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/PeiBoardInitPostMemLib.c
index 54a1ad6edf..f04f1e7c40 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/PeiBoardInitPostMemLib.c
+++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/PeiBoardInitPostMemLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/PeiBoardInitPostMemLib.inf b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/PeiBoardInitPostMemLib.inf
index 50d52af4d6..1948a97925 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/PeiBoardInitPostMemLib.inf
+++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/PeiBoardInitPostMemLib.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/PeiBoardInitPreMemLib.c b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/PeiBoardInitPreMemLib.c
index 306465c8af..511bc01339 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/PeiBoardInitPreMemLib.c
+++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/PeiBoardInitPreMemLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/PeiBoardInitPreMemLib.inf b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/PeiBoardInitPreMemLib.inf
index 2451e6aa79..f3f671c20a 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/PeiBoardInitPreMemLib.inf
+++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/PeiBoardInitPreMemLib.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/PeiMtOlympusDetect.c b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/PeiMtOlympusDetect.c
index 6968969f54..11221828da 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/PeiMtOlympusDetect.c
+++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/PeiMtOlympusDetect.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/PeiMtOlympusInitLib.h b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/PeiMtOlympusInitLib.h
index 6996cbfc50..bada6aef36 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/PeiMtOlympusInitLib.h
+++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/PeiMtOlympusInitLib.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/PeiMtOlympusInitPostMemLib.c b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/PeiMtOlympusInitPostMemLib.c
index 95101fe473..7bcbe6e4a4 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/PeiMtOlympusInitPostMemLib.c
+++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/PeiMtOlympusInitPostMemLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/PeiMtOlympusInitPreMemLib.c b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/PeiMtOlympusInitPreMemLib.c
index d0453ad10d..42858ed74b 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/PeiMtOlympusInitPreMemLib.c
+++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/PeiMtOlympusInitPreMemLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018 - 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/UsbOC.c b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/UsbOC.c
index 7ff9d875ad..a9375b116e 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/UsbOC.c
+++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/Library/BoardInitLib/UsbOC.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkg.dsc b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkg.dsc
index ded1201a86..de1a3965d7 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkg.dsc
+++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkg.dsc
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkg.fdf b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkg.fdf
index 9902e04df9..e7523da74e 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkg.fdf
+++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkg.fdf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkgBuildOption.dsc b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkgBuildOption.dsc
index 7c373374ed..1237bf95f2 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkgBuildOption.dsc
+++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkgBuildOption.dsc
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkgConfig.dsc b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkgConfig.dsc
index 4f9e0a9702..d9c443a915 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkgConfig.dsc
+++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkgConfig.dsc
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkgPcd.dsc b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkgPcd.dsc
index fc63ca628a..83b0f53fa1 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkgPcd.dsc
+++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkgPcd.dsc
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/StructureConfig.dsc b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/StructureConfig.dsc
index 121179fa8e..98527b1a05 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/StructureConfig.dsc
+++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/StructureConfig.dsc
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/bld.bat b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/bld.bat
index a66d19e66e..f624be03a9 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/bld.bat
+++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/bld.bat
@@ -1,13 +1,7 @@
@REM @file
@REM
@REM Copyright (c) 2018, Intel Corporation. All rights reserved.<BR>
-@REM This program and the accompanying materials
-@REM are licensed and made available under the terms and conditions of the BSD License
-@REM which accompanies this distribution. The full text of the license may be found at
-@REM http://opensource.org/licenses/bsd-license.php
-@REM
-@REM THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-@REM WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+@REM SPDX-License-Identifier: BSD-2-Clause-Patent
@REM
@echo off
diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/postbuild.bat b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/postbuild.bat
index 5c787bb647..e7e272b208 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/postbuild.bat
+++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/postbuild.bat
@@ -1,13 +1,7 @@
@REM @file
@REM
@REM Copyright (c) 2018, Intel Corporation. All rights reserved.<BR>
-@REM This program and the accompanying materials
-@REM are licensed and made available under the terms and conditions of the BSD License
-@REM which accompanies this distribution. The full text of the license may be found at
-@REM http://opensource.org/licenses/bsd-license.php
-@REM
-@REM THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-@REM WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+@REM SPDX-License-Identifier: BSD-2-Clause-Patent
@REM
@set SCRIPT_ERROR=0
diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/prebuild.bat b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/prebuild.bat
index 81a9634d51..d9c1442ea1 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/prebuild.bat
+++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/prebuild.bat
@@ -1,13 +1,7 @@
@REM @file
@REM
@REM Copyright (c) 2018, Intel Corporation. All rights reserved.<BR>
-@REM This program and the accompanying materials
-@REM are licensed and made available under the terms and conditions of the BSD License
-@REM which accompanies this distribution. The full text of the license may be found at
-@REM http://opensource.org/licenses/bsd-license.php
-@REM
-@REM THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-@REM WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+@REM SPDX-License-Identifier: BSD-2-Clause-Patent
@REM
@set SCRIPT_ERROR=0
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Features/Ipmi/Library/IpmiLibKcs/IpmiLibKcs.c b/Platform/Intel/PurleyOpenBoardPkg/Features/Ipmi/Library/IpmiLibKcs/IpmiLibKcs.c
index 62114fb3e5..700e413aa6 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Features/Ipmi/Library/IpmiLibKcs/IpmiLibKcs.c
+++ b/Platform/Intel/PurleyOpenBoardPkg/Features/Ipmi/Library/IpmiLibKcs/IpmiLibKcs.c
@@ -2,13 +2,7 @@
IPMI library - KCS.
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Features/Ipmi/Library/IpmiLibKcs/IpmiLibKcs.inf b/Platform/Intel/PurleyOpenBoardPkg/Features/Ipmi/Library/IpmiLibKcs/IpmiLibKcs.inf
index c4796d594a..f46a8fcac6 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Features/Ipmi/Library/IpmiLibKcs/IpmiLibKcs.inf
+++ b/Platform/Intel/PurleyOpenBoardPkg/Features/Ipmi/Library/IpmiLibKcs/IpmiLibKcs.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Features/Ipmi/Library/IpmiLibKcs/KcsBmc.c b/Platform/Intel/PurleyOpenBoardPkg/Features/Ipmi/Library/IpmiLibKcs/KcsBmc.c
index 4f766517ec..483843c6da 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Features/Ipmi/Library/IpmiLibKcs/KcsBmc.c
+++ b/Platform/Intel/PurleyOpenBoardPkg/Features/Ipmi/Library/IpmiLibKcs/KcsBmc.c
@@ -2,13 +2,7 @@
KCS Transport Hook.
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Features/Ipmi/Library/IpmiLibKcs/KcsBmc.h b/Platform/Intel/PurleyOpenBoardPkg/Features/Ipmi/Library/IpmiLibKcs/KcsBmc.h
index 8a7e90a108..bf8ae6b63d 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Features/Ipmi/Library/IpmiLibKcs/KcsBmc.h
+++ b/Platform/Intel/PurleyOpenBoardPkg/Features/Ipmi/Library/IpmiLibKcs/KcsBmc.h
@@ -2,13 +2,7 @@
KCS Transport Hook head file.
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Features/Ipmi/Library/IpmiPlatformHookLib/IpmiPlatformHookLib.c b/Platform/Intel/PurleyOpenBoardPkg/Features/Ipmi/Library/IpmiPlatformHookLib/IpmiPlatformHookLib.c
index 988e5f24ce..1cdd39c79a 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Features/Ipmi/Library/IpmiPlatformHookLib/IpmiPlatformHookLib.c
+++ b/Platform/Intel/PurleyOpenBoardPkg/Features/Ipmi/Library/IpmiPlatformHookLib/IpmiPlatformHookLib.c
@@ -2,13 +2,7 @@
IPMI platform hook.
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Features/Ipmi/Library/IpmiPlatformHookLib/IpmiPlatformHookLib.inf b/Platform/Intel/PurleyOpenBoardPkg/Features/Ipmi/Library/IpmiPlatformHookLib/IpmiPlatformHookLib.inf
index 73427edeea..4047130b3d 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Features/Ipmi/Library/IpmiPlatformHookLib/IpmiPlatformHookLib.inf
+++ b/Platform/Intel/PurleyOpenBoardPkg/Features/Ipmi/Library/IpmiPlatformHookLib/IpmiPlatformHookLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Include/Acpi/GlobalNvs.asi b/Platform/Intel/PurleyOpenBoardPkg/Include/Acpi/GlobalNvs.asi
index fa97877d69..3e049cca8e 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Include/Acpi/GlobalNvs.asi
+++ b/Platform/Intel/PurleyOpenBoardPkg/Include/Acpi/GlobalNvs.asi
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Include/Acpi/GlobalNvsAreaDef.h b/Platform/Intel/PurleyOpenBoardPkg/Include/Acpi/GlobalNvsAreaDef.h
index 65dbf7cebb..8af401de99 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Include/Acpi/GlobalNvsAreaDef.h
+++ b/Platform/Intel/PurleyOpenBoardPkg/Include/Acpi/GlobalNvsAreaDef.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Include/Guid/PchRcVariable.h b/Platform/Intel/PurleyOpenBoardPkg/Include/Guid/PchRcVariable.h
index fd0b553337..79b7429052 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Include/Guid/PchRcVariable.h
+++ b/Platform/Intel/PurleyOpenBoardPkg/Include/Guid/PchRcVariable.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Include/Guid/SetupVariable.h b/Platform/Intel/PurleyOpenBoardPkg/Include/Guid/SetupVariable.h
index 3d6267fac1..f8ea067b50 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Include/Guid/SetupVariable.h
+++ b/Platform/Intel/PurleyOpenBoardPkg/Include/Guid/SetupVariable.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Include/IioBifurcationSlotTable.h b/Platform/Intel/PurleyOpenBoardPkg/Include/IioBifurcationSlotTable.h
index 92b3057cdb..76450ec21f 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Include/IioBifurcationSlotTable.h
+++ b/Platform/Intel/PurleyOpenBoardPkg/Include/IioBifurcationSlotTable.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Include/Platform.h b/Platform/Intel/PurleyOpenBoardPkg/Include/Platform.h
index 8871b01fd0..160506039a 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Include/Platform.h
+++ b/Platform/Intel/PurleyOpenBoardPkg/Include/Platform.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Include/Ppi/SystemBoard.h b/Platform/Intel/PurleyOpenBoardPkg/Include/Ppi/SystemBoard.h
index 902c8931b9..ce0ebaf973 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Include/Ppi/SystemBoard.h
+++ b/Platform/Intel/PurleyOpenBoardPkg/Include/Ppi/SystemBoard.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Include/Protocol/PciIovPlatform.h b/Platform/Intel/PurleyOpenBoardPkg/Include/Protocol/PciIovPlatform.h
index cce27a5fe7..43762cf9ee 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Include/Protocol/PciIovPlatform.h
+++ b/Platform/Intel/PurleyOpenBoardPkg/Include/Protocol/PciIovPlatform.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Include/SetupTable.h b/Platform/Intel/PurleyOpenBoardPkg/Include/SetupTable.h
index 99ada898c7..7d8742ad4d 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Include/SetupTable.h
+++ b/Platform/Intel/PurleyOpenBoardPkg/Include/SetupTable.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Include/SioRegs.h b/Platform/Intel/PurleyOpenBoardPkg/Include/SioRegs.h
index d3ac4c95a5..8b25ad3162 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Include/SioRegs.h
+++ b/Platform/Intel/PurleyOpenBoardPkg/Include/SioRegs.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Override/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/BdsPlatform.c b/Platform/Intel/PurleyOpenBoardPkg/Override/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/BdsPlatform.c
index 831d325037..b3b8ceba6f 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Override/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/BdsPlatform.c
+++ b/Platform/Intel/PurleyOpenBoardPkg/Override/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/BdsPlatform.c
@@ -2,13 +2,7 @@
This file include all platform action which can be customized by IBV/OEM.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Override/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/BdsPlatform.h b/Platform/Intel/PurleyOpenBoardPkg/Override/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/BdsPlatform.h
index 779ba9a98d..360a00d7d7 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Override/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/BdsPlatform.h
+++ b/Platform/Intel/PurleyOpenBoardPkg/Override/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/BdsPlatform.h
@@ -2,13 +2,7 @@
Header file for BDS Platform specific code
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Override/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/DxePlatformBootManagerLib.inf b/Platform/Intel/PurleyOpenBoardPkg/Override/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/DxePlatformBootManagerLib.inf
index 563c8a25b2..09b7fd906a 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Override/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/DxePlatformBootManagerLib.inf
+++ b/Platform/Intel/PurleyOpenBoardPkg/Override/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/DxePlatformBootManagerLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Override/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/MemoryTest.c b/Platform/Intel/PurleyOpenBoardPkg/Override/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/MemoryTest.c
index 6c36e7d28b..e6445fecf8 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Override/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/MemoryTest.c
+++ b/Platform/Intel/PurleyOpenBoardPkg/Override/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/MemoryTest.c
@@ -2,13 +2,7 @@
Perform the platform memory test
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Override/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/PlatformBootOption.c b/Platform/Intel/PurleyOpenBoardPkg/Override/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/PlatformBootOption.c
index ea30de0540..84aa097d58 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Override/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/PlatformBootOption.c
+++ b/Platform/Intel/PurleyOpenBoardPkg/Override/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib/PlatformBootOption.c
@@ -2,13 +2,7 @@
Driver for Platform Boot Options support.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Pci/PciPlatform/IoApic.h b/Platform/Intel/PurleyOpenBoardPkg/Pci/PciPlatform/IoApic.h
index 55ca9f68fd..3ec3baa207 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Pci/PciPlatform/IoApic.h
+++ b/Platform/Intel/PurleyOpenBoardPkg/Pci/PciPlatform/IoApic.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Pci/PciPlatform/PciIovPlatformPolicy.c b/Platform/Intel/PurleyOpenBoardPkg/Pci/PciPlatform/PciIovPlatformPolicy.c
index 6737bbbcf0..0b941ccb07 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Pci/PciPlatform/PciIovPlatformPolicy.c
+++ b/Platform/Intel/PurleyOpenBoardPkg/Pci/PciPlatform/PciIovPlatformPolicy.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Pci/PciPlatform/PciIovPlatformPolicy.h b/Platform/Intel/PurleyOpenBoardPkg/Pci/PciPlatform/PciIovPlatformPolicy.h
index 8b358d14a3..f7a8cb06a0 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Pci/PciPlatform/PciIovPlatformPolicy.h
+++ b/Platform/Intel/PurleyOpenBoardPkg/Pci/PciPlatform/PciIovPlatformPolicy.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Pci/PciPlatform/PciPlatform.c b/Platform/Intel/PurleyOpenBoardPkg/Pci/PciPlatform/PciPlatform.c
index 9f042c2b76..b479ec5992 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Pci/PciPlatform/PciPlatform.c
+++ b/Platform/Intel/PurleyOpenBoardPkg/Pci/PciPlatform/PciPlatform.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Pci/PciPlatform/PciPlatform.h b/Platform/Intel/PurleyOpenBoardPkg/Pci/PciPlatform/PciPlatform.h
index f36fdda6e6..353715688a 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Pci/PciPlatform/PciPlatform.h
+++ b/Platform/Intel/PurleyOpenBoardPkg/Pci/PciPlatform/PciPlatform.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Pci/PciPlatform/PciPlatform.inf b/Platform/Intel/PurleyOpenBoardPkg/Pci/PciPlatform/PciPlatform.inf
index b46bbf713a..3cc1b045a0 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Pci/PciPlatform/PciPlatform.inf
+++ b/Platform/Intel/PurleyOpenBoardPkg/Pci/PciPlatform/PciPlatform.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Pci/PciPlatform/PciPlatformHooks.c b/Platform/Intel/PurleyOpenBoardPkg/Pci/PciPlatform/PciPlatformHooks.c
index 9310df3e67..2556d46407 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Pci/PciPlatform/PciPlatformHooks.c
+++ b/Platform/Intel/PurleyOpenBoardPkg/Pci/PciPlatform/PciPlatformHooks.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Pci/PciPlatform/PciPlatformHooks.h b/Platform/Intel/PurleyOpenBoardPkg/Pci/PciPlatform/PciPlatformHooks.h
index 8d4734bb80..a5cee1b3a5 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Pci/PciPlatform/PciPlatformHooks.h
+++ b/Platform/Intel/PurleyOpenBoardPkg/Pci/PciPlatform/PciPlatformHooks.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Pci/PciPlatform/PciSupportLib.c b/Platform/Intel/PurleyOpenBoardPkg/Pci/PciPlatform/PciSupportLib.c
index dbd744b9d2..d8bf65439f 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Pci/PciPlatform/PciSupportLib.c
+++ b/Platform/Intel/PurleyOpenBoardPkg/Pci/PciPlatform/PciSupportLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Pci/PciPlatform/PciSupportLib.h b/Platform/Intel/PurleyOpenBoardPkg/Pci/PciPlatform/PciSupportLib.h
index 78fd013498..dc123b0d42 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Pci/PciPlatform/PciSupportLib.h
+++ b/Platform/Intel/PurleyOpenBoardPkg/Pci/PciPlatform/PciSupportLib.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/PlatPkg.dec b/Platform/Intel/PurleyOpenBoardPkg/PlatPkg.dec
index c203716029..5fc4de6f24 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/PlatPkg.dec
+++ b/Platform/Intel/PurleyOpenBoardPkg/PlatPkg.dec
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Policy/IioUdsDataDxe/IioUdsDataDxe.c b/Platform/Intel/PurleyOpenBoardPkg/Policy/IioUdsDataDxe/IioUdsDataDxe.c
index 132731a38c..6c626cf05d 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Policy/IioUdsDataDxe/IioUdsDataDxe.c
+++ b/Platform/Intel/PurleyOpenBoardPkg/Policy/IioUdsDataDxe/IioUdsDataDxe.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Policy/IioUdsDataDxe/IioUdsDataDxe.h b/Platform/Intel/PurleyOpenBoardPkg/Policy/IioUdsDataDxe/IioUdsDataDxe.h
index 9453ac618d..62da06d605 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Policy/IioUdsDataDxe/IioUdsDataDxe.h
+++ b/Platform/Intel/PurleyOpenBoardPkg/Policy/IioUdsDataDxe/IioUdsDataDxe.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Policy/IioUdsDataDxe/IioUdsDataDxe.inf b/Platform/Intel/PurleyOpenBoardPkg/Policy/IioUdsDataDxe/IioUdsDataDxe.inf
index 74a2453bbd..faafe39bf9 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Policy/IioUdsDataDxe/IioUdsDataDxe.inf
+++ b/Platform/Intel/PurleyOpenBoardPkg/Policy/IioUdsDataDxe/IioUdsDataDxe.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Policy/Library/SiliconPolicyInitLib/SiliconPolicyInitLib.c b/Platform/Intel/PurleyOpenBoardPkg/Policy/Library/SiliconPolicyInitLib/SiliconPolicyInitLib.c
index 429bda6ae4..ae7720cfb1 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Policy/Library/SiliconPolicyInitLib/SiliconPolicyInitLib.c
+++ b/Platform/Intel/PurleyOpenBoardPkg/Policy/Library/SiliconPolicyInitLib/SiliconPolicyInitLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Policy/Library/SiliconPolicyInitLib/SiliconPolicyInitLib.inf b/Platform/Intel/PurleyOpenBoardPkg/Policy/Library/SiliconPolicyInitLib/SiliconPolicyInitLib.inf
index 69c32d39bf..d039717b54 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Policy/Library/SiliconPolicyInitLib/SiliconPolicyInitLib.inf
+++ b/Platform/Intel/PurleyOpenBoardPkg/Policy/Library/SiliconPolicyInitLib/SiliconPolicyInitLib.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Policy/Library/SiliconPolicyUpdateLib/PchPolicyUpdateUsb.c b/Platform/Intel/PurleyOpenBoardPkg/Policy/Library/SiliconPolicyUpdateLib/PchPolicyUpdateUsb.c
index a2780dcd5f..73b90fd6d9 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Policy/Library/SiliconPolicyUpdateLib/PchPolicyUpdateUsb.c
+++ b/Platform/Intel/PurleyOpenBoardPkg/Policy/Library/SiliconPolicyUpdateLib/PchPolicyUpdateUsb.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Policy/Library/SiliconPolicyUpdateLib/SiliconPolicyUpdateLib.c b/Platform/Intel/PurleyOpenBoardPkg/Policy/Library/SiliconPolicyUpdateLib/SiliconPolicyUpdateLib.c
index 53466d0c1b..cac6409719 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Policy/Library/SiliconPolicyUpdateLib/SiliconPolicyUpdateLib.c
+++ b/Platform/Intel/PurleyOpenBoardPkg/Policy/Library/SiliconPolicyUpdateLib/SiliconPolicyUpdateLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Policy/Library/SiliconPolicyUpdateLib/SiliconPolicyUpdateLib.inf b/Platform/Intel/PurleyOpenBoardPkg/Policy/Library/SiliconPolicyUpdateLib/SiliconPolicyUpdateLib.inf
index ffa9eed0da..cefb2ad36c 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Policy/Library/SiliconPolicyUpdateLib/SiliconPolicyUpdateLib.inf
+++ b/Platform/Intel/PurleyOpenBoardPkg/Policy/Library/SiliconPolicyUpdateLib/SiliconPolicyUpdateLib.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Policy/PlatformCpuPolicy/PlatformCpuPolicy.c b/Platform/Intel/PurleyOpenBoardPkg/Policy/PlatformCpuPolicy/PlatformCpuPolicy.c
index 4b8a979fc2..38b872fff7 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Policy/PlatformCpuPolicy/PlatformCpuPolicy.c
+++ b/Platform/Intel/PurleyOpenBoardPkg/Policy/PlatformCpuPolicy/PlatformCpuPolicy.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Policy/PlatformCpuPolicy/PlatformCpuPolicy.inf b/Platform/Intel/PurleyOpenBoardPkg/Policy/PlatformCpuPolicy/PlatformCpuPolicy.inf
index a06647e9e3..5b8784c5d0 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Policy/PlatformCpuPolicy/PlatformCpuPolicy.inf
+++ b/Platform/Intel/PurleyOpenBoardPkg/Policy/PlatformCpuPolicy/PlatformCpuPolicy.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Policy/S3NvramSave/S3NvramSave.c b/Platform/Intel/PurleyOpenBoardPkg/Policy/S3NvramSave/S3NvramSave.c
index 27d5efbeef..158b19c169 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Policy/S3NvramSave/S3NvramSave.c
+++ b/Platform/Intel/PurleyOpenBoardPkg/Policy/S3NvramSave/S3NvramSave.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Policy/S3NvramSave/S3NvramSave.h b/Platform/Intel/PurleyOpenBoardPkg/Policy/S3NvramSave/S3NvramSave.h
index 2627266fd5..ad8efe572a 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Policy/S3NvramSave/S3NvramSave.h
+++ b/Platform/Intel/PurleyOpenBoardPkg/Policy/S3NvramSave/S3NvramSave.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Policy/S3NvramSave/S3NvramSave.inf b/Platform/Intel/PurleyOpenBoardPkg/Policy/S3NvramSave/S3NvramSave.inf
index a06c1ff2c5..2df78fe321 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Policy/S3NvramSave/S3NvramSave.inf
+++ b/Platform/Intel/PurleyOpenBoardPkg/Policy/S3NvramSave/S3NvramSave.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Policy/SystemBoard/SystemBoardCommon.c b/Platform/Intel/PurleyOpenBoardPkg/Policy/SystemBoard/SystemBoardCommon.c
index 6f28e1e7d4..6b9efae0f6 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Policy/SystemBoard/SystemBoardCommon.c
+++ b/Platform/Intel/PurleyOpenBoardPkg/Policy/SystemBoard/SystemBoardCommon.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Policy/SystemBoard/SystemBoardPei.c b/Platform/Intel/PurleyOpenBoardPkg/Policy/SystemBoard/SystemBoardPei.c
index 5a1d4618e4..9d05a39c68 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Policy/SystemBoard/SystemBoardPei.c
+++ b/Platform/Intel/PurleyOpenBoardPkg/Policy/SystemBoard/SystemBoardPei.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Policy/SystemBoard/SystemBoardPei.h b/Platform/Intel/PurleyOpenBoardPkg/Policy/SystemBoard/SystemBoardPei.h
index bf2c9201c1..1adc59cb3d 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Policy/SystemBoard/SystemBoardPei.h
+++ b/Platform/Intel/PurleyOpenBoardPkg/Policy/SystemBoard/SystemBoardPei.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Intel/PurleyOpenBoardPkg/Policy/SystemBoard/SystemBoardPei.inf b/Platform/Intel/PurleyOpenBoardPkg/Policy/SystemBoard/SystemBoardPei.inf
index 6b1202bfa8..0439dc2847 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/Policy/SystemBoard/SystemBoardPei.inf
+++ b/Platform/Intel/PurleyOpenBoardPkg/Policy/SystemBoard/SystemBoardPei.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
--
2.21.0.windows.1
^ permalink raw reply related [flat|nested] 63+ messages in thread
* [[edk2-platforms][PATCH V2] 13/30] Platform/LeMaker: Replace BSD License with BSD+Patent License
2019-05-15 23:09 [[edk2-platforms][PATCH V2] 00/30] Change edk2-platforms/master to BSD+Patent License Michael D Kinney
` (11 preceding siblings ...)
2019-05-15 23:09 ` [[edk2-platforms][PATCH V2] 12/30] Platform/Intel/PurleyOpenBoardPkg: " Michael D Kinney
@ 2019-05-15 23:09 ` Michael D Kinney
2019-05-15 23:09 ` [[edk2-platforms][PATCH V2] 14/30] Platform/Marvell: " Michael D Kinney
` (17 subsequent siblings)
30 siblings, 0 replies; 63+ messages in thread
From: Michael D Kinney @ 2019-05-15 23:09 UTC (permalink / raw)
To: devel; +Cc: Leif Lindholm, Ard Biesheuvel
https://bugzilla.tianocore.org/show_bug.cgi?id=1373
Replace BSD 2-Clause License with BSD+Patent License. This change is
based on the following emails:
https://lists.01.org/pipermail/edk2-devel/2019-February/036260.html
https://lists.01.org/pipermail/edk2-devel/2018-October/030385.html
RFCs with detailed process for the license change:
V3: https://lists.01.org/pipermail/edk2-devel/2019-March/038116.html
V2: https://lists.01.org/pipermail/edk2-devel/2019-March/037669.html
V1: https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
Platform/LeMaker/CelloBoard/CelloBoard.dsc | 8 +-------
Platform/LeMaker/CelloBoard/CelloBoard.fdf | 8 +-------
2 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/Platform/LeMaker/CelloBoard/CelloBoard.dsc b/Platform/LeMaker/CelloBoard/CelloBoard.dsc
index bc2f3e2076..525276a2b0 100644
--- a/Platform/LeMaker/CelloBoard/CelloBoard.dsc
+++ b/Platform/LeMaker/CelloBoard/CelloBoard.dsc
@@ -1,13 +1,7 @@
#
# Copyright (c) 2015 - 2016, AMD Incorporated. All rights reserved.
#
-# This program and the accompanying materials are licensed and made
-# available under the terms and conditions of the BSD License which
-# accompanies this distribution. The full text of the license may
-# be found at http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
################################################################################
diff --git a/Platform/LeMaker/CelloBoard/CelloBoard.fdf b/Platform/LeMaker/CelloBoard/CelloBoard.fdf
index d34b986b93..a2098989a0 100644
--- a/Platform/LeMaker/CelloBoard/CelloBoard.fdf
+++ b/Platform/LeMaker/CelloBoard/CelloBoard.fdf
@@ -1,13 +1,7 @@
#
# Copyright (c) 2015 - 2016, AMD Incorporated. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
################################################################################
--
2.21.0.windows.1
^ permalink raw reply related [flat|nested] 63+ messages in thread* [[edk2-platforms][PATCH V2] 14/30] Platform/Marvell: Replace BSD License with BSD+Patent License
2019-05-15 23:09 [[edk2-platforms][PATCH V2] 00/30] Change edk2-platforms/master to BSD+Patent License Michael D Kinney
` (12 preceding siblings ...)
2019-05-15 23:09 ` [[edk2-platforms][PATCH V2] 13/30] Platform/LeMaker: " Michael D Kinney
@ 2019-05-15 23:09 ` Michael D Kinney
2019-05-17 10:50 ` Leif Lindholm
2019-05-15 23:09 ` [[edk2-platforms][PATCH V2] 15/30] Platform/RaspberryPi: " Michael D Kinney
` (16 subsequent siblings)
30 siblings, 1 reply; 63+ messages in thread
From: Michael D Kinney @ 2019-05-15 23:09 UTC (permalink / raw)
To: devel; +Cc: Leif Lindholm, Ard Biesheuvel
https://bugzilla.tianocore.org/show_bug.cgi?id=1373
Replace BSD 2-Clause License with BSD+Patent License. This change is
based on the following emails:
https://lists.01.org/pipermail/edk2-devel/2019-February/036260.html
https://lists.01.org/pipermail/edk2-devel/2018-October/030385.html
RFCs with detailed process for the license change:
V3: https://lists.01.org/pipermail/edk2-devel/2019-March/038116.html
V2: https://lists.01.org/pipermail/edk2-devel/2019-March/037669.html
V1: https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf.inc | 8 +-------
.../Armada70x0DbBoardDescLib/Armada70x0DbBoardDescLib.c | 8 +-------
.../Armada70x0DbBoardDescLib/Armada70x0DbBoardDescLib.inf | 8 +-------
.../NonDiscoverableInitLib/NonDiscoverableInitLib.c | 8 +-------
.../NonDiscoverableInitLib/NonDiscoverableInitLib.h | 8 +-------
.../NonDiscoverableInitLib/NonDiscoverableInitLib.inf | 8 +-------
Platform/Marvell/Armada80x0Db/Armada80x0Db.fdf.inc | 8 +-------
.../Armada80x0DbBoardDescLib/Armada80x0DbBoardDescLib.c | 8 +-------
.../Armada80x0DbBoardDescLib/Armada80x0DbBoardDescLib.inf | 8 +-------
.../NonDiscoverableInitLib/NonDiscoverableInitLib.c | 8 +-------
.../NonDiscoverableInitLib/NonDiscoverableInitLib.h | 8 +-------
.../NonDiscoverableInitLib/NonDiscoverableInitLib.inf | 8 +-------
12 files changed, 12 insertions(+), 84 deletions(-)
diff --git a/Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf.inc b/Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf.inc
index 712960636d..77e8b11bf5 100644
--- a/Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf.inc
+++ b/Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf.inc
@@ -1,13 +1,7 @@
#
# Copyright (C) 2018 Marvell International Ltd. and its affiliates
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
# Per-board additional content of the DXE phase firmware volume
diff --git a/Platform/Marvell/Armada70x0Db/Armada70x0DbBoardDescLib/Armada70x0DbBoardDescLib.c b/Platform/Marvell/Armada70x0Db/Armada70x0DbBoardDescLib/Armada70x0DbBoardDescLib.c
index f0133ec253..dbd434ff96 100644
--- a/Platform/Marvell/Armada70x0Db/Armada70x0DbBoardDescLib/Armada70x0DbBoardDescLib.c
+++ b/Platform/Marvell/Armada70x0Db/Armada70x0DbBoardDescLib/Armada70x0DbBoardDescLib.c
@@ -2,13 +2,7 @@
*
* Copyright (C) 2018, Marvell International Ltd. and its affiliates.
*
-* This program and the accompanying materials are licensed and made available
-* under the terms and conditions of the BSD License which accompanies this
-* distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/Marvell/Armada70x0Db/Armada70x0DbBoardDescLib/Armada70x0DbBoardDescLib.inf b/Platform/Marvell/Armada70x0Db/Armada70x0DbBoardDescLib/Armada70x0DbBoardDescLib.inf
index c995515064..20294ab43b 100644
--- a/Platform/Marvell/Armada70x0Db/Armada70x0DbBoardDescLib/Armada70x0DbBoardDescLib.inf
+++ b/Platform/Marvell/Armada70x0Db/Armada70x0DbBoardDescLib/Armada70x0DbBoardDescLib.inf
@@ -2,13 +2,7 @@
#
# Copyright (C) 2018, Marvell International Ltd. and its affiliates<BR>
#
-# This program and the accompanying materials are licensed and made available
-# under the terms and conditions of the BSD License which accompanies this
-# distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
-# IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#
##
diff --git a/Platform/Marvell/Armada70x0Db/NonDiscoverableInitLib/NonDiscoverableInitLib.c b/Platform/Marvell/Armada70x0Db/NonDiscoverableInitLib/NonDiscoverableInitLib.c
index d8dba6e9d8..554155eed6 100644
--- a/Platform/Marvell/Armada70x0Db/NonDiscoverableInitLib/NonDiscoverableInitLib.c
+++ b/Platform/Marvell/Armada70x0Db/NonDiscoverableInitLib/NonDiscoverableInitLib.c
@@ -3,13 +3,7 @@
* Copyright (c) 2017, Linaro Ltd. All rights reserved.
* Copyright (c) 2018, Marvell International Ltd. All rights reserved.
*
-* This program and the accompanying materials are licensed and made available
-* under the terms and conditions of the BSD License which accompanies this
-* distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/Marvell/Armada70x0Db/NonDiscoverableInitLib/NonDiscoverableInitLib.h b/Platform/Marvell/Armada70x0Db/NonDiscoverableInitLib/NonDiscoverableInitLib.h
index 8a0e4248b4..73a71ad3c4 100644
--- a/Platform/Marvell/Armada70x0Db/NonDiscoverableInitLib/NonDiscoverableInitLib.h
+++ b/Platform/Marvell/Armada70x0Db/NonDiscoverableInitLib/NonDiscoverableInitLib.h
@@ -2,13 +2,7 @@
*
* Copyright (c) 2018, Marvell International Ltd. All rights reserved.
*
-* This program and the accompanying materials are licensed and made available
-* under the terms and conditions of the BSD License which accompanies this
-* distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
#ifndef __NON_DISCOVERABLE_INIT_LIB_H__
diff --git a/Platform/Marvell/Armada70x0Db/NonDiscoverableInitLib/NonDiscoverableInitLib.inf b/Platform/Marvell/Armada70x0Db/NonDiscoverableInitLib/NonDiscoverableInitLib.inf
index 56c08ecb19..946b9fd6d0 100644
--- a/Platform/Marvell/Armada70x0Db/NonDiscoverableInitLib/NonDiscoverableInitLib.inf
+++ b/Platform/Marvell/Armada70x0Db/NonDiscoverableInitLib/NonDiscoverableInitLib.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2017, Linaro Ltd. 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
-# distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
-# IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#
##
diff --git a/Platform/Marvell/Armada80x0Db/Armada80x0Db.fdf.inc b/Platform/Marvell/Armada80x0Db/Armada80x0Db.fdf.inc
index f2fcc55d38..92d2629931 100644
--- a/Platform/Marvell/Armada80x0Db/Armada80x0Db.fdf.inc
+++ b/Platform/Marvell/Armada80x0Db/Armada80x0Db.fdf.inc
@@ -1,13 +1,7 @@
#
# Copyright (C) 2018 Marvell International Ltd. and its affiliates
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
# Per-board additional content of the DXE phase firmware volume
diff --git a/Platform/Marvell/Armada80x0Db/Armada80x0DbBoardDescLib/Armada80x0DbBoardDescLib.c b/Platform/Marvell/Armada80x0Db/Armada80x0DbBoardDescLib/Armada80x0DbBoardDescLib.c
index 61b6202c16..f083c94982 100644
--- a/Platform/Marvell/Armada80x0Db/Armada80x0DbBoardDescLib/Armada80x0DbBoardDescLib.c
+++ b/Platform/Marvell/Armada80x0Db/Armada80x0DbBoardDescLib/Armada80x0DbBoardDescLib.c
@@ -2,13 +2,7 @@
*
* Copyright (C) 2018, Marvell International Ltd. and its affiliates.
*
-* This program and the accompanying materials are licensed and made available
-* under the terms and conditions of the BSD License which accompanies this
-* distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/Marvell/Armada80x0Db/Armada80x0DbBoardDescLib/Armada80x0DbBoardDescLib.inf b/Platform/Marvell/Armada80x0Db/Armada80x0DbBoardDescLib/Armada80x0DbBoardDescLib.inf
index 786b7f0d78..07ee65dfa4 100644
--- a/Platform/Marvell/Armada80x0Db/Armada80x0DbBoardDescLib/Armada80x0DbBoardDescLib.inf
+++ b/Platform/Marvell/Armada80x0Db/Armada80x0DbBoardDescLib/Armada80x0DbBoardDescLib.inf
@@ -2,13 +2,7 @@
#
# Copyright (C) 2018, Marvell International Ltd. and its affiliates<BR>
#
-# This program and the accompanying materials are licensed and made available
-# under the terms and conditions of the BSD License which accompanies this
-# distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
-# IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#
##
diff --git a/Platform/Marvell/Armada80x0Db/NonDiscoverableInitLib/NonDiscoverableInitLib.c b/Platform/Marvell/Armada80x0Db/NonDiscoverableInitLib/NonDiscoverableInitLib.c
index e7a1d1e687..804339f43e 100644
--- a/Platform/Marvell/Armada80x0Db/NonDiscoverableInitLib/NonDiscoverableInitLib.c
+++ b/Platform/Marvell/Armada80x0Db/NonDiscoverableInitLib/NonDiscoverableInitLib.c
@@ -3,13 +3,7 @@
* Copyright (c) 2017, Linaro Ltd. All rights reserved.
* Copyright (c) 2018, Marvell International Ltd. All rights reserved.
*
-* This program and the accompanying materials are licensed and made available
-* under the terms and conditions of the BSD License which accompanies this
-* distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/Marvell/Armada80x0Db/NonDiscoverableInitLib/NonDiscoverableInitLib.h b/Platform/Marvell/Armada80x0Db/NonDiscoverableInitLib/NonDiscoverableInitLib.h
index 64373ff0e7..7e8075e591 100644
--- a/Platform/Marvell/Armada80x0Db/NonDiscoverableInitLib/NonDiscoverableInitLib.h
+++ b/Platform/Marvell/Armada80x0Db/NonDiscoverableInitLib/NonDiscoverableInitLib.h
@@ -3,13 +3,7 @@
* Copyright (c) 2017, Linaro Ltd. All rights reserved.
* Copyright (c) 2018, Marvell International Ltd. All rights reserved.
*
-* This program and the accompanying materials are licensed and made available
-* under the terms and conditions of the BSD License which accompanies this
-* distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
#ifndef __NON_DISCOVERABLE_INIT_LIB_H__
diff --git a/Platform/Marvell/Armada80x0Db/NonDiscoverableInitLib/NonDiscoverableInitLib.inf b/Platform/Marvell/Armada80x0Db/NonDiscoverableInitLib/NonDiscoverableInitLib.inf
index fe21e5248f..fb303f3d89 100644
--- a/Platform/Marvell/Armada80x0Db/NonDiscoverableInitLib/NonDiscoverableInitLib.inf
+++ b/Platform/Marvell/Armada80x0Db/NonDiscoverableInitLib/NonDiscoverableInitLib.inf
@@ -3,13 +3,7 @@
# Copyright (c) 2017, Linaro Ltd. All rights reserved.<BR>
# Copyright (c) 2018, Marvell International Ltd. 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
-# distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
-# IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#
##
--
2.21.0.windows.1
^ permalink raw reply related [flat|nested] 63+ messages in thread* Re: [[edk2-platforms][PATCH V2] 14/30] Platform/Marvell: Replace BSD License with BSD+Patent License
2019-05-15 23:09 ` [[edk2-platforms][PATCH V2] 14/30] Platform/Marvell: " Michael D Kinney
@ 2019-05-17 10:50 ` Leif Lindholm
0 siblings, 0 replies; 63+ messages in thread
From: Leif Lindholm @ 2019-05-17 10:50 UTC (permalink / raw)
To: Michael D Kinney; +Cc: devel, Ard Biesheuvel
On Wed, May 15, 2019 at 04:09:55PM -0700, Michael D Kinney wrote:
> https://bugzilla.tianocore.org/show_bug.cgi?id=1373
>
> Replace BSD 2-Clause License with BSD+Patent License. This change is
> based on the following emails:
>
> https://lists.01.org/pipermail/edk2-devel/2019-February/036260.html
> https://lists.01.org/pipermail/edk2-devel/2018-October/030385.html
>
> RFCs with detailed process for the license change:
>
> V3: https://lists.01.org/pipermail/edk2-devel/2019-March/038116.html
> V2: https://lists.01.org/pipermail/edk2-devel/2019-March/037669.html
> V1: https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html
As far as I can tell, this excludes the source files currently
licensed under 3-clause BSD (2-clause plus non-endorsement clause).
This is correct, and as discussed offline, but it would be worth
pointing it out explicitly in the commit message.
(Conversations about relicensing the 3-clause files are happening in
the background.)
Other than that, looks good to me.
/
Leif
> Cc: Leif Lindholm <leif.lindholm@linaro.org>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
> ---
> Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf.inc | 8 +-------
> .../Armada70x0DbBoardDescLib/Armada70x0DbBoardDescLib.c | 8 +-------
> .../Armada70x0DbBoardDescLib/Armada70x0DbBoardDescLib.inf | 8 +-------
> .../NonDiscoverableInitLib/NonDiscoverableInitLib.c | 8 +-------
> .../NonDiscoverableInitLib/NonDiscoverableInitLib.h | 8 +-------
> .../NonDiscoverableInitLib/NonDiscoverableInitLib.inf | 8 +-------
> Platform/Marvell/Armada80x0Db/Armada80x0Db.fdf.inc | 8 +-------
> .../Armada80x0DbBoardDescLib/Armada80x0DbBoardDescLib.c | 8 +-------
> .../Armada80x0DbBoardDescLib/Armada80x0DbBoardDescLib.inf | 8 +-------
> .../NonDiscoverableInitLib/NonDiscoverableInitLib.c | 8 +-------
> .../NonDiscoverableInitLib/NonDiscoverableInitLib.h | 8 +-------
> .../NonDiscoverableInitLib/NonDiscoverableInitLib.inf | 8 +-------
> 12 files changed, 12 insertions(+), 84 deletions(-)
>
> diff --git a/Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf.inc b/Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf.inc
> index 712960636d..77e8b11bf5 100644
> --- a/Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf.inc
> +++ b/Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf.inc
> @@ -1,13 +1,7 @@
> #
> # Copyright (C) 2018 Marvell International Ltd. and its affiliates
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD License
> -# which accompanies this distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
>
> # Per-board additional content of the DXE phase firmware volume
> diff --git a/Platform/Marvell/Armada70x0Db/Armada70x0DbBoardDescLib/Armada70x0DbBoardDescLib.c b/Platform/Marvell/Armada70x0Db/Armada70x0DbBoardDescLib/Armada70x0DbBoardDescLib.c
> index f0133ec253..dbd434ff96 100644
> --- a/Platform/Marvell/Armada70x0Db/Armada70x0DbBoardDescLib/Armada70x0DbBoardDescLib.c
> +++ b/Platform/Marvell/Armada70x0Db/Armada70x0DbBoardDescLib/Armada70x0DbBoardDescLib.c
> @@ -2,13 +2,7 @@
> *
> * Copyright (C) 2018, Marvell International Ltd. and its affiliates.
> *
> -* This program and the accompanying materials are licensed and made available
> -* under the terms and conditions of the BSD License which accompanies this
> -* distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/Marvell/Armada70x0Db/Armada70x0DbBoardDescLib/Armada70x0DbBoardDescLib.inf b/Platform/Marvell/Armada70x0Db/Armada70x0DbBoardDescLib/Armada70x0DbBoardDescLib.inf
> index c995515064..20294ab43b 100644
> --- a/Platform/Marvell/Armada70x0Db/Armada70x0DbBoardDescLib/Armada70x0DbBoardDescLib.inf
> +++ b/Platform/Marvell/Armada70x0Db/Armada70x0DbBoardDescLib/Armada70x0DbBoardDescLib.inf
> @@ -2,13 +2,7 @@
> #
> # Copyright (C) 2018, Marvell International Ltd. and its affiliates<BR>
> #
> -# This program and the accompanying materials are licensed and made available
> -# under the terms and conditions of the BSD License which accompanies this
> -# distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> -# IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> #
> ##
> diff --git a/Platform/Marvell/Armada70x0Db/NonDiscoverableInitLib/NonDiscoverableInitLib.c b/Platform/Marvell/Armada70x0Db/NonDiscoverableInitLib/NonDiscoverableInitLib.c
> index d8dba6e9d8..554155eed6 100644
> --- a/Platform/Marvell/Armada70x0Db/NonDiscoverableInitLib/NonDiscoverableInitLib.c
> +++ b/Platform/Marvell/Armada70x0Db/NonDiscoverableInitLib/NonDiscoverableInitLib.c
> @@ -3,13 +3,7 @@
> * Copyright (c) 2017, Linaro Ltd. All rights reserved.
> * Copyright (c) 2018, Marvell International Ltd. All rights reserved.
> *
> -* This program and the accompanying materials are licensed and made available
> -* under the terms and conditions of the BSD License which accompanies this
> -* distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/Marvell/Armada70x0Db/NonDiscoverableInitLib/NonDiscoverableInitLib.h b/Platform/Marvell/Armada70x0Db/NonDiscoverableInitLib/NonDiscoverableInitLib.h
> index 8a0e4248b4..73a71ad3c4 100644
> --- a/Platform/Marvell/Armada70x0Db/NonDiscoverableInitLib/NonDiscoverableInitLib.h
> +++ b/Platform/Marvell/Armada70x0Db/NonDiscoverableInitLib/NonDiscoverableInitLib.h
> @@ -2,13 +2,7 @@
> *
> * Copyright (c) 2018, Marvell International Ltd. All rights reserved.
> *
> -* This program and the accompanying materials are licensed and made available
> -* under the terms and conditions of the BSD License which accompanies this
> -* distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
> #ifndef __NON_DISCOVERABLE_INIT_LIB_H__
> diff --git a/Platform/Marvell/Armada70x0Db/NonDiscoverableInitLib/NonDiscoverableInitLib.inf b/Platform/Marvell/Armada70x0Db/NonDiscoverableInitLib/NonDiscoverableInitLib.inf
> index 56c08ecb19..946b9fd6d0 100644
> --- a/Platform/Marvell/Armada70x0Db/NonDiscoverableInitLib/NonDiscoverableInitLib.inf
> +++ b/Platform/Marvell/Armada70x0Db/NonDiscoverableInitLib/NonDiscoverableInitLib.inf
> @@ -2,13 +2,7 @@
> #
> # Copyright (c) 2017, Linaro Ltd. 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
> -# distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> -# IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> #
> ##
> diff --git a/Platform/Marvell/Armada80x0Db/Armada80x0Db.fdf.inc b/Platform/Marvell/Armada80x0Db/Armada80x0Db.fdf.inc
> index f2fcc55d38..92d2629931 100644
> --- a/Platform/Marvell/Armada80x0Db/Armada80x0Db.fdf.inc
> +++ b/Platform/Marvell/Armada80x0Db/Armada80x0Db.fdf.inc
> @@ -1,13 +1,7 @@
> #
> # Copyright (C) 2018 Marvell International Ltd. and its affiliates
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD License
> -# which accompanies this distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
>
> # Per-board additional content of the DXE phase firmware volume
> diff --git a/Platform/Marvell/Armada80x0Db/Armada80x0DbBoardDescLib/Armada80x0DbBoardDescLib.c b/Platform/Marvell/Armada80x0Db/Armada80x0DbBoardDescLib/Armada80x0DbBoardDescLib.c
> index 61b6202c16..f083c94982 100644
> --- a/Platform/Marvell/Armada80x0Db/Armada80x0DbBoardDescLib/Armada80x0DbBoardDescLib.c
> +++ b/Platform/Marvell/Armada80x0Db/Armada80x0DbBoardDescLib/Armada80x0DbBoardDescLib.c
> @@ -2,13 +2,7 @@
> *
> * Copyright (C) 2018, Marvell International Ltd. and its affiliates.
> *
> -* This program and the accompanying materials are licensed and made available
> -* under the terms and conditions of the BSD License which accompanies this
> -* distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/Marvell/Armada80x0Db/Armada80x0DbBoardDescLib/Armada80x0DbBoardDescLib.inf b/Platform/Marvell/Armada80x0Db/Armada80x0DbBoardDescLib/Armada80x0DbBoardDescLib.inf
> index 786b7f0d78..07ee65dfa4 100644
> --- a/Platform/Marvell/Armada80x0Db/Armada80x0DbBoardDescLib/Armada80x0DbBoardDescLib.inf
> +++ b/Platform/Marvell/Armada80x0Db/Armada80x0DbBoardDescLib/Armada80x0DbBoardDescLib.inf
> @@ -2,13 +2,7 @@
> #
> # Copyright (C) 2018, Marvell International Ltd. and its affiliates<BR>
> #
> -# This program and the accompanying materials are licensed and made available
> -# under the terms and conditions of the BSD License which accompanies this
> -# distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> -# IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> #
> ##
> diff --git a/Platform/Marvell/Armada80x0Db/NonDiscoverableInitLib/NonDiscoverableInitLib.c b/Platform/Marvell/Armada80x0Db/NonDiscoverableInitLib/NonDiscoverableInitLib.c
> index e7a1d1e687..804339f43e 100644
> --- a/Platform/Marvell/Armada80x0Db/NonDiscoverableInitLib/NonDiscoverableInitLib.c
> +++ b/Platform/Marvell/Armada80x0Db/NonDiscoverableInitLib/NonDiscoverableInitLib.c
> @@ -3,13 +3,7 @@
> * Copyright (c) 2017, Linaro Ltd. All rights reserved.
> * Copyright (c) 2018, Marvell International Ltd. All rights reserved.
> *
> -* This program and the accompanying materials are licensed and made available
> -* under the terms and conditions of the BSD License which accompanies this
> -* distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/Marvell/Armada80x0Db/NonDiscoverableInitLib/NonDiscoverableInitLib.h b/Platform/Marvell/Armada80x0Db/NonDiscoverableInitLib/NonDiscoverableInitLib.h
> index 64373ff0e7..7e8075e591 100644
> --- a/Platform/Marvell/Armada80x0Db/NonDiscoverableInitLib/NonDiscoverableInitLib.h
> +++ b/Platform/Marvell/Armada80x0Db/NonDiscoverableInitLib/NonDiscoverableInitLib.h
> @@ -3,13 +3,7 @@
> * Copyright (c) 2017, Linaro Ltd. All rights reserved.
> * Copyright (c) 2018, Marvell International Ltd. All rights reserved.
> *
> -* This program and the accompanying materials are licensed and made available
> -* under the terms and conditions of the BSD License which accompanies this
> -* distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
> #ifndef __NON_DISCOVERABLE_INIT_LIB_H__
> diff --git a/Platform/Marvell/Armada80x0Db/NonDiscoverableInitLib/NonDiscoverableInitLib.inf b/Platform/Marvell/Armada80x0Db/NonDiscoverableInitLib/NonDiscoverableInitLib.inf
> index fe21e5248f..fb303f3d89 100644
> --- a/Platform/Marvell/Armada80x0Db/NonDiscoverableInitLib/NonDiscoverableInitLib.inf
> +++ b/Platform/Marvell/Armada80x0Db/NonDiscoverableInitLib/NonDiscoverableInitLib.inf
> @@ -3,13 +3,7 @@
> # Copyright (c) 2017, Linaro Ltd. All rights reserved.<BR>
> # Copyright (c) 2018, Marvell International Ltd. 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
> -# distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> -# IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> #
> ##
> --
> 2.21.0.windows.1
>
^ permalink raw reply [flat|nested] 63+ messages in thread
* [[edk2-platforms][PATCH V2] 15/30] Platform/RaspberryPi: Replace BSD License with BSD+Patent License
2019-05-15 23:09 [[edk2-platforms][PATCH V2] 00/30] Change edk2-platforms/master to BSD+Patent License Michael D Kinney
` (13 preceding siblings ...)
2019-05-15 23:09 ` [[edk2-platforms][PATCH V2] 14/30] Platform/Marvell: " Michael D Kinney
@ 2019-05-15 23:09 ` Michael D Kinney
2019-05-17 11:07 ` [edk2-devel] " Leif Lindholm
2019-05-15 23:09 ` [[edk2-platforms][PATCH V2] 16/30] Platform/Socionext: " Michael D Kinney
` (15 subsequent siblings)
30 siblings, 1 reply; 63+ messages in thread
From: Michael D Kinney @ 2019-05-15 23:09 UTC (permalink / raw)
To: devel; +Cc: Leif Lindholm, Ard Biesheuvel
https://bugzilla.tianocore.org/show_bug.cgi?id=1373
Replace BSD 2-Clause License with BSD+Patent License. This change is
based on the following emails:
https://lists.01.org/pipermail/edk2-devel/2019-February/036260.html
https://lists.01.org/pipermail/edk2-devel/2018-October/030385.html
RFCs with detailed process for the license change:
V3: https://lists.01.org/pipermail/edk2-devel/2019-March/038116.html
V2: https://lists.01.org/pipermail/edk2-devel/2019-March/037669.html
V1: https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
Platform/RaspberryPi/RPi3/AcpiTables/AcpiTables.h | 8 +-------
Platform/RaspberryPi/RPi3/AcpiTables/AcpiTables.inf | 8 +-------
Platform/RaspberryPi/RPi3/AcpiTables/Csrt.aslc | 8 +-------
Platform/RaspberryPi/RPi3/AcpiTables/Dbg2.aslc | 8 +-------
Platform/RaspberryPi/RPi3/AcpiTables/Dsdt.asl | 8 +-------
Platform/RaspberryPi/RPi3/AcpiTables/Fadt.aslc | 8 +-------
Platform/RaspberryPi/RPi3/AcpiTables/Gtdt.aslc | 8 +-------
Platform/RaspberryPi/RPi3/AcpiTables/Madt.aslc | 8 +-------
Platform/RaspberryPi/RPi3/AcpiTables/Pep.asl | 8 +-------
Platform/RaspberryPi/RPi3/AcpiTables/Pep.c | 8 +-------
Platform/RaspberryPi/RPi3/AcpiTables/Pep.h | 8 +-------
Platform/RaspberryPi/RPi3/AcpiTables/Rhpx.asl | 8 +-------
Platform/RaspberryPi/RPi3/AcpiTables/Sdhc.asl | 8 +-------
Platform/RaspberryPi/RPi3/AcpiTables/Spcr.asl | 8 +-------
Platform/RaspberryPi/RPi3/AcpiTables/Uart.asl | 8 +-------
.../RPi3/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.c | 8 +-------
.../RPi3/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.h | 8 +-------
.../RPi3/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.inf | 8 +-------
Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxe.c | 8 +-------
.../RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxe.inf | 9 +--------
.../RPi3/Drivers/ConfigDxe/ConfigDxeFormSetGuid.h | 8 +-------
.../RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxeHii.uni | 8 +-------
.../RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxeHii.vfr | 8 +-------
.../RaspberryPi/RPi3/Drivers/DisplayDxe/ComponentName.c | 8 +-------
.../RaspberryPi/RPi3/Drivers/DisplayDxe/DisplayDxe.c | 8 +-------
.../RaspberryPi/RPi3/Drivers/DisplayDxe/DisplayDxe.h | 8 +-------
.../RaspberryPi/RPi3/Drivers/DisplayDxe/DisplayDxe.inf | 8 +-------
.../RaspberryPi/RPi3/Drivers/DisplayDxe/Screenshot.c | 8 +-------
.../RPi3/Drivers/DwUsbHostDxe/ComponentName.c | 8 +-------
.../RPi3/Drivers/DwUsbHostDxe/DriverBinding.c | 8 +-------
.../RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwUsbHostDxe.c | 8 +-------
.../RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwUsbHostDxe.h | 8 +-------
.../RPi3/Drivers/DwUsbHostDxe/DwUsbHostDxe.inf | 8 +-------
Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwcHw.h | 8 +-------
Platform/RaspberryPi/RPi3/Drivers/FdtDxe/FdtDxe.c | 8 +-------
Platform/RaspberryPi/RPi3/Drivers/FdtDxe/FdtDxe.inf | 8 +-------
.../RPi3/Drivers/GraphicsConsoleDxe/ComponentName.c | 8 +-------
.../RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsole.c | 8 +-------
.../RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsole.h | 8 +-------
.../Drivers/GraphicsConsoleDxe/GraphicsConsoleDxe.inf | 9 +--------
.../Drivers/GraphicsConsoleDxe/GraphicsConsoleDxe.uni | 8 +-------
| 8 +-------
.../RPi3/Drivers/GraphicsConsoleDxe/NewFont.c | 8 +-------
Platform/RaspberryPi/RPi3/Drivers/MmcDxe/ComponentName.c | 8 +-------
Platform/RaspberryPi/RPi3/Drivers/MmcDxe/Diagnostics.c | 8 +-------
Platform/RaspberryPi/RPi3/Drivers/MmcDxe/Mmc.c | 8 +-------
Platform/RaspberryPi/RPi3/Drivers/MmcDxe/Mmc.h | 8 +-------
Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcBlockIo.c | 8 +-------
Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcDebug.c | 8 +-------
Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcDxe.inf | 8 +-------
.../RaspberryPi/RPi3/Drivers/MmcDxe/MmcIdentification.c | 8 +-------
.../RPi3/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.c | 8 +-------
.../RPi3/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.inf | 8 +-------
.../RPi3/Drivers/RpiFirmwareDxe/RpiFirmwareDxe.c | 8 +-------
.../RPi3/Drivers/RpiFirmwareDxe/RpiFirmwareDxe.inf | 8 +-------
Platform/RaspberryPi/RPi3/Drivers/SdHostDxe/SdHostDxe.c | 8 +-------
.../RaspberryPi/RPi3/Drivers/SdHostDxe/SdHostDxe.inf | 8 +-------
.../RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/FileIo.c | 8 +-------
.../RPi3/Drivers/VarBlockServiceDxe/FvbInfo.c | 8 +-------
.../RPi3/Drivers/VarBlockServiceDxe/VarBlockService.c | 8 +-------
.../RPi3/Drivers/VarBlockServiceDxe/VarBlockService.h | 8 +-------
.../RPi3/Drivers/VarBlockServiceDxe/VarBlockServiceDxe.c | 8 +-------
.../Drivers/VarBlockServiceDxe/VarBlockServiceDxe.inf | 9 +--------
Platform/RaspberryPi/RPi3/Include/Protocol/DwUsb.h | 8 +-------
.../RaspberryPi/RPi3/Include/Protocol/ExtendedTextOut.h | 8 +-------
Platform/RaspberryPi/RPi3/Include/Protocol/RpiFirmware.h | 8 +-------
Platform/RaspberryPi/RPi3/Include/Protocol/RpiMmcHost.h | 8 +-------
.../RPi3/Library/MemoryInitPeiLib/MemoryInitPeiLib.c | 8 +-------
.../RPi3/Library/MemoryInitPeiLib/MemoryInitPeiLib.inf | 8 +-------
.../RPi3/Library/PlatformBootManagerLib/PlatformBm.c | 8 +-------
.../RPi3/Library/PlatformBootManagerLib/PlatformBm.h | 8 +-------
.../PlatformBootManagerLib/PlatformBootManagerLib.inf | 9 +--------
.../RPi3/Library/PlatformLib/AArch64/RaspberryPiHelper.S | 8 +-------
.../RaspberryPi/RPi3/Library/PlatformLib/PlatformLib.inf | 8 +-------
.../RaspberryPi/RPi3/Library/PlatformLib/RaspberryPi.c | 8 +-------
.../RPi3/Library/PlatformLib/RaspberryPiMem.c | 8 +-------
.../RPi3/Library/PlatformUiAppLib/PlatformUiAppLib.c | 8 +-------
Platform/RaspberryPi/RPi3/Library/ResetLib/ResetLib.c | 8 +-------
Platform/RaspberryPi/RPi3/Library/ResetLib/ResetLib.inf | 8 +-------
Platform/RaspberryPi/RPi3/RPi3.dec | 9 +--------
Platform/RaspberryPi/RPi3/RPi3.dsc | 9 +--------
Platform/RaspberryPi/RPi3/RPi3.fdf | 9 +--------
82 files changed, 82 insertions(+), 581 deletions(-)
diff --git a/Platform/RaspberryPi/RPi3/AcpiTables/AcpiTables.h b/Platform/RaspberryPi/RPi3/AcpiTables/AcpiTables.h
index be28b6dece..958af026c8 100644
--- a/Platform/RaspberryPi/RPi3/AcpiTables/AcpiTables.h
+++ b/Platform/RaspberryPi/RPi3/AcpiTables/AcpiTables.h
@@ -5,13 +5,7 @@
* Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.com>
* Copyright (c) Microsoft Corporation. All rights reserved.
*
- * This program and the accompanying materials
- * are licensed and made available under the terms and conditions of the BSD License
- * which accompanies this distribution. The full text of the license may be found at
- * http://opensource.org/licenses/bsd-license.php
- *
- * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/RaspberryPi/RPi3/AcpiTables/AcpiTables.inf b/Platform/RaspberryPi/RPi3/AcpiTables/AcpiTables.inf
index 62de9c0720..7ef41e79ad 100644
--- a/Platform/RaspberryPi/RPi3/AcpiTables/AcpiTables.inf
+++ b/Platform/RaspberryPi/RPi3/AcpiTables/AcpiTables.inf
@@ -5,13 +5,7 @@
# Copyright (c) 2017, Andrey Warkentin <andrey.warkentin@gmail.com>
# Copyright (c) Microsoft Corporation. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
diff --git a/Platform/RaspberryPi/RPi3/AcpiTables/Csrt.aslc b/Platform/RaspberryPi/RPi3/AcpiTables/Csrt.aslc
index 1b593bd29c..3b617c0a83 100644
--- a/Platform/RaspberryPi/RPi3/AcpiTables/Csrt.aslc
+++ b/Platform/RaspberryPi/RPi3/AcpiTables/Csrt.aslc
@@ -4,13 +4,7 @@
*
* Copyright (c) Microsoft Corporation. All rights reserved.
*
- * This program and the accompanying materials
- * are licensed and made available under the terms and conditions of the BSD License
- * which accompanies this distribution. The full text of the license may be found at
- * http://opensource.org/licenses/bsd-license.php
- *
- * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/RaspberryPi/RPi3/AcpiTables/Dbg2.aslc b/Platform/RaspberryPi/RPi3/AcpiTables/Dbg2.aslc
index dc2d2dfb28..9315f23e0d 100644
--- a/Platform/RaspberryPi/RPi3/AcpiTables/Dbg2.aslc
+++ b/Platform/RaspberryPi/RPi3/AcpiTables/Dbg2.aslc
@@ -4,13 +4,7 @@
*
* Copyright (c) Microsoft Corporation. All rights reserved.
*
- * This program and the accompanying materials
- * are licensed and made available under the terms and conditions of the BSD License
- * which accompanies this distribution. The full text of the license may be found at
- * http://opensource.org/licenses/bsd-license.php
- *
- * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/RaspberryPi/RPi3/AcpiTables/Dsdt.asl b/Platform/RaspberryPi/RPi3/AcpiTables/Dsdt.asl
index be2c4db7cc..ab4d4bf485 100644
--- a/Platform/RaspberryPi/RPi3/AcpiTables/Dsdt.asl
+++ b/Platform/RaspberryPi/RPi3/AcpiTables/Dsdt.asl
@@ -5,13 +5,7 @@
* Copyright (c) 2018, Andrey Warkentin <andrey.warkentin@gmail.com>
* Copyright (c) Microsoft Corporation. All rights reserved.
*
- * This program and the accompanying materials
- * are licensed and made available under the terms and conditions of the BSD License
- * which accompanies this distribution. The full text of the license may be found at
- * http://opensource.org/licenses/bsd-license.php
- *
- * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/RaspberryPi/RPi3/AcpiTables/Fadt.aslc b/Platform/RaspberryPi/RPi3/AcpiTables/Fadt.aslc
index eb1873993c..3ef877fde5 100644
--- a/Platform/RaspberryPi/RPi3/AcpiTables/Fadt.aslc
+++ b/Platform/RaspberryPi/RPi3/AcpiTables/Fadt.aslc
@@ -5,13 +5,7 @@
* Copyright (c) 2018, Andrey Warkentin <andrey.warkentin@gmail.com>
* Copyright (c) Microsoft Corporation. All rights reserved.
*
- * This program and the accompanying materials
- * are licensed and made available under the terms and conditions of the BSD License
- * which accompanies this distribution. The full text of the license may be found at
- * http://opensource.org/licenses/bsd-license.php
- *
- * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/RaspberryPi/RPi3/AcpiTables/Gtdt.aslc b/Platform/RaspberryPi/RPi3/AcpiTables/Gtdt.aslc
index 611eed2881..6551315a55 100644
--- a/Platform/RaspberryPi/RPi3/AcpiTables/Gtdt.aslc
+++ b/Platform/RaspberryPi/RPi3/AcpiTables/Gtdt.aslc
@@ -5,13 +5,7 @@
*
* Copyright (c) Microsoft Corporation. All rights reserved.
*
- * This program and the accompanying materials
- * are licensed and made available under the terms and conditions of the BSD License
- * which accompanies this distribution. The full text of the license may be found at
- * http://opensource.org/licenses/bsd-license.php
- *
- * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/RaspberryPi/RPi3/AcpiTables/Madt.aslc b/Platform/RaspberryPi/RPi3/AcpiTables/Madt.aslc
index 69c96273f5..39cd4c5cee 100644
--- a/Platform/RaspberryPi/RPi3/AcpiTables/Madt.aslc
+++ b/Platform/RaspberryPi/RPi3/AcpiTables/Madt.aslc
@@ -5,13 +5,7 @@
* Copyright (c) 2018, Andrey Warkentin <andrey.warkentin@gmail.com>
* Copyright (c) Microsoft Corporation. All rights reserved.
*
- * This program and the accompanying materials
- * are licensed and made available under the terms and conditions of the BSD License
- * which accompanies this distribution. The full text of the license may be found at
- * http://opensource.org/licenses/bsd-license.php
- *
- * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/RaspberryPi/RPi3/AcpiTables/Pep.asl b/Platform/RaspberryPi/RPi3/AcpiTables/Pep.asl
index c0c5fca4c3..2ddb27bcdb 100644
--- a/Platform/RaspberryPi/RPi3/AcpiTables/Pep.asl
+++ b/Platform/RaspberryPi/RPi3/AcpiTables/Pep.asl
@@ -5,13 +5,7 @@
* Copyright (c) 2018, Andrey Warkentin <andrey.warkentin@gmail.com>
* Copyright (c) Microsoft Corporation. All rights reserved.
*
- * This program and the accompanying materials
- * are licensed and made available under the terms and conditions of the BSD License
- * which accompanies this distribution. The full text of the license may be found at
- * http://opensource.org/licenses/bsd-license.php
- *
- * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/RaspberryPi/RPi3/AcpiTables/Pep.c b/Platform/RaspberryPi/RPi3/AcpiTables/Pep.c
index bf96178a7c..51db779d79 100644
--- a/Platform/RaspberryPi/RPi3/AcpiTables/Pep.c
+++ b/Platform/RaspberryPi/RPi3/AcpiTables/Pep.c
@@ -5,13 +5,7 @@
* Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.com>
* Copyright (c) Microsoft Corporation. All rights reserved.
*
- * This program and the accompanying materials
- * are licensed and made available under the terms and conditions of the BSD License
- * which accompanies this distribution. The full text of the license may be found at
- * http://opensource.org/licenses/bsd-license.php
- *
- * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/RaspberryPi/RPi3/AcpiTables/Pep.h b/Platform/RaspberryPi/RPi3/AcpiTables/Pep.h
index 08fee8ce57..f5f04518de 100644
--- a/Platform/RaspberryPi/RPi3/AcpiTables/Pep.h
+++ b/Platform/RaspberryPi/RPi3/AcpiTables/Pep.h
@@ -5,13 +5,7 @@
* Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.com>
* Copyright (c) Microsoft Corporation. All rights reserved.
*
- * This program and the accompanying materials
- * are licensed and made available under the terms and conditions of the BSD License
- * which accompanies this distribution. The full text of the license may be found at
- * http://opensource.org/licenses/bsd-license.php
- *
- * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/RaspberryPi/RPi3/AcpiTables/Rhpx.asl b/Platform/RaspberryPi/RPi3/AcpiTables/Rhpx.asl
index b2127c02e9..0971e13ee0 100644
--- a/Platform/RaspberryPi/RPi3/AcpiTables/Rhpx.asl
+++ b/Platform/RaspberryPi/RPi3/AcpiTables/Rhpx.asl
@@ -5,13 +5,7 @@
* Copyright (c) 2018, Andrey Warkentin <andrey.warkentin@gmail.com>
* Copyright (c) Microsoft Corporation. All rights reserved.
*
- * This program and the accompanying materials
- * are licensed and made available under the terms and conditions of the BSD License
- * which accompanies this distribution. The full text of the license may be found at
- * http://opensource.org/licenses/bsd-license.php
- *
- * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/RaspberryPi/RPi3/AcpiTables/Sdhc.asl b/Platform/RaspberryPi/RPi3/AcpiTables/Sdhc.asl
index e912b16c5f..0d42db30ae 100644
--- a/Platform/RaspberryPi/RPi3/AcpiTables/Sdhc.asl
+++ b/Platform/RaspberryPi/RPi3/AcpiTables/Sdhc.asl
@@ -5,13 +5,7 @@
* Copyright (c) 2018, Andrey Warkentin <andrey.warkentin@gmail.com>
* Copyright (c) Microsoft Corporation. All rights reserved.
*
- * This program and the accompanying materials
- * are licensed and made available under the terms and conditions of the BSD License
- * which accompanies this distribution. The full text of the license may be found at
- * http://opensource.org/licenses/bsd-license.php
- *
- * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/RaspberryPi/RPi3/AcpiTables/Spcr.asl b/Platform/RaspberryPi/RPi3/AcpiTables/Spcr.asl
index c5a5f6e0af..2e6a373237 100644
--- a/Platform/RaspberryPi/RPi3/AcpiTables/Spcr.asl
+++ b/Platform/RaspberryPi/RPi3/AcpiTables/Spcr.asl
@@ -4,13 +4,7 @@
*
* Copyright (c) 2017-2018, Andrey Warkentin <andrey.warkentin@gmail.com>
*
- * This program and the accompanying materials
- * are licensed and made available under the terms and conditions of the BSD License
- * which accompanies this distribution. The full text of the license may be found at
- * http://opensource.org/licenses/bsd-license.php
- *
- * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/RaspberryPi/RPi3/AcpiTables/Uart.asl b/Platform/RaspberryPi/RPi3/AcpiTables/Uart.asl
index 26fcef1317..a0067c82c6 100644
--- a/Platform/RaspberryPi/RPi3/AcpiTables/Uart.asl
+++ b/Platform/RaspberryPi/RPi3/AcpiTables/Uart.asl
@@ -5,13 +5,7 @@
* Copyright (c) 2018, Andrey Warkentin <andrey.warkentin@gmail.com>
* Copyright (c) Microsoft Corporation. All rights reserved.
*
- * This program and the accompanying materials
- * are licensed and made available under the terms and conditions of the BSD License
- * which accompanies this distribution. The full text of the license may be found at
- * http://opensource.org/licenses/bsd-license.php
- *
- * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/RaspberryPi/RPi3/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.c b/Platform/RaspberryPi/RPi3/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.c
index 828b40f82a..6d706af6f2 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.c
+++ b/Platform/RaspberryPi/RPi3/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.c
@@ -3,13 +3,7 @@
* Copyright (c) 2017, Andrei Warkentin <andrey.warkentin@gmail.com>
* Copyright (c) Microsoft Corporation. All rights reserved.
*
- * This program and the accompanying materials
- * are licensed and made available under the terms and conditions of the BSD License
- * which accompanies this distribution. The full text of the license may be found at
- * http://opensource.org/licenses/bsd-license.php
- *
- * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/RaspberryPi/RPi3/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.h b/Platform/RaspberryPi/RPi3/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.h
index d1a3f014b4..6cd600f738 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.h
+++ b/Platform/RaspberryPi/RPi3/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.h
@@ -2,13 +2,7 @@
*
* Copyright (c) Microsoft Corporation. All rights reserved.
*
- * This program and the accompanying materials
- * are licensed and made available under the terms and conditions of the BSD License
- * which accompanies this distribution. The full text of the license may be found at
- * http://opensource.org/licenses/bsd-license.php
- *
- * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/RaspberryPi/RPi3/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.inf b/Platform/RaspberryPi/RPi3/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.inf
index 1e36221944..3da379b99b 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.inf
+++ b/Platform/RaspberryPi/RPi3/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.inf
@@ -3,13 +3,7 @@
# Copyright (c) 2017, Andrei Warkentin <andrey.warkentin@gmail.com>
# Copyright (c) Microsoft Corporation. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
diff --git a/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxe.c b/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxe.c
index b78d7deae4..d64e70adce 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxe.c
+++ b/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxe.c
@@ -2,13 +2,7 @@
*
* Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.com>
*
- * This program and the accompanying materials
- * are licensed and made available under the terms and conditions of the BSD License
- * which accompanies this distribution. The full text of the license may be found at
- * http://opensource.org/licenses/bsd-license.php
- *
- * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxe.inf b/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxe.inf
index 68eaec25ab..3fee190ac4 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxe.inf
+++ b/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxe.inf
@@ -2,14 +2,7 @@
#
# Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.com>
#
-# This program and the accompanying materials are licensed and made available
-# under the terms and conditions of the BSD License which accompanies this
-# distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
-# IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
diff --git a/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxeFormSetGuid.h b/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxeFormSetGuid.h
index b29ae3a424..30f9b905c4 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxeFormSetGuid.h
+++ b/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxeFormSetGuid.h
@@ -2,13 +2,7 @@
*
* Copyright (c) 2018 Andrei Warkentin <andrey.warkentin@gmail.com>
*
- * This program and the accompanying materials
- * are licensed and made available under the terms and conditions of the BSD License
- * which accompanies this distribution. The full text of the license may be found at
- * http://opensource.org/licenses/bsd-license.php
- *
- * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxeHii.uni b/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxeHii.uni
index bf09261d5e..a9c1014330 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxeHii.uni
+++ b/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxeHii.uni
@@ -2,13 +2,7 @@
*
* Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.com>
*
- * This program and the accompanying materials
- * are licensed and made available under the terms and conditions of the BSD License
- * which accompanies this distribution. The full text of the license may be found at
- * http://opensource.org/licenses/bsd-license.php
- *
- * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxeHii.vfr b/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxeHii.vfr
index d3d98acc2e..7a18245258 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxeHii.vfr
+++ b/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxeHii.vfr
@@ -2,13 +2,7 @@
*
* Copyright (c) 2018 Andrei Warkentin <andrey.warkentin@gmail.com>
*
- * This program and the accompanying materials
- * are licensed and made available under the terms and conditions of the BSD License
- * which accompanies this distribution. The full text of the license may be found at
- * http://opensource.org/licenses/bsd-license.php
- *
- * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/ComponentName.c b/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/ComponentName.c
index 9a84aea511..092230cd7c 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/ComponentName.c
+++ b/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/ComponentName.c
@@ -3,13 +3,7 @@
* Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.com>
* Copyright (c) 2006-2016, Intel Corporation. All rights reserved.
*
- * This program and the accompanying materials
- * are licensed and made available under the terms and conditions of the BSD License
- * which accompanies this distribution. The full text of the license may be found at
- * http://opensource.org/licenses/bsd-license.php
- *
- * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/DisplayDxe.c b/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/DisplayDxe.c
index 0e99194e85..9475a5ad67 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/DisplayDxe.c
+++ b/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/DisplayDxe.c
@@ -3,13 +3,7 @@
* Copyright (c) 2017-2018, Andrei Warkentin <andrey.warkentin@gmail.com>
* Copyright (c) Microsoft Corporation. All rights reserved.
*
- * This program and the accompanying materials
- * are licensed and made available under the terms and conditions of the BSD License
- * which accompanies this distribution. The full text of the license may be found at
- * http://opensource.org/licenses/bsd-license.php
- *
- * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/DisplayDxe.h b/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/DisplayDxe.h
index 48a049de31..bfbe9e8688 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/DisplayDxe.h
+++ b/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/DisplayDxe.h
@@ -3,13 +3,7 @@
* Copyright (c) 2017-2018, Andrei Warkentin <andrey.warkentin@gmail.com>
* Copyright (c) Microsoft Corporation. All rights reserved.
*
- * This program and the accompanying materials
- * are licensed and made available under the terms and conditions of the BSD License
- * which accompanies this distribution. The full text of the license may be found at
- * http://opensource.org/licenses/bsd-license.php
- *
- * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/DisplayDxe.inf b/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/DisplayDxe.inf
index 2e716ff779..652f6827f3 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/DisplayDxe.inf
+++ b/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/DisplayDxe.inf
@@ -5,13 +5,7 @@
# Copyright (c) 2017, Andrei Warkentin <andrey.warkentin@gmail.com>
# Copyright (c) Microsoft Corporation. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
diff --git a/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/Screenshot.c b/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/Screenshot.c
index a5d32d59c3..5f31c64bbf 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/Screenshot.c
+++ b/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/Screenshot.c
@@ -3,13 +3,7 @@
* Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.
* Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.com>
*
- * This program and the accompanying materials
- * are licensed and made available under the terms and conditions of the BSD License
- * which accompanies this distribution. The full text of the license may be found at
- * http://opensource.org/licenses/bsd-license.php
- *
- * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/ComponentName.c b/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/ComponentName.c
index 056debb7c5..2f3c53323b 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/ComponentName.c
+++ b/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/ComponentName.c
@@ -2,13 +2,7 @@
*
* Copyright (c) 2018, Andrey Warkentin <andrey.warkentin@gmail.com>
*
- * This program and the accompanying materials
- * are licensed and made available under the terms and conditions of the BSD License
- * which accompanies this distribution. The full text of the license may be found at
- * http://opensource.org/licenses/bsd-license.php
- *
- * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DriverBinding.c b/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DriverBinding.c
index 05aa133fa0..7f78179d4c 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DriverBinding.c
+++ b/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DriverBinding.c
@@ -2,13 +2,7 @@
*
* Copyright (c) 2018, Andrey Warkentin <andrey.warkentin@gmail.com>
*
- * This program and the accompanying materials
- * are licensed and made available under the terms and conditions of the BSD License
- * which accompanies this distribution. The full text of the license may be found at
- * http://opensource.org/licenses/bsd-license.php
- *
- * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwUsbHostDxe.c b/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwUsbHostDxe.c
index 8905a4d18f..59120b9d85 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwUsbHostDxe.c
+++ b/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwUsbHostDxe.c
@@ -3,13 +3,7 @@
* Copyright (c) 2017-2018, Andrey Warkentin <andrey.warkentin@gmail.com>
* Copyright (c) 2015-2016, Linaro Limited. All rights reserved.
*
- * This program and the accompanying materials
- * are licensed and made available under the terms and conditions of the BSD License
- * which accompanies this distribution. The full text of the license may be found at
- * http://opensource.org/licenses/bsd-license.php
- *
- * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwUsbHostDxe.h b/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwUsbHostDxe.h
index 673d8d3406..106e542535 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwUsbHostDxe.h
+++ b/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwUsbHostDxe.h
@@ -3,13 +3,7 @@
* Copyright (c) 2017-2018, Andrey Warkentin <andrey.warkentin@gmail.com>
* Copyright (c) 2015-2016, Linaro Limited. All rights reserved.
*
- * This program and the accompanying materials
- * are licensed and made available under the terms and conditions of the BSD License
- * which accompanies this distribution. The full text of the license may be found at
- * http://opensource.org/licenses/bsd-license.php
- *
- * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwUsbHostDxe.inf b/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwUsbHostDxe.inf
index 5ae730ccaa..6eaca35aef 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwUsbHostDxe.inf
+++ b/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwUsbHostDxe.inf
@@ -3,13 +3,7 @@
# Copyright (c) 2017-2018, Andrei Warkentin <andrey.warkentin@gmail.com>
# Copyright (c) 2015-2016, Linaro Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
diff --git a/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwcHw.h b/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwcHw.h
index d92bb2d3fd..88fd93934f 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwcHw.h
+++ b/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwcHw.h
@@ -3,13 +3,7 @@
* Copyright (c) 2017, Andrey Warkentin <andrey.warkentin@gmail.com>
* Copyright (c) 2015-2016, Linaro Limited. All rights reserved.
*
- * This program and the accompanying materials
- * are licensed and made available under the terms and conditions of the BSD License
- * which accompanies this distribution. The full text of the license may be found at
- * http://opensource.org/licenses/bsd-license.php
- *
- * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/RaspberryPi/RPi3/Drivers/FdtDxe/FdtDxe.c b/Platform/RaspberryPi/RPi3/Drivers/FdtDxe/FdtDxe.c
index eb5698cb50..83446e3e45 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/FdtDxe/FdtDxe.c
+++ b/Platform/RaspberryPi/RPi3/Drivers/FdtDxe/FdtDxe.c
@@ -3,13 +3,7 @@
* Copyright (c) 2017, Andrey Warkentin <andrey.warkentin@gmail.com>
* Copyright (c) 2016, Linaro, Ltd. All rights reserved.
*
- * This program and the accompanying materials
- * are licensed and made available under the terms and conditions of the BSD License
- * which accompanies this distribution. The full text of the license may be found at
- * http://opensource.org/licenses/bsd-license.php
- *
- * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
#include <PiDxe.h>
diff --git a/Platform/RaspberryPi/RPi3/Drivers/FdtDxe/FdtDxe.inf b/Platform/RaspberryPi/RPi3/Drivers/FdtDxe/FdtDxe.inf
index d93a18019d..5b0b1a09f3 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/FdtDxe/FdtDxe.inf
+++ b/Platform/RaspberryPi/RPi3/Drivers/FdtDxe/FdtDxe.inf
@@ -3,13 +3,7 @@
# Copyright (c) 2017, Andrei Warkentin <andrey.warkentin@gmail.com>
# Copyright (c) 2016, Linaro, Ltd. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
diff --git a/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/ComponentName.c b/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/ComponentName.c
index 3ae639ad3d..6a094bfeda 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/ComponentName.c
+++ b/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/ComponentName.c
@@ -3,13 +3,7 @@
* Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.com>
* Copyright (c) 2006-2016, Intel Corporation. All rights reserved.
*
- * This program and the accompanying materials
- * are licensed and made available under the terms and conditions of the BSD License
- * which accompanies this distribution. The full text of the license may be found at
- * http://opensource.org/licenses/bsd-license.php
- *
- * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsole.c b/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsole.c
index 246f4ad52b..5e15b59e7c 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsole.c
+++ b/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsole.c
@@ -3,13 +3,7 @@
* Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.com>
* Copyright (c) 2006-2016, Intel Corporation. All rights reserved.
*
- * This program and the accompanying materials
- * are licensed and made available under the terms and conditions of the BSD License
- * which accompanies this distribution. The full text of the license may be found at
- * http://opensource.org/licenses/bsd-license.php
- *
- * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsole.h b/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsole.h
index ba93cab86b..62980fd03d 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsole.h
+++ b/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsole.h
@@ -3,13 +3,7 @@
* Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.com>
* Copyright (c) 2006-2016, Intel Corporation. All rights reserved.
*
- * This program and the accompanying materials
- * are licensed and made available under the terms and conditions of the BSD License
- * which accompanies this distribution. The full text of the license may be found at
- * http://opensource.org/licenses/bsd-license.php
- *
- * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsoleDxe.inf b/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
index 11c1a3ae0e..51d1eed12e 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
+++ b/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
@@ -3,14 +3,7 @@
# Copyright (c) 2006-2014, Intel Corporation. All rights reserved.
# Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.com>
#
-# This program and the accompanying materials are licensed and made available
-# under the terms and conditions of the BSD License which accompanies this
-# distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
-# IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
diff --git a/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsoleDxe.uni b/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsoleDxe.uni
index 0957c5795f..a7d8b8431a 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsoleDxe.uni
+++ b/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsoleDxe.uni
@@ -3,13 +3,7 @@
* Copyright (c) 2006-2014, Intel Corporation. All rights reserved.
* Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.com>
*
- * This program and the accompanying materials
- * are licensed and made available under the terms and conditions of the BSD License
- * which accompanies this distribution. The full text of the license may be found at
- * http://opensource.org/licenses/bsd-license.php
- *
- * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
--git a/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsoleDxeExtra.uni b/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsoleDxeExtra.uni
index 9aa9af4de6..b849a6b99d 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsoleDxeExtra.uni
+++ b/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsoleDxeExtra.uni
@@ -3,13 +3,7 @@
* Copyright (c) 2006-2014, Intel Corporation. All rights reserved.
* Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.com>
*
- * This program and the accompanying materials
- * are licensed and made available under the terms and conditions of the BSD License
- * which accompanies this distribution. The full text of the license may be found at
- * http://opensource.org/licenses/bsd-license.php
- *
- * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/NewFont.c b/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/NewFont.c
index c4840a6637..87a949b25c 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/NewFont.c
+++ b/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/NewFont.c
@@ -2,13 +2,7 @@
*
* Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.com>
*
- * This program and the accompanying materials
- * are licensed and made available under the terms and conditions of the BSD License
- * which accompanies this distribution. The full text of the license may be found at
- * http://opensource.org/licenses/bsd-license.php
- *
- * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/ComponentName.c b/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/ComponentName.c
index 034da778ca..07d762c5ac 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/ComponentName.c
+++ b/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/ComponentName.c
@@ -4,13 +4,7 @@
*
* Copyright (c) 2011, ARM Limited. All rights reserved.
*
- * This program and the accompanying materials
- * are licensed and made available under the terms and conditions of the BSD License
- * which accompanies this distribution. The full text of the license may be found at
- * http://opensource.org/licenses/bsd-license.php
- *
- * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/Diagnostics.c b/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/Diagnostics.c
index c019a85b48..58f1e25199 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/Diagnostics.c
+++ b/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/Diagnostics.c
@@ -4,13 +4,7 @@
*
* Copyright (c) 2011-2014, ARM Limited. All rights reserved.
*
- * This program and the accompanying materials
- * are licensed and made available under the terms and conditions of the BSD License
- * which accompanies this distribution. The full text of the license may be found at
- * http://opensource.org/licenses/bsd-license.php
- *
- * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/Mmc.c b/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/Mmc.c
index 1d75276b80..c3c7279e47 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/Mmc.c
+++ b/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/Mmc.c
@@ -4,13 +4,7 @@
*
* Copyright (c) 2011-2013, ARM Limited. All rights reserved.
*
- * This program and the accompanying materials
- * are licensed and made available under the terms and conditions of the BSD License
- * which accompanies this distribution. The full text of the license may be found at
- * http://opensource.org/licenses/bsd-license.php
- *
- * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/Mmc.h b/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/Mmc.h
index f6a5a99928..28a890b048 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/Mmc.h
+++ b/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/Mmc.h
@@ -4,13 +4,7 @@
*
* Copyright (c) 2011-2015, ARM Limited. All rights reserved.
*
- * This program and the accompanying materials
- * are licensed and made available under the terms and conditions of the BSD License
- * which accompanies this distribution. The full text of the license may be found at
- * http://opensource.org/licenses/bsd-license.php
- *
- * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcBlockIo.c b/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcBlockIo.c
index ede814dfa2..29a9fd7df6 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcBlockIo.c
+++ b/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcBlockIo.c
@@ -2,13 +2,7 @@
*
* Copyright (c) 2011-2015, ARM Limited. All rights reserved.
*
- * This program and the accompanying materials
- * are licensed and made available under the terms and conditions of the BSD License
- * which accompanies this distribution. The full text of the license may be found at
- * http://opensource.org/licenses/bsd-license.php
- *
- * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcDebug.c b/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcDebug.c
index c0af5f6e8d..22209fcaca 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcDebug.c
+++ b/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcDebug.c
@@ -2,13 +2,7 @@
*
* Copyright (c) 2011-2013, ARM Limited. All rights reserved.
*
- * This program and the accompanying materials
- * are licensed and made available under the terms and conditions of the BSD License
- * which accompanies this distribution. The full text of the license may be found at
- * http://opensource.org/licenses/bsd-license.php
- *
- * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcDxe.inf b/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcDxe.inf
index c8e7fbf39c..2c71bb6243 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcDxe.inf
+++ b/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcDxe.inf
@@ -3,13 +3,7 @@
# Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.com>
# Copyright (c) 2011-2015, ARM Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
diff --git a/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcIdentification.c b/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcIdentification.c
index e9b8124d3a..4ee5c5ca6f 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcIdentification.c
+++ b/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcIdentification.c
@@ -2,13 +2,7 @@
*
* Copyright (c) 2011-2015, ARM Limited. All rights reserved.
*
- * This program and the accompanying materials
- * are licensed and made available under the terms and conditions of the BSD License
- * which accompanies this distribution. The full text of the license may be found at
- * http://opensource.org/licenses/bsd-license.php
- *
- * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/RaspberryPi/RPi3/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.c b/Platform/RaspberryPi/RPi3/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.c
index 7707763e43..bc35175279 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.c
+++ b/Platform/RaspberryPi/RPi3/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.c
@@ -21,13 +21,7 @@
* Copyright (c) 2012, Apple Inc. All rights reserved.<BR>
* Copyright (c) Microsoft Corporation. All rights reserved.
*
- * This program and the accompanying materials
- * are licensed and made available under the terms and conditions of the BSD License
- * which accompanies this distribution. The full text of the license may be found at
- * http://opensource.org/licenses/bsd-license.php
- *
- * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/RaspberryPi/RPi3/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.inf b/Platform/RaspberryPi/RPi3/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.inf
index 4ae41c0382..f7c74f7f54 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.inf
+++ b/Platform/RaspberryPi/RPi3/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.inf
@@ -6,13 +6,7 @@
# Copyright (c) Microsoft Corporation. All rights reserved.
# Copyright (c) 2013 Linaro.org
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
diff --git a/Platform/RaspberryPi/RPi3/Drivers/RpiFirmwareDxe/RpiFirmwareDxe.c b/Platform/RaspberryPi/RPi3/Drivers/RpiFirmwareDxe/RpiFirmwareDxe.c
index d330e45fdc..925f5a9212 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/RpiFirmwareDxe/RpiFirmwareDxe.c
+++ b/Platform/RaspberryPi/RPi3/Drivers/RpiFirmwareDxe/RpiFirmwareDxe.c
@@ -3,13 +3,7 @@
* Copyright (c) 2017-2018, Andrei Warkentin <andrey.warkentin@gmail.com>
* Copyright (c) 2016, Linaro, Ltd. All rights reserved.
*
- * This program and the accompanying materials
- * are licensed and made available under the terms and conditions of the BSD License
- * which accompanies this distribution. The full text of the license may be found at
- * http://opensource.org/licenses/bsd-license.php
- *
- * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/RaspberryPi/RPi3/Drivers/RpiFirmwareDxe/RpiFirmwareDxe.inf b/Platform/RaspberryPi/RPi3/Drivers/RpiFirmwareDxe/RpiFirmwareDxe.inf
index 45af4d08b2..bba0007076 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/RpiFirmwareDxe/RpiFirmwareDxe.inf
+++ b/Platform/RaspberryPi/RPi3/Drivers/RpiFirmwareDxe/RpiFirmwareDxe.inf
@@ -3,13 +3,7 @@
# Copyright (c) 2017-2018, Andrei Warkentin <andrey.warkentin@gmail.com>
# Copyright (c) 2016, Linaro, Ltd. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
diff --git a/Platform/RaspberryPi/RPi3/Drivers/SdHostDxe/SdHostDxe.c b/Platform/RaspberryPi/RPi3/Drivers/SdHostDxe/SdHostDxe.c
index 3bf789f96b..2f31c5eb8c 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/SdHostDxe/SdHostDxe.c
+++ b/Platform/RaspberryPi/RPi3/Drivers/SdHostDxe/SdHostDxe.c
@@ -3,13 +3,7 @@
* Copyright (c) 2017, Andrei Warkentin <andrey.warkentin@gmail.com>
* Copyright (c) Microsoft Corporation. All rights reserved.
*
- * This program and the accompanying materials
- * are licensed and made available under the terms and conditions of the BSD License
- * which accompanies this distribution. The full text of the license may be found at
- * http://opensource.org/licenses/bsd-license.php
- *
- * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/RaspberryPi/RPi3/Drivers/SdHostDxe/SdHostDxe.inf b/Platform/RaspberryPi/RPi3/Drivers/SdHostDxe/SdHostDxe.inf
index 49d25a8415..4a950dc05d 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/SdHostDxe/SdHostDxe.inf
+++ b/Platform/RaspberryPi/RPi3/Drivers/SdHostDxe/SdHostDxe.inf
@@ -3,13 +3,7 @@
# Copyright (c) 2017, Andrei Warkentin <andrey.warkentin@gmail.com>
# Copyright (c) Microsoft Corporation. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
diff --git a/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/FileIo.c b/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/FileIo.c
index 0e8cd516f6..3bcd79428a 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/FileIo.c
+++ b/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/FileIo.c
@@ -3,13 +3,7 @@
* Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.com>
* Copyright (c) 2007-2009, Intel Corporation. All rights reserved.
*
- * This program and the accompanying materials
- * are licensed and made available under the terms and conditions of the BSD License
- * which accompanies this distribution. The full text of the license may be found at
- * http://opensource.org/licenses/bsd-license.php
- *
- * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/FvbInfo.c b/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/FvbInfo.c
index 14341def4c..0e0c108dba 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/FvbInfo.c
+++ b/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/FvbInfo.c
@@ -3,13 +3,7 @@
* Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.com>
* Copyright (c) 2006-2014, Intel Corporation. All rights reserved.
*
- * This program and the accompanying materials
- * are licensed and made available under the terms and conditions of the BSD License
- * which accompanies this distribution. The full text of the license may be found at
- * http://opensource.org/licenses/bsd-license.php
- *
- * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/VarBlockService.c b/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/VarBlockService.c
index 7ff5bd7a74..572309439a 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/VarBlockService.c
+++ b/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/VarBlockService.c
@@ -3,13 +3,7 @@
* Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.com>
* Copyright (c) 2006-2014, Intel Corporation. All rights reserved.
*
- * This program and the accompanying materials
- * are licensed and made available under the terms and conditions of the BSD License
- * which accompanies this distribution. The full text of the license may be found at
- * http://opensource.org/licenses/bsd-license.php
- *
- * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/VarBlockService.h b/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/VarBlockService.h
index 3596c4ac55..b65c26453d 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/VarBlockService.h
+++ b/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/VarBlockService.h
@@ -3,13 +3,7 @@
* Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.com>
* Copyright (c) 2007-2009, Intel Corporation. All rights reserved.
*
- * This program and the accompanying materials
- * are licensed and made available under the terms and conditions of the BSD License
- * which accompanies this distribution. The full text of the license may be found at
- * http://opensource.org/licenses/bsd-license.php
- *
- * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/VarBlockServiceDxe.c b/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/VarBlockServiceDxe.c
index 3c6ede74c2..07f3f1c242 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/VarBlockServiceDxe.c
+++ b/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/VarBlockServiceDxe.c
@@ -4,13 +4,7 @@
* Copyright (C) 2015, Red Hat, Inc.
* Copyright (c) 2006-2014, Intel Corporation. All rights reserved.
*
- * This program and the accompanying materials
- * are licensed and made available under the terms and conditions of the BSD License
- * which accompanies this distribution. The full text of the license may be found at
- * http://opensource.org/licenses/bsd-license.php
- *
- * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/VarBlockServiceDxe.inf b/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/VarBlockServiceDxe.inf
index f440e4eee8..8f99528f89 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/VarBlockServiceDxe.inf
+++ b/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/VarBlockServiceDxe.inf
@@ -6,14 +6,7 @@
# Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.com>
# Copyright (c) 2006-2013, Intel Corporation. All rights reserved.
#
-# This program and the accompanying materials are licensed and made available
-# under the terms and conditions of the BSD License which accompanies this
-# distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
-# IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
diff --git a/Platform/RaspberryPi/RPi3/Include/Protocol/DwUsb.h b/Platform/RaspberryPi/RPi3/Include/Protocol/DwUsb.h
index ac57960e04..4882aad6d9 100644
--- a/Platform/RaspberryPi/RPi3/Include/Protocol/DwUsb.h
+++ b/Platform/RaspberryPi/RPi3/Include/Protocol/DwUsb.h
@@ -3,13 +3,7 @@
* Copyright (c) 2015-2016, Linaro. All rights reserved.
* Copyright (c) 2015-2016, Hisilicon Limited. All rights reserved.
*
- * This program and the accompanying materials
- * are licensed and made available under the terms and conditions of the BSD License
- * which accompanies this distribution. The full text of the license may be found at
- * http://opensource.org/licenses/bsd-license.php
- *
- * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/RaspberryPi/RPi3/Include/Protocol/ExtendedTextOut.h b/Platform/RaspberryPi/RPi3/Include/Protocol/ExtendedTextOut.h
index f79cd8589f..0c57e438f1 100644
--- a/Platform/RaspberryPi/RPi3/Include/Protocol/ExtendedTextOut.h
+++ b/Platform/RaspberryPi/RPi3/Include/Protocol/ExtendedTextOut.h
@@ -2,13 +2,7 @@
*
* Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.com>
*
- * This program and the accompanying materials
- * are licensed and made available under the terms and conditions of the BSD License
- * which accompanies this distribution. The full text of the license may be found at
- * http://opensource.org/licenses/bsd-license.php
- *
- * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/RaspberryPi/RPi3/Include/Protocol/RpiFirmware.h b/Platform/RaspberryPi/RPi3/Include/Protocol/RpiFirmware.h
index 7583d7e1fc..f3e3d1e99e 100644
--- a/Platform/RaspberryPi/RPi3/Include/Protocol/RpiFirmware.h
+++ b/Platform/RaspberryPi/RPi3/Include/Protocol/RpiFirmware.h
@@ -2,13 +2,7 @@
*
* Copyright (c) 2016, Linaro Limited. All rights reserved.
*
- * This program and the accompanying materials
- * are licensed and made available under the terms and conditions of the BSD License
- * which accompanies this distribution. The full text of the license may be found at
- * http://opensource.org/licenses/bsd-license.php
- *
- * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/RaspberryPi/RPi3/Include/Protocol/RpiMmcHost.h b/Platform/RaspberryPi/RPi3/Include/Protocol/RpiMmcHost.h
index 2c0c7e0cdc..c558e00bf5 100644
--- a/Platform/RaspberryPi/RPi3/Include/Protocol/RpiMmcHost.h
+++ b/Platform/RaspberryPi/RPi3/Include/Protocol/RpiMmcHost.h
@@ -3,13 +3,7 @@
* Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.com>
* Copyright (c) 2011-2014, ARM Limited. All rights reserved.
*
- * This program and the accompanying materials
- * are licensed and made available under the terms and conditions of the BSD License
- * which accompanies this distribution. The full text of the license may be found at
- * http://opensource.org/licenses/bsd-license.php
- *
- * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/RaspberryPi/RPi3/Library/MemoryInitPeiLib/MemoryInitPeiLib.c b/Platform/RaspberryPi/RPi3/Library/MemoryInitPeiLib/MemoryInitPeiLib.c
index 903364e08b..60cf397f8b 100644
--- a/Platform/RaspberryPi/RPi3/Library/MemoryInitPeiLib/MemoryInitPeiLib.c
+++ b/Platform/RaspberryPi/RPi3/Library/MemoryInitPeiLib/MemoryInitPeiLib.c
@@ -3,13 +3,7 @@
* Copyright (c) 2017-2018, Andrey Warkentin <andrey.warkentin@gmail.com>
* Copyright (c) 2011-2015, ARM Limited. All rights reserved.
*
- * This program and the accompanying materials
- * are licensed and made available under the terms and conditions of the BSD License
- * which accompanies this distribution. The full text of the license may be found at
- * http://opensource.org/licenses/bsd-license.php
- *
- * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/RaspberryPi/RPi3/Library/MemoryInitPeiLib/MemoryInitPeiLib.inf b/Platform/RaspberryPi/RPi3/Library/MemoryInitPeiLib/MemoryInitPeiLib.inf
index 8e44f2e394..0084c01093 100644
--- a/Platform/RaspberryPi/RPi3/Library/MemoryInitPeiLib/MemoryInitPeiLib.inf
+++ b/Platform/RaspberryPi/RPi3/Library/MemoryInitPeiLib/MemoryInitPeiLib.inf
@@ -3,13 +3,7 @@
# Copyright (c) 2016, Linaro, Ltd. All rights reserved.
# Copyright (c) 2011-2014, ARM Ltd. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
diff --git a/Platform/RaspberryPi/RPi3/Library/PlatformBootManagerLib/PlatformBm.c b/Platform/RaspberryPi/RPi3/Library/PlatformBootManagerLib/PlatformBm.c
index 9bbe0db649..92f3b6146d 100644
--- a/Platform/RaspberryPi/RPi3/Library/PlatformBootManagerLib/PlatformBm.c
+++ b/Platform/RaspberryPi/RPi3/Library/PlatformBootManagerLib/PlatformBm.c
@@ -7,13 +7,7 @@
* Copyright (c) 2014, ARM Ltd. All rights reserved.
* Copyright (c) 2004-2016, Intel Corporation. All rights reserved.
*
- * This program and the accompanying materials
- * are licensed and made available under the terms and conditions of the BSD License
- * which accompanies this distribution. The full text of the license may be found at
- * http://opensource.org/licenses/bsd-license.php
- *
- * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/RaspberryPi/RPi3/Library/PlatformBootManagerLib/PlatformBm.h b/Platform/RaspberryPi/RPi3/Library/PlatformBootManagerLib/PlatformBm.h
index 3717ba6174..8408c7fb52 100644
--- a/Platform/RaspberryPi/RPi3/Library/PlatformBootManagerLib/PlatformBm.h
+++ b/Platform/RaspberryPi/RPi3/Library/PlatformBootManagerLib/PlatformBm.h
@@ -6,13 +6,7 @@
* Copyright (c) 2014, ARM Ltd. All rights reserved.
* Copyright (c) 2004-2016, Intel Corporation. All rights reserved.
*
- * This program and the accompanying materials
- * are licensed and made available under the terms and conditions of the BSD License
- * which accompanies this distribution. The full text of the license may be found at
- * http://opensource.org/licenses/bsd-license.php
- *
- * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/RaspberryPi/RPi3/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf b/Platform/RaspberryPi/RPi3/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
index b30772d5a1..7ce3e95c80 100644
--- a/Platform/RaspberryPi/RPi3/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
+++ b/Platform/RaspberryPi/RPi3/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
@@ -6,14 +6,7 @@
# Copyright (c) 2014, ARM Ltd. All rights reserved.
# Copyright (c) 2007-2014, Intel Corporation. All rights reserved.
#
-# This program and the accompanying materials are licensed and made available
-# under the terms and conditions of the BSD License which accompanies this
-# distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
-# IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
diff --git a/Platform/RaspberryPi/RPi3/Library/PlatformLib/AArch64/RaspberryPiHelper.S b/Platform/RaspberryPi/RPi3/Library/PlatformLib/AArch64/RaspberryPiHelper.S
index 9638259700..36af208d12 100644
--- a/Platform/RaspberryPi/RPi3/Library/PlatformLib/AArch64/RaspberryPiHelper.S
+++ b/Platform/RaspberryPi/RPi3/Library/PlatformLib/AArch64/RaspberryPiHelper.S
@@ -3,13 +3,7 @@
* Copyright (c) 2016, Linaro Limited. All rights reserved.
* Copyright (c) 2011-2013, ARM Limited. All rights reserved.
*
- * This program and the accompanying materials
- * are licensed and made available under the terms and conditions of the BSD License
- * which accompanies this distribution. The full text of the license may be found at
- * http://opensource.org/licenses/bsd-license.php
- *
- * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/RaspberryPi/RPi3/Library/PlatformLib/PlatformLib.inf b/Platform/RaspberryPi/RPi3/Library/PlatformLib/PlatformLib.inf
index a4506888f1..5c1f55e2df 100644
--- a/Platform/RaspberryPi/RPi3/Library/PlatformLib/PlatformLib.inf
+++ b/Platform/RaspberryPi/RPi3/Library/PlatformLib/PlatformLib.inf
@@ -4,13 +4,7 @@
# Copyright (c) 2014-2016, Linaro Limited. All rights reserved.
# Copyright (c) 2011-2014, ARM Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
diff --git a/Platform/RaspberryPi/RPi3/Library/PlatformLib/RaspberryPi.c b/Platform/RaspberryPi/RPi3/Library/PlatformLib/RaspberryPi.c
index 758ebda844..f032f3c792 100644
--- a/Platform/RaspberryPi/RPi3/Library/PlatformLib/RaspberryPi.c
+++ b/Platform/RaspberryPi/RPi3/Library/PlatformLib/RaspberryPi.c
@@ -5,13 +5,7 @@
* Copyright (c) 2011-2013, ARM Limited. All rights reserved.
*
*
- * This program and the accompanying materials
- * are licensed and made available under the terms and conditions of the BSD License
- * which accompanies this distribution. The full text of the license may be found at
- * http://opensource.org/licenses/bsd-license.php
- *
- * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/RaspberryPi/RPi3/Library/PlatformLib/RaspberryPiMem.c b/Platform/RaspberryPi/RPi3/Library/PlatformLib/RaspberryPiMem.c
index 6d7c044982..97d5af5260 100644
--- a/Platform/RaspberryPi/RPi3/Library/PlatformLib/RaspberryPiMem.c
+++ b/Platform/RaspberryPi/RPi3/Library/PlatformLib/RaspberryPiMem.c
@@ -3,13 +3,7 @@
* Copyright (c) 2017-2018, Andrey Warkentin <andrey.warkentin@gmail.com>
* Copyright (c) 2014, Linaro Limited. All rights reserved.
*
- * This program and the accompanying materials
- * are licensed and made available under the terms and conditions of the BSD License
- * which accompanies this distribution. The full text of the license may be found at
- * http://opensource.org/licenses/bsd-license.php
- *
- * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/RaspberryPi/RPi3/Library/PlatformUiAppLib/PlatformUiAppLib.c b/Platform/RaspberryPi/RPi3/Library/PlatformUiAppLib/PlatformUiAppLib.c
index 3f8521a351..1bd2b83f8e 100644
--- a/Platform/RaspberryPi/RPi3/Library/PlatformUiAppLib/PlatformUiAppLib.c
+++ b/Platform/RaspberryPi/RPi3/Library/PlatformUiAppLib/PlatformUiAppLib.c
@@ -2,13 +2,7 @@
*
* Copyright (c) 2019, Andrey Warkentin <andrey.warkentin@gmail.com>
*
- * This program and the accompanying materials
- * are licensed and made available under the terms and conditions of the BSD License
- * which accompanies this distribution. The full text of the license may be found at
- * http://opensource.org/licenses/bsd-license.php
- *
- * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/RaspberryPi/RPi3/Library/ResetLib/ResetLib.c b/Platform/RaspberryPi/RPi3/Library/ResetLib/ResetLib.c
index 465bb8babf..c62a92321e 100644
--- a/Platform/RaspberryPi/RPi3/Library/ResetLib/ResetLib.c
+++ b/Platform/RaspberryPi/RPi3/Library/ResetLib/ResetLib.c
@@ -8,13 +8,7 @@
* Copyright (c) 2013-2015, ARM Ltd. All rights reserved.
* Copyright (c) 2008-2009, Apple Inc. All rights reserved.
*
- * This program and the accompanying materials
- * are licensed and made available under the terms and conditions of the BSD License
- * which accompanies this distribution. The full text of the license may be found at
- * http://opensource.org/licenses/bsd-license.php
- *
- * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/RaspberryPi/RPi3/Library/ResetLib/ResetLib.inf b/Platform/RaspberryPi/RPi3/Library/ResetLib/ResetLib.inf
index 31ec5a3c17..f58020bf91 100644
--- a/Platform/RaspberryPi/RPi3/Library/ResetLib/ResetLib.inf
+++ b/Platform/RaspberryPi/RPi3/Library/ResetLib/ResetLib.inf
@@ -8,13 +8,7 @@
# Copyright (c) 2014, ARM Ltd. All rights reserved.
# Copyright (c) 2008, Apple Inc. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
diff --git a/Platform/RaspberryPi/RPi3/RPi3.dec b/Platform/RaspberryPi/RPi3/RPi3.dec
index 2ca7e746a6..ab37882378 100644
--- a/Platform/RaspberryPi/RPi3/RPi3.dec
+++ b/Platform/RaspberryPi/RPi3/RPi3.dec
@@ -3,14 +3,7 @@
# Copyright (c) 2016, Linaro, Ltd. All rights reserved.
# Copyright (c) 2017-2018, Andrei Warkentin <andrey.warkentin@gmail.com>
#
-# This program and the accompanying materials are licensed and made available
-# under the terms and conditions of the BSD License which accompanies this
-# distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
-# IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/RaspberryPi/RPi3/RPi3.dsc b/Platform/RaspberryPi/RPi3/RPi3.dsc
index dcdfa10290..53b87ba4e5 100644
--- a/Platform/RaspberryPi/RPi3/RPi3.dsc
+++ b/Platform/RaspberryPi/RPi3/RPi3.dsc
@@ -5,14 +5,7 @@
# Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.
# Copyright (c) 2017 - 2018, Andrei Warkentin <andrey.warkentin@gmail.com>
#
-# This program and the accompanying materials are licensed and made available
-# under the terms and conditions of the BSD License which accompanies this
-# distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
-# IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/RaspberryPi/RPi3/RPi3.fdf b/Platform/RaspberryPi/RPi3/RPi3.fdf
index 85f2187545..cf4b99a5e9 100644
--- a/Platform/RaspberryPi/RPi3/RPi3.fdf
+++ b/Platform/RaspberryPi/RPi3/RPi3.fdf
@@ -5,14 +5,7 @@
# Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.
# Copyright (c) 2017 - 2018, Andrei Warkentin <andrey.warkentin@gmail.com>
#
-# This program and the accompanying materials are licensed and made available
-# under the terms and conditions of the BSD License which accompanies this
-# distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
-# IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
--
2.21.0.windows.1
^ permalink raw reply related [flat|nested] 63+ messages in thread* Re: [edk2-devel] [[edk2-platforms][PATCH V2] 15/30] Platform/RaspberryPi: Replace BSD License with BSD+Patent License
2019-05-15 23:09 ` [[edk2-platforms][PATCH V2] 15/30] Platform/RaspberryPi: " Michael D Kinney
@ 2019-05-17 11:07 ` Leif Lindholm
2019-05-17 11:08 ` Ard Biesheuvel
0 siblings, 1 reply; 63+ messages in thread
From: Leif Lindholm @ 2019-05-17 11:07 UTC (permalink / raw)
To: devel, michael.d.kinney; +Cc: Ard Biesheuvel
On Wed, May 15, 2019 at 04:09:56PM -0700, Michael D Kinney wrote:
> https://bugzilla.tianocore.org/show_bug.cgi?id=1373
>
> Replace BSD 2-Clause License with BSD+Patent License. This change is
> based on the following emails:
>
> https://lists.01.org/pipermail/edk2-devel/2019-February/036260.html
> https://lists.01.org/pipermail/edk2-devel/2018-October/030385.html
>
> RFCs with detailed process for the license change:
>
> V3: https://lists.01.org/pipermail/edk2-devel/2019-March/038116.html
> V2: https://lists.01.org/pipermail/edk2-devel/2019-March/037669.html
> V1: https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html
This excludes the (presumably unintentionally, clarification being
sought with original author) unlicensed file:
Platform\RaspberryPi\RPi3\Library\PlatformUiAppLib\PlatformUiAppLib.inf
This would be wort mentioning in the commit message unless the
situation is resolved before the series is pushed.
It also excludes the 3-clause BSD licensed file
Platform\RaspberryPi\RPi3\Include\IndustryStandard\RpiMbox.h
based on work from Ard who suggests that was unintentional.
Ard: can you confirm for the list that this was always intended to be
2-clause?
Regards,
Leif
> Cc: Leif Lindholm <leif.lindholm@linaro.org>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
> ---
> Platform/RaspberryPi/RPi3/AcpiTables/AcpiTables.h | 8 +-------
> Platform/RaspberryPi/RPi3/AcpiTables/AcpiTables.inf | 8 +-------
> Platform/RaspberryPi/RPi3/AcpiTables/Csrt.aslc | 8 +-------
> Platform/RaspberryPi/RPi3/AcpiTables/Dbg2.aslc | 8 +-------
> Platform/RaspberryPi/RPi3/AcpiTables/Dsdt.asl | 8 +-------
> Platform/RaspberryPi/RPi3/AcpiTables/Fadt.aslc | 8 +-------
> Platform/RaspberryPi/RPi3/AcpiTables/Gtdt.aslc | 8 +-------
> Platform/RaspberryPi/RPi3/AcpiTables/Madt.aslc | 8 +-------
> Platform/RaspberryPi/RPi3/AcpiTables/Pep.asl | 8 +-------
> Platform/RaspberryPi/RPi3/AcpiTables/Pep.c | 8 +-------
> Platform/RaspberryPi/RPi3/AcpiTables/Pep.h | 8 +-------
> Platform/RaspberryPi/RPi3/AcpiTables/Rhpx.asl | 8 +-------
> Platform/RaspberryPi/RPi3/AcpiTables/Sdhc.asl | 8 +-------
> Platform/RaspberryPi/RPi3/AcpiTables/Spcr.asl | 8 +-------
> Platform/RaspberryPi/RPi3/AcpiTables/Uart.asl | 8 +-------
> .../RPi3/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.c | 8 +-------
> .../RPi3/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.h | 8 +-------
> .../RPi3/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.inf | 8 +-------
> Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxe.c | 8 +-------
> .../RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxe.inf | 9 +--------
> .../RPi3/Drivers/ConfigDxe/ConfigDxeFormSetGuid.h | 8 +-------
> .../RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxeHii.uni | 8 +-------
> .../RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxeHii.vfr | 8 +-------
> .../RaspberryPi/RPi3/Drivers/DisplayDxe/ComponentName.c | 8 +-------
> .../RaspberryPi/RPi3/Drivers/DisplayDxe/DisplayDxe.c | 8 +-------
> .../RaspberryPi/RPi3/Drivers/DisplayDxe/DisplayDxe.h | 8 +-------
> .../RaspberryPi/RPi3/Drivers/DisplayDxe/DisplayDxe.inf | 8 +-------
> .../RaspberryPi/RPi3/Drivers/DisplayDxe/Screenshot.c | 8 +-------
> .../RPi3/Drivers/DwUsbHostDxe/ComponentName.c | 8 +-------
> .../RPi3/Drivers/DwUsbHostDxe/DriverBinding.c | 8 +-------
> .../RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwUsbHostDxe.c | 8 +-------
> .../RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwUsbHostDxe.h | 8 +-------
> .../RPi3/Drivers/DwUsbHostDxe/DwUsbHostDxe.inf | 8 +-------
> Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwcHw.h | 8 +-------
> Platform/RaspberryPi/RPi3/Drivers/FdtDxe/FdtDxe.c | 8 +-------
> Platform/RaspberryPi/RPi3/Drivers/FdtDxe/FdtDxe.inf | 8 +-------
> .../RPi3/Drivers/GraphicsConsoleDxe/ComponentName.c | 8 +-------
> .../RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsole.c | 8 +-------
> .../RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsole.h | 8 +-------
> .../Drivers/GraphicsConsoleDxe/GraphicsConsoleDxe.inf | 9 +--------
> .../Drivers/GraphicsConsoleDxe/GraphicsConsoleDxe.uni | 8 +-------
> .../GraphicsConsoleDxe/GraphicsConsoleDxeExtra.uni | 8 +-------
> .../RPi3/Drivers/GraphicsConsoleDxe/NewFont.c | 8 +-------
> Platform/RaspberryPi/RPi3/Drivers/MmcDxe/ComponentName.c | 8 +-------
> Platform/RaspberryPi/RPi3/Drivers/MmcDxe/Diagnostics.c | 8 +-------
> Platform/RaspberryPi/RPi3/Drivers/MmcDxe/Mmc.c | 8 +-------
> Platform/RaspberryPi/RPi3/Drivers/MmcDxe/Mmc.h | 8 +-------
> Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcBlockIo.c | 8 +-------
> Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcDebug.c | 8 +-------
> Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcDxe.inf | 8 +-------
> .../RaspberryPi/RPi3/Drivers/MmcDxe/MmcIdentification.c | 8 +-------
> .../RPi3/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.c | 8 +-------
> .../RPi3/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.inf | 8 +-------
> .../RPi3/Drivers/RpiFirmwareDxe/RpiFirmwareDxe.c | 8 +-------
> .../RPi3/Drivers/RpiFirmwareDxe/RpiFirmwareDxe.inf | 8 +-------
> Platform/RaspberryPi/RPi3/Drivers/SdHostDxe/SdHostDxe.c | 8 +-------
> .../RaspberryPi/RPi3/Drivers/SdHostDxe/SdHostDxe.inf | 8 +-------
> .../RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/FileIo.c | 8 +-------
> .../RPi3/Drivers/VarBlockServiceDxe/FvbInfo.c | 8 +-------
> .../RPi3/Drivers/VarBlockServiceDxe/VarBlockService.c | 8 +-------
> .../RPi3/Drivers/VarBlockServiceDxe/VarBlockService.h | 8 +-------
> .../RPi3/Drivers/VarBlockServiceDxe/VarBlockServiceDxe.c | 8 +-------
> .../Drivers/VarBlockServiceDxe/VarBlockServiceDxe.inf | 9 +--------
> Platform/RaspberryPi/RPi3/Include/Protocol/DwUsb.h | 8 +-------
> .../RaspberryPi/RPi3/Include/Protocol/ExtendedTextOut.h | 8 +-------
> Platform/RaspberryPi/RPi3/Include/Protocol/RpiFirmware.h | 8 +-------
> Platform/RaspberryPi/RPi3/Include/Protocol/RpiMmcHost.h | 8 +-------
> .../RPi3/Library/MemoryInitPeiLib/MemoryInitPeiLib.c | 8 +-------
> .../RPi3/Library/MemoryInitPeiLib/MemoryInitPeiLib.inf | 8 +-------
> .../RPi3/Library/PlatformBootManagerLib/PlatformBm.c | 8 +-------
> .../RPi3/Library/PlatformBootManagerLib/PlatformBm.h | 8 +-------
> .../PlatformBootManagerLib/PlatformBootManagerLib.inf | 9 +--------
> .../RPi3/Library/PlatformLib/AArch64/RaspberryPiHelper.S | 8 +-------
> .../RaspberryPi/RPi3/Library/PlatformLib/PlatformLib.inf | 8 +-------
> .../RaspberryPi/RPi3/Library/PlatformLib/RaspberryPi.c | 8 +-------
> .../RPi3/Library/PlatformLib/RaspberryPiMem.c | 8 +-------
> .../RPi3/Library/PlatformUiAppLib/PlatformUiAppLib.c | 8 +-------
> Platform/RaspberryPi/RPi3/Library/ResetLib/ResetLib.c | 8 +-------
> Platform/RaspberryPi/RPi3/Library/ResetLib/ResetLib.inf | 8 +-------
> Platform/RaspberryPi/RPi3/RPi3.dec | 9 +--------
> Platform/RaspberryPi/RPi3/RPi3.dsc | 9 +--------
> Platform/RaspberryPi/RPi3/RPi3.fdf | 9 +--------
> 82 files changed, 82 insertions(+), 581 deletions(-)
>
> diff --git a/Platform/RaspberryPi/RPi3/AcpiTables/AcpiTables.h b/Platform/RaspberryPi/RPi3/AcpiTables/AcpiTables.h
> index be28b6dece..958af026c8 100644
> --- a/Platform/RaspberryPi/RPi3/AcpiTables/AcpiTables.h
> +++ b/Platform/RaspberryPi/RPi3/AcpiTables/AcpiTables.h
> @@ -5,13 +5,7 @@
> * Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.com>
> * Copyright (c) Microsoft Corporation. All rights reserved.
> *
> - * This program and the accompanying materials
> - * are licensed and made available under the terms and conditions of the BSD License
> - * which accompanies this distribution. The full text of the license may be found at
> - * http://opensource.org/licenses/bsd-license.php
> - *
> - * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + * SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/RaspberryPi/RPi3/AcpiTables/AcpiTables.inf b/Platform/RaspberryPi/RPi3/AcpiTables/AcpiTables.inf
> index 62de9c0720..7ef41e79ad 100644
> --- a/Platform/RaspberryPi/RPi3/AcpiTables/AcpiTables.inf
> +++ b/Platform/RaspberryPi/RPi3/AcpiTables/AcpiTables.inf
> @@ -5,13 +5,7 @@
> # Copyright (c) 2017, Andrey Warkentin <andrey.warkentin@gmail.com>
> # Copyright (c) Microsoft Corporation. All rights reserved.
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD License
> -# which accompanies this distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> #**/
>
> diff --git a/Platform/RaspberryPi/RPi3/AcpiTables/Csrt.aslc b/Platform/RaspberryPi/RPi3/AcpiTables/Csrt.aslc
> index 1b593bd29c..3b617c0a83 100644
> --- a/Platform/RaspberryPi/RPi3/AcpiTables/Csrt.aslc
> +++ b/Platform/RaspberryPi/RPi3/AcpiTables/Csrt.aslc
> @@ -4,13 +4,7 @@
> *
> * Copyright (c) Microsoft Corporation. All rights reserved.
> *
> - * This program and the accompanying materials
> - * are licensed and made available under the terms and conditions of the BSD License
> - * which accompanies this distribution. The full text of the license may be found at
> - * http://opensource.org/licenses/bsd-license.php
> - *
> - * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + * SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/RaspberryPi/RPi3/AcpiTables/Dbg2.aslc b/Platform/RaspberryPi/RPi3/AcpiTables/Dbg2.aslc
> index dc2d2dfb28..9315f23e0d 100644
> --- a/Platform/RaspberryPi/RPi3/AcpiTables/Dbg2.aslc
> +++ b/Platform/RaspberryPi/RPi3/AcpiTables/Dbg2.aslc
> @@ -4,13 +4,7 @@
> *
> * Copyright (c) Microsoft Corporation. All rights reserved.
> *
> - * This program and the accompanying materials
> - * are licensed and made available under the terms and conditions of the BSD License
> - * which accompanies this distribution. The full text of the license may be found at
> - * http://opensource.org/licenses/bsd-license.php
> - *
> - * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + * SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/RaspberryPi/RPi3/AcpiTables/Dsdt.asl b/Platform/RaspberryPi/RPi3/AcpiTables/Dsdt.asl
> index be2c4db7cc..ab4d4bf485 100644
> --- a/Platform/RaspberryPi/RPi3/AcpiTables/Dsdt.asl
> +++ b/Platform/RaspberryPi/RPi3/AcpiTables/Dsdt.asl
> @@ -5,13 +5,7 @@
> * Copyright (c) 2018, Andrey Warkentin <andrey.warkentin@gmail.com>
> * Copyright (c) Microsoft Corporation. All rights reserved.
> *
> - * This program and the accompanying materials
> - * are licensed and made available under the terms and conditions of the BSD License
> - * which accompanies this distribution. The full text of the license may be found at
> - * http://opensource.org/licenses/bsd-license.php
> - *
> - * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + * SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/RaspberryPi/RPi3/AcpiTables/Fadt.aslc b/Platform/RaspberryPi/RPi3/AcpiTables/Fadt.aslc
> index eb1873993c..3ef877fde5 100644
> --- a/Platform/RaspberryPi/RPi3/AcpiTables/Fadt.aslc
> +++ b/Platform/RaspberryPi/RPi3/AcpiTables/Fadt.aslc
> @@ -5,13 +5,7 @@
> * Copyright (c) 2018, Andrey Warkentin <andrey.warkentin@gmail.com>
> * Copyright (c) Microsoft Corporation. All rights reserved.
> *
> - * This program and the accompanying materials
> - * are licensed and made available under the terms and conditions of the BSD License
> - * which accompanies this distribution. The full text of the license may be found at
> - * http://opensource.org/licenses/bsd-license.php
> - *
> - * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + * SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/RaspberryPi/RPi3/AcpiTables/Gtdt.aslc b/Platform/RaspberryPi/RPi3/AcpiTables/Gtdt.aslc
> index 611eed2881..6551315a55 100644
> --- a/Platform/RaspberryPi/RPi3/AcpiTables/Gtdt.aslc
> +++ b/Platform/RaspberryPi/RPi3/AcpiTables/Gtdt.aslc
> @@ -5,13 +5,7 @@
> *
> * Copyright (c) Microsoft Corporation. All rights reserved.
> *
> - * This program and the accompanying materials
> - * are licensed and made available under the terms and conditions of the BSD License
> - * which accompanies this distribution. The full text of the license may be found at
> - * http://opensource.org/licenses/bsd-license.php
> - *
> - * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + * SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/RaspberryPi/RPi3/AcpiTables/Madt.aslc b/Platform/RaspberryPi/RPi3/AcpiTables/Madt.aslc
> index 69c96273f5..39cd4c5cee 100644
> --- a/Platform/RaspberryPi/RPi3/AcpiTables/Madt.aslc
> +++ b/Platform/RaspberryPi/RPi3/AcpiTables/Madt.aslc
> @@ -5,13 +5,7 @@
> * Copyright (c) 2018, Andrey Warkentin <andrey.warkentin@gmail.com>
> * Copyright (c) Microsoft Corporation. All rights reserved.
> *
> - * This program and the accompanying materials
> - * are licensed and made available under the terms and conditions of the BSD License
> - * which accompanies this distribution. The full text of the license may be found at
> - * http://opensource.org/licenses/bsd-license.php
> - *
> - * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + * SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/RaspberryPi/RPi3/AcpiTables/Pep.asl b/Platform/RaspberryPi/RPi3/AcpiTables/Pep.asl
> index c0c5fca4c3..2ddb27bcdb 100644
> --- a/Platform/RaspberryPi/RPi3/AcpiTables/Pep.asl
> +++ b/Platform/RaspberryPi/RPi3/AcpiTables/Pep.asl
> @@ -5,13 +5,7 @@
> * Copyright (c) 2018, Andrey Warkentin <andrey.warkentin@gmail.com>
> * Copyright (c) Microsoft Corporation. All rights reserved.
> *
> - * This program and the accompanying materials
> - * are licensed and made available under the terms and conditions of the BSD License
> - * which accompanies this distribution. The full text of the license may be found at
> - * http://opensource.org/licenses/bsd-license.php
> - *
> - * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + * SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/RaspberryPi/RPi3/AcpiTables/Pep.c b/Platform/RaspberryPi/RPi3/AcpiTables/Pep.c
> index bf96178a7c..51db779d79 100644
> --- a/Platform/RaspberryPi/RPi3/AcpiTables/Pep.c
> +++ b/Platform/RaspberryPi/RPi3/AcpiTables/Pep.c
> @@ -5,13 +5,7 @@
> * Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.com>
> * Copyright (c) Microsoft Corporation. All rights reserved.
> *
> - * This program and the accompanying materials
> - * are licensed and made available under the terms and conditions of the BSD License
> - * which accompanies this distribution. The full text of the license may be found at
> - * http://opensource.org/licenses/bsd-license.php
> - *
> - * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + * SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/RaspberryPi/RPi3/AcpiTables/Pep.h b/Platform/RaspberryPi/RPi3/AcpiTables/Pep.h
> index 08fee8ce57..f5f04518de 100644
> --- a/Platform/RaspberryPi/RPi3/AcpiTables/Pep.h
> +++ b/Platform/RaspberryPi/RPi3/AcpiTables/Pep.h
> @@ -5,13 +5,7 @@
> * Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.com>
> * Copyright (c) Microsoft Corporation. All rights reserved.
> *
> - * This program and the accompanying materials
> - * are licensed and made available under the terms and conditions of the BSD License
> - * which accompanies this distribution. The full text of the license may be found at
> - * http://opensource.org/licenses/bsd-license.php
> - *
> - * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + * SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/RaspberryPi/RPi3/AcpiTables/Rhpx.asl b/Platform/RaspberryPi/RPi3/AcpiTables/Rhpx.asl
> index b2127c02e9..0971e13ee0 100644
> --- a/Platform/RaspberryPi/RPi3/AcpiTables/Rhpx.asl
> +++ b/Platform/RaspberryPi/RPi3/AcpiTables/Rhpx.asl
> @@ -5,13 +5,7 @@
> * Copyright (c) 2018, Andrey Warkentin <andrey.warkentin@gmail.com>
> * Copyright (c) Microsoft Corporation. All rights reserved.
> *
> - * This program and the accompanying materials
> - * are licensed and made available under the terms and conditions of the BSD License
> - * which accompanies this distribution. The full text of the license may be found at
> - * http://opensource.org/licenses/bsd-license.php
> - *
> - * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + * SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/RaspberryPi/RPi3/AcpiTables/Sdhc.asl b/Platform/RaspberryPi/RPi3/AcpiTables/Sdhc.asl
> index e912b16c5f..0d42db30ae 100644
> --- a/Platform/RaspberryPi/RPi3/AcpiTables/Sdhc.asl
> +++ b/Platform/RaspberryPi/RPi3/AcpiTables/Sdhc.asl
> @@ -5,13 +5,7 @@
> * Copyright (c) 2018, Andrey Warkentin <andrey.warkentin@gmail.com>
> * Copyright (c) Microsoft Corporation. All rights reserved.
> *
> - * This program and the accompanying materials
> - * are licensed and made available under the terms and conditions of the BSD License
> - * which accompanies this distribution. The full text of the license may be found at
> - * http://opensource.org/licenses/bsd-license.php
> - *
> - * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + * SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/RaspberryPi/RPi3/AcpiTables/Spcr.asl b/Platform/RaspberryPi/RPi3/AcpiTables/Spcr.asl
> index c5a5f6e0af..2e6a373237 100644
> --- a/Platform/RaspberryPi/RPi3/AcpiTables/Spcr.asl
> +++ b/Platform/RaspberryPi/RPi3/AcpiTables/Spcr.asl
> @@ -4,13 +4,7 @@
> *
> * Copyright (c) 2017-2018, Andrey Warkentin <andrey.warkentin@gmail.com>
> *
> - * This program and the accompanying materials
> - * are licensed and made available under the terms and conditions of the BSD License
> - * which accompanies this distribution. The full text of the license may be found at
> - * http://opensource.org/licenses/bsd-license.php
> - *
> - * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + * SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/RaspberryPi/RPi3/AcpiTables/Uart.asl b/Platform/RaspberryPi/RPi3/AcpiTables/Uart.asl
> index 26fcef1317..a0067c82c6 100644
> --- a/Platform/RaspberryPi/RPi3/AcpiTables/Uart.asl
> +++ b/Platform/RaspberryPi/RPi3/AcpiTables/Uart.asl
> @@ -5,13 +5,7 @@
> * Copyright (c) 2018, Andrey Warkentin <andrey.warkentin@gmail.com>
> * Copyright (c) Microsoft Corporation. All rights reserved.
> *
> - * This program and the accompanying materials
> - * are licensed and made available under the terms and conditions of the BSD License
> - * which accompanies this distribution. The full text of the license may be found at
> - * http://opensource.org/licenses/bsd-license.php
> - *
> - * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + * SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/RaspberryPi/RPi3/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.c b/Platform/RaspberryPi/RPi3/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.c
> index 828b40f82a..6d706af6f2 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.c
> +++ b/Platform/RaspberryPi/RPi3/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.c
> @@ -3,13 +3,7 @@
> * Copyright (c) 2017, Andrei Warkentin <andrey.warkentin@gmail.com>
> * Copyright (c) Microsoft Corporation. All rights reserved.
> *
> - * This program and the accompanying materials
> - * are licensed and made available under the terms and conditions of the BSD License
> - * which accompanies this distribution. The full text of the license may be found at
> - * http://opensource.org/licenses/bsd-license.php
> - *
> - * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + * SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/RaspberryPi/RPi3/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.h b/Platform/RaspberryPi/RPi3/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.h
> index d1a3f014b4..6cd600f738 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.h
> +++ b/Platform/RaspberryPi/RPi3/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.h
> @@ -2,13 +2,7 @@
> *
> * Copyright (c) Microsoft Corporation. All rights reserved.
> *
> - * This program and the accompanying materials
> - * are licensed and made available under the terms and conditions of the BSD License
> - * which accompanies this distribution. The full text of the license may be found at
> - * http://opensource.org/licenses/bsd-license.php
> - *
> - * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + * SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/RaspberryPi/RPi3/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.inf b/Platform/RaspberryPi/RPi3/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.inf
> index 1e36221944..3da379b99b 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.inf
> +++ b/Platform/RaspberryPi/RPi3/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.inf
> @@ -3,13 +3,7 @@
> # Copyright (c) 2017, Andrei Warkentin <andrey.warkentin@gmail.com>
> # Copyright (c) Microsoft Corporation. All rights reserved.
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD License
> -# which accompanies this distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> #**/
>
> diff --git a/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxe.c b/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxe.c
> index b78d7deae4..d64e70adce 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxe.c
> +++ b/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxe.c
> @@ -2,13 +2,7 @@
> *
> * Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.com>
> *
> - * This program and the accompanying materials
> - * are licensed and made available under the terms and conditions of the BSD License
> - * which accompanies this distribution. The full text of the license may be found at
> - * http://opensource.org/licenses/bsd-license.php
> - *
> - * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + * SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxe.inf b/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxe.inf
> index 68eaec25ab..3fee190ac4 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxe.inf
> +++ b/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxe.inf
> @@ -2,14 +2,7 @@
> #
> # Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.com>
> #
> -# This program and the accompanying materials are licensed and made available
> -# under the terms and conditions of the BSD License which accompanies this
> -# distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> -# IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> #**/
>
> diff --git a/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxeFormSetGuid.h b/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxeFormSetGuid.h
> index b29ae3a424..30f9b905c4 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxeFormSetGuid.h
> +++ b/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxeFormSetGuid.h
> @@ -2,13 +2,7 @@
> *
> * Copyright (c) 2018 Andrei Warkentin <andrey.warkentin@gmail.com>
> *
> - * This program and the accompanying materials
> - * are licensed and made available under the terms and conditions of the BSD License
> - * which accompanies this distribution. The full text of the license may be found at
> - * http://opensource.org/licenses/bsd-license.php
> - *
> - * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + * SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxeHii.uni b/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxeHii.uni
> index bf09261d5e..a9c1014330 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxeHii.uni
> +++ b/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxeHii.uni
> @@ -2,13 +2,7 @@
> *
> * Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.com>
> *
> - * This program and the accompanying materials
> - * are licensed and made available under the terms and conditions of the BSD License
> - * which accompanies this distribution. The full text of the license may be found at
> - * http://opensource.org/licenses/bsd-license.php
> - *
> - * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + * SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxeHii.vfr b/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxeHii.vfr
> index d3d98acc2e..7a18245258 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxeHii.vfr
> +++ b/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxeHii.vfr
> @@ -2,13 +2,7 @@
> *
> * Copyright (c) 2018 Andrei Warkentin <andrey.warkentin@gmail.com>
> *
> - * This program and the accompanying materials
> - * are licensed and made available under the terms and conditions of the BSD License
> - * which accompanies this distribution. The full text of the license may be found at
> - * http://opensource.org/licenses/bsd-license.php
> - *
> - * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + * SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/ComponentName.c b/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/ComponentName.c
> index 9a84aea511..092230cd7c 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/ComponentName.c
> +++ b/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/ComponentName.c
> @@ -3,13 +3,7 @@
> * Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.com>
> * Copyright (c) 2006-2016, Intel Corporation. All rights reserved.
> *
> - * This program and the accompanying materials
> - * are licensed and made available under the terms and conditions of the BSD License
> - * which accompanies this distribution. The full text of the license may be found at
> - * http://opensource.org/licenses/bsd-license.php
> - *
> - * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + * SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/DisplayDxe.c b/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/DisplayDxe.c
> index 0e99194e85..9475a5ad67 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/DisplayDxe.c
> +++ b/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/DisplayDxe.c
> @@ -3,13 +3,7 @@
> * Copyright (c) 2017-2018, Andrei Warkentin <andrey.warkentin@gmail.com>
> * Copyright (c) Microsoft Corporation. All rights reserved.
> *
> - * This program and the accompanying materials
> - * are licensed and made available under the terms and conditions of the BSD License
> - * which accompanies this distribution. The full text of the license may be found at
> - * http://opensource.org/licenses/bsd-license.php
> - *
> - * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + * SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/DisplayDxe.h b/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/DisplayDxe.h
> index 48a049de31..bfbe9e8688 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/DisplayDxe.h
> +++ b/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/DisplayDxe.h
> @@ -3,13 +3,7 @@
> * Copyright (c) 2017-2018, Andrei Warkentin <andrey.warkentin@gmail.com>
> * Copyright (c) Microsoft Corporation. All rights reserved.
> *
> - * This program and the accompanying materials
> - * are licensed and made available under the terms and conditions of the BSD License
> - * which accompanies this distribution. The full text of the license may be found at
> - * http://opensource.org/licenses/bsd-license.php
> - *
> - * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + * SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/DisplayDxe.inf b/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/DisplayDxe.inf
> index 2e716ff779..652f6827f3 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/DisplayDxe.inf
> +++ b/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/DisplayDxe.inf
> @@ -5,13 +5,7 @@
> # Copyright (c) 2017, Andrei Warkentin <andrey.warkentin@gmail.com>
> # Copyright (c) Microsoft Corporation. All rights reserved.
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD License
> -# which accompanies this distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> #**/
>
> diff --git a/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/Screenshot.c b/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/Screenshot.c
> index a5d32d59c3..5f31c64bbf 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/Screenshot.c
> +++ b/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/Screenshot.c
> @@ -3,13 +3,7 @@
> * Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.
> * Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.com>
> *
> - * This program and the accompanying materials
> - * are licensed and made available under the terms and conditions of the BSD License
> - * which accompanies this distribution. The full text of the license may be found at
> - * http://opensource.org/licenses/bsd-license.php
> - *
> - * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + * SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/ComponentName.c b/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/ComponentName.c
> index 056debb7c5..2f3c53323b 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/ComponentName.c
> +++ b/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/ComponentName.c
> @@ -2,13 +2,7 @@
> *
> * Copyright (c) 2018, Andrey Warkentin <andrey.warkentin@gmail.com>
> *
> - * This program and the accompanying materials
> - * are licensed and made available under the terms and conditions of the BSD License
> - * which accompanies this distribution. The full text of the license may be found at
> - * http://opensource.org/licenses/bsd-license.php
> - *
> - * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + * SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DriverBinding.c b/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DriverBinding.c
> index 05aa133fa0..7f78179d4c 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DriverBinding.c
> +++ b/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DriverBinding.c
> @@ -2,13 +2,7 @@
> *
> * Copyright (c) 2018, Andrey Warkentin <andrey.warkentin@gmail.com>
> *
> - * This program and the accompanying materials
> - * are licensed and made available under the terms and conditions of the BSD License
> - * which accompanies this distribution. The full text of the license may be found at
> - * http://opensource.org/licenses/bsd-license.php
> - *
> - * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + * SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwUsbHostDxe.c b/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwUsbHostDxe.c
> index 8905a4d18f..59120b9d85 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwUsbHostDxe.c
> +++ b/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwUsbHostDxe.c
> @@ -3,13 +3,7 @@
> * Copyright (c) 2017-2018, Andrey Warkentin <andrey.warkentin@gmail.com>
> * Copyright (c) 2015-2016, Linaro Limited. All rights reserved.
> *
> - * This program and the accompanying materials
> - * are licensed and made available under the terms and conditions of the BSD License
> - * which accompanies this distribution. The full text of the license may be found at
> - * http://opensource.org/licenses/bsd-license.php
> - *
> - * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + * SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwUsbHostDxe.h b/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwUsbHostDxe.h
> index 673d8d3406..106e542535 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwUsbHostDxe.h
> +++ b/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwUsbHostDxe.h
> @@ -3,13 +3,7 @@
> * Copyright (c) 2017-2018, Andrey Warkentin <andrey.warkentin@gmail.com>
> * Copyright (c) 2015-2016, Linaro Limited. All rights reserved.
> *
> - * This program and the accompanying materials
> - * are licensed and made available under the terms and conditions of the BSD License
> - * which accompanies this distribution. The full text of the license may be found at
> - * http://opensource.org/licenses/bsd-license.php
> - *
> - * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + * SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwUsbHostDxe.inf b/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwUsbHostDxe.inf
> index 5ae730ccaa..6eaca35aef 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwUsbHostDxe.inf
> +++ b/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwUsbHostDxe.inf
> @@ -3,13 +3,7 @@
> # Copyright (c) 2017-2018, Andrei Warkentin <andrey.warkentin@gmail.com>
> # Copyright (c) 2015-2016, Linaro Limited. All rights reserved.
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD License
> -# which accompanies this distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> #**/
>
> diff --git a/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwcHw.h b/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwcHw.h
> index d92bb2d3fd..88fd93934f 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwcHw.h
> +++ b/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwcHw.h
> @@ -3,13 +3,7 @@
> * Copyright (c) 2017, Andrey Warkentin <andrey.warkentin@gmail.com>
> * Copyright (c) 2015-2016, Linaro Limited. All rights reserved.
> *
> - * This program and the accompanying materials
> - * are licensed and made available under the terms and conditions of the BSD License
> - * which accompanies this distribution. The full text of the license may be found at
> - * http://opensource.org/licenses/bsd-license.php
> - *
> - * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + * SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/RaspberryPi/RPi3/Drivers/FdtDxe/FdtDxe.c b/Platform/RaspberryPi/RPi3/Drivers/FdtDxe/FdtDxe.c
> index eb5698cb50..83446e3e45 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/FdtDxe/FdtDxe.c
> +++ b/Platform/RaspberryPi/RPi3/Drivers/FdtDxe/FdtDxe.c
> @@ -3,13 +3,7 @@
> * Copyright (c) 2017, Andrey Warkentin <andrey.warkentin@gmail.com>
> * Copyright (c) 2016, Linaro, Ltd. All rights reserved.
> *
> - * This program and the accompanying materials
> - * are licensed and made available under the terms and conditions of the BSD License
> - * which accompanies this distribution. The full text of the license may be found at
> - * http://opensource.org/licenses/bsd-license.php
> - *
> - * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + * SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
> #include <PiDxe.h>
> diff --git a/Platform/RaspberryPi/RPi3/Drivers/FdtDxe/FdtDxe.inf b/Platform/RaspberryPi/RPi3/Drivers/FdtDxe/FdtDxe.inf
> index d93a18019d..5b0b1a09f3 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/FdtDxe/FdtDxe.inf
> +++ b/Platform/RaspberryPi/RPi3/Drivers/FdtDxe/FdtDxe.inf
> @@ -3,13 +3,7 @@
> # Copyright (c) 2017, Andrei Warkentin <andrey.warkentin@gmail.com>
> # Copyright (c) 2016, Linaro, Ltd. All rights reserved.
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD License
> -# which accompanies this distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> #**/
>
> diff --git a/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/ComponentName.c b/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/ComponentName.c
> index 3ae639ad3d..6a094bfeda 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/ComponentName.c
> +++ b/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/ComponentName.c
> @@ -3,13 +3,7 @@
> * Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.com>
> * Copyright (c) 2006-2016, Intel Corporation. All rights reserved.
> *
> - * This program and the accompanying materials
> - * are licensed and made available under the terms and conditions of the BSD License
> - * which accompanies this distribution. The full text of the license may be found at
> - * http://opensource.org/licenses/bsd-license.php
> - *
> - * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + * SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsole.c b/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsole.c
> index 246f4ad52b..5e15b59e7c 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsole.c
> +++ b/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsole.c
> @@ -3,13 +3,7 @@
> * Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.com>
> * Copyright (c) 2006-2016, Intel Corporation. All rights reserved.
> *
> - * This program and the accompanying materials
> - * are licensed and made available under the terms and conditions of the BSD License
> - * which accompanies this distribution. The full text of the license may be found at
> - * http://opensource.org/licenses/bsd-license.php
> - *
> - * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + * SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsole.h b/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsole.h
> index ba93cab86b..62980fd03d 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsole.h
> +++ b/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsole.h
> @@ -3,13 +3,7 @@
> * Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.com>
> * Copyright (c) 2006-2016, Intel Corporation. All rights reserved.
> *
> - * This program and the accompanying materials
> - * are licensed and made available under the terms and conditions of the BSD License
> - * which accompanies this distribution. The full text of the license may be found at
> - * http://opensource.org/licenses/bsd-license.php
> - *
> - * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + * SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsoleDxe.inf b/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
> index 11c1a3ae0e..51d1eed12e 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
> +++ b/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
> @@ -3,14 +3,7 @@
> # Copyright (c) 2006-2014, Intel Corporation. All rights reserved.
> # Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.com>
> #
> -# This program and the accompanying materials are licensed and made available
> -# under the terms and conditions of the BSD License which accompanies this
> -# distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> -# IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> #**/
>
> diff --git a/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsoleDxe.uni b/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsoleDxe.uni
> index 0957c5795f..a7d8b8431a 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsoleDxe.uni
> +++ b/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsoleDxe.uni
> @@ -3,13 +3,7 @@
> * Copyright (c) 2006-2014, Intel Corporation. All rights reserved.
> * Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.com>
> *
> - * This program and the accompanying materials
> - * are licensed and made available under the terms and conditions of the BSD License
> - * which accompanies this distribution. The full text of the license may be found at
> - * http://opensource.org/licenses/bsd-license.php
> - *
> - * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + * SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsoleDxeExtra.uni b/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsoleDxeExtra.uni
> index 9aa9af4de6..b849a6b99d 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsoleDxeExtra.uni
> +++ b/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsoleDxeExtra.uni
> @@ -3,13 +3,7 @@
> * Copyright (c) 2006-2014, Intel Corporation. All rights reserved.
> * Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.com>
> *
> - * This program and the accompanying materials
> - * are licensed and made available under the terms and conditions of the BSD License
> - * which accompanies this distribution. The full text of the license may be found at
> - * http://opensource.org/licenses/bsd-license.php
> - *
> - * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + * SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/NewFont.c b/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/NewFont.c
> index c4840a6637..87a949b25c 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/NewFont.c
> +++ b/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/NewFont.c
> @@ -2,13 +2,7 @@
> *
> * Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.com>
> *
> - * This program and the accompanying materials
> - * are licensed and made available under the terms and conditions of the BSD License
> - * which accompanies this distribution. The full text of the license may be found at
> - * http://opensource.org/licenses/bsd-license.php
> - *
> - * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + * SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/ComponentName.c b/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/ComponentName.c
> index 034da778ca..07d762c5ac 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/ComponentName.c
> +++ b/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/ComponentName.c
> @@ -4,13 +4,7 @@
> *
> * Copyright (c) 2011, ARM Limited. All rights reserved.
> *
> - * This program and the accompanying materials
> - * are licensed and made available under the terms and conditions of the BSD License
> - * which accompanies this distribution. The full text of the license may be found at
> - * http://opensource.org/licenses/bsd-license.php
> - *
> - * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + * SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/Diagnostics.c b/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/Diagnostics.c
> index c019a85b48..58f1e25199 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/Diagnostics.c
> +++ b/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/Diagnostics.c
> @@ -4,13 +4,7 @@
> *
> * Copyright (c) 2011-2014, ARM Limited. All rights reserved.
> *
> - * This program and the accompanying materials
> - * are licensed and made available under the terms and conditions of the BSD License
> - * which accompanies this distribution. The full text of the license may be found at
> - * http://opensource.org/licenses/bsd-license.php
> - *
> - * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + * SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/Mmc.c b/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/Mmc.c
> index 1d75276b80..c3c7279e47 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/Mmc.c
> +++ b/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/Mmc.c
> @@ -4,13 +4,7 @@
> *
> * Copyright (c) 2011-2013, ARM Limited. All rights reserved.
> *
> - * This program and the accompanying materials
> - * are licensed and made available under the terms and conditions of the BSD License
> - * which accompanies this distribution. The full text of the license may be found at
> - * http://opensource.org/licenses/bsd-license.php
> - *
> - * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + * SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/Mmc.h b/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/Mmc.h
> index f6a5a99928..28a890b048 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/Mmc.h
> +++ b/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/Mmc.h
> @@ -4,13 +4,7 @@
> *
> * Copyright (c) 2011-2015, ARM Limited. All rights reserved.
> *
> - * This program and the accompanying materials
> - * are licensed and made available under the terms and conditions of the BSD License
> - * which accompanies this distribution. The full text of the license may be found at
> - * http://opensource.org/licenses/bsd-license.php
> - *
> - * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + * SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcBlockIo.c b/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcBlockIo.c
> index ede814dfa2..29a9fd7df6 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcBlockIo.c
> +++ b/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcBlockIo.c
> @@ -2,13 +2,7 @@
> *
> * Copyright (c) 2011-2015, ARM Limited. All rights reserved.
> *
> - * This program and the accompanying materials
> - * are licensed and made available under the terms and conditions of the BSD License
> - * which accompanies this distribution. The full text of the license may be found at
> - * http://opensource.org/licenses/bsd-license.php
> - *
> - * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + * SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcDebug.c b/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcDebug.c
> index c0af5f6e8d..22209fcaca 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcDebug.c
> +++ b/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcDebug.c
> @@ -2,13 +2,7 @@
> *
> * Copyright (c) 2011-2013, ARM Limited. All rights reserved.
> *
> - * This program and the accompanying materials
> - * are licensed and made available under the terms and conditions of the BSD License
> - * which accompanies this distribution. The full text of the license may be found at
> - * http://opensource.org/licenses/bsd-license.php
> - *
> - * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + * SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcDxe.inf b/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcDxe.inf
> index c8e7fbf39c..2c71bb6243 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcDxe.inf
> +++ b/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcDxe.inf
> @@ -3,13 +3,7 @@
> # Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.com>
> # Copyright (c) 2011-2015, ARM Limited. All rights reserved.
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD License
> -# which accompanies this distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> #**/
>
> diff --git a/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcIdentification.c b/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcIdentification.c
> index e9b8124d3a..4ee5c5ca6f 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcIdentification.c
> +++ b/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcIdentification.c
> @@ -2,13 +2,7 @@
> *
> * Copyright (c) 2011-2015, ARM Limited. All rights reserved.
> *
> - * This program and the accompanying materials
> - * are licensed and made available under the terms and conditions of the BSD License
> - * which accompanies this distribution. The full text of the license may be found at
> - * http://opensource.org/licenses/bsd-license.php
> - *
> - * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + * SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/RaspberryPi/RPi3/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.c b/Platform/RaspberryPi/RPi3/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.c
> index 7707763e43..bc35175279 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.c
> +++ b/Platform/RaspberryPi/RPi3/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.c
> @@ -21,13 +21,7 @@
> * Copyright (c) 2012, Apple Inc. All rights reserved.<BR>
> * Copyright (c) Microsoft Corporation. All rights reserved.
> *
> - * This program and the accompanying materials
> - * are licensed and made available under the terms and conditions of the BSD License
> - * which accompanies this distribution. The full text of the license may be found at
> - * http://opensource.org/licenses/bsd-license.php
> - *
> - * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + * SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/RaspberryPi/RPi3/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.inf b/Platform/RaspberryPi/RPi3/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.inf
> index 4ae41c0382..f7c74f7f54 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.inf
> +++ b/Platform/RaspberryPi/RPi3/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.inf
> @@ -6,13 +6,7 @@
> # Copyright (c) Microsoft Corporation. All rights reserved.
> # Copyright (c) 2013 Linaro.org
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD License
> -# which accompanies this distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> #**/
>
> diff --git a/Platform/RaspberryPi/RPi3/Drivers/RpiFirmwareDxe/RpiFirmwareDxe.c b/Platform/RaspberryPi/RPi3/Drivers/RpiFirmwareDxe/RpiFirmwareDxe.c
> index d330e45fdc..925f5a9212 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/RpiFirmwareDxe/RpiFirmwareDxe.c
> +++ b/Platform/RaspberryPi/RPi3/Drivers/RpiFirmwareDxe/RpiFirmwareDxe.c
> @@ -3,13 +3,7 @@
> * Copyright (c) 2017-2018, Andrei Warkentin <andrey.warkentin@gmail.com>
> * Copyright (c) 2016, Linaro, Ltd. All rights reserved.
> *
> - * This program and the accompanying materials
> - * are licensed and made available under the terms and conditions of the BSD License
> - * which accompanies this distribution. The full text of the license may be found at
> - * http://opensource.org/licenses/bsd-license.php
> - *
> - * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + * SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/RaspberryPi/RPi3/Drivers/RpiFirmwareDxe/RpiFirmwareDxe.inf b/Platform/RaspberryPi/RPi3/Drivers/RpiFirmwareDxe/RpiFirmwareDxe.inf
> index 45af4d08b2..bba0007076 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/RpiFirmwareDxe/RpiFirmwareDxe.inf
> +++ b/Platform/RaspberryPi/RPi3/Drivers/RpiFirmwareDxe/RpiFirmwareDxe.inf
> @@ -3,13 +3,7 @@
> # Copyright (c) 2017-2018, Andrei Warkentin <andrey.warkentin@gmail.com>
> # Copyright (c) 2016, Linaro, Ltd. All rights reserved.
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD License
> -# which accompanies this distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> #**/
>
> diff --git a/Platform/RaspberryPi/RPi3/Drivers/SdHostDxe/SdHostDxe.c b/Platform/RaspberryPi/RPi3/Drivers/SdHostDxe/SdHostDxe.c
> index 3bf789f96b..2f31c5eb8c 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/SdHostDxe/SdHostDxe.c
> +++ b/Platform/RaspberryPi/RPi3/Drivers/SdHostDxe/SdHostDxe.c
> @@ -3,13 +3,7 @@
> * Copyright (c) 2017, Andrei Warkentin <andrey.warkentin@gmail.com>
> * Copyright (c) Microsoft Corporation. All rights reserved.
> *
> - * This program and the accompanying materials
> - * are licensed and made available under the terms and conditions of the BSD License
> - * which accompanies this distribution. The full text of the license may be found at
> - * http://opensource.org/licenses/bsd-license.php
> - *
> - * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + * SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/RaspberryPi/RPi3/Drivers/SdHostDxe/SdHostDxe.inf b/Platform/RaspberryPi/RPi3/Drivers/SdHostDxe/SdHostDxe.inf
> index 49d25a8415..4a950dc05d 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/SdHostDxe/SdHostDxe.inf
> +++ b/Platform/RaspberryPi/RPi3/Drivers/SdHostDxe/SdHostDxe.inf
> @@ -3,13 +3,7 @@
> # Copyright (c) 2017, Andrei Warkentin <andrey.warkentin@gmail.com>
> # Copyright (c) Microsoft Corporation. All rights reserved.
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD License
> -# which accompanies this distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> #**/
>
> diff --git a/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/FileIo.c b/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/FileIo.c
> index 0e8cd516f6..3bcd79428a 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/FileIo.c
> +++ b/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/FileIo.c
> @@ -3,13 +3,7 @@
> * Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.com>
> * Copyright (c) 2007-2009, Intel Corporation. All rights reserved.
> *
> - * This program and the accompanying materials
> - * are licensed and made available under the terms and conditions of the BSD License
> - * which accompanies this distribution. The full text of the license may be found at
> - * http://opensource.org/licenses/bsd-license.php
> - *
> - * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + * SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/FvbInfo.c b/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/FvbInfo.c
> index 14341def4c..0e0c108dba 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/FvbInfo.c
> +++ b/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/FvbInfo.c
> @@ -3,13 +3,7 @@
> * Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.com>
> * Copyright (c) 2006-2014, Intel Corporation. All rights reserved.
> *
> - * This program and the accompanying materials
> - * are licensed and made available under the terms and conditions of the BSD License
> - * which accompanies this distribution. The full text of the license may be found at
> - * http://opensource.org/licenses/bsd-license.php
> - *
> - * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + * SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/VarBlockService.c b/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/VarBlockService.c
> index 7ff5bd7a74..572309439a 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/VarBlockService.c
> +++ b/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/VarBlockService.c
> @@ -3,13 +3,7 @@
> * Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.com>
> * Copyright (c) 2006-2014, Intel Corporation. All rights reserved.
> *
> - * This program and the accompanying materials
> - * are licensed and made available under the terms and conditions of the BSD License
> - * which accompanies this distribution. The full text of the license may be found at
> - * http://opensource.org/licenses/bsd-license.php
> - *
> - * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + * SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/VarBlockService.h b/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/VarBlockService.h
> index 3596c4ac55..b65c26453d 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/VarBlockService.h
> +++ b/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/VarBlockService.h
> @@ -3,13 +3,7 @@
> * Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.com>
> * Copyright (c) 2007-2009, Intel Corporation. All rights reserved.
> *
> - * This program and the accompanying materials
> - * are licensed and made available under the terms and conditions of the BSD License
> - * which accompanies this distribution. The full text of the license may be found at
> - * http://opensource.org/licenses/bsd-license.php
> - *
> - * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + * SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/VarBlockServiceDxe.c b/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/VarBlockServiceDxe.c
> index 3c6ede74c2..07f3f1c242 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/VarBlockServiceDxe.c
> +++ b/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/VarBlockServiceDxe.c
> @@ -4,13 +4,7 @@
> * Copyright (C) 2015, Red Hat, Inc.
> * Copyright (c) 2006-2014, Intel Corporation. All rights reserved.
> *
> - * This program and the accompanying materials
> - * are licensed and made available under the terms and conditions of the BSD License
> - * which accompanies this distribution. The full text of the license may be found at
> - * http://opensource.org/licenses/bsd-license.php
> - *
> - * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + * SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/VarBlockServiceDxe.inf b/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/VarBlockServiceDxe.inf
> index f440e4eee8..8f99528f89 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/VarBlockServiceDxe.inf
> +++ b/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/VarBlockServiceDxe.inf
> @@ -6,14 +6,7 @@
> # Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.com>
> # Copyright (c) 2006-2013, Intel Corporation. All rights reserved.
> #
> -# This program and the accompanying materials are licensed and made available
> -# under the terms and conditions of the BSD License which accompanies this
> -# distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> -# IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> #**/
>
> diff --git a/Platform/RaspberryPi/RPi3/Include/Protocol/DwUsb.h b/Platform/RaspberryPi/RPi3/Include/Protocol/DwUsb.h
> index ac57960e04..4882aad6d9 100644
> --- a/Platform/RaspberryPi/RPi3/Include/Protocol/DwUsb.h
> +++ b/Platform/RaspberryPi/RPi3/Include/Protocol/DwUsb.h
> @@ -3,13 +3,7 @@
> * Copyright (c) 2015-2016, Linaro. All rights reserved.
> * Copyright (c) 2015-2016, Hisilicon Limited. All rights reserved.
> *
> - * This program and the accompanying materials
> - * are licensed and made available under the terms and conditions of the BSD License
> - * which accompanies this distribution. The full text of the license may be found at
> - * http://opensource.org/licenses/bsd-license.php
> - *
> - * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + * SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/RaspberryPi/RPi3/Include/Protocol/ExtendedTextOut.h b/Platform/RaspberryPi/RPi3/Include/Protocol/ExtendedTextOut.h
> index f79cd8589f..0c57e438f1 100644
> --- a/Platform/RaspberryPi/RPi3/Include/Protocol/ExtendedTextOut.h
> +++ b/Platform/RaspberryPi/RPi3/Include/Protocol/ExtendedTextOut.h
> @@ -2,13 +2,7 @@
> *
> * Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.com>
> *
> - * This program and the accompanying materials
> - * are licensed and made available under the terms and conditions of the BSD License
> - * which accompanies this distribution. The full text of the license may be found at
> - * http://opensource.org/licenses/bsd-license.php
> - *
> - * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + * SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/RaspberryPi/RPi3/Include/Protocol/RpiFirmware.h b/Platform/RaspberryPi/RPi3/Include/Protocol/RpiFirmware.h
> index 7583d7e1fc..f3e3d1e99e 100644
> --- a/Platform/RaspberryPi/RPi3/Include/Protocol/RpiFirmware.h
> +++ b/Platform/RaspberryPi/RPi3/Include/Protocol/RpiFirmware.h
> @@ -2,13 +2,7 @@
> *
> * Copyright (c) 2016, Linaro Limited. All rights reserved.
> *
> - * This program and the accompanying materials
> - * are licensed and made available under the terms and conditions of the BSD License
> - * which accompanies this distribution. The full text of the license may be found at
> - * http://opensource.org/licenses/bsd-license.php
> - *
> - * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + * SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/RaspberryPi/RPi3/Include/Protocol/RpiMmcHost.h b/Platform/RaspberryPi/RPi3/Include/Protocol/RpiMmcHost.h
> index 2c0c7e0cdc..c558e00bf5 100644
> --- a/Platform/RaspberryPi/RPi3/Include/Protocol/RpiMmcHost.h
> +++ b/Platform/RaspberryPi/RPi3/Include/Protocol/RpiMmcHost.h
> @@ -3,13 +3,7 @@
> * Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.com>
> * Copyright (c) 2011-2014, ARM Limited. All rights reserved.
> *
> - * This program and the accompanying materials
> - * are licensed and made available under the terms and conditions of the BSD License
> - * which accompanies this distribution. The full text of the license may be found at
> - * http://opensource.org/licenses/bsd-license.php
> - *
> - * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + * SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/RaspberryPi/RPi3/Library/MemoryInitPeiLib/MemoryInitPeiLib.c b/Platform/RaspberryPi/RPi3/Library/MemoryInitPeiLib/MemoryInitPeiLib.c
> index 903364e08b..60cf397f8b 100644
> --- a/Platform/RaspberryPi/RPi3/Library/MemoryInitPeiLib/MemoryInitPeiLib.c
> +++ b/Platform/RaspberryPi/RPi3/Library/MemoryInitPeiLib/MemoryInitPeiLib.c
> @@ -3,13 +3,7 @@
> * Copyright (c) 2017-2018, Andrey Warkentin <andrey.warkentin@gmail.com>
> * Copyright (c) 2011-2015, ARM Limited. All rights reserved.
> *
> - * This program and the accompanying materials
> - * are licensed and made available under the terms and conditions of the BSD License
> - * which accompanies this distribution. The full text of the license may be found at
> - * http://opensource.org/licenses/bsd-license.php
> - *
> - * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + * SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/RaspberryPi/RPi3/Library/MemoryInitPeiLib/MemoryInitPeiLib.inf b/Platform/RaspberryPi/RPi3/Library/MemoryInitPeiLib/MemoryInitPeiLib.inf
> index 8e44f2e394..0084c01093 100644
> --- a/Platform/RaspberryPi/RPi3/Library/MemoryInitPeiLib/MemoryInitPeiLib.inf
> +++ b/Platform/RaspberryPi/RPi3/Library/MemoryInitPeiLib/MemoryInitPeiLib.inf
> @@ -3,13 +3,7 @@
> # Copyright (c) 2016, Linaro, Ltd. All rights reserved.
> # Copyright (c) 2011-2014, ARM Ltd. All rights reserved.
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD License
> -# which accompanies this distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> #**/
>
> diff --git a/Platform/RaspberryPi/RPi3/Library/PlatformBootManagerLib/PlatformBm.c b/Platform/RaspberryPi/RPi3/Library/PlatformBootManagerLib/PlatformBm.c
> index 9bbe0db649..92f3b6146d 100644
> --- a/Platform/RaspberryPi/RPi3/Library/PlatformBootManagerLib/PlatformBm.c
> +++ b/Platform/RaspberryPi/RPi3/Library/PlatformBootManagerLib/PlatformBm.c
> @@ -7,13 +7,7 @@
> * Copyright (c) 2014, ARM Ltd. All rights reserved.
> * Copyright (c) 2004-2016, Intel Corporation. All rights reserved.
> *
> - * This program and the accompanying materials
> - * are licensed and made available under the terms and conditions of the BSD License
> - * which accompanies this distribution. The full text of the license may be found at
> - * http://opensource.org/licenses/bsd-license.php
> - *
> - * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + * SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/RaspberryPi/RPi3/Library/PlatformBootManagerLib/PlatformBm.h b/Platform/RaspberryPi/RPi3/Library/PlatformBootManagerLib/PlatformBm.h
> index 3717ba6174..8408c7fb52 100644
> --- a/Platform/RaspberryPi/RPi3/Library/PlatformBootManagerLib/PlatformBm.h
> +++ b/Platform/RaspberryPi/RPi3/Library/PlatformBootManagerLib/PlatformBm.h
> @@ -6,13 +6,7 @@
> * Copyright (c) 2014, ARM Ltd. All rights reserved.
> * Copyright (c) 2004-2016, Intel Corporation. All rights reserved.
> *
> - * This program and the accompanying materials
> - * are licensed and made available under the terms and conditions of the BSD License
> - * which accompanies this distribution. The full text of the license may be found at
> - * http://opensource.org/licenses/bsd-license.php
> - *
> - * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + * SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/RaspberryPi/RPi3/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf b/Platform/RaspberryPi/RPi3/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
> index b30772d5a1..7ce3e95c80 100644
> --- a/Platform/RaspberryPi/RPi3/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
> +++ b/Platform/RaspberryPi/RPi3/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
> @@ -6,14 +6,7 @@
> # Copyright (c) 2014, ARM Ltd. All rights reserved.
> # Copyright (c) 2007-2014, Intel Corporation. All rights reserved.
> #
> -# This program and the accompanying materials are licensed and made available
> -# under the terms and conditions of the BSD License which accompanies this
> -# distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> -# IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> #**/
>
> diff --git a/Platform/RaspberryPi/RPi3/Library/PlatformLib/AArch64/RaspberryPiHelper.S b/Platform/RaspberryPi/RPi3/Library/PlatformLib/AArch64/RaspberryPiHelper.S
> index 9638259700..36af208d12 100644
> --- a/Platform/RaspberryPi/RPi3/Library/PlatformLib/AArch64/RaspberryPiHelper.S
> +++ b/Platform/RaspberryPi/RPi3/Library/PlatformLib/AArch64/RaspberryPiHelper.S
> @@ -3,13 +3,7 @@
> * Copyright (c) 2016, Linaro Limited. All rights reserved.
> * Copyright (c) 2011-2013, ARM Limited. All rights reserved.
> *
> - * This program and the accompanying materials
> - * are licensed and made available under the terms and conditions of the BSD License
> - * which accompanies this distribution. The full text of the license may be found at
> - * http://opensource.org/licenses/bsd-license.php
> - *
> - * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + * SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/RaspberryPi/RPi3/Library/PlatformLib/PlatformLib.inf b/Platform/RaspberryPi/RPi3/Library/PlatformLib/PlatformLib.inf
> index a4506888f1..5c1f55e2df 100644
> --- a/Platform/RaspberryPi/RPi3/Library/PlatformLib/PlatformLib.inf
> +++ b/Platform/RaspberryPi/RPi3/Library/PlatformLib/PlatformLib.inf
> @@ -4,13 +4,7 @@
> # Copyright (c) 2014-2016, Linaro Limited. All rights reserved.
> # Copyright (c) 2011-2014, ARM Limited. All rights reserved.
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD License
> -# which accompanies this distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> #**/
>
> diff --git a/Platform/RaspberryPi/RPi3/Library/PlatformLib/RaspberryPi.c b/Platform/RaspberryPi/RPi3/Library/PlatformLib/RaspberryPi.c
> index 758ebda844..f032f3c792 100644
> --- a/Platform/RaspberryPi/RPi3/Library/PlatformLib/RaspberryPi.c
> +++ b/Platform/RaspberryPi/RPi3/Library/PlatformLib/RaspberryPi.c
> @@ -5,13 +5,7 @@
> * Copyright (c) 2011-2013, ARM Limited. All rights reserved.
> *
> *
> - * This program and the accompanying materials
> - * are licensed and made available under the terms and conditions of the BSD License
> - * which accompanies this distribution. The full text of the license may be found at
> - * http://opensource.org/licenses/bsd-license.php
> - *
> - * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + * SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/RaspberryPi/RPi3/Library/PlatformLib/RaspberryPiMem.c b/Platform/RaspberryPi/RPi3/Library/PlatformLib/RaspberryPiMem.c
> index 6d7c044982..97d5af5260 100644
> --- a/Platform/RaspberryPi/RPi3/Library/PlatformLib/RaspberryPiMem.c
> +++ b/Platform/RaspberryPi/RPi3/Library/PlatformLib/RaspberryPiMem.c
> @@ -3,13 +3,7 @@
> * Copyright (c) 2017-2018, Andrey Warkentin <andrey.warkentin@gmail.com>
> * Copyright (c) 2014, Linaro Limited. All rights reserved.
> *
> - * This program and the accompanying materials
> - * are licensed and made available under the terms and conditions of the BSD License
> - * which accompanies this distribution. The full text of the license may be found at
> - * http://opensource.org/licenses/bsd-license.php
> - *
> - * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + * SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/RaspberryPi/RPi3/Library/PlatformUiAppLib/PlatformUiAppLib.c b/Platform/RaspberryPi/RPi3/Library/PlatformUiAppLib/PlatformUiAppLib.c
> index 3f8521a351..1bd2b83f8e 100644
> --- a/Platform/RaspberryPi/RPi3/Library/PlatformUiAppLib/PlatformUiAppLib.c
> +++ b/Platform/RaspberryPi/RPi3/Library/PlatformUiAppLib/PlatformUiAppLib.c
> @@ -2,13 +2,7 @@
> *
> * Copyright (c) 2019, Andrey Warkentin <andrey.warkentin@gmail.com>
> *
> - * This program and the accompanying materials
> - * are licensed and made available under the terms and conditions of the BSD License
> - * which accompanies this distribution. The full text of the license may be found at
> - * http://opensource.org/licenses/bsd-license.php
> - *
> - * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + * SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/RaspberryPi/RPi3/Library/ResetLib/ResetLib.c b/Platform/RaspberryPi/RPi3/Library/ResetLib/ResetLib.c
> index 465bb8babf..c62a92321e 100644
> --- a/Platform/RaspberryPi/RPi3/Library/ResetLib/ResetLib.c
> +++ b/Platform/RaspberryPi/RPi3/Library/ResetLib/ResetLib.c
> @@ -8,13 +8,7 @@
> * Copyright (c) 2013-2015, ARM Ltd. All rights reserved.
> * Copyright (c) 2008-2009, Apple Inc. All rights reserved.
> *
> - * This program and the accompanying materials
> - * are licensed and made available under the terms and conditions of the BSD License
> - * which accompanies this distribution. The full text of the license may be found at
> - * http://opensource.org/licenses/bsd-license.php
> - *
> - * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + * SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Platform/RaspberryPi/RPi3/Library/ResetLib/ResetLib.inf b/Platform/RaspberryPi/RPi3/Library/ResetLib/ResetLib.inf
> index 31ec5a3c17..f58020bf91 100644
> --- a/Platform/RaspberryPi/RPi3/Library/ResetLib/ResetLib.inf
> +++ b/Platform/RaspberryPi/RPi3/Library/ResetLib/ResetLib.inf
> @@ -8,13 +8,7 @@
> # Copyright (c) 2014, ARM Ltd. All rights reserved.
> # Copyright (c) 2008, Apple Inc. All rights reserved.
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD License
> -# which accompanies this distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> #**/
>
> diff --git a/Platform/RaspberryPi/RPi3/RPi3.dec b/Platform/RaspberryPi/RPi3/RPi3.dec
> index 2ca7e746a6..ab37882378 100644
> --- a/Platform/RaspberryPi/RPi3/RPi3.dec
> +++ b/Platform/RaspberryPi/RPi3/RPi3.dec
> @@ -3,14 +3,7 @@
> # Copyright (c) 2016, Linaro, Ltd. All rights reserved.
> # Copyright (c) 2017-2018, Andrei Warkentin <andrey.warkentin@gmail.com>
> #
> -# This program and the accompanying materials are licensed and made available
> -# under the terms and conditions of the BSD License which accompanies this
> -# distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> -# IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Platform/RaspberryPi/RPi3/RPi3.dsc b/Platform/RaspberryPi/RPi3/RPi3.dsc
> index dcdfa10290..53b87ba4e5 100644
> --- a/Platform/RaspberryPi/RPi3/RPi3.dsc
> +++ b/Platform/RaspberryPi/RPi3/RPi3.dsc
> @@ -5,14 +5,7 @@
> # Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.
> # Copyright (c) 2017 - 2018, Andrei Warkentin <andrey.warkentin@gmail.com>
> #
> -# This program and the accompanying materials are licensed and made available
> -# under the terms and conditions of the BSD License which accompanies this
> -# distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> -# IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Platform/RaspberryPi/RPi3/RPi3.fdf b/Platform/RaspberryPi/RPi3/RPi3.fdf
> index 85f2187545..cf4b99a5e9 100644
> --- a/Platform/RaspberryPi/RPi3/RPi3.fdf
> +++ b/Platform/RaspberryPi/RPi3/RPi3.fdf
> @@ -5,14 +5,7 @@
> # Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.
> # Copyright (c) 2017 - 2018, Andrei Warkentin <andrey.warkentin@gmail.com>
> #
> -# This program and the accompanying materials are licensed and made available
> -# under the terms and conditions of the BSD License which accompanies this
> -# distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> -# IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> --
> 2.21.0.windows.1
>
>
>
>
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: [edk2-devel] [[edk2-platforms][PATCH V2] 15/30] Platform/RaspberryPi: Replace BSD License with BSD+Patent License
2019-05-17 11:07 ` [edk2-devel] " Leif Lindholm
@ 2019-05-17 11:08 ` Ard Biesheuvel
0 siblings, 0 replies; 63+ messages in thread
From: Ard Biesheuvel @ 2019-05-17 11:08 UTC (permalink / raw)
To: Leif Lindholm; +Cc: edk2-devel-groups-io, Kinney, Michael D
On Fri, 17 May 2019 at 13:07, Leif Lindholm <leif.lindholm@linaro.org> wrote:
>
> On Wed, May 15, 2019 at 04:09:56PM -0700, Michael D Kinney wrote:
> > https://bugzilla.tianocore.org/show_bug.cgi?id=1373
> >
> > Replace BSD 2-Clause License with BSD+Patent License. This change is
> > based on the following emails:
> >
> > https://lists.01.org/pipermail/edk2-devel/2019-February/036260.html
> > https://lists.01.org/pipermail/edk2-devel/2018-October/030385.html
> >
> > RFCs with detailed process for the license change:
> >
> > V3: https://lists.01.org/pipermail/edk2-devel/2019-March/038116.html
> > V2: https://lists.01.org/pipermail/edk2-devel/2019-March/037669.html
> > V1: https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html
>
> This excludes the (presumably unintentionally, clarification being
> sought with original author) unlicensed file:
> Platform\RaspberryPi\RPi3\Library\PlatformUiAppLib\PlatformUiAppLib.inf
>
> This would be wort mentioning in the commit message unless the
> situation is resolved before the series is pushed.
>
> It also excludes the 3-clause BSD licensed file
> Platform\RaspberryPi\RPi3\Include\IndustryStandard\RpiMbox.h
> based on work from Ard who suggests that was unintentional.
>
> Ard: can you confirm for the list that this was always intended to be
> 2-clause?
>
Indeed - I inadvertently copy/pasted a version of the license header
from another file that included the ARM non-endorsement clause, but
the intention was to use 2-clause BSD.
^ permalink raw reply [flat|nested] 63+ messages in thread
* [[edk2-platforms][PATCH V2] 16/30] Platform/Socionext: Replace BSD License with BSD+Patent License
2019-05-15 23:09 [[edk2-platforms][PATCH V2] 00/30] Change edk2-platforms/master to BSD+Patent License Michael D Kinney
` (14 preceding siblings ...)
2019-05-15 23:09 ` [[edk2-platforms][PATCH V2] 15/30] Platform/RaspberryPi: " Michael D Kinney
@ 2019-05-15 23:09 ` Michael D Kinney
2019-05-15 23:09 ` [[edk2-platforms][PATCH V2] 17/30] Platform/SoftIron: " Michael D Kinney
` (14 subsequent siblings)
30 siblings, 0 replies; 63+ messages in thread
From: Michael D Kinney @ 2019-05-15 23:09 UTC (permalink / raw)
To: devel; +Cc: Leif Lindholm, Ard Biesheuvel
https://bugzilla.tianocore.org/show_bug.cgi?id=1373
Replace BSD 2-Clause License with BSD+Patent License. This change is
based on the following emails:
https://lists.01.org/pipermail/edk2-devel/2019-February/036260.html
https://lists.01.org/pipermail/edk2-devel/2018-October/030385.html
RFCs with detailed process for the license change:
V3: https://lists.01.org/pipermail/edk2-devel/2019-March/038116.html
V2: https://lists.01.org/pipermail/edk2-devel/2019-March/037669.html
V1: https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
Platform/Socionext/DeveloperBox/DeveloperBox.dsc | 8 +-------
Platform/Socionext/DeveloperBox/DeveloperBox.dsc.inc | 8 +-------
Platform/Socionext/DeveloperBox/DeveloperBox.fdf | 8 +-------
Platform/Socionext/DeveloperBox/DeveloperBoxMm.dsc | 8 +-------
Platform/Socionext/DeveloperBox/DeveloperBoxMm.fdf | 8 +-------
Platform/Socionext/DeveloperBox/Logo/Logo.c | 8 +-------
Platform/Socionext/DeveloperBox/Logo/Logo.idf | 8 +-------
Platform/Socionext/DeveloperBox/Logo/LogoDxe.inf | 7 +------
.../DeveloperBox/SmbiosPlatformDxe/SmbiosPlatformDxe.c | 8 +-------
.../DeveloperBox/SmbiosPlatformDxe/SmbiosPlatformDxe.inf | 7 +------
.../SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf | 8 +-------
.../SystemFirmwareDescriptorPei.c | 8 +-------
.../SystemFirmwareDescriptorTable.aslc | 8 +-------
.../SystemFirmwareUpdateConfig.ini | 8 +-------
.../Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc | 8 +-------
.../Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.fdf | 8 +-------
.../SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf | 8 +-------
.../SystemFirmwareDescriptorPei.c | 8 +-------
.../SystemFirmwareDescriptorTable.aslc | 8 +-------
.../SystemFirmwareUpdateConfig.ini | 8 +-------
20 files changed, 20 insertions(+), 138 deletions(-)
diff --git a/Platform/Socionext/DeveloperBox/DeveloperBox.dsc b/Platform/Socionext/DeveloperBox/DeveloperBox.dsc
index 909cfb5507..428e5d6459 100644
--- a/Platform/Socionext/DeveloperBox/DeveloperBox.dsc
+++ b/Platform/Socionext/DeveloperBox/DeveloperBox.dsc
@@ -2,13 +2,7 @@
# Copyright (c) 2013-2014, ARM Limited. All rights reserved.
# Copyright (c) 2017, Linaro Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
################################################################################
diff --git a/Platform/Socionext/DeveloperBox/DeveloperBox.dsc.inc b/Platform/Socionext/DeveloperBox/DeveloperBox.dsc.inc
index 1ac8c8f957..fdb25f4566 100644
--- a/Platform/Socionext/DeveloperBox/DeveloperBox.dsc.inc
+++ b/Platform/Socionext/DeveloperBox/DeveloperBox.dsc.inc
@@ -2,13 +2,7 @@
# Copyright (c) 2013-2014, ARM Limited. All rights reserved.
# Copyright (c) 2017-2018, Linaro Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
################################################################################
diff --git a/Platform/Socionext/DeveloperBox/DeveloperBox.fdf b/Platform/Socionext/DeveloperBox/DeveloperBox.fdf
index 5309a77c1a..b322fead62 100644
--- a/Platform/Socionext/DeveloperBox/DeveloperBox.fdf
+++ b/Platform/Socionext/DeveloperBox/DeveloperBox.fdf
@@ -2,13 +2,7 @@
# Copyright (c) 2013-2014, ARM Limited. All rights reserved.
# Copyright (c) 2017, Linaro Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
################################################################################
diff --git a/Platform/Socionext/DeveloperBox/DeveloperBoxMm.dsc b/Platform/Socionext/DeveloperBox/DeveloperBoxMm.dsc
index 141b175047..00f6d44963 100644
--- a/Platform/Socionext/DeveloperBox/DeveloperBoxMm.dsc
+++ b/Platform/Socionext/DeveloperBox/DeveloperBoxMm.dsc
@@ -2,13 +2,7 @@
# Copyright (c) 2013-2014, ARM Limited. All rights reserved.
# Copyright (c) 2017-2018, Linaro Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
################################################################################
diff --git a/Platform/Socionext/DeveloperBox/DeveloperBoxMm.fdf b/Platform/Socionext/DeveloperBox/DeveloperBoxMm.fdf
index c7c8535906..83a3c4660c 100644
--- a/Platform/Socionext/DeveloperBox/DeveloperBoxMm.fdf
+++ b/Platform/Socionext/DeveloperBox/DeveloperBoxMm.fdf
@@ -2,13 +2,7 @@
# Copyright (c) 2013-2014, ARM Limited. All rights reserved.
# Copyright (c) 2017-2018, Linaro Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
################################################################################
diff --git a/Platform/Socionext/DeveloperBox/Logo/Logo.c b/Platform/Socionext/DeveloperBox/Logo/Logo.c
index 03bf748efd..49e24d6c2b 100644
--- a/Platform/Socionext/DeveloperBox/Logo/Logo.c
+++ b/Platform/Socionext/DeveloperBox/Logo/Logo.c
@@ -4,13 +4,7 @@
Copyright (c) 2016 - 2017, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2018, Linaro, Ltd. 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
- distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Socionext/DeveloperBox/Logo/Logo.idf b/Platform/Socionext/DeveloperBox/Logo/Logo.idf
index 43a17dff65..83490c990a 100644
--- a/Platform/Socionext/DeveloperBox/Logo/Logo.idf
+++ b/Platform/Socionext/DeveloperBox/Logo/Logo.idf
@@ -3,13 +3,7 @@
//
// Copyright (c) 2018, Linaro, Ltd. 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
-// distribution. The full text of the license may be found at
-// http://opensource.org/licenses/bsd-license.php
-//
-// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+// SPDX-License-Identifier: BSD-2-Clause-Patent
//
#image IMG_LOGO Logo.bmp
diff --git a/Platform/Socionext/DeveloperBox/Logo/LogoDxe.inf b/Platform/Socionext/DeveloperBox/Logo/LogoDxe.inf
index d25fd097eb..59a153102d 100644
--- a/Platform/Socionext/DeveloperBox/Logo/LogoDxe.inf
+++ b/Platform/Socionext/DeveloperBox/Logo/LogoDxe.inf
@@ -4,12 +4,7 @@
# Copyright (c) 2016 - 2017, Intel Corporation. All rights reserved.<BR>
# Copyright (c) 2018, Linaro, Ltd. 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 distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#
##
diff --git a/Platform/Socionext/DeveloperBox/SmbiosPlatformDxe/SmbiosPlatformDxe.c b/Platform/Socionext/DeveloperBox/SmbiosPlatformDxe/SmbiosPlatformDxe.c
index 84572f470b..6227b77877 100644
--- a/Platform/Socionext/DeveloperBox/SmbiosPlatformDxe/SmbiosPlatformDxe.c
+++ b/Platform/Socionext/DeveloperBox/SmbiosPlatformDxe/SmbiosPlatformDxe.c
@@ -5,13 +5,7 @@
Copyright (c) 2015, ARM Limited. All rights reserved.
Copyright (c) 2018, Linaro, Ltd. All rights reserved.
- This program and the accompanying materials are licensed and made available
- under the terms and conditions of the BSD License which accompanies this
- distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Socionext/DeveloperBox/SmbiosPlatformDxe/SmbiosPlatformDxe.inf b/Platform/Socionext/DeveloperBox/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
index 4bb5acdfa3..e711cbf6dc 100644
--- a/Platform/Socionext/DeveloperBox/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
+++ b/Platform/Socionext/DeveloperBox/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
@@ -2,12 +2,7 @@
#
# Copyright (c) 2018, Linaro, Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Socionext/DeveloperBox/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf b/Platform/Socionext/DeveloperBox/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf
index c2fa202cb0..6fd833b228 100644
--- a/Platform/Socionext/DeveloperBox/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf
+++ b/Platform/Socionext/DeveloperBox/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf
@@ -2,13 +2,7 @@
# System Firmware descriptor.
#
# Copyright (c) 2016, 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 distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Socionext/DeveloperBox/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c b/Platform/Socionext/DeveloperBox/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c
index f89d9f4842..7b894a9e87 100644
--- a/Platform/Socionext/DeveloperBox/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c
+++ b/Platform/Socionext/DeveloperBox/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c
@@ -2,13 +2,7 @@
System Firmware descriptor producer.
Copyright (c) 2016, 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Socionext/DeveloperBox/SystemFirmwareDescriptor/SystemFirmwareDescriptorTable.aslc b/Platform/Socionext/DeveloperBox/SystemFirmwareDescriptor/SystemFirmwareDescriptorTable.aslc
index 12a56315a5..03d4dac4c0 100644
--- a/Platform/Socionext/DeveloperBox/SystemFirmwareDescriptor/SystemFirmwareDescriptorTable.aslc
+++ b/Platform/Socionext/DeveloperBox/SystemFirmwareDescriptor/SystemFirmwareDescriptorTable.aslc
@@ -4,13 +4,7 @@
Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2017, Linaro, Ltd. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Socionext/DeveloperBox/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini b/Platform/Socionext/DeveloperBox/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini
index 1f77aeab50..724b4668b1 100644
--- a/Platform/Socionext/DeveloperBox/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini
+++ b/Platform/Socionext/DeveloperBox/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini
@@ -1,13 +1,7 @@
## @file
#
# Copyright (c) 2016, 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 distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc b/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc
index 8dbf836f7e..189baa8659 100644
--- a/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc
+++ b/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc
@@ -2,13 +2,7 @@
# Copyright (c) 2013-2014, ARM Limited. All rights reserved.
# Copyright (c) 2017, Linaro Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
################################################################################
diff --git a/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.fdf b/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.fdf
index 1e07f579a8..1c9795df3b 100644
--- a/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.fdf
+++ b/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.fdf
@@ -2,13 +2,7 @@
# Copyright (c) 2013-2014, ARM Limited. All rights reserved.
# Copyright (c) 2017, Linaro Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
################################################################################
diff --git a/Platform/Socionext/SynQuacerEvalBoard/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf b/Platform/Socionext/SynQuacerEvalBoard/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf
index 95a5e482a7..9f7f3b9655 100644
--- a/Platform/Socionext/SynQuacerEvalBoard/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf
+++ b/Platform/Socionext/SynQuacerEvalBoard/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf
@@ -2,13 +2,7 @@
# System Firmware descriptor.
#
# Copyright (c) 2016, 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 distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Platform/Socionext/SynQuacerEvalBoard/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c b/Platform/Socionext/SynQuacerEvalBoard/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c
index f89d9f4842..7b894a9e87 100644
--- a/Platform/Socionext/SynQuacerEvalBoard/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c
+++ b/Platform/Socionext/SynQuacerEvalBoard/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c
@@ -2,13 +2,7 @@
System Firmware descriptor producer.
Copyright (c) 2016, 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Socionext/SynQuacerEvalBoard/SystemFirmwareDescriptor/SystemFirmwareDescriptorTable.aslc b/Platform/Socionext/SynQuacerEvalBoard/SystemFirmwareDescriptor/SystemFirmwareDescriptorTable.aslc
index daf26c79df..265cffddda 100644
--- a/Platform/Socionext/SynQuacerEvalBoard/SystemFirmwareDescriptor/SystemFirmwareDescriptorTable.aslc
+++ b/Platform/Socionext/SynQuacerEvalBoard/SystemFirmwareDescriptor/SystemFirmwareDescriptorTable.aslc
@@ -4,13 +4,7 @@
Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2017, Linaro, Ltd. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Platform/Socionext/SynQuacerEvalBoard/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini b/Platform/Socionext/SynQuacerEvalBoard/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini
index f3983da961..ff109f92d3 100644
--- a/Platform/Socionext/SynQuacerEvalBoard/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini
+++ b/Platform/Socionext/SynQuacerEvalBoard/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini
@@ -1,13 +1,7 @@
## @file
#
# Copyright (c) 2016, 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 distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
--
2.21.0.windows.1
^ permalink raw reply related [flat|nested] 63+ messages in thread* [[edk2-platforms][PATCH V2] 17/30] Platform/SoftIron: Replace BSD License with BSD+Patent License
2019-05-15 23:09 [[edk2-platforms][PATCH V2] 00/30] Change edk2-platforms/master to BSD+Patent License Michael D Kinney
` (15 preceding siblings ...)
2019-05-15 23:09 ` [[edk2-platforms][PATCH V2] 16/30] Platform/Socionext: " Michael D Kinney
@ 2019-05-15 23:09 ` Michael D Kinney
2019-05-15 23:09 ` [[edk2-platforms][PATCH V2] 18/30] Platform/SolidRun: " Michael D Kinney
` (13 subsequent siblings)
30 siblings, 0 replies; 63+ messages in thread
From: Michael D Kinney @ 2019-05-15 23:09 UTC (permalink / raw)
To: devel; +Cc: Leif Lindholm, Ard Biesheuvel
https://bugzilla.tianocore.org/show_bug.cgi?id=1373
Replace BSD 2-Clause License with BSD+Patent License. This change is
based on the following emails:
https://lists.01.org/pipermail/edk2-devel/2019-February/036260.html
https://lists.01.org/pipermail/edk2-devel/2018-October/030385.html
RFCs with detailed process for the license change:
V3: https://lists.01.org/pipermail/edk2-devel/2019-March/038116.html
V2: https://lists.01.org/pipermail/edk2-devel/2019-March/037669.html
V1: https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
.../Overdrive1000Board/FdtBlob/styx-overdrive1000.dts | 9 +--------
.../SoftIron/Overdrive1000Board/Overdrive1000Board.dsc | 8 +-------
.../SoftIron/Overdrive1000Board/Overdrive1000Board.fdf | 8 +-------
3 files changed, 3 insertions(+), 22 deletions(-)
diff --git a/Platform/SoftIron/Overdrive1000Board/FdtBlob/styx-overdrive1000.dts b/Platform/SoftIron/Overdrive1000Board/FdtBlob/styx-overdrive1000.dts
index d99b48d084..707025a22d 100644
--- a/Platform/SoftIron/Overdrive1000Board/FdtBlob/styx-overdrive1000.dts
+++ b/Platform/SoftIron/Overdrive1000Board/FdtBlob/styx-overdrive1000.dts
@@ -3,14 +3,7 @@
*
* Copyright 2015 - 2016 ADVANCED MICRO DEVICES, INC. All Rights Reserved.
*
- * This program and the accompanying materials are licensed and made available
- * under the terms and conditions of the BSD License which accompanies this
- * distribution. The full text of the license may be found at
- * http://opensource.org/licenses/bsd-license.php
- *
- * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
- * IMPLIED.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*
*/
diff --git a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc b/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc
index cc4f2facd0..d74ad479af 100644
--- a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc
+++ b/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc
@@ -1,13 +1,7 @@
#
# Copyright (c) 2014 - 2016, AMD Incorporated. All rights reserved.
#
-# This program and the accompanying materials are licensed and made
-# available under the terms and conditions of the BSD License which
-# accompanies this distribution. The full text of the license may
-# be found at http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
################################################################################
diff --git a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.fdf b/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.fdf
index fa814880e0..6581138a6c 100644
--- a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.fdf
+++ b/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.fdf
@@ -1,13 +1,7 @@
#
# Copyright (c) 2014 - 2016, AMD Incorporated. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
################################################################################
--
2.21.0.windows.1
^ permalink raw reply related [flat|nested] 63+ messages in thread* [[edk2-platforms][PATCH V2] 18/30] Platform/SolidRun: Replace BSD License with BSD+Patent License
2019-05-15 23:09 [[edk2-platforms][PATCH V2] 00/30] Change edk2-platforms/master to BSD+Patent License Michael D Kinney
` (16 preceding siblings ...)
2019-05-15 23:09 ` [[edk2-platforms][PATCH V2] 17/30] Platform/SoftIron: " Michael D Kinney
@ 2019-05-15 23:09 ` Michael D Kinney
2019-05-15 23:10 ` [[edk2-platforms][PATCH V2] 19/30] Silicon/AMD: " Michael D Kinney
` (12 subsequent siblings)
30 siblings, 0 replies; 63+ messages in thread
From: Michael D Kinney @ 2019-05-15 23:09 UTC (permalink / raw)
To: devel; +Cc: Leif Lindholm, Ard Biesheuvel
https://bugzilla.tianocore.org/show_bug.cgi?id=1373
Replace BSD 2-Clause License with BSD+Patent License. This change is
based on the following emails:
https://lists.01.org/pipermail/edk2-devel/2019-February/036260.html
https://lists.01.org/pipermail/edk2-devel/2018-October/030385.html
RFCs with detailed process for the license change:
V3: https://lists.01.org/pipermail/edk2-devel/2019-March/038116.html
V2: https://lists.01.org/pipermail/edk2-devel/2019-March/037669.html
V1: https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.fdf.inc | 8 +-------
.../Armada80x0McBinBoardDescLib.c | 8 +-------
.../Armada80x0McBinBoardDescLib.inf | 8 +-------
.../NonDiscoverableInitLib/NonDiscoverableInitLib.c | 8 +-------
.../NonDiscoverableInitLib/NonDiscoverableInitLib.h | 8 +-------
.../NonDiscoverableInitLib/NonDiscoverableInitLib.inf | 8 +-------
6 files changed, 6 insertions(+), 42 deletions(-)
diff --git a/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.fdf.inc b/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.fdf.inc
index 254fcee341..57d2990459 100644
--- a/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.fdf.inc
+++ b/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.fdf.inc
@@ -1,13 +1,7 @@
#
# Copyright (C) 2018 Marvell International Ltd. and its affiliates
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
# Per-board additional content of the DXE phase firmware volume
diff --git a/Platform/SolidRun/Armada80x0McBin/Armada80x0McBinBoardDescLib/Armada80x0McBinBoardDescLib.c b/Platform/SolidRun/Armada80x0McBin/Armada80x0McBinBoardDescLib/Armada80x0McBinBoardDescLib.c
index 32596ada23..3b69074676 100644
--- a/Platform/SolidRun/Armada80x0McBin/Armada80x0McBinBoardDescLib/Armada80x0McBinBoardDescLib.c
+++ b/Platform/SolidRun/Armada80x0McBin/Armada80x0McBinBoardDescLib/Armada80x0McBinBoardDescLib.c
@@ -2,13 +2,7 @@
*
* Copyright (C) 2018, Marvell International Ltd. and its affiliates.
*
-* This program and the accompanying materials are licensed and made available
-* under the terms and conditions of the BSD License which accompanies this
-* distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/SolidRun/Armada80x0McBin/Armada80x0McBinBoardDescLib/Armada80x0McBinBoardDescLib.inf b/Platform/SolidRun/Armada80x0McBin/Armada80x0McBinBoardDescLib/Armada80x0McBinBoardDescLib.inf
index 43e4b9e7ab..4ebe4c3883 100644
--- a/Platform/SolidRun/Armada80x0McBin/Armada80x0McBinBoardDescLib/Armada80x0McBinBoardDescLib.inf
+++ b/Platform/SolidRun/Armada80x0McBin/Armada80x0McBinBoardDescLib/Armada80x0McBinBoardDescLib.inf
@@ -2,13 +2,7 @@
#
# Copyright (C) 2018, Marvell International Ltd. and its affiliates<BR>
#
-# This program and the accompanying materials are licensed and made available
-# under the terms and conditions of the BSD License which accompanies this
-# distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
-# IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#
##
diff --git a/Platform/SolidRun/Armada80x0McBin/NonDiscoverableInitLib/NonDiscoverableInitLib.c b/Platform/SolidRun/Armada80x0McBin/NonDiscoverableInitLib/NonDiscoverableInitLib.c
index d1055cb4a8..c9e88722c2 100644
--- a/Platform/SolidRun/Armada80x0McBin/NonDiscoverableInitLib/NonDiscoverableInitLib.c
+++ b/Platform/SolidRun/Armada80x0McBin/NonDiscoverableInitLib/NonDiscoverableInitLib.c
@@ -3,13 +3,7 @@
* Copyright (c) 2017, Linaro Ltd. All rights reserved.
* Copyright (c) 2018, Marvell International Ltd. All rights reserved.
*
-* This program and the accompanying materials are licensed and made available
-* under the terms and conditions of the BSD License which accompanies this
-* distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Platform/SolidRun/Armada80x0McBin/NonDiscoverableInitLib/NonDiscoverableInitLib.h b/Platform/SolidRun/Armada80x0McBin/NonDiscoverableInitLib/NonDiscoverableInitLib.h
index 38e1f200a9..a338a9d183 100644
--- a/Platform/SolidRun/Armada80x0McBin/NonDiscoverableInitLib/NonDiscoverableInitLib.h
+++ b/Platform/SolidRun/Armada80x0McBin/NonDiscoverableInitLib/NonDiscoverableInitLib.h
@@ -3,13 +3,7 @@
* Copyright (c) 2017, Linaro Ltd. All rights reserved.
* Copyright (c) 2018, Marvell International Ltd. All rights reserved.
*
-* This program and the accompanying materials are licensed and made available
-* under the terms and conditions of the BSD License which accompanies this
-* distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
#ifndef __NON_DISCOVERABLE_INIT_LIB_H__
diff --git a/Platform/SolidRun/Armada80x0McBin/NonDiscoverableInitLib/NonDiscoverableInitLib.inf b/Platform/SolidRun/Armada80x0McBin/NonDiscoverableInitLib/NonDiscoverableInitLib.inf
index 60fc9a1b73..469a0323ca 100644
--- a/Platform/SolidRun/Armada80x0McBin/NonDiscoverableInitLib/NonDiscoverableInitLib.inf
+++ b/Platform/SolidRun/Armada80x0McBin/NonDiscoverableInitLib/NonDiscoverableInitLib.inf
@@ -3,13 +3,7 @@
# Copyright (c) 2017, Linaro Ltd. All rights reserved.<BR>
# Copyright (c) 2018, Marvell International Ltd. 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
-# distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
-# IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#
##
--
2.21.0.windows.1
^ permalink raw reply related [flat|nested] 63+ messages in thread* [[edk2-platforms][PATCH V2] 19/30] Silicon/AMD: Replace BSD License with BSD+Patent License
2019-05-15 23:09 [[edk2-platforms][PATCH V2] 00/30] Change edk2-platforms/master to BSD+Patent License Michael D Kinney
` (17 preceding siblings ...)
2019-05-15 23:09 ` [[edk2-platforms][PATCH V2] 18/30] Platform/SolidRun: " Michael D Kinney
@ 2019-05-15 23:10 ` Michael D Kinney
2019-05-15 23:10 ` [[edk2-platforms][PATCH V2] 20/30] Silicon/Atmel: " Michael D Kinney
` (11 subsequent siblings)
30 siblings, 0 replies; 63+ messages in thread
From: Michael D Kinney @ 2019-05-15 23:10 UTC (permalink / raw)
To: devel; +Cc: Leif Lindholm, Ard Biesheuvel
https://bugzilla.tianocore.org/show_bug.cgi?id=1373
Replace BSD 2-Clause License with BSD+Patent License. This change is
based on the following emails:
https://lists.01.org/pipermail/edk2-devel/2019-February/036260.html
https://lists.01.org/pipermail/edk2-devel/2018-October/030385.html
RFCs with detailed process for the license change:
V3: https://lists.01.org/pipermail/edk2-devel/2019-March/038116.html
V2: https://lists.01.org/pipermail/edk2-devel/2019-March/037669.html
V1: https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
Silicon/AMD/Styx/AmdStyx.dec | 8 +-------
Silicon/AMD/Styx/Common/Protocol/AmdMpCoreInfo.h | 8 +-------
Silicon/AMD/Styx/Common/SocVersion.h | 8 +-------
Silicon/AMD/Styx/Common/Varstore.fdf.inc | 9 +--------
Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/AcpiPlatform.c | 8 +-------
Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/AcpiPlatform.h | 8 +-------
.../AMD/Styx/Drivers/AcpiPlatformDxe/AcpiPlatformDxe.inf | 8 +-------
Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Csrt.aslc | 8 +-------
Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Dbg2.aslc | 8 +-------
Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Dsdt.asl | 8 +-------
Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Fadt.aslc | 8 +-------
Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Gtdt.aslc | 8 +-------
Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Iort.aslc | 8 +-------
Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Madt.aslc | 8 +-------
Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Mcfg.aslc | 8 +-------
Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Pptt.aslc | 8 +-------
Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Spcr.aslc | 8 +-------
Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/SsdtB1.asl | 8 +-------
Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/SsdtKcs.asl | 8 +-------
Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/SsdtXgbe.asl | 8 +-------
Silicon/AMD/Styx/Drivers/PlatInitDxe/PlatInitDxe.c | 8 +-------
Silicon/AMD/Styx/Drivers/PlatInitDxe/PlatInitDxe.inf | 8 +-------
Silicon/AMD/Styx/Drivers/PlatInitPei/PlatInitPei.c | 8 +-------
Silicon/AMD/Styx/Drivers/PlatInitPei/PlatInitPei.inf | 8 +-------
.../Styx/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.c | 8 +-------
.../Styx/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.inf | 8 +-------
Silicon/AMD/Styx/Drivers/StyxRngDxe/StyxRngDxe.c | 8 +-------
Silicon/AMD/Styx/Drivers/StyxRngDxe/StyxRngDxe.inf | 8 +-------
.../Styx/Drivers/StyxSataPlatformDxe/InitController.c | 8 +-------
.../AMD/Styx/Drivers/StyxSataPlatformDxe/SataRegisters.h | 8 +-------
.../Drivers/StyxSataPlatformDxe/StyxSataPlatformDxe.inf | 8 +-------
Silicon/AMD/Styx/Drivers/StyxSpiFvDxe/StyxSpiFvDxe.c | 8 +-------
Silicon/AMD/Styx/Drivers/StyxSpiFvDxe/StyxSpiFvDxe.inf | 8 +-------
.../AMD/Styx/Library/AmdStyxHelperLib/AmdStyxHelperLib.c | 8 +-------
.../Styx/Library/AmdStyxHelperLib/AmdStyxHelperLib.inf | 8 +-------
Silicon/AMD/Styx/Library/AmdStyxLib/AArch64/Helper.S | 8 +-------
Silicon/AMD/Styx/Library/AmdStyxLib/AmdStyxLib.inf | 8 +-------
Silicon/AMD/Styx/Library/AmdStyxLib/AmdStyxLibSec.inf | 8 +-------
Silicon/AMD/Styx/Library/AmdStyxLib/Styx.c | 8 +-------
Silicon/AMD/Styx/Library/AmdStyxLib/StyxMem.c | 8 +-------
.../AmdStyxPciHostBridgeLib/AmdStyxPciHostBridgeLib.c | 8 +-------
.../AmdStyxPciHostBridgeLib/AmdStyxPciHostBridgeLib.inf | 8 +-------
.../AMD/Styx/Library/MemoryInitPei/MemoryInitPeiLib.c | 8 +-------
.../AMD/Styx/Library/MemoryInitPei/MemoryInitPeiLib.inf | 8 +-------
.../AMD/Styx/Library/RealTimeClockLib/RealTimeClockLib.c | 8 +-------
.../Styx/Library/RealTimeClockLib/RealTimeClockLib.inf | 7 +------
.../AMD/Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.c | 8 +-------
.../Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.inf | 8 +-------
.../StyxPlatformFlashAccessLib.c | 8 +-------
.../StyxPlatformFlashAccessLib.inf | 8 +-------
50 files changed, 50 insertions(+), 350 deletions(-)
diff --git a/Silicon/AMD/Styx/AmdStyx.dec b/Silicon/AMD/Styx/AmdStyx.dec
index dedc155659..0ba65e0248 100644
--- a/Silicon/AMD/Styx/AmdStyx.dec
+++ b/Silicon/AMD/Styx/AmdStyx.dec
@@ -3,13 +3,7 @@
#
# Copyright (c) 2014 - 2016, AMD Inc. All rights reserved.
#
-# This program and the accompanying materials are licensed and made
-# available under the terms and conditions of the BSD License which
-# accompanies this distribution. The full text of the license may be
-# found at http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
diff --git a/Silicon/AMD/Styx/Common/Protocol/AmdMpCoreInfo.h b/Silicon/AMD/Styx/Common/Protocol/AmdMpCoreInfo.h
index e6aa8fb1be..f5501b2b21 100644
--- a/Silicon/AMD/Styx/Common/Protocol/AmdMpCoreInfo.h
+++ b/Silicon/AMD/Styx/Common/Protocol/AmdMpCoreInfo.h
@@ -2,13 +2,7 @@
Copyright (c) 2016, AMD Inc. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/AMD/Styx/Common/SocVersion.h b/Silicon/AMD/Styx/Common/SocVersion.h
index fc270b7c34..354dfbfdd0 100644
--- a/Silicon/AMD/Styx/Common/SocVersion.h
+++ b/Silicon/AMD/Styx/Common/SocVersion.h
@@ -3,13 +3,7 @@
#
# Copyright (c) 2018 Linaro, Ltd. 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 distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
diff --git a/Silicon/AMD/Styx/Common/Varstore.fdf.inc b/Silicon/AMD/Styx/Common/Varstore.fdf.inc
index 83aa4334fb..0bd8f924e7 100644
--- a/Silicon/AMD/Styx/Common/Varstore.fdf.inc
+++ b/Silicon/AMD/Styx/Common/Varstore.fdf.inc
@@ -5,14 +5,7 @@
# Copyright (C) 2014, Red Hat, Inc.
# 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
-# distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
-# IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/AcpiPlatform.c b/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/AcpiPlatform.c
index 259a708b7c..743ef0f655 100644
--- a/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/AcpiPlatform.c
+++ b/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/AcpiPlatform.c
@@ -5,13 +5,7 @@
Copyright (c) 2008 - 2011, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2014 - 2016, AMD Inc. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
/**
diff --git a/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/AcpiPlatform.h b/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/AcpiPlatform.h
index 883dc9df36..122504e080 100644
--- a/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/AcpiPlatform.h
+++ b/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/AcpiPlatform.h
@@ -3,13 +3,7 @@
Copyright (c) 2014 - 2015, AMD Inc. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/AcpiPlatformDxe.inf b/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/AcpiPlatformDxe.inf
index f231e0b2ee..d7c596094e 100644
--- a/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/AcpiPlatformDxe.inf
+++ b/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/AcpiPlatformDxe.inf
@@ -4,13 +4,7 @@
# Copyright (c) 2008 - 2014, Intel Corporation. All rights reserved.<BR>
# Copyright (c) 2014 - 2016, AMD Inc. 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 distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
#/**
diff --git a/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Csrt.aslc b/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Csrt.aslc
index 4aca932025..4996209870 100644
--- a/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Csrt.aslc
+++ b/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Csrt.aslc
@@ -6,13 +6,7 @@
Copyright (c) 2014 - 2016, AMD Inc. All rights reserved.
- This program and the accompanying materials are licensed and
- made available under the terms and conditions of the BSD License
- which accompanies this distribution. The full text of the
- license may be found at http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Dbg2.aslc b/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Dbg2.aslc
index e55119258b..015fe1c20b 100644
--- a/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Dbg2.aslc
+++ b/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Dbg2.aslc
@@ -6,13 +6,7 @@
Copyright (c) 2014 - 2016, AMD Inc. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Dsdt.asl b/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Dsdt.asl
index 118382371d..3a3bdcad62 100644
--- a/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Dsdt.asl
+++ b/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Dsdt.asl
@@ -5,13 +5,7 @@
Copyright (c) 2014, ARM Ltd. All rights reserved.<BR>
Copyright (c) 2014 - 2016, AMD Inc. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
/**
diff --git a/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Fadt.aslc b/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Fadt.aslc
index 35d190bdf6..f1e3db9ebf 100644
--- a/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Fadt.aslc
+++ b/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Fadt.aslc
@@ -5,13 +5,7 @@
Copyright (c) 2012 - 2014, ARM Ltd. All rights reserved.<BR>
Copyright (c) 2014 - 2016, AMD Inc. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
/**
diff --git a/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Gtdt.aslc b/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Gtdt.aslc
index 34f92f2e40..24b22c5cd9 100644
--- a/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Gtdt.aslc
+++ b/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Gtdt.aslc
@@ -5,13 +5,7 @@
Copyright (c) 2012 - 2014, ARM Ltd. All rights reserved.<BR>
Copyright (c) 2014 - 2016, AMD Inc. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
/**
diff --git a/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Iort.aslc b/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Iort.aslc
index 073b994bc5..d46be49f03 100644
--- a/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Iort.aslc
+++ b/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Iort.aslc
@@ -2,13 +2,7 @@
Copyright (c) 2017, Linaro, Ltd. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Madt.aslc b/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Madt.aslc
index d4762bbbae..06341670c3 100644
--- a/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Madt.aslc
+++ b/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Madt.aslc
@@ -6,13 +6,7 @@
Copyright (c) 2014 - 2016, AMD Inc. All rights reserved.<BR>
Copyright (c) 2018, Linaro, Ltd. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Mcfg.aslc b/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Mcfg.aslc
index 67fb0429d8..e121f06f2c 100644
--- a/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Mcfg.aslc
+++ b/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Mcfg.aslc
@@ -6,13 +6,7 @@
Copyright (c) 2014 - 2016, AMD Inc. All rights reserved.
- This program and the accompanying materials are licensed and
- made available under the terms and conditions of the BSD License
- which accompanies this distribution. The full text of the
- license may be found at http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Pptt.aslc b/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Pptt.aslc
index 031307fa3c..70f3830d20 100644
--- a/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Pptt.aslc
+++ b/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Pptt.aslc
@@ -2,13 +2,7 @@
Copyright (c) 2018, Linaro Ltd. 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
- distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Spcr.aslc b/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Spcr.aslc
index bd84a19cce..9a9d00eb91 100644
--- a/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Spcr.aslc
+++ b/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Spcr.aslc
@@ -6,13 +6,7 @@
Copyright (c) 2014 - 2016, AMD Inc. All rights reserved.
- This program and the accompanying materials
- are licensed and made available under the terms and conditions of the BSD License
- which accompanies this distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/SsdtB1.asl b/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/SsdtB1.asl
index 78aa220a04..5c7e87181d 100644
--- a/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/SsdtB1.asl
+++ b/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/SsdtB1.asl
@@ -6,13 +6,7 @@
Copyright (c) 2014 - 2016, AMD Inc. All rights reserved.<BR>
Copyright (c) 2018, Linaro, Ltd. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/SsdtKcs.asl b/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/SsdtKcs.asl
index 3cac427df2..434c91330a 100644
--- a/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/SsdtKcs.asl
+++ b/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/SsdtKcs.asl
@@ -5,13 +5,7 @@
Copyright (c) 2014, ARM Ltd. All rights reserved.<BR>
Copyright (c) 2014 - 2016, AMD Inc. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/SsdtXgbe.asl b/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/SsdtXgbe.asl
index 503c47365f..33f8389e0d 100644
--- a/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/SsdtXgbe.asl
+++ b/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/SsdtXgbe.asl
@@ -6,13 +6,7 @@
Copyright (c) 2014 - 2016, AMD Inc. All rights reserved.<BR>
Copyright (c) 2018, Linaro, Ltd. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/AMD/Styx/Drivers/PlatInitDxe/PlatInitDxe.c b/Silicon/AMD/Styx/Drivers/PlatInitDxe/PlatInitDxe.c
index 68f97fb891..5ecf9dbd64 100644
--- a/Silicon/AMD/Styx/Drivers/PlatInitDxe/PlatInitDxe.c
+++ b/Silicon/AMD/Styx/Drivers/PlatInitDxe/PlatInitDxe.c
@@ -2,13 +2,7 @@
Copyright (c) 2016, AMD Inc. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/AMD/Styx/Drivers/PlatInitDxe/PlatInitDxe.inf b/Silicon/AMD/Styx/Drivers/PlatInitDxe/PlatInitDxe.inf
index 1ebde27233..da5582269a 100644
--- a/Silicon/AMD/Styx/Drivers/PlatInitDxe/PlatInitDxe.inf
+++ b/Silicon/AMD/Styx/Drivers/PlatInitDxe/PlatInitDxe.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2016, AMD Inc. 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 distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#*/
diff --git a/Silicon/AMD/Styx/Drivers/PlatInitPei/PlatInitPei.c b/Silicon/AMD/Styx/Drivers/PlatInitPei/PlatInitPei.c
index 932be55b60..0f1d2c6ff6 100644
--- a/Silicon/AMD/Styx/Drivers/PlatInitPei/PlatInitPei.c
+++ b/Silicon/AMD/Styx/Drivers/PlatInitPei/PlatInitPei.c
@@ -2,13 +2,7 @@
Copyright (c) 2014 - 2016, AMD Inc. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/AMD/Styx/Drivers/PlatInitPei/PlatInitPei.inf b/Silicon/AMD/Styx/Drivers/PlatInitPei/PlatInitPei.inf
index 99cf01347a..a0e9e8e9f1 100644
--- a/Silicon/AMD/Styx/Drivers/PlatInitPei/PlatInitPei.inf
+++ b/Silicon/AMD/Styx/Drivers/PlatInitPei/PlatInitPei.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2014 - 2016, AMD Inc. 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 distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#*/
diff --git a/Silicon/AMD/Styx/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.c b/Silicon/AMD/Styx/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.c
index 8fe806c18a..aa0e3ff147 100644
--- a/Silicon/AMD/Styx/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.c
+++ b/Silicon/AMD/Styx/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.c
@@ -19,13 +19,7 @@
Copyright (c) 2013, Linaro Ltd. All rights reserved.<BR>
Copyright (c) 2014 - 2016, AMD Inc. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/AMD/Styx/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.inf b/Silicon/AMD/Styx/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.inf
index 76521cbde5..4b6609a66f 100644
--- a/Silicon/AMD/Styx/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.inf
+++ b/Silicon/AMD/Styx/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.inf
@@ -4,13 +4,7 @@
# Copyright (c) 2013, Linaro Ltd. All rights reserved.<BR>
# Copyright (c) 2014 - 2016, AMD Inc. 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 distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
diff --git a/Silicon/AMD/Styx/Drivers/StyxRngDxe/StyxRngDxe.c b/Silicon/AMD/Styx/Drivers/StyxRngDxe/StyxRngDxe.c
index be6cf9eda5..5d7bf20e8d 100644
--- a/Silicon/AMD/Styx/Drivers/StyxRngDxe/StyxRngDxe.c
+++ b/Silicon/AMD/Styx/Drivers/StyxRngDxe/StyxRngDxe.c
@@ -4,13 +4,7 @@
Copyright (C) 2016, Linaro Ltd. 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
- distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT
- WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/AMD/Styx/Drivers/StyxRngDxe/StyxRngDxe.inf b/Silicon/AMD/Styx/Drivers/StyxRngDxe/StyxRngDxe.inf
index e63656037e..15ce8ae57a 100644
--- a/Silicon/AMD/Styx/Drivers/StyxRngDxe/StyxRngDxe.inf
+++ b/Silicon/AMD/Styx/Drivers/StyxRngDxe/StyxRngDxe.inf
@@ -3,13 +3,7 @@
#
# Copyright (C) 2016, Linaro Ltd. 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
-# distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT
-# WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/AMD/Styx/Drivers/StyxSataPlatformDxe/InitController.c b/Silicon/AMD/Styx/Drivers/StyxSataPlatformDxe/InitController.c
index 1d2bca3d57..fb329cbde9 100644
--- a/Silicon/AMD/Styx/Drivers/StyxSataPlatformDxe/InitController.c
+++ b/Silicon/AMD/Styx/Drivers/StyxSataPlatformDxe/InitController.c
@@ -4,13 +4,7 @@
Copyright (c) 2014 - 2016, AMD Inc. All rights reserved.<BR>
Copyright (c) 2016, Linaro, Ltd. 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
- distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include "SataRegisters.h"
diff --git a/Silicon/AMD/Styx/Drivers/StyxSataPlatformDxe/SataRegisters.h b/Silicon/AMD/Styx/Drivers/StyxSataPlatformDxe/SataRegisters.h
index ff78f4ac3c..799dc098d2 100644
--- a/Silicon/AMD/Styx/Drivers/StyxSataPlatformDxe/SataRegisters.h
+++ b/Silicon/AMD/Styx/Drivers/StyxSataPlatformDxe/SataRegisters.h
@@ -4,13 +4,7 @@
Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2014 - 2016, AMD Inc. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef __SATA_REGISTERS_H__
diff --git a/Silicon/AMD/Styx/Drivers/StyxSataPlatformDxe/StyxSataPlatformDxe.inf b/Silicon/AMD/Styx/Drivers/StyxSataPlatformDxe/StyxSataPlatformDxe.inf
index 8a4deb9185..4f719b9116 100644
--- a/Silicon/AMD/Styx/Drivers/StyxSataPlatformDxe/StyxSataPlatformDxe.inf
+++ b/Silicon/AMD/Styx/Drivers/StyxSataPlatformDxe/StyxSataPlatformDxe.inf
@@ -5,13 +5,7 @@
# Copyright (c) 2014 - 2016, AMD Inc. All rights reserved.<BR>
# Copyright (c) 2016, Linaro, Ltd. 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 distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/AMD/Styx/Drivers/StyxSpiFvDxe/StyxSpiFvDxe.c b/Silicon/AMD/Styx/Drivers/StyxSpiFvDxe/StyxSpiFvDxe.c
index f544af3eeb..e34842e5a7 100644
--- a/Silicon/AMD/Styx/Drivers/StyxSpiFvDxe/StyxSpiFvDxe.c
+++ b/Silicon/AMD/Styx/Drivers/StyxSpiFvDxe/StyxSpiFvDxe.c
@@ -4,13 +4,7 @@
Copyright (c) 2016, Linaro Ltd. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/AMD/Styx/Drivers/StyxSpiFvDxe/StyxSpiFvDxe.inf b/Silicon/AMD/Styx/Drivers/StyxSpiFvDxe/StyxSpiFvDxe.inf
index 76042ab301..bcc2306ec9 100644
--- a/Silicon/AMD/Styx/Drivers/StyxSpiFvDxe/StyxSpiFvDxe.inf
+++ b/Silicon/AMD/Styx/Drivers/StyxSpiFvDxe/StyxSpiFvDxe.inf
@@ -4,13 +4,7 @@
#
# Copyright (c) 2016, Linaro Ltd. 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 distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
diff --git a/Silicon/AMD/Styx/Library/AmdStyxHelperLib/AmdStyxHelperLib.c b/Silicon/AMD/Styx/Library/AmdStyxHelperLib/AmdStyxHelperLib.c
index d8b70f56fa..b001ed6bad 100644
--- a/Silicon/AMD/Styx/Library/AmdStyxHelperLib/AmdStyxHelperLib.c
+++ b/Silicon/AMD/Styx/Library/AmdStyxHelperLib/AmdStyxHelperLib.c
@@ -2,13 +2,7 @@
Copyright (c) 2014 - 2016, AMD Inc. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/AMD/Styx/Library/AmdStyxHelperLib/AmdStyxHelperLib.inf b/Silicon/AMD/Styx/Library/AmdStyxHelperLib/AmdStyxHelperLib.inf
index 17681d9ed5..4ba0b570d5 100644
--- a/Silicon/AMD/Styx/Library/AmdStyxHelperLib/AmdStyxHelperLib.inf
+++ b/Silicon/AMD/Styx/Library/AmdStyxHelperLib/AmdStyxHelperLib.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2014 - 2016, AMD Inc. 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 distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
diff --git a/Silicon/AMD/Styx/Library/AmdStyxLib/AArch64/Helper.S b/Silicon/AMD/Styx/Library/AmdStyxLib/AArch64/Helper.S
index 19a2fc07f3..48cd356f45 100644
--- a/Silicon/AMD/Styx/Library/AmdStyxLib/AArch64/Helper.S
+++ b/Silicon/AMD/Styx/Library/AmdStyxLib/AArch64/Helper.S
@@ -3,13 +3,7 @@
# Copyright (c) 2011-2013, ARM Limited. All rights reserved.<BR>
# Copyright (c) 2014 - 2016, AMD Inc. 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 distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
#/**
diff --git a/Silicon/AMD/Styx/Library/AmdStyxLib/AmdStyxLib.inf b/Silicon/AMD/Styx/Library/AmdStyxLib/AmdStyxLib.inf
index 3a38f294eb..3abec5583b 100644
--- a/Silicon/AMD/Styx/Library/AmdStyxLib/AmdStyxLib.inf
+++ b/Silicon/AMD/Styx/Library/AmdStyxLib/AmdStyxLib.inf
@@ -3,13 +3,7 @@
# Copyright (c) 2011-2014, ARM Limited. All rights reserved.<BR>
# Copyright (c) 2014 - 2016, AMD Inc. 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 distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#*/
#/**
diff --git a/Silicon/AMD/Styx/Library/AmdStyxLib/AmdStyxLibSec.inf b/Silicon/AMD/Styx/Library/AmdStyxLib/AmdStyxLibSec.inf
index b24ffd469a..5a68942ceb 100644
--- a/Silicon/AMD/Styx/Library/AmdStyxLib/AmdStyxLibSec.inf
+++ b/Silicon/AMD/Styx/Library/AmdStyxLib/AmdStyxLibSec.inf
@@ -3,13 +3,7 @@
# Copyright (c) 2011-2012, ARM Limited. All rights reserved.<BR>
# Copyright (c) 2014 - 2016, AMD Inc. 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 distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#*/
#/**
diff --git a/Silicon/AMD/Styx/Library/AmdStyxLib/Styx.c b/Silicon/AMD/Styx/Library/AmdStyxLib/Styx.c
index dc59d4f08f..6627cecc82 100644
--- a/Silicon/AMD/Styx/Library/AmdStyxLib/Styx.c
+++ b/Silicon/AMD/Styx/Library/AmdStyxLib/Styx.c
@@ -3,13 +3,7 @@
* Copyright (c) 2011-2013, ARM Limited. All rights reserved.<BR>
* Copyright (c) 2014 - 2016, AMD Inc. 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 distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
/**
diff --git a/Silicon/AMD/Styx/Library/AmdStyxLib/StyxMem.c b/Silicon/AMD/Styx/Library/AmdStyxLib/StyxMem.c
index 479a40627d..480c8c13ba 100644
--- a/Silicon/AMD/Styx/Library/AmdStyxLib/StyxMem.c
+++ b/Silicon/AMD/Styx/Library/AmdStyxLib/StyxMem.c
@@ -3,13 +3,7 @@
* Copyright (c) 2011-2014, ARM Limited. All rights reserved.<BR>
* Copyright (c) 2014 - 2016, AMD Inc. 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 distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
/**
diff --git a/Silicon/AMD/Styx/Library/AmdStyxPciHostBridgeLib/AmdStyxPciHostBridgeLib.c b/Silicon/AMD/Styx/Library/AmdStyxPciHostBridgeLib/AmdStyxPciHostBridgeLib.c
index 8d8c76a0f7..d52b668af9 100644
--- a/Silicon/AMD/Styx/Library/AmdStyxPciHostBridgeLib/AmdStyxPciHostBridgeLib.c
+++ b/Silicon/AMD/Styx/Library/AmdStyxPciHostBridgeLib/AmdStyxPciHostBridgeLib.c
@@ -3,13 +3,7 @@
Copyright (c) 2016, Linaro Ltd. 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
- distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php.
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT
- WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include <PiDxe.h>
diff --git a/Silicon/AMD/Styx/Library/AmdStyxPciHostBridgeLib/AmdStyxPciHostBridgeLib.inf b/Silicon/AMD/Styx/Library/AmdStyxPciHostBridgeLib/AmdStyxPciHostBridgeLib.inf
index 3fdaf14d8c..31c973cd2a 100644
--- a/Silicon/AMD/Styx/Library/AmdStyxPciHostBridgeLib/AmdStyxPciHostBridgeLib.inf
+++ b/Silicon/AMD/Styx/Library/AmdStyxPciHostBridgeLib/AmdStyxPciHostBridgeLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2016, Linaro Ltd. 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
-# distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
-# IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#
##
diff --git a/Silicon/AMD/Styx/Library/MemoryInitPei/MemoryInitPeiLib.c b/Silicon/AMD/Styx/Library/MemoryInitPei/MemoryInitPeiLib.c
index 67f90efdcb..0cbd960f30 100644
--- a/Silicon/AMD/Styx/Library/MemoryInitPei/MemoryInitPeiLib.c
+++ b/Silicon/AMD/Styx/Library/MemoryInitPei/MemoryInitPeiLib.c
@@ -3,13 +3,7 @@
Copyright (c) 2011-2014, ARM Limited. All rights reserved.<BR>
Copyright (c) 2014 - 2016 AMD Inc. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
/**
diff --git a/Silicon/AMD/Styx/Library/MemoryInitPei/MemoryInitPeiLib.inf b/Silicon/AMD/Styx/Library/MemoryInitPei/MemoryInitPeiLib.inf
index db7ce6af33..37bb91b1ee 100644
--- a/Silicon/AMD/Styx/Library/MemoryInitPei/MemoryInitPeiLib.inf
+++ b/Silicon/AMD/Styx/Library/MemoryInitPei/MemoryInitPeiLib.inf
@@ -3,13 +3,7 @@
# Copyright (c) 2011 - 2014, ARM Ltd. All rights reserved.<BR>
# Copyright (c) 2014 - 2016, AMD Inc. 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 distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#**/
#/**
# Derived from:
diff --git a/Silicon/AMD/Styx/Library/RealTimeClockLib/RealTimeClockLib.c b/Silicon/AMD/Styx/Library/RealTimeClockLib/RealTimeClockLib.c
index 11f398ad29..d15fcf031a 100644
--- a/Silicon/AMD/Styx/Library/RealTimeClockLib/RealTimeClockLib.c
+++ b/Silicon/AMD/Styx/Library/RealTimeClockLib/RealTimeClockLib.c
@@ -5,13 +5,7 @@
Copyright (c) 2011 - 2014, ARM Ltd. All rights reserved.<BR>
Copyright (c) 2014 - 2016, AMD Inc. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
/**
diff --git a/Silicon/AMD/Styx/Library/RealTimeClockLib/RealTimeClockLib.inf b/Silicon/AMD/Styx/Library/RealTimeClockLib/RealTimeClockLib.inf
index 5392bd076c..52373dfad7 100644
--- a/Silicon/AMD/Styx/Library/RealTimeClockLib/RealTimeClockLib.inf
+++ b/Silicon/AMD/Styx/Library/RealTimeClockLib/RealTimeClockLib.inf
@@ -4,12 +4,7 @@
# Copyright (c) 2011 - 2014, ARM Ltd. All rights reserved.<BR>
# Copyright (c) 2014 - 2016, AMD Inc. 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 distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
#/**
diff --git a/Silicon/AMD/Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.c b/Silicon/AMD/Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.c
index 248eda7c8a..c84c1a81c3 100644
--- a/Silicon/AMD/Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.c
+++ b/Silicon/AMD/Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.c
@@ -2,13 +2,7 @@
*
* Copyright (c) 2017, Linaro, Ltd. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/AMD/Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.inf b/Silicon/AMD/Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.inf
index 3fbc0548aa..b4d6fd4008 100644
--- a/Silicon/AMD/Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.inf
+++ b/Silicon/AMD/Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.inf
@@ -2,13 +2,7 @@
*
* Copyright (c) 2017, Linaro, Ltd. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/AMD/Styx/Library/StyxPlatformFlashAccessLib/StyxPlatformFlashAccessLib.c b/Silicon/AMD/Styx/Library/StyxPlatformFlashAccessLib/StyxPlatformFlashAccessLib.c
index 38f1830b5c..7eeee08227 100644
--- a/Silicon/AMD/Styx/Library/StyxPlatformFlashAccessLib/StyxPlatformFlashAccessLib.c
+++ b/Silicon/AMD/Styx/Library/StyxPlatformFlashAccessLib/StyxPlatformFlashAccessLib.c
@@ -4,13 +4,7 @@
Copyright (c) 2017, Linaro, Ltd. All rights reserved.<BR>
Copyright (c) 2018, 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/AMD/Styx/Library/StyxPlatformFlashAccessLib/StyxPlatformFlashAccessLib.inf b/Silicon/AMD/Styx/Library/StyxPlatformFlashAccessLib/StyxPlatformFlashAccessLib.inf
index b54a2e90ff..05b785db2a 100644
--- a/Silicon/AMD/Styx/Library/StyxPlatformFlashAccessLib/StyxPlatformFlashAccessLib.inf
+++ b/Silicon/AMD/Styx/Library/StyxPlatformFlashAccessLib/StyxPlatformFlashAccessLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, Linaro, Ltd. 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 distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
--
2.21.0.windows.1
^ permalink raw reply related [flat|nested] 63+ messages in thread* [[edk2-platforms][PATCH V2] 20/30] Silicon/Atmel: Replace BSD License with BSD+Patent License
2019-05-15 23:09 [[edk2-platforms][PATCH V2] 00/30] Change edk2-platforms/master to BSD+Patent License Michael D Kinney
` (18 preceding siblings ...)
2019-05-15 23:10 ` [[edk2-platforms][PATCH V2] 19/30] Silicon/AMD: " Michael D Kinney
@ 2019-05-15 23:10 ` Michael D Kinney
2019-05-15 23:10 ` [[edk2-platforms][PATCH V2] 21/30] Silicon/Broadcom: " Michael D Kinney
` (10 subsequent siblings)
30 siblings, 0 replies; 63+ messages in thread
From: Michael D Kinney @ 2019-05-15 23:10 UTC (permalink / raw)
To: devel; +Cc: Leif Lindholm, Ard Biesheuvel
https://bugzilla.tianocore.org/show_bug.cgi?id=1373
Replace BSD 2-Clause License with BSD+Patent License. This change is
based on the following emails:
https://lists.01.org/pipermail/edk2-devel/2019-February/036260.html
https://lists.01.org/pipermail/edk2-devel/2018-October/030385.html
RFCs with detailed process for the license change:
V3: https://lists.01.org/pipermail/edk2-devel/2019-March/038116.html
V2: https://lists.01.org/pipermail/edk2-devel/2019-March/037669.html
V1: https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
Silicon/Atmel/AtSha204a/AtSha204a.dec | 8 +-------
Silicon/Atmel/AtSha204a/AtSha204aDriver.c | 8 +-------
Silicon/Atmel/AtSha204a/AtSha204aDriver.h | 8 +-------
Silicon/Atmel/AtSha204a/AtSha204aDxe.inf | 8 +-------
Silicon/Atmel/AtSha204a/ComponentName.c | 8 +-------
Silicon/Atmel/AtSha204a/DriverBinding.c | 8 +-------
6 files changed, 6 insertions(+), 42 deletions(-)
diff --git a/Silicon/Atmel/AtSha204a/AtSha204a.dec b/Silicon/Atmel/AtSha204a/AtSha204a.dec
index f1fdea5984..d731d08d1a 100644
--- a/Silicon/Atmel/AtSha204a/AtSha204a.dec
+++ b/Silicon/Atmel/AtSha204a/AtSha204a.dec
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, Linaro Ltd. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Atmel/AtSha204a/AtSha204aDriver.c b/Silicon/Atmel/AtSha204a/AtSha204aDriver.c
index 5db2de21a7..4a9a2aa3b3 100644
--- a/Silicon/Atmel/AtSha204a/AtSha204aDriver.c
+++ b/Silicon/Atmel/AtSha204a/AtSha204aDriver.c
@@ -3,13 +3,7 @@
Copyright (c) 2018, Linaro Ltd. 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 distribution. The full text of the license may
- be found at http://opensource.org/licenses/bsd-license.php.
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Atmel/AtSha204a/AtSha204aDriver.h b/Silicon/Atmel/AtSha204a/AtSha204aDriver.h
index 315a450d34..615959baf4 100644
--- a/Silicon/Atmel/AtSha204a/AtSha204aDriver.h
+++ b/Silicon/Atmel/AtSha204a/AtSha204aDriver.h
@@ -3,13 +3,7 @@
Copyright (c) 2018, Linaro Ltd. 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 distribution. The full text of the license may
- be found at http://opensource.org/licenses/bsd-license.php.
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Atmel/AtSha204a/AtSha204aDxe.inf b/Silicon/Atmel/AtSha204a/AtSha204aDxe.inf
index fe90cc5381..03ae76e176 100644
--- a/Silicon/Atmel/AtSha204a/AtSha204aDxe.inf
+++ b/Silicon/Atmel/AtSha204a/AtSha204aDxe.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2018, Linaro Ltd. 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 distribution. The full text of the license may
-# be found at http://opensource.org/licenses/bsd-license.php.
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Atmel/AtSha204a/ComponentName.c b/Silicon/Atmel/AtSha204a/ComponentName.c
index 9893e7c4c2..eec7b9120b 100644
--- a/Silicon/Atmel/AtSha204a/ComponentName.c
+++ b/Silicon/Atmel/AtSha204a/ComponentName.c
@@ -3,13 +3,7 @@
Copyright (c) 2018, Linaro Ltd. All rights reserved.
- This program and the accompanying materials
- are licensed and made available under the terms and conditions of the BSD License
- which accompanies this distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Atmel/AtSha204a/DriverBinding.c b/Silicon/Atmel/AtSha204a/DriverBinding.c
index 17e61f96e8..38ffd80df9 100644
--- a/Silicon/Atmel/AtSha204a/DriverBinding.c
+++ b/Silicon/Atmel/AtSha204a/DriverBinding.c
@@ -3,13 +3,7 @@
Copyright (c) 2018, Linaro Ltd. 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 distribution. The full text of the license may
- be found at http://opensource.org/licenses/bsd-license.php.
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
--
2.21.0.windows.1
^ permalink raw reply related [flat|nested] 63+ messages in thread* [[edk2-platforms][PATCH V2] 21/30] Silicon/Broadcom: Replace BSD License with BSD+Patent License
2019-05-15 23:09 [[edk2-platforms][PATCH V2] 00/30] Change edk2-platforms/master to BSD+Patent License Michael D Kinney
` (19 preceding siblings ...)
2019-05-15 23:10 ` [[edk2-platforms][PATCH V2] 20/30] Silicon/Atmel: " Michael D Kinney
@ 2019-05-15 23:10 ` Michael D Kinney
2019-05-17 11:08 ` Leif Lindholm
2019-05-15 23:10 ` [[edk2-platforms][PATCH V2] 22/30] Silicon/Hisilicon: " Michael D Kinney
` (9 subsequent siblings)
30 siblings, 1 reply; 63+ messages in thread
From: Michael D Kinney @ 2019-05-15 23:10 UTC (permalink / raw)
To: devel; +Cc: Leif Lindholm, Ard Biesheuvel
https://bugzilla.tianocore.org/show_bug.cgi?id=1373
Replace BSD 2-Clause License with BSD+Patent License. This change is
based on the following emails:
https://lists.01.org/pipermail/edk2-devel/2019-February/036260.html
https://lists.01.org/pipermail/edk2-devel/2018-October/030385.html
RFCs with detailed process for the license change:
V3: https://lists.01.org/pipermail/edk2-devel/2019-March/038116.html
V2: https://lists.01.org/pipermail/edk2-devel/2019-March/037669.html
V1: https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
Silicon/Broadcom/Bcm283x/Bcm283x.dec | 9 +--------
.../Broadcom/Bcm283x/Drivers/InterruptDxe/InterruptDxe.c | 8 +-------
.../Bcm283x/Drivers/InterruptDxe/InterruptDxe.inf | 8 +-------
Silicon/Broadcom/Bcm283x/Drivers/RngDxe/RngDxe.c | 8 +-------
Silicon/Broadcom/Bcm283x/Drivers/RngDxe/RngDxe.inf | 8 +-------
.../Bcm283x/Include/IndustryStandard/Bcm2836Gpio.h | 8 +-------
.../Bcm283x/Include/IndustryStandard/Bcm2836SdHost.h | 8 +-------
.../Bcm283x/Include/IndustryStandard/Bcm2836Sdio.h | 8 +-------
Silicon/Broadcom/Bcm283x/Include/Library/GpioLib.h | 8 +-------
Silicon/Broadcom/Bcm283x/Library/GpioLib/GpioLib.c | 8 +-------
Silicon/Broadcom/Bcm283x/Library/GpioLib/GpioLib.inf | 8 +-------
11 files changed, 11 insertions(+), 78 deletions(-)
diff --git a/Silicon/Broadcom/Bcm283x/Bcm283x.dec b/Silicon/Broadcom/Bcm283x/Bcm283x.dec
index d193da4c0e..ec62ff27fb 100644
--- a/Silicon/Broadcom/Bcm283x/Bcm283x.dec
+++ b/Silicon/Broadcom/Bcm283x/Bcm283x.dec
@@ -2,14 +2,7 @@
#
# Copyright (c) 2019, Pete Batard <pete@akeo.ie>
#
-# This program and the accompanying materials are licensed and made available
-# under the terms and conditions of the BSD License which accompanies this
-# distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
-# IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Broadcom/Bcm283x/Drivers/InterruptDxe/InterruptDxe.c b/Silicon/Broadcom/Bcm283x/Drivers/InterruptDxe/InterruptDxe.c
index 9058aa94ff..a1fe13032f 100644
--- a/Silicon/Broadcom/Bcm283x/Drivers/InterruptDxe/InterruptDxe.c
+++ b/Silicon/Broadcom/Bcm283x/Drivers/InterruptDxe/InterruptDxe.c
@@ -2,13 +2,7 @@
*
* Copyright (c) 2016, Linaro, Ltd. All rights reserved.
*
- * This program and the accompanying materials
- * are licensed and made available under the terms and conditions of the BSD License
- * which accompanies this distribution. The full text of the license may be found at
- * http://opensource.org/licenses/bsd-license.php
- *
- * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Broadcom/Bcm283x/Drivers/InterruptDxe/InterruptDxe.inf b/Silicon/Broadcom/Bcm283x/Drivers/InterruptDxe/InterruptDxe.inf
index 5812e48dbb..cdce11a51e 100644
--- a/Silicon/Broadcom/Bcm283x/Drivers/InterruptDxe/InterruptDxe.inf
+++ b/Silicon/Broadcom/Bcm283x/Drivers/InterruptDxe/InterruptDxe.inf
@@ -3,13 +3,7 @@
# Copyright (c) 2017, Andrei Warkentin <andrey.warkentin@gmail.com>
# Copyright (c) 2016 Linaro, Ltd. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
diff --git a/Silicon/Broadcom/Bcm283x/Drivers/RngDxe/RngDxe.c b/Silicon/Broadcom/Bcm283x/Drivers/RngDxe/RngDxe.c
index 399d931585..722815d32f 100644
--- a/Silicon/Broadcom/Bcm283x/Drivers/RngDxe/RngDxe.c
+++ b/Silicon/Broadcom/Bcm283x/Drivers/RngDxe/RngDxe.c
@@ -4,13 +4,7 @@
Copyright (C) 2019, Linaro Ltd. 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
- distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT
- WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Broadcom/Bcm283x/Drivers/RngDxe/RngDxe.inf b/Silicon/Broadcom/Bcm283x/Drivers/RngDxe/RngDxe.inf
index 45e8825244..cb1695bd2d 100644
--- a/Silicon/Broadcom/Bcm283x/Drivers/RngDxe/RngDxe.inf
+++ b/Silicon/Broadcom/Bcm283x/Drivers/RngDxe/RngDxe.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2019 Linaro, Ltd. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
diff --git a/Silicon/Broadcom/Bcm283x/Include/IndustryStandard/Bcm2836Gpio.h b/Silicon/Broadcom/Bcm283x/Include/IndustryStandard/Bcm2836Gpio.h
index 5fc43ddaa2..123de2c2d1 100644
--- a/Silicon/Broadcom/Bcm283x/Include/IndustryStandard/Bcm2836Gpio.h
+++ b/Silicon/Broadcom/Bcm283x/Include/IndustryStandard/Bcm2836Gpio.h
@@ -3,13 +3,7 @@
* Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.com>
* Copyright (c) Microsoft Corporation. All rights reserved.
*
- * This program and the accompanying materials
- * are licensed and made available under the terms and conditions of the BSD License
- * which accompanies this distribution. The full text of the license may be found at
- * http://opensource.org/licenses/bsd-license.php
- *
- * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Broadcom/Bcm283x/Include/IndustryStandard/Bcm2836SdHost.h b/Silicon/Broadcom/Bcm283x/Include/IndustryStandard/Bcm2836SdHost.h
index 1841cc2857..d0492a4ff4 100644
--- a/Silicon/Broadcom/Bcm283x/Include/IndustryStandard/Bcm2836SdHost.h
+++ b/Silicon/Broadcom/Bcm283x/Include/IndustryStandard/Bcm2836SdHost.h
@@ -3,13 +3,7 @@
* Copyright (c) 2017, Andrei Warkentin <andrey.warkentin@gmail.com>
* Copyright (c) Microsoft Corporation. All rights reserved.
*
- * This program and the accompanying materials
- * are licensed and made available under the terms and conditions of the BSD License
- * which accompanies this distribution. The full text of the license may be found at
- * http://opensource.org/licenses/bsd-license.php
- *
- * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Broadcom/Bcm283x/Include/IndustryStandard/Bcm2836Sdio.h b/Silicon/Broadcom/Bcm283x/Include/IndustryStandard/Bcm2836Sdio.h
index 502ccb4982..fb0d029041 100644
--- a/Silicon/Broadcom/Bcm283x/Include/IndustryStandard/Bcm2836Sdio.h
+++ b/Silicon/Broadcom/Bcm283x/Include/IndustryStandard/Bcm2836Sdio.h
@@ -2,13 +2,7 @@
*
* Copyright (c) Microsoft Corporation. All rights reserved.
*
- * This program and the accompanying materials
- * are licensed and made available under the terms and conditions of the BSD License
- * which accompanies this distribution. The full text of the license may be found at
- * http://opensource.org/licenses/bsd-license.php
- *
- * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Broadcom/Bcm283x/Include/Library/GpioLib.h b/Silicon/Broadcom/Bcm283x/Include/Library/GpioLib.h
index c3e1fc21bf..014c6b07a2 100644
--- a/Silicon/Broadcom/Bcm283x/Include/Library/GpioLib.h
+++ b/Silicon/Broadcom/Bcm283x/Include/Library/GpioLib.h
@@ -4,13 +4,7 @@
*
* Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.com>
*
- * This program and the accompanying materials
- * are licensed and made available under the terms and conditions of the BSD License
- * which accompanies this distribution. The full text of the license may be found at
- * http://opensource.org/licenses/bsd-license.php
- *
- * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Broadcom/Bcm283x/Library/GpioLib/GpioLib.c b/Silicon/Broadcom/Bcm283x/Library/GpioLib/GpioLib.c
index 8cf560e4fc..542b6e8f6b 100644
--- a/Silicon/Broadcom/Bcm283x/Library/GpioLib/GpioLib.c
+++ b/Silicon/Broadcom/Bcm283x/Library/GpioLib/GpioLib.c
@@ -4,13 +4,7 @@
*
* Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.com>
*
- * This program and the accompanying materials
- * are licensed and made available under the terms and conditions of the BSD License
- * which accompanies this distribution. The full text of the license may be found at
- * http://opensource.org/licenses/bsd-license.php
- *
- * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Broadcom/Bcm283x/Library/GpioLib/GpioLib.inf b/Silicon/Broadcom/Bcm283x/Library/GpioLib/GpioLib.inf
index 68ebe44e3d..50da4eb771 100644
--- a/Silicon/Broadcom/Bcm283x/Library/GpioLib/GpioLib.inf
+++ b/Silicon/Broadcom/Bcm283x/Library/GpioLib/GpioLib.inf
@@ -4,13 +4,7 @@
#
# Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.com>
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
--
2.21.0.windows.1
^ permalink raw reply related [flat|nested] 63+ messages in thread* Re: [[edk2-platforms][PATCH V2] 21/30] Silicon/Broadcom: Replace BSD License with BSD+Patent License
2019-05-15 23:10 ` [[edk2-platforms][PATCH V2] 21/30] Silicon/Broadcom: " Michael D Kinney
@ 2019-05-17 11:08 ` Leif Lindholm
2019-05-17 11:09 ` Ard Biesheuvel
0 siblings, 1 reply; 63+ messages in thread
From: Leif Lindholm @ 2019-05-17 11:08 UTC (permalink / raw)
To: Michael D Kinney; +Cc: devel, Ard Biesheuvel
On Wed, May 15, 2019 at 04:10:02PM -0700, Michael D Kinney wrote:
> https://bugzilla.tianocore.org/show_bug.cgi?id=1373
>
> Replace BSD 2-Clause License with BSD+Patent License. This change is
> based on the following emails:
>
> https://lists.01.org/pipermail/edk2-devel/2019-February/036260.html
> https://lists.01.org/pipermail/edk2-devel/2018-October/030385.html
>
> RFCs with detailed process for the license change:
>
> V3: https://lists.01.org/pipermail/edk2-devel/2019-March/038116.html
> V2: https://lists.01.org/pipermail/edk2-devel/2019-March/037669.html
> V1: https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html
This patch excludes the 3-clause BSD licensed file
Silicon\Broadcom\Bcm283x\Include\IndustryStandard\Bcm2836.h
based on work from Ard who suggests that was unintentional.
Ard: can you confirm for the list that this was always intended to be 2-clause?
Regards,
Leif
> Cc: Leif Lindholm <leif.lindholm@linaro.org>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
> ---
> Silicon/Broadcom/Bcm283x/Bcm283x.dec | 9 +--------
> .../Broadcom/Bcm283x/Drivers/InterruptDxe/InterruptDxe.c | 8 +-------
> .../Bcm283x/Drivers/InterruptDxe/InterruptDxe.inf | 8 +-------
> Silicon/Broadcom/Bcm283x/Drivers/RngDxe/RngDxe.c | 8 +-------
> Silicon/Broadcom/Bcm283x/Drivers/RngDxe/RngDxe.inf | 8 +-------
> .../Bcm283x/Include/IndustryStandard/Bcm2836Gpio.h | 8 +-------
> .../Bcm283x/Include/IndustryStandard/Bcm2836SdHost.h | 8 +-------
> .../Bcm283x/Include/IndustryStandard/Bcm2836Sdio.h | 8 +-------
> Silicon/Broadcom/Bcm283x/Include/Library/GpioLib.h | 8 +-------
> Silicon/Broadcom/Bcm283x/Library/GpioLib/GpioLib.c | 8 +-------
> Silicon/Broadcom/Bcm283x/Library/GpioLib/GpioLib.inf | 8 +-------
> 11 files changed, 11 insertions(+), 78 deletions(-)
>
> diff --git a/Silicon/Broadcom/Bcm283x/Bcm283x.dec b/Silicon/Broadcom/Bcm283x/Bcm283x.dec
> index d193da4c0e..ec62ff27fb 100644
> --- a/Silicon/Broadcom/Bcm283x/Bcm283x.dec
> +++ b/Silicon/Broadcom/Bcm283x/Bcm283x.dec
> @@ -2,14 +2,7 @@
> #
> # Copyright (c) 2019, Pete Batard <pete@akeo.ie>
> #
> -# This program and the accompanying materials are licensed and made available
> -# under the terms and conditions of the BSD License which accompanies this
> -# distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> -# IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Silicon/Broadcom/Bcm283x/Drivers/InterruptDxe/InterruptDxe.c b/Silicon/Broadcom/Bcm283x/Drivers/InterruptDxe/InterruptDxe.c
> index 9058aa94ff..a1fe13032f 100644
> --- a/Silicon/Broadcom/Bcm283x/Drivers/InterruptDxe/InterruptDxe.c
> +++ b/Silicon/Broadcom/Bcm283x/Drivers/InterruptDxe/InterruptDxe.c
> @@ -2,13 +2,7 @@
> *
> * Copyright (c) 2016, Linaro, Ltd. All rights reserved.
> *
> - * This program and the accompanying materials
> - * are licensed and made available under the terms and conditions of the BSD License
> - * which accompanies this distribution. The full text of the license may be found at
> - * http://opensource.org/licenses/bsd-license.php
> - *
> - * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + * SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Silicon/Broadcom/Bcm283x/Drivers/InterruptDxe/InterruptDxe.inf b/Silicon/Broadcom/Bcm283x/Drivers/InterruptDxe/InterruptDxe.inf
> index 5812e48dbb..cdce11a51e 100644
> --- a/Silicon/Broadcom/Bcm283x/Drivers/InterruptDxe/InterruptDxe.inf
> +++ b/Silicon/Broadcom/Bcm283x/Drivers/InterruptDxe/InterruptDxe.inf
> @@ -3,13 +3,7 @@
> # Copyright (c) 2017, Andrei Warkentin <andrey.warkentin@gmail.com>
> # Copyright (c) 2016 Linaro, Ltd. All rights reserved.
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD License
> -# which accompanies this distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> #**/
>
> diff --git a/Silicon/Broadcom/Bcm283x/Drivers/RngDxe/RngDxe.c b/Silicon/Broadcom/Bcm283x/Drivers/RngDxe/RngDxe.c
> index 399d931585..722815d32f 100644
> --- a/Silicon/Broadcom/Bcm283x/Drivers/RngDxe/RngDxe.c
> +++ b/Silicon/Broadcom/Bcm283x/Drivers/RngDxe/RngDxe.c
> @@ -4,13 +4,7 @@
>
> Copyright (C) 2019, Linaro Ltd. 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
> - distribution. The full text of the license may be found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT
> - WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Broadcom/Bcm283x/Drivers/RngDxe/RngDxe.inf b/Silicon/Broadcom/Bcm283x/Drivers/RngDxe/RngDxe.inf
> index 45e8825244..cb1695bd2d 100644
> --- a/Silicon/Broadcom/Bcm283x/Drivers/RngDxe/RngDxe.inf
> +++ b/Silicon/Broadcom/Bcm283x/Drivers/RngDxe/RngDxe.inf
> @@ -2,13 +2,7 @@
> #
> # Copyright (c) 2019 Linaro, Ltd. All rights reserved.
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD License
> -# which accompanies this distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> #**/
>
> diff --git a/Silicon/Broadcom/Bcm283x/Include/IndustryStandard/Bcm2836Gpio.h b/Silicon/Broadcom/Bcm283x/Include/IndustryStandard/Bcm2836Gpio.h
> index 5fc43ddaa2..123de2c2d1 100644
> --- a/Silicon/Broadcom/Bcm283x/Include/IndustryStandard/Bcm2836Gpio.h
> +++ b/Silicon/Broadcom/Bcm283x/Include/IndustryStandard/Bcm2836Gpio.h
> @@ -3,13 +3,7 @@
> * Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.com>
> * Copyright (c) Microsoft Corporation. All rights reserved.
> *
> - * This program and the accompanying materials
> - * are licensed and made available under the terms and conditions of the BSD License
> - * which accompanies this distribution. The full text of the license may be found at
> - * http://opensource.org/licenses/bsd-license.php
> - *
> - * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + * SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Silicon/Broadcom/Bcm283x/Include/IndustryStandard/Bcm2836SdHost.h b/Silicon/Broadcom/Bcm283x/Include/IndustryStandard/Bcm2836SdHost.h
> index 1841cc2857..d0492a4ff4 100644
> --- a/Silicon/Broadcom/Bcm283x/Include/IndustryStandard/Bcm2836SdHost.h
> +++ b/Silicon/Broadcom/Bcm283x/Include/IndustryStandard/Bcm2836SdHost.h
> @@ -3,13 +3,7 @@
> * Copyright (c) 2017, Andrei Warkentin <andrey.warkentin@gmail.com>
> * Copyright (c) Microsoft Corporation. All rights reserved.
> *
> - * This program and the accompanying materials
> - * are licensed and made available under the terms and conditions of the BSD License
> - * which accompanies this distribution. The full text of the license may be found at
> - * http://opensource.org/licenses/bsd-license.php
> - *
> - * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + * SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Silicon/Broadcom/Bcm283x/Include/IndustryStandard/Bcm2836Sdio.h b/Silicon/Broadcom/Bcm283x/Include/IndustryStandard/Bcm2836Sdio.h
> index 502ccb4982..fb0d029041 100644
> --- a/Silicon/Broadcom/Bcm283x/Include/IndustryStandard/Bcm2836Sdio.h
> +++ b/Silicon/Broadcom/Bcm283x/Include/IndustryStandard/Bcm2836Sdio.h
> @@ -2,13 +2,7 @@
> *
> * Copyright (c) Microsoft Corporation. All rights reserved.
> *
> - * This program and the accompanying materials
> - * are licensed and made available under the terms and conditions of the BSD License
> - * which accompanies this distribution. The full text of the license may be found at
> - * http://opensource.org/licenses/bsd-license.php
> - *
> - * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + * SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Silicon/Broadcom/Bcm283x/Include/Library/GpioLib.h b/Silicon/Broadcom/Bcm283x/Include/Library/GpioLib.h
> index c3e1fc21bf..014c6b07a2 100644
> --- a/Silicon/Broadcom/Bcm283x/Include/Library/GpioLib.h
> +++ b/Silicon/Broadcom/Bcm283x/Include/Library/GpioLib.h
> @@ -4,13 +4,7 @@
> *
> * Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.com>
> *
> - * This program and the accompanying materials
> - * are licensed and made available under the terms and conditions of the BSD License
> - * which accompanies this distribution. The full text of the license may be found at
> - * http://opensource.org/licenses/bsd-license.php
> - *
> - * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + * SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Silicon/Broadcom/Bcm283x/Library/GpioLib/GpioLib.c b/Silicon/Broadcom/Bcm283x/Library/GpioLib/GpioLib.c
> index 8cf560e4fc..542b6e8f6b 100644
> --- a/Silicon/Broadcom/Bcm283x/Library/GpioLib/GpioLib.c
> +++ b/Silicon/Broadcom/Bcm283x/Library/GpioLib/GpioLib.c
> @@ -4,13 +4,7 @@
> *
> * Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.com>
> *
> - * This program and the accompanying materials
> - * are licensed and made available under the terms and conditions of the BSD License
> - * which accompanies this distribution. The full text of the license may be found at
> - * http://opensource.org/licenses/bsd-license.php
> - *
> - * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + * SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Silicon/Broadcom/Bcm283x/Library/GpioLib/GpioLib.inf b/Silicon/Broadcom/Bcm283x/Library/GpioLib/GpioLib.inf
> index 68ebe44e3d..50da4eb771 100644
> --- a/Silicon/Broadcom/Bcm283x/Library/GpioLib/GpioLib.inf
> +++ b/Silicon/Broadcom/Bcm283x/Library/GpioLib/GpioLib.inf
> @@ -4,13 +4,7 @@
> #
> # Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.com>
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD License
> -# which accompanies this distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> #**/
>
> --
> 2.21.0.windows.1
>
^ permalink raw reply [flat|nested] 63+ messages in thread
* [[edk2-platforms][PATCH V2] 22/30] Silicon/Hisilicon: Replace BSD License with BSD+Patent License
2019-05-15 23:09 [[edk2-platforms][PATCH V2] 00/30] Change edk2-platforms/master to BSD+Patent License Michael D Kinney
` (20 preceding siblings ...)
2019-05-15 23:10 ` [[edk2-platforms][PATCH V2] 21/30] Silicon/Broadcom: " Michael D Kinney
@ 2019-05-15 23:10 ` Michael D Kinney
2019-05-15 23:10 ` [[edk2-platforms][PATCH V2] 23/30] Silicon/Intel/KabylakeSiliconPkg: " Michael D Kinney
` (8 subsequent siblings)
30 siblings, 0 replies; 63+ messages in thread
From: Michael D Kinney @ 2019-05-15 23:10 UTC (permalink / raw)
To: devel; +Cc: Leif Lindholm, Ard Biesheuvel
https://bugzilla.tianocore.org/show_bug.cgi?id=1373
Replace BSD 2-Clause License with BSD+Patent License. This change is
based on the following emails:
https://lists.01.org/pipermail/edk2-devel/2019-February/036260.html
https://lists.01.org/pipermail/edk2-devel/2018-October/030385.html
RFCs with detailed process for the license change:
V3: https://lists.01.org/pipermail/edk2-devel/2019-March/038116.html
V2: https://lists.01.org/pipermail/edk2-devel/2019-March/037669.html
V1: https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
.../Drivers/AcpiPlatformDxe/AcpiPlatform.c | 8 +-------
.../AcpiPlatformDxe/AcpiPlatformDxe.inf | 8 +-------
.../Hisilicon/Drivers/AcpiPlatformDxe/EthMac.c | 8 +-------
.../Hisilicon/Drivers/AcpiPlatformDxe/EthMac.h | 8 +-------
.../Drivers/FlashFvbDxe/FlashBlockIoDxe.c | 8 +-------
.../Drivers/FlashFvbDxe/FlashFvbDxe.c | 8 +-------
.../Drivers/FlashFvbDxe/FlashFvbDxe.h | 8 +-------
.../Drivers/FlashFvbDxe/FlashFvbDxe.inf | 8 +-------
.../Drivers/HisiAcpiPlatformDxe/AcpiPlatform.c | 8 +-------
.../HisiAcpiPlatformDxe/AcpiPlatform.uni | 8 +-------
.../HisiAcpiPlatformDxe/AcpiPlatformDxe.inf | 8 +-------
| 8 +-------
.../HisiAcpiPlatformDxe/UpdateAcpiTable.c | 8 +-------
.../HisiAcpiPlatformDxe/UpdateAcpiTable.h | 8 +-------
.../Drivers/NorFlashDxe/NorFlashConfig.c | 8 +-------
.../Drivers/NorFlashDxe/NorFlashDxe.c | 8 +-------
.../Drivers/NorFlashDxe/NorFlashDxe.inf | 8 +-------
.../Hisilicon/Drivers/NorFlashDxe/NorFlashHw.c | 8 +-------
.../Hisilicon/Drivers/NorFlashDxe/NorFlashHw.h | 8 +-------
.../Drivers/PciPlatform/PciPlatform.c | 8 +-------
.../Drivers/PciPlatform/PciPlatform.inf | 8 +-------
.../Drivers/SasPlatform/SasPlatform.c | 8 +-------
.../Drivers/SasPlatform/SasPlatform.inf | 8 +-------
Silicon/Hisilicon/Drivers/SasV1Dxe/SasV1Dxe.c | 8 +-------
.../Hisilicon/Drivers/SasV1Dxe/SasV1Dxe.inf | 8 +-------
.../Smbios/AddSmbiosType9/AddSmbiosType9.c | 8 +-------
.../Smbios/AddSmbiosType9/AddSmbiosType9.h | 8 +-------
.../Smbios/AddSmbiosType9/AddSmbiosType9.inf | 8 +-------
.../Smbios/MemorySubClassDxe/MemorySubClass.c | 8 +-------
.../Smbios/MemorySubClassDxe/MemorySubClass.h | 8 +-------
.../MemorySubClassDxe/MemorySubClassDxe.inf | 8 +-------
.../MemorySubClassStrings.uni | 8 +-------
.../ProcessorSubClassDxe/ProcessorSubClass.c | 8 +-------
.../ProcessorSubClassDxe/ProcessorSubClass.h | 8 +-------
.../ProcessorSubClassDxe.inf | 8 +-------
.../ProcessorSubClassStrings.uni | 8 +-------
.../Drivers/Smbios/SmbiosMiscDxe/SmbiosMisc.h | 8 +-------
.../Smbios/SmbiosMiscDxe/SmbiosMiscDataTable.c | 8 +-------
.../Smbios/SmbiosMiscDxe/SmbiosMiscDxe.inf | 7 +------
.../SmbiosMiscDxe/SmbiosMiscEntryPoint.c | 8 +-------
.../SmbiosMiscDxe/SmbiosMiscLibString.uni | 8 +-------
.../SmbiosMiscDxe/Type00/MiscBiosVendor.uni | 8 +-------
.../SmbiosMiscDxe/Type00/MiscBiosVendorData.c | 8 +-------
.../Type00/MiscBiosVendorFunction.c | 8 +-------
.../Type01/MiscSystemManufacturer.uni | 8 +-------
.../Type01/MiscSystemManufacturerData.c | 8 +-------
.../Type01/MiscSystemManufacturerFunction.c | 8 +-------
.../Type02/MiscBaseBoardManufacturer.uni | 8 +-------
.../Type02/MiscBaseBoardManufacturerData.c | 8 +-------
.../Type02/MiscBaseBoardManufacturerFunction.c | 8 +-------
.../Type03/MiscChassisManufacturer.uni | 8 +-------
.../Type03/MiscChassisManufacturerData.c | 8 +-------
.../Type03/MiscChassisManufacturerFunction.c | 8 +-------
.../Type09/MiscSystemSlotDesignation.uni | Bin 1592 -> 826 bytes
.../Type09/MiscSystemSlotDesignationData.c | 8 +-------
.../Type09/MiscSystemSlotDesignationFunction.c | 8 +-------
.../MiscNumberOfInstallableLanguages.uni | 8 +-------
.../MiscNumberOfInstallableLanguagesData.c | 8 +-------
.../MiscNumberOfInstallableLanguagesFunction.c | 8 +-------
.../Type32/MiscBootInformationData.c | 8 +-------
.../Type32/MiscBootInformationFunction.c | 8 +-------
.../Type38/MiscIpmiDeviceInformationData.c | 8 +-------
.../Type38/MiscIpmiDeviceInformationFunction.c | 8 +-------
.../Drivers/SnpPlatform/SnpPlatform.c | 8 +-------
.../Drivers/SnpPlatform/SnpPlatform.inf | 8 +-------
.../Drivers/UpdateFdtDxe/UpdateFdtDxe.c | 8 +-------
.../Drivers/UpdateFdtDxe/UpdateFdtDxe.inf | 8 +-------
.../Drivers/VersionInfoPeim/VersionInfoPeim.c | 8 +-------
.../VersionInfoPeim/VersionInfoPeim.inf | 8 +-------
.../VirtualEhciPciIo/VirtualEhciPciIo.c | 8 +-------
.../VirtualEhciPciIo/VirtualEhciPciIo.inf | 8 +-------
.../Hi1610/Drivers/IoInitDxe/IoInitDxe.c | 8 +-------
.../Hi1610/Drivers/IoInitDxe/IoInitDxe.inf | 8 +-------
.../Hi1610/Drivers/PcieInit1610/PcieInit.c | 8 +-------
.../Hi1610/Drivers/PcieInit1610/PcieInit.h | 8 +-------
.../Drivers/PcieInit1610/PcieInitDxe.inf | 8 +-------
.../Hi1610/Drivers/PcieInit1610/PcieInitLib.c | 8 +-------
.../Hi1610/Drivers/PcieInit1610/PcieInitLib.h | 8 +-------
.../Drivers/PcieInit1610/PcieKernelApi.h | 8 +-------
Silicon/Hisilicon/Hi1610/Hi1610.dec | 8 +-------
.../Hi1610AcpiTables/AcpiTablesHi1610.inf | 8 +-------
.../Hi1610/Hi1610AcpiTables/D03Mcfg.aslc | 7 ++-----
.../Hi1610/Hi1610AcpiTables/Dsdt/CPU.asl | 8 +-------
.../Hi1610/Hi1610AcpiTables/Dsdt/Com.asl | 8 +-------
.../Hi1610/Hi1610AcpiTables/Dsdt/D03Hns.asl | 8 +-------
.../Hi1610/Hi1610AcpiTables/Dsdt/D03Mbig.asl | 8 +-------
.../Hi1610/Hi1610AcpiTables/Dsdt/D03Pci.asl | 8 +-------
.../Hi1610/Hi1610AcpiTables/Dsdt/D03Sas.asl | 8 +-------
.../Hi1610/Hi1610AcpiTables/Dsdt/D03Usb.asl | 8 +-------
.../Hi1610AcpiTables/Dsdt/DsdtHi1610.asl | 8 +-------
.../Hi1610/Hi1610AcpiTables/Dsdt/Lpc.asl | 8 +-------
.../Hi1610/Hi1610AcpiTables/Facs.aslc | 8 +-------
.../Hi1610/Hi1610AcpiTables/Fadt.aslc | 8 +-------
.../Hi1610/Hi1610AcpiTables/Gtdt.aslc | 8 +-------
.../Hi1610/Hi1610AcpiTables/Hi1610Platform.h | 8 +-------
.../Hi1610/Hi1610AcpiTables/MadtHi1610.aslc | 8 +-------
.../Hi1610/Hi1610AcpiTables/Slit.aslc | 7 ++-----
.../Hi1610/Hi1610AcpiTables/Srat.aslc | 7 ++-----
.../Hisilicon/Hi1610/Include/PlatformArch.h | 8 +-------
.../Hi161xPciPlatformLib.c | 8 +-------
.../Hi161xPciPlatformLib.inf | 7 +------
.../Hi161xPciSegmentLib.inf | 7 +------
.../Hi161xPciSegmentLib/PciSegmentLib.c | 9 +--------
.../Hi1616/D05AcpiTables/AcpiTablesHi1616.inf | 8 +-------
.../Hi1616/D05AcpiTables/D05Mcfg.aslc | 7 ++-----
.../Hi1616/D05AcpiTables/D05Slit.aslc | 7 ++-----
.../Hi1616/D05AcpiTables/D05Spcr.aslc | 8 +-------
.../Hi1616/D05AcpiTables/D05Srat.aslc | 7 ++-----
.../Hi1616/D05AcpiTables/Dsdt/CPU.asl | 8 +-------
.../Hi1616/D05AcpiTables/Dsdt/Com.asl | 8 +-------
.../Hi1616/D05AcpiTables/Dsdt/D05Hns.asl | 8 +-------
.../Hi1616/D05AcpiTables/Dsdt/D05I2c.asl | 8 +-------
.../Hi1616/D05AcpiTables/Dsdt/D05Mbig.asl | 8 +-------
.../Hi1616/D05AcpiTables/Dsdt/D05Pci.asl | 8 +-------
.../Hi1616/D05AcpiTables/Dsdt/D05Sas.asl | 8 +-------
.../Hi1616/D05AcpiTables/Dsdt/D05Usb.asl | 8 +-------
.../Hi1616/D05AcpiTables/Dsdt/DsdtHi1616.asl | 8 +-------
.../Hi1616/D05AcpiTables/Dsdt/Lpc.asl | 8 +-------
.../Hisilicon/Hi1616/D05AcpiTables/Facs.aslc | 8 +-------
.../Hisilicon/Hi1616/D05AcpiTables/Fadt.aslc | 8 +-------
.../Hisilicon/Hi1616/D05AcpiTables/Gtdt.aslc | 8 +-------
.../Hi1616/D05AcpiTables/Hi1616Platform.h | 8 +-------
.../Hi1616/D05AcpiTables/MadtHi1616.aslc | 8 +-------
Silicon/Hisilicon/Hi1616/Hi1616.dec | 8 +-------
.../Hisilicon/Hi1616/Include/PlatformArch.h | 8 +-------
Silicon/Hisilicon/Hi1616/Pptt/Pptt.c | 8 +-------
Silicon/Hisilicon/Hi1616/Pptt/Pptt.h | 8 +-------
Silicon/Hisilicon/Hi1616/Pptt/Pptt.inf | 8 +-------
Silicon/Hisilicon/Hi1620/Drivers/Apei/Apei.c | 8 +-------
Silicon/Hisilicon/Hi1620/Drivers/Apei/Apei.h | 8 +-------
Silicon/Hisilicon/Hi1620/Drivers/Apei/Apei.inf | 8 +-------
.../Hisilicon/Hi1620/Drivers/Apei/Bert/Bert.c | 8 +-------
.../Hisilicon/Hi1620/Drivers/Apei/Bert/Bert.h | 8 +-------
.../Hisilicon/Hi1620/Drivers/Apei/Einj/Einj.c | 8 +-------
.../Hisilicon/Hi1620/Drivers/Apei/Einj/Einj.h | 8 +-------
.../Hi1620/Drivers/Apei/ErrorSource/Ghes.c | 8 +-------
.../Hi1620/Drivers/Apei/ErrorSource/Ghes.h | 8 +-------
.../Hisilicon/Hi1620/Drivers/Apei/Erst/Erst.c | 8 +-------
.../Hisilicon/Hi1620/Drivers/Apei/Erst/Erst.h | 8 +-------
.../Hisilicon/Hi1620/Drivers/Apei/Hest/Hest.c | 8 +-------
.../Hisilicon/Hi1620/Drivers/Apei/Hest/Hest.h | 8 +-------
.../Hi1620/Drivers/Apei/OemApeiHi1620.c | 8 +-------
.../Hi1620/Drivers/Apei/OemApeiHi1620.h | 8 +-------
.../Pl011DebugSerialPortInitDxe.c | 8 +-------
.../Pl011DebugSerialPortInitDxe.inf | 8 +-------
Silicon/Hisilicon/Hi1620/Hi1620.dec | 8 +-------
.../Hi1620AcpiTables/AcpiTablesHi1620.inf | 8 +-------
.../Hi1620/Hi1620AcpiTables/Dsdt/CPU.asl | 8 +-------
.../Hi1620/Hi1620AcpiTables/Dsdt/Com.asl | 8 +-------
.../Hi1620AcpiTables/Dsdt/DsdtHi1620.asl | 8 +-------
.../Hi1620AcpiTables/Dsdt/Hi1620Apei.asl | 8 +-------
.../Hi1620/Hi1620AcpiTables/Dsdt/Hi1620Ged.asl | 8 +-------
.../Hi1620AcpiTables/Dsdt/Hi1620Mbig.asl | 8 +-------
.../Hi1620AcpiTables/Dsdt/Hi1620Mctp.asl | 8 +-------
.../Hi1620/Hi1620AcpiTables/Dsdt/Hi1620Pci.asl | 8 +-------
.../Hi1620AcpiTables/Dsdt/Hi1620Power.asl | 8 +-------
.../Hi1620/Hi1620AcpiTables/Dsdt/Hi1620Rde.asl | 8 +-------
.../Hi1620/Hi1620AcpiTables/Dsdt/Hi1620Sec.asl | 8 +-------
.../Dsdt/Hi1620Socip4_i2c100k.asl | 8 +-------
.../Dsdt/Hi1620Socip4_i2c400k.asl | 8 +-------
.../Hi1620AcpiTables/Dsdt/LpcUart_clk.asl | 8 +-------
.../Hi1620AcpiTables/Dsdt/Pv680UncorePmu.asl | 8 +-------
.../Hi1620/Hi1620AcpiTables/Dsdt/ipmi.asl | 8 +-------
.../Hi1620/Hi1620AcpiTables/Facs.aslc | 8 +-------
.../Hi1620/Hi1620AcpiTables/Fadt.aslc | 8 +-------
.../Hi1620/Hi1620AcpiTables/Gtdt.aslc | 8 +-------
.../Hi1620/Hi1620AcpiTables/Hi1620Dbg2.aslc | 7 ++-----
.../Hi1620/Hi1620AcpiTables/Hi1620Mcfg.aslc | 7 ++-----
.../Hi1620/Hi1620AcpiTables/Hi1620Platform.h | 8 +-------
.../Hi1620/Hi1620AcpiTables/Hi1620Slit.aslc | 7 ++-----
.../Hi1620/Hi1620AcpiTables/Hi1620Spcr.aslc | 8 +-------
.../Hi1620/Hi1620AcpiTables/Hi1620Srat.aslc | 7 ++-----
.../Hi1620/Hi1620AcpiTables/MadtHi1620.aslc | 8 +-------
.../Hi1620OemConfigUiLib/MemoryConfig.hfr | 8 +-------
.../Hi1620OemConfigUiLib/MemoryConfig.uni | 8 +-------
.../Hi1620/Hi1620OemConfigUiLib/MiscConfig.hfr | 8 +-------
.../Hi1620/Hi1620OemConfigUiLib/MiscConfig.uni | 8 +-------
.../Hi1620/Hi1620OemConfigUiLib/OemConfig.c | 8 +-------
.../Hi1620/Hi1620OemConfigUiLib/OemConfig.h | 8 +-------
.../Hi1620/Hi1620OemConfigUiLib/OemConfigUi.h | 8 +-------
.../Hi1620OemConfigUiLib/OemConfigUiLib.inf | 8 +-------
.../Hi1620OemConfigUiLib/OemConfigUiLib.uni | 8 +-------
.../OemConfigUiLibStrings.uni | 8 +-------
.../Hi1620OemConfigUiLib/OemConfigVfr.vfr | 8 +-------
.../Hi1620/Hi1620OemConfigUiLib/PcieConfig.hfr | 8 +-------
.../Hi1620OemConfigUiLib/PcieConfigStrings.uni | 8 +-------
.../Hi1620OemConfigUiLib/PciePortConfig.hfr | 8 +-------
.../Hi1620/Hi1620OemConfigUiLib/RasConfig.hfr | 8 +-------
.../Hi1620/Hi1620OemConfigUiLib/RasConfig.uni | 8 +-------
.../Hi1620/Hi1620OemConfigUiLib/iBMCConfig.hfr | 8 +-------
.../Hi1620/Hi1620OemConfigUiLib/iBMCConfig.uni | 8 +-------
.../Hisilicon/Hi1620/Include/PlatformArch.h | 8 +-------
.../Hi1620PciPlatformLib.c | 8 +-------
.../Hi1620PciPlatformLib.inf | 7 +------
Silicon/Hisilicon/Hi1620/Pptt/Pptt.c | 8 +-------
Silicon/Hisilicon/Hi1620/Pptt/Pptt.h | 8 +-------
Silicon/Hisilicon/Hi1620/Pptt/Pptt.inf | 8 +-------
Silicon/Hisilicon/Hi3660/Hi3660.dec | 8 +-------
Silicon/Hisilicon/Hi3660/Include/Hi3660.h | 8 +-------
Silicon/Hisilicon/Hi6220/Hi6220.dec | 8 +-------
Silicon/Hisilicon/Hi6220/Include/Hi6220.h | 8 +-------
.../Hisilicon/Hi6220/Include/Hi6220RegsPeri.h | 8 +-------
Silicon/Hisilicon/HisiPkg.dec | 8 +-------
Silicon/Hisilicon/Hisilicon.dsc.inc | 8 +-------
Silicon/Hisilicon/Hisilicon.fdf.inc | 8 +-------
Silicon/Hisilicon/Include/Guid/MemoryMapData.h | 8 +-------
.../Include/Guid/VersionInfoHobGuid.h | 8 +-------
.../Hisilicon/Include/Library/AcpiNextLib.h | 8 +-------
.../Include/Library/BmcConfigBootLib.h | 8 +-------
Silicon/Hisilicon/Include/Library/CpldIoLib.h | 8 +-------
.../Hisilicon/Include/Library/FdtUpdateLib.h | 8 +-------
.../Hisilicon/Include/Library/HwMemInitLib.h | 8 +-------
Silicon/Hisilicon/Include/Library/I2CLib.h | 8 +-------
.../Hisilicon/Include/Library/OemConfigData.h | 8 +-------
.../Hisilicon/Include/Library/OemDevicePath.h | 8 +-------
Silicon/Hisilicon/Include/Library/OemMiscLib.h | 8 +-------
Silicon/Hisilicon/Include/Library/OemNicLib.h | 8 +-------
.../Include/Library/OemSetVirtualMapDesc.h | 8 +-------
.../Hisilicon/Include/Library/PlatformPciLib.h | 8 +-------
.../Include/Protocol/HisiBoardNicProtocol.h | 8 +-------
.../Include/Protocol/HisiPlatformSasProtocol.h | 8 +-------
.../Include/Protocol/HisiSpiFlashProtocol.h | 8 +-------
.../Include/Protocol/IpmiInterfaceProtocol.h | 8 +-------
.../Include/Protocol/NorFlashProtocol.h | 8 +-------
.../Include/Protocol/PlatformSasProtocol.h | 8 +-------
.../Include/Protocol/SnpPlatformProtocol.h | 8 +-------
.../Include/Regs/HisiPcieV1RegOffset.h | 8 +-------
.../ArmPlatformLibHisilicon/AArch64/Helper.S | 8 +-------
.../ArmPlatformLibHisilicon/ArmPlatformLib.c | 8 +-------
.../ArmPlatformLibHisilicon/ArmPlatformLib.inf | 8 +-------
.../ArmPlatformLibMem.c | 8 +-------
.../ArmPlatformLibSec.inf | 8 +-------
.../BmcConfigBootLib/BmcConfigBootLib.c | 8 +-------
.../BmcConfigBootLib/BmcConfigBootLib.inf | 8 +-------
.../Hisilicon/Library/CpldIoLib/CpldIoLib.c | 8 +-------
.../Hisilicon/Library/CpldIoLib/CpldIoLib.inf | 8 +-------
.../Library/CpldIoLib/CpldIoLibRuntime.c | 8 +-------
.../Library/CpldIoLib/CpldIoLibRuntime.inf | 8 +-------
.../DS3231RealTimeClock.h | 8 +-------
.../DS3231RealTimeClockLib.c | 8 +-------
.../DS3231RealTimeClockLib.inf | 7 +------
.../Dw8250SerialPortLib/Dw8250SerialPortLib.c | 8 +-------
.../Dw8250SerialPortLib/Dw8250SerialPortLib.h | 8 +-------
.../Dw8250SerialPortLib.inf | 8 +-------
.../Dw8250SerialPortRuntimeLib.c | 8 +-------
.../Dw8250SerialPortRuntimeLib.h | 8 +-------
.../Dw8250SerialPortRuntimeLib.inf | 8 +-------
Silicon/Hisilicon/Library/I2CLib/I2CHw.h | 8 +-------
Silicon/Hisilicon/Library/I2CLib/I2CLib.c | 8 +-------
Silicon/Hisilicon/Library/I2CLib/I2CLib.inf | 8 +-------
.../Hisilicon/Library/I2CLib/I2CLibCommon.c | 8 +-------
.../Hisilicon/Library/I2CLib/I2CLibInternal.h | 8 +-------
.../Hisilicon/Library/I2CLib/I2CLibRuntime.c | 8 +-------
.../Hisilicon/Library/I2CLib/I2CLibRuntime.inf | 8 +-------
.../M41T83RealTimeClock.h | 8 +-------
.../M41T83RealTimeClockLib.c | 8 +-------
.../M41T83RealTimeClockLib.inf | 8 +-------
.../PlatformBootManagerLib/PlatformBm.c | 8 +-------
.../PlatformBootManagerLib/PlatformBm.h | 8 +-------
.../PlatformBootManagerLib.inf | 9 +--------
.../PlatformFlashAccessLibDxe.c | 8 +-------
.../PlatformFlashAccessLibDxe.inf | 8 +-------
.../PlatformIntelBdsLib/IntelBdsPlatform.c | 8 +-------
.../PlatformIntelBdsLib/IntelBdsPlatform.h | 8 +-------
.../IntelBdsPlatformCommon.c | 8 +-------
.../IntelBdsPlatformCommon.h | 8 +-------
.../PlatformIntelBdsLib.inf | 9 +--------
.../VirtualRealTimeClockLib/RealTimeClockLib.c | 8 +-------
.../RealTimeClockLib.inf | 8 +-------
269 files changed, 278 insertions(+), 1854 deletions(-)
diff --git a/Silicon/Hisilicon/Drivers/AcpiPlatformDxe/AcpiPlatform.c b/Silicon/Hisilicon/Drivers/AcpiPlatformDxe/AcpiPlatform.c
index 3d5ae9142a..b888cb14eb 100644
--- a/Silicon/Hisilicon/Drivers/AcpiPlatformDxe/AcpiPlatform.c
+++ b/Silicon/Hisilicon/Drivers/AcpiPlatformDxe/AcpiPlatform.c
@@ -3,13 +3,7 @@
Copyright (c) 2014, Applied Micro Curcuit Corporation. All rights reserved.<BR>
Copyright (c) 2015, Hisilicon Limited. All rights reserved.<BR>
Copyright (c) 2015, Linaro Limited. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include <PiDxe.h>
diff --git a/Silicon/Hisilicon/Drivers/AcpiPlatformDxe/AcpiPlatformDxe.inf b/Silicon/Hisilicon/Drivers/AcpiPlatformDxe/AcpiPlatformDxe.inf
index 171583bee0..53da73119d 100644
--- a/Silicon/Hisilicon/Drivers/AcpiPlatformDxe/AcpiPlatformDxe.inf
+++ b/Silicon/Hisilicon/Drivers/AcpiPlatformDxe/AcpiPlatformDxe.inf
@@ -3,13 +3,7 @@
# Copyright (c) 2014, Applied Micro Curcuit Corp. All rights reserved.<BR>
# Copyright (c) 2015, Hisilicon Limited. All rights reserved.<BR>
# Copyright (c) 2015, Linaro Limited. 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 distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Hisilicon/Drivers/AcpiPlatformDxe/EthMac.c b/Silicon/Hisilicon/Drivers/AcpiPlatformDxe/EthMac.c
index 78a4f58fd0..cd98506836 100644
--- a/Silicon/Hisilicon/Drivers/AcpiPlatformDxe/EthMac.c
+++ b/Silicon/Hisilicon/Drivers/AcpiPlatformDxe/EthMac.c
@@ -3,13 +3,7 @@
Copyright (c) 2014, Applied Micro Curcuit Corporation. All rights reserved.<BR>
Copyright (c) 2015, Hisilicon Limited. All rights reserved.<BR>
Copyright (c) 2015, Linaro Limited. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
This driver is called to initialize the FW part of the PHY in preparation
for the OS.
diff --git a/Silicon/Hisilicon/Drivers/AcpiPlatformDxe/EthMac.h b/Silicon/Hisilicon/Drivers/AcpiPlatformDxe/EthMac.h
index bf4cbb1a53..0a3e811fd5 100644
--- a/Silicon/Hisilicon/Drivers/AcpiPlatformDxe/EthMac.h
+++ b/Silicon/Hisilicon/Drivers/AcpiPlatformDxe/EthMac.h
@@ -5,13 +5,7 @@
* Copyright (c) 2015, Linaro Limited. All rights reserved.
* Author: Loc Ho <lho@apm.com>
*
- * This program and the accompanying materials
- *are licensed and made available under the terms and conditions of the BSD License
- * which accompanies this distribution. The full text of the license may be found at
- * http://opensource.org/licenses/bsd-license.php
- *
- * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*/
#ifndef _ETH_MAC_H_
#define _ETH_MAC_H_
diff --git a/Silicon/Hisilicon/Drivers/FlashFvbDxe/FlashBlockIoDxe.c b/Silicon/Hisilicon/Drivers/FlashFvbDxe/FlashBlockIoDxe.c
index 91c07338ed..e06e5acabc 100644
--- a/Silicon/Hisilicon/Drivers/FlashFvbDxe/FlashBlockIoDxe.c
+++ b/Silicon/Hisilicon/Drivers/FlashFvbDxe/FlashBlockIoDxe.c
@@ -4,13 +4,7 @@
* Copyright (c) 2015, Hisilicon Limited. All rights reserved.
* Copyright (c) 2015, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Hisilicon/Drivers/FlashFvbDxe/FlashFvbDxe.c b/Silicon/Hisilicon/Drivers/FlashFvbDxe/FlashFvbDxe.c
index e18cc9e06e..5164672ad5 100644
--- a/Silicon/Hisilicon/Drivers/FlashFvbDxe/FlashFvbDxe.c
+++ b/Silicon/Hisilicon/Drivers/FlashFvbDxe/FlashFvbDxe.c
@@ -4,13 +4,7 @@
* Copyright (c) 2015, Hisilicon Limited. All rights reserved.
* Copyright (c) 2015, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
* Based on files under ArmPlatformPkg/Drivers/NorFlashDxe/
**/
diff --git a/Silicon/Hisilicon/Drivers/FlashFvbDxe/FlashFvbDxe.h b/Silicon/Hisilicon/Drivers/FlashFvbDxe/FlashFvbDxe.h
index 76385b6b65..47df349112 100644
--- a/Silicon/Hisilicon/Drivers/FlashFvbDxe/FlashFvbDxe.h
+++ b/Silicon/Hisilicon/Drivers/FlashFvbDxe/FlashFvbDxe.h
@@ -4,13 +4,7 @@
* Copyright (c) 2015, Hisilicon Limited. All rights reserved.
* Copyright (c) 2015, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Hisilicon/Drivers/FlashFvbDxe/FlashFvbDxe.inf b/Silicon/Hisilicon/Drivers/FlashFvbDxe/FlashFvbDxe.inf
index f8be4741ef..23591b8045 100644
--- a/Silicon/Hisilicon/Drivers/FlashFvbDxe/FlashFvbDxe.inf
+++ b/Silicon/Hisilicon/Drivers/FlashFvbDxe/FlashFvbDxe.inf
@@ -4,13 +4,7 @@
# Copyright (c) 2015, Hisilicon Limited. All rights reserved.
# Copyright (c) 2015, Linaro Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
diff --git a/Silicon/Hisilicon/Drivers/HisiAcpiPlatformDxe/AcpiPlatform.c b/Silicon/Hisilicon/Drivers/HisiAcpiPlatformDxe/AcpiPlatform.c
index a26060ef4c..3c80ab57ef 100644
--- a/Silicon/Hisilicon/Drivers/HisiAcpiPlatformDxe/AcpiPlatform.c
+++ b/Silicon/Hisilicon/Drivers/HisiAcpiPlatformDxe/AcpiPlatform.c
@@ -2,13 +2,7 @@
Sample ACPI Platform Driver
Copyright (c) 2008 - 2011, 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Hisilicon/Drivers/HisiAcpiPlatformDxe/AcpiPlatform.uni b/Silicon/Hisilicon/Drivers/HisiAcpiPlatformDxe/AcpiPlatform.uni
index 1275549bd0..668e5dbfd1 100644
--- a/Silicon/Hisilicon/Drivers/HisiAcpiPlatformDxe/AcpiPlatform.uni
+++ b/Silicon/Hisilicon/Drivers/HisiAcpiPlatformDxe/AcpiPlatform.uni
@@ -5,13 +5,7 @@
//
// Copyright (c) 2008 - 2014, 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 distribution. The full text of the license may be found at
-// http://opensource.org/licenses/bsd-license.php
-//
-// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+// SPDX-License-Identifier: BSD-2-Clause-Patent
//
// **/
diff --git a/Silicon/Hisilicon/Drivers/HisiAcpiPlatformDxe/AcpiPlatformDxe.inf b/Silicon/Hisilicon/Drivers/HisiAcpiPlatformDxe/AcpiPlatformDxe.inf
index f166d7672b..a5812fc7ac 100644
--- a/Silicon/Hisilicon/Drivers/HisiAcpiPlatformDxe/AcpiPlatformDxe.inf
+++ b/Silicon/Hisilicon/Drivers/HisiAcpiPlatformDxe/AcpiPlatformDxe.inf
@@ -2,13 +2,7 @@
# Sample ACPI Platform Driver
#
# Copyright (c) 2008 - 2014, 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 distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
--git a/Silicon/Hisilicon/Drivers/HisiAcpiPlatformDxe/AcpiPlatformExtra.uni b/Silicon/Hisilicon/Drivers/HisiAcpiPlatformDxe/AcpiPlatformExtra.uni
index 4c21968f7a..7a60a8434d 100644
--- a/Silicon/Hisilicon/Drivers/HisiAcpiPlatformDxe/AcpiPlatformExtra.uni
+++ b/Silicon/Hisilicon/Drivers/HisiAcpiPlatformDxe/AcpiPlatformExtra.uni
@@ -3,13 +3,7 @@
//
// Copyright (c) 2013 - 2014, 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 distribution. The full text of the license may be found at
-// http://opensource.org/licenses/bsd-license.php
-//
-// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+// SPDX-License-Identifier: BSD-2-Clause-Patent
//
// **/
diff --git a/Silicon/Hisilicon/Drivers/HisiAcpiPlatformDxe/UpdateAcpiTable.c b/Silicon/Hisilicon/Drivers/HisiAcpiPlatformDxe/UpdateAcpiTable.c
index c2c8f687b0..39f7f6b1a3 100644
--- a/Silicon/Hisilicon/Drivers/HisiAcpiPlatformDxe/UpdateAcpiTable.c
+++ b/Silicon/Hisilicon/Drivers/HisiAcpiPlatformDxe/UpdateAcpiTable.c
@@ -1,12 +1,6 @@
/** @file
Copyright (c) 2016, Hisilicon Limited. All rights reserved.
- This program and the accompanying materials are licensed and made available
- under the terms and conditions of the BSD License which accompanies this
- distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT
- WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include <PlatformArch.h>
#include <IndustryStandard/Acpi.h>
diff --git a/Silicon/Hisilicon/Drivers/HisiAcpiPlatformDxe/UpdateAcpiTable.h b/Silicon/Hisilicon/Drivers/HisiAcpiPlatformDxe/UpdateAcpiTable.h
index 45b3729b6a..ef515a78b0 100644
--- a/Silicon/Hisilicon/Drivers/HisiAcpiPlatformDxe/UpdateAcpiTable.h
+++ b/Silicon/Hisilicon/Drivers/HisiAcpiPlatformDxe/UpdateAcpiTable.h
@@ -1,12 +1,6 @@
/** @file
Copyright (c) 2016, Hisilicon Limited. All rights reserved.
- This program and the accompanying materials are licensed and made available
- under the terms and conditions of the BSD License which accompanies this
- distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT
- WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
EFI_STATUS
diff --git a/Silicon/Hisilicon/Drivers/NorFlashDxe/NorFlashConfig.c b/Silicon/Hisilicon/Drivers/NorFlashDxe/NorFlashConfig.c
index ab3b70caf2..bbcbe95ab0 100644
--- a/Silicon/Hisilicon/Drivers/NorFlashDxe/NorFlashConfig.c
+++ b/Silicon/Hisilicon/Drivers/NorFlashDxe/NorFlashConfig.c
@@ -3,13 +3,7 @@
* Copyright (c) 2015, Hisilicon Limited. All rights reserved.
* Copyright (c) 2015, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Hisilicon/Drivers/NorFlashDxe/NorFlashDxe.c b/Silicon/Hisilicon/Drivers/NorFlashDxe/NorFlashDxe.c
index 8b8a5d7a3f..54d76ebf1b 100644
--- a/Silicon/Hisilicon/Drivers/NorFlashDxe/NorFlashDxe.c
+++ b/Silicon/Hisilicon/Drivers/NorFlashDxe/NorFlashDxe.c
@@ -3,13 +3,7 @@
* Copyright (c) 2015, Hisilicon Limited. All rights reserved.
* Copyright (c) 2015, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Hisilicon/Drivers/NorFlashDxe/NorFlashDxe.inf b/Silicon/Hisilicon/Drivers/NorFlashDxe/NorFlashDxe.inf
index 254e27eeac..e64c2e597e 100644
--- a/Silicon/Hisilicon/Drivers/NorFlashDxe/NorFlashDxe.inf
+++ b/Silicon/Hisilicon/Drivers/NorFlashDxe/NorFlashDxe.inf
@@ -3,13 +3,7 @@
# Copyright (c) 2015, Hisilicon Limited. All rights reserved.
# Copyright (c) 2015, Linaro Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
diff --git a/Silicon/Hisilicon/Drivers/NorFlashDxe/NorFlashHw.c b/Silicon/Hisilicon/Drivers/NorFlashDxe/NorFlashHw.c
index 3aeaeb9091..599c9a1416 100644
--- a/Silicon/Hisilicon/Drivers/NorFlashDxe/NorFlashHw.c
+++ b/Silicon/Hisilicon/Drivers/NorFlashDxe/NorFlashHw.c
@@ -3,13 +3,7 @@
* Copyright (c) 2015, Hisilicon Limited. All rights reserved.
* Copyright (c) 2015, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Hisilicon/Drivers/NorFlashDxe/NorFlashHw.h b/Silicon/Hisilicon/Drivers/NorFlashDxe/NorFlashHw.h
index 36c0c9ec23..93c696ef19 100644
--- a/Silicon/Hisilicon/Drivers/NorFlashDxe/NorFlashHw.h
+++ b/Silicon/Hisilicon/Drivers/NorFlashDxe/NorFlashHw.h
@@ -3,13 +3,7 @@
* Copyright (c) 2015, Hisilicon Limited. All rights reserved.
* Copyright (c) 2015, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Hisilicon/Drivers/PciPlatform/PciPlatform.c b/Silicon/Hisilicon/Drivers/PciPlatform/PciPlatform.c
index fcdd36cf94..f1077a0ccb 100644
--- a/Silicon/Hisilicon/Drivers/PciPlatform/PciPlatform.c
+++ b/Silicon/Hisilicon/Drivers/PciPlatform/PciPlatform.c
@@ -3,13 +3,7 @@
* Copyright (c) 2016, Hisilicon Limited. All rights reserved.
* Copyright (c) 2016, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Hisilicon/Drivers/PciPlatform/PciPlatform.inf b/Silicon/Hisilicon/Drivers/PciPlatform/PciPlatform.inf
index 099021fcc8..f965ebbd45 100644
--- a/Silicon/Hisilicon/Drivers/PciPlatform/PciPlatform.inf
+++ b/Silicon/Hisilicon/Drivers/PciPlatform/PciPlatform.inf
@@ -3,13 +3,7 @@
# Copyright (c) 2016, Hisilicon Limited. All rights reserved.
# Copyright (c) 2016, Linaro Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
diff --git a/Silicon/Hisilicon/Drivers/SasPlatform/SasPlatform.c b/Silicon/Hisilicon/Drivers/SasPlatform/SasPlatform.c
index 7ae1f5d36f..85c357903a 100644
--- a/Silicon/Hisilicon/Drivers/SasPlatform/SasPlatform.c
+++ b/Silicon/Hisilicon/Drivers/SasPlatform/SasPlatform.c
@@ -3,13 +3,7 @@
* Copyright (c) 2017, Hisilicon Limited. All rights reserved.
* Copyright (c) 2017, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Hisilicon/Drivers/SasPlatform/SasPlatform.inf b/Silicon/Hisilicon/Drivers/SasPlatform/SasPlatform.inf
index fe33623158..1c4d5dac10 100644
--- a/Silicon/Hisilicon/Drivers/SasPlatform/SasPlatform.inf
+++ b/Silicon/Hisilicon/Drivers/SasPlatform/SasPlatform.inf
@@ -3,13 +3,7 @@
# Copyright (c) 2017, Hisilicon Limited. All rights reserved.
# Copyright (c) 2017, Linaro Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
diff --git a/Silicon/Hisilicon/Drivers/SasV1Dxe/SasV1Dxe.c b/Silicon/Hisilicon/Drivers/SasV1Dxe/SasV1Dxe.c
index b18b56ddb2..6cc7f427e4 100644
--- a/Silicon/Hisilicon/Drivers/SasV1Dxe/SasV1Dxe.c
+++ b/Silicon/Hisilicon/Drivers/SasV1Dxe/SasV1Dxe.c
@@ -3,13 +3,7 @@
Copyright (c) 2016 Linaro Ltd.
Copyright (c) 2016 Hisilicon Limited.
- This program and the accompanying materials
- are licensed and made available under the terms and conditions of the BSD License
- which accompanies this distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Hisilicon/Drivers/SasV1Dxe/SasV1Dxe.inf b/Silicon/Hisilicon/Drivers/SasV1Dxe/SasV1Dxe.inf
index fe0be239b7..01a6a9ad86 100644
--- a/Silicon/Hisilicon/Drivers/SasV1Dxe/SasV1Dxe.inf
+++ b/Silicon/Hisilicon/Drivers/SasV1Dxe/SasV1Dxe.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2016 Linaro Ltd.
# Copyright (c) 2016 Hisilicon Limited.
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
diff --git a/Silicon/Hisilicon/Drivers/Smbios/AddSmbiosType9/AddSmbiosType9.c b/Silicon/Hisilicon/Drivers/Smbios/AddSmbiosType9/AddSmbiosType9.c
index cc1131577d..87a06a2ef1 100644
--- a/Silicon/Hisilicon/Drivers/Smbios/AddSmbiosType9/AddSmbiosType9.c
+++ b/Silicon/Hisilicon/Drivers/Smbios/AddSmbiosType9/AddSmbiosType9.c
@@ -3,13 +3,7 @@
* Copyright (c) 2015, Hisilicon Limited. All rights reserved.
* Copyright (c) 2015, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Hisilicon/Drivers/Smbios/AddSmbiosType9/AddSmbiosType9.h b/Silicon/Hisilicon/Drivers/Smbios/AddSmbiosType9/AddSmbiosType9.h
index 5766152399..7194ae5890 100644
--- a/Silicon/Hisilicon/Drivers/Smbios/AddSmbiosType9/AddSmbiosType9.h
+++ b/Silicon/Hisilicon/Drivers/Smbios/AddSmbiosType9/AddSmbiosType9.h
@@ -3,13 +3,7 @@
* Copyright (c) 2015, Hisilicon Limited. All rights reserved.
* Copyright (c) 2015, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Hisilicon/Drivers/Smbios/AddSmbiosType9/AddSmbiosType9.inf b/Silicon/Hisilicon/Drivers/Smbios/AddSmbiosType9/AddSmbiosType9.inf
index 4db7b498bd..7af37f93bd 100644
--- a/Silicon/Hisilicon/Drivers/Smbios/AddSmbiosType9/AddSmbiosType9.inf
+++ b/Silicon/Hisilicon/Drivers/Smbios/AddSmbiosType9/AddSmbiosType9.inf
@@ -3,13 +3,7 @@
# Copyright (c) 2015, Hisilicon Limited. All rights reserved.
# Copyright (c) 2015, Linaro Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
diff --git a/Silicon/Hisilicon/Drivers/Smbios/MemorySubClassDxe/MemorySubClass.c b/Silicon/Hisilicon/Drivers/Smbios/MemorySubClassDxe/MemorySubClass.c
index 7d3005eb14..a1af020474 100644
--- a/Silicon/Hisilicon/Drivers/Smbios/MemorySubClassDxe/MemorySubClass.c
+++ b/Silicon/Hisilicon/Drivers/Smbios/MemorySubClassDxe/MemorySubClass.c
@@ -3,13 +3,7 @@
* Copyright (c) 2015, Hisilicon Limited. All rights reserved.
* Copyright (c) 2015, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Hisilicon/Drivers/Smbios/MemorySubClassDxe/MemorySubClass.h b/Silicon/Hisilicon/Drivers/Smbios/MemorySubClassDxe/MemorySubClass.h
index 0c201b4870..22c7f67971 100644
--- a/Silicon/Hisilicon/Drivers/Smbios/MemorySubClassDxe/MemorySubClass.h
+++ b/Silicon/Hisilicon/Drivers/Smbios/MemorySubClassDxe/MemorySubClass.h
@@ -3,13 +3,7 @@
* Copyright (c) 2015, Hisilicon Limited. All rights reserved.
* Copyright (c) 2015, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Hisilicon/Drivers/Smbios/MemorySubClassDxe/MemorySubClassDxe.inf b/Silicon/Hisilicon/Drivers/Smbios/MemorySubClassDxe/MemorySubClassDxe.inf
index 94f6fe404c..973b917e3b 100644
--- a/Silicon/Hisilicon/Drivers/Smbios/MemorySubClassDxe/MemorySubClassDxe.inf
+++ b/Silicon/Hisilicon/Drivers/Smbios/MemorySubClassDxe/MemorySubClassDxe.inf
@@ -3,13 +3,7 @@
# Copyright (c) 2015, Hisilicon Limited. All rights reserved.
# Copyright (c) 2015, Linaro Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
diff --git a/Silicon/Hisilicon/Drivers/Smbios/MemorySubClassDxe/MemorySubClassStrings.uni b/Silicon/Hisilicon/Drivers/Smbios/MemorySubClassDxe/MemorySubClassStrings.uni
index edf8464e5c..cabc63cc99 100644
--- a/Silicon/Hisilicon/Drivers/Smbios/MemorySubClassDxe/MemorySubClassStrings.uni
+++ b/Silicon/Hisilicon/Drivers/Smbios/MemorySubClassDxe/MemorySubClassStrings.uni
@@ -4,13 +4,7 @@
// Copyright (c) 2015, Hisilicon Limited. All rights reserved.
// Copyright (c) 2015, Linaro Limited. All rights reserved.
//
-// This program and the accompanying materials
-// are licensed and made available under the terms and conditions of the BSD License
-// which accompanies this distribution. The full text of the license may be found at
-// http://opensource.org/licenses/bsd-license.php
-//
-// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+// SPDX-License-Identifier: BSD-2-Clause-Patent
//
// --*/
diff --git a/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClass.c b/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClass.c
index c9903ba535..75af47b330 100644
--- a/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClass.c
+++ b/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClass.c
@@ -3,13 +3,7 @@
* Copyright (c) 2015, Hisilicon Limited. All rights reserved.
* Copyright (c) 2015, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClass.h b/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClass.h
index 6ddc6cf590..3ce180d21d 100644
--- a/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClass.h
+++ b/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClass.h
@@ -3,13 +3,7 @@
* Copyright (c) 2015, Hisilicon Limited. All rights reserved.
* Copyright (c) 2015, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClassDxe.inf b/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClassDxe.inf
index 808da65cd4..94a753a044 100644
--- a/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClassDxe.inf
+++ b/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClassDxe.inf
@@ -3,13 +3,7 @@
# Copyright (c) 2015, Hisilicon Limited. All rights reserved.
# Copyright (c) 2015, Linaro Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
diff --git a/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClassStrings.uni b/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClassStrings.uni
index d2928faf93..e81b1403e4 100644
--- a/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClassStrings.uni
+++ b/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClassStrings.uni
@@ -3,13 +3,7 @@
// Copyright (c) 2015, Hisilicon Limited. All rights reserved.
// Copyright (c) 2015, Linaro Limited. All rights reserved.
//
-// This program and the accompanying materials
-// are licensed and made available under the terms and conditions of the BSD License
-// which accompanies this distribution. The full text of the license may be found at
-// http://opensource.org/licenses/bsd-license.php
-//
-// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+// SPDX-License-Identifier: BSD-2-Clause-Patent
//
/////
diff --git a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMisc.h b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMisc.h
index 66f9db9665..416a6e88f1 100644
--- a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMisc.h
+++ b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMisc.h
@@ -3,13 +3,7 @@
Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2015, Hisilicon Limited. All rights reserved.<BR>
Copyright (c) 2015, Linaro Limited. 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 distribution. The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
Module Name:
diff --git a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMiscDataTable.c b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMiscDataTable.c
index 8e00865712..94f1f86c53 100644
--- a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMiscDataTable.c
+++ b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMiscDataTable.c
@@ -3,13 +3,7 @@
Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2015, Hisilicon Limited. All rights reserved.<BR>
Copyright (c) 2015, Linaro Limited. 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 distribution. The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
Module Name:
diff --git a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMiscDxe.inf b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMiscDxe.inf
index 0c37b53af9..002b462d51 100644
--- a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMiscDxe.inf
+++ b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMiscDxe.inf
@@ -9,12 +9,7 @@
# Copyright (c) 2015, Hisilicon Limited. All rights reserved.<BR>
# Copyright (c) 2015, Linaro Limited. 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 distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#
# Based on files under Nt32Pkg/MiscSubClassPlatformDxe/
diff --git a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMiscEntryPoint.c b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMiscEntryPoint.c
index 051410b527..44e2100ffa 100644
--- a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMiscEntryPoint.c
+++ b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMiscEntryPoint.c
@@ -3,13 +3,7 @@
Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2015, Hisilicon Limited. All rights reserved.<BR>
Copyright (c) 2015, Linaro Limited. 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 distribution. The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
Module Name:
diff --git a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMiscLibString.uni b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMiscLibString.uni
index 2e434e323a..50d43930ad 100644
--- a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMiscLibString.uni
+++ b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMiscLibString.uni
@@ -4,13 +4,7 @@
// Copyright (c) 2015, Hisilicon Limited. All rights reserved.<BR>
// Copyright (c) 2015, Linaro Limited. 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 distribution. The full text of the license may be found at
-// http://opensource.org/licenses/bsd-license.php
-//
-// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+// SPDX-License-Identifier: BSD-2-Clause-Patent
//
// Based on files under Nt32Pkg/MiscSubClassPlatformDxe/
// --*/
diff --git a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendor.uni b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendor.uni
index 215952a560..13e7a2410b 100644
--- a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendor.uni
+++ b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendor.uni
@@ -4,13 +4,7 @@
// Copyright (c) 2015, Hisilicon Limited. All rights reserved.<BR>
// Copyright (c) 2015, Linaro Limited. 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 distribution. The full text of the license may be found at
-// http://opensource.org/licenses/bsd-license.php
-//
-// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+// SPDX-License-Identifier: BSD-2-Clause-Patent
//
// Based on files under Nt32Pkg/MiscSubClassPlatformDxe/
// --*/
diff --git a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorData.c b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorData.c
index b822768b44..fc0201f0d7 100644
--- a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorData.c
+++ b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorData.c
@@ -3,13 +3,7 @@
Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2015, Hisilicon Limited. All rights reserved.<BR>
Copyright (c) 2015, Linaro Limited. 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 distribution. The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
Module Name:
diff --git a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorFunction.c b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorFunction.c
index 9a42f04085..78bc096004 100644
--- a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorFunction.c
+++ b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorFunction.c
@@ -3,13 +3,7 @@
Copyright (c) 2009, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2015, Hisilicon Limited. All rights reserved.<BR>
Copyright (c) 2015, Linaro Limited. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
Module Name:
diff --git a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufacturer.uni b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufacturer.uni
index 1632f83880..c9af547a46 100644
--- a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufacturer.uni
+++ b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufacturer.uni
@@ -4,13 +4,7 @@
// Copyright (c) 2015, Hisilicon Limited. All rights reserved.<BR>
// Copyright (c) 2015, Linaro Limited. 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 distribution. The full text of the license may be found at
-// http://opensource.org/licenses/bsd-license.php
-//
-// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+// SPDX-License-Identifier: BSD-2-Clause-Patent
//
// Based on files under Nt32Pkg/MiscSubClassPlatformDxe/
// --*/
diff --git a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufacturerData.c b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufacturerData.c
index 37fc33b00a..c2ffb8a131 100644
--- a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufacturerData.c
+++ b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufacturerData.c
@@ -3,13 +3,7 @@
Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2015, Hisilicon Limited. All rights reserved.<BR>
Copyright (c) 2015, Linaro Limited. 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 distribution. The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
Module Name:
diff --git a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufacturerFunction.c b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufacturerFunction.c
index 5e965c996c..9f6c406543 100644
--- a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufacturerFunction.c
+++ b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufacturerFunction.c
@@ -3,13 +3,7 @@
Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2015, Hisilicon Limited. All rights reserved.<BR>
Copyright (c) 2015, Linaro Limited. 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 distribution. The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
Module Name:
diff --git a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type02/MiscBaseBoardManufacturer.uni b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type02/MiscBaseBoardManufacturer.uni
index 11320c0fe7..73ad967b15 100644
--- a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type02/MiscBaseBoardManufacturer.uni
+++ b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type02/MiscBaseBoardManufacturer.uni
@@ -4,13 +4,7 @@
// Copyright (c) 2015, Hisilicon Limited. All rights reserved.<BR>
// Copyright (c) 2015, Linaro Limited. 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 distribution. The full text of the license may be found at
-// http://opensource.org/licenses/bsd-license.php
-//
-// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+// SPDX-License-Identifier: BSD-2-Clause-Patent
//
// Based on files under Nt32Pkg/MiscSubClassPlatformDxe/
// --*/
diff --git a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type02/MiscBaseBoardManufacturerData.c b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type02/MiscBaseBoardManufacturerData.c
index 20991b1ea1..87c35b64f0 100644
--- a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type02/MiscBaseBoardManufacturerData.c
+++ b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type02/MiscBaseBoardManufacturerData.c
@@ -3,13 +3,7 @@
Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2015, Hisilicon Limited. All rights reserved.<BR>
Copyright (c) 2015, Linaro Limited. 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 distribution. The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
Module Name:
diff --git a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type02/MiscBaseBoardManufacturerFunction.c b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type02/MiscBaseBoardManufacturerFunction.c
index a141f9e7d7..76fa1ccc7f 100644
--- a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type02/MiscBaseBoardManufacturerFunction.c
+++ b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type02/MiscBaseBoardManufacturerFunction.c
@@ -3,13 +3,7 @@
Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2015, Hisilicon Limited. All rights reserved.<BR>
Copyright (c) 2015, Linaro Limited. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
Module Name:
diff --git a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufacturer.uni b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufacturer.uni
index 543ef00c0d..5487375753 100644
--- a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufacturer.uni
+++ b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufacturer.uni
@@ -4,13 +4,7 @@
// Copyright (c) 2015, Hisilicon Limited. All rights reserved.<BR>
// Copyright (c) 2015, Linaro Limited. 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 distribution. The full text of the license may be found at
-// http://opensource.org/licenses/bsd-license.php
-//
-// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+// SPDX-License-Identifier: BSD-2-Clause-Patent
//
// Based on files under Nt32Pkg/MiscSubClassPlatformDxe/
// --*/
diff --git a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufacturerData.c b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufacturerData.c
index 6237fbe535..846e1287cb 100644
--- a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufacturerData.c
+++ b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufacturerData.c
@@ -3,13 +3,7 @@
Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2015, Hisilicon Limited. All rights reserved.<BR>
Copyright (c) 2015, Linaro Limited. 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 distribution. The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
Module Name:
diff --git a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufacturerFunction.c b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufacturerFunction.c
index 4bb170117d..79795ad1e4 100644
--- a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufacturerFunction.c
+++ b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufacturerFunction.c
@@ -3,13 +3,7 @@
Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2015, Hisilicon Limited. All rights reserved.<BR>
Copyright (c) 2015, Linaro Limited. 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 distribution. The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
Module Name:
diff --git a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type09/MiscSystemSlotDesignation.uni b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type09/MiscSystemSlotDesignation.uni
index 19968f22f323a2f121b8d55e0d75a73b59c5937a..6e77b63a5c95db642825d4d1228003699a34d785 100644
GIT binary patch
delta 100
zcmdnNvx{xR3C8eXh5!Z^h6n~-1|Nn@hGd3RhCGI1AgRmX$&do(l>o)lfH;+*h{1|M
jfx(F(7^p*+!3c<*8FCmB8A_o#0)Xrih@Q=|tkR4CAfgjm
literal 1592
zcmchXO>Yx15QgWB#DB2T3m;8FIdDLLl(b8`qBK=E6>vhyCfP)4611BZ^5=o)wd3rz
zoRAP&t?jYr<DGXr{`IqKU32!#p7TAnM@ZfM?CjXq_RY3d+QJH(+XmeymfKV2m-d41
z6|446Izm2Vo!Sb`sok)ahY}weN9-<Gt*paIk8^3%zAG<Ht-`jnJH`o`Z>(=u_U<oG
z9f3+X&WKj=-|*)?uCsI2OMc;#_y2)IF;`??g5h5xi1l(dq&CXc!L*_jj3e@Nj4SeV
z<U1#0$+_oZiKfoB9$Uf55?QRM9wRub8jK6OtOJu%>{KK9js9gl*+sZxE!IaiW|ZBn
zM<L%ek`Qa@QAaPKN)xQ(O;Jv3n>FnEme~oiSk3Vsu+&_9_gv(Re`dQtUmnFq;7hS8
zWMw@DXN;?x5qK5;87JYk3iS`P9-_L>Oki`1*4XDiBZt6&Fl`#ls;4&8;<fKQbz8_t
z`lZjWgKbGgyARl}*cpR;LjT>5-oeY9KXMXh<#T2Us4nTKft@n;>?3jtrw&#%57|xW
zxocL5XZqSMm=pGE4|Nq%dOSfR^PUH+)KeN;%<?O*E#|(LB^~auIs3%9a1DG!$vq+o
z*#-M4UgcxpqhBEjyY>`wh?aB|HE6v@SC(IxKX4-CdJB?Wl#oSYpZ9)h?<rhda<3Hg
zgtsB`7H7S5ZQjc8LWbS9cHs3S9Z(0|<idA??yPFrCNITk;Z<j<RYiST4ZC;)b?(qs
z4Zea#TphE@$Va;gdy>w{c*sgs$<R6_&zcF>KynMB!r#Fr7NN=LeZ`&ncOnDV8cDZ6
QJ)-wsZ&vJw8m%(@4X3j6lK=n!
diff --git a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type09/MiscSystemSlotDesignationData.c b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type09/MiscSystemSlotDesignationData.c
index f9b1f03abd..71bff2d138 100644
--- a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type09/MiscSystemSlotDesignationData.c
+++ b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type09/MiscSystemSlotDesignationData.c
@@ -3,13 +3,7 @@
Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2016, Hisilicon Limited. All rights reserved.<BR>
Copyright (c) 2016, Linaro Limited. 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 distribution. The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
Module Name:
diff --git a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type09/MiscSystemSlotDesignationFunction.c b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type09/MiscSystemSlotDesignationFunction.c
index 945fd4c6e3..e921155ad1 100644
--- a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type09/MiscSystemSlotDesignationFunction.c
+++ b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type09/MiscSystemSlotDesignationFunction.c
@@ -5,13 +5,7 @@
Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2016, Hisilicon Limited. All rights reserved.<BR>
Copyright (c) 2016, Linaro Limited. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type13/MiscNumberOfInstallableLanguages.uni b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type13/MiscNumberOfInstallableLanguages.uni
index c9873ad890..559003369f 100644
--- a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type13/MiscNumberOfInstallableLanguages.uni
+++ b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type13/MiscNumberOfInstallableLanguages.uni
@@ -4,13 +4,7 @@
// Copyright (c) 2015, Hisilicon Limited. All rights reserved.<BR>
// Copyright (c) 2015, Linaro Limited. 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 distribution. The full text of the license may be found at
-// http://opensource.org/licenses/bsd-license.php
-//
-// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+// SPDX-License-Identifier: BSD-2-Clause-Patent
//
// Based on files under Nt32Pkg/MiscSubClassPlatformDxe/
// --*/
diff --git a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type13/MiscNumberOfInstallableLanguagesData.c b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type13/MiscNumberOfInstallableLanguagesData.c
index 60f616085e..94d9d7f1f0 100644
--- a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type13/MiscNumberOfInstallableLanguagesData.c
+++ b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type13/MiscNumberOfInstallableLanguagesData.c
@@ -3,13 +3,7 @@
Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2015, Hisilicon Limited. All rights reserved.<BR>
Copyright (c) 2015, Linaro Limited. 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 distribution. The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
Module Name:
diff --git a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type13/MiscNumberOfInstallableLanguagesFunction.c b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type13/MiscNumberOfInstallableLanguagesFunction.c
index 1f8f3eaf58..2acbdea738 100644
--- a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type13/MiscNumberOfInstallableLanguagesFunction.c
+++ b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type13/MiscNumberOfInstallableLanguagesFunction.c
@@ -3,13 +3,7 @@
Copyright (c) 2009 - 2012, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2015, Hisilicon Limited. All rights reserved.<BR>
Copyright (c) 2015, Linaro Limited. 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 distribution. The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
Based on files under Nt32Pkg/MiscSubClassPlatformDxe/
**/
diff --git a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type32/MiscBootInformationData.c b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type32/MiscBootInformationData.c
index 9f04694548..ac5b435076 100644
--- a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type32/MiscBootInformationData.c
+++ b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type32/MiscBootInformationData.c
@@ -3,13 +3,7 @@
Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2015, Hisilicon Limited. All rights reserved.<BR>
Copyright (c) 2015, Linaro Limited. 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 distribution. The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
Module Name:
diff --git a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type32/MiscBootInformationFunction.c b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type32/MiscBootInformationFunction.c
index 7840445eb8..22de8b5737 100644
--- a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type32/MiscBootInformationFunction.c
+++ b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type32/MiscBootInformationFunction.c
@@ -5,13 +5,7 @@
Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2015, Hisilicon Limited. All rights reserved.<BR>
Copyright (c) 2015, Linaro Limited. 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 distribution. The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
Based on files under Nt32Pkg/MiscSubClassPlatformDxe/
**/
diff --git a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type38/MiscIpmiDeviceInformationData.c b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type38/MiscIpmiDeviceInformationData.c
index 2dc99f1f9c..33b9cb9ca4 100644
--- a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type38/MiscIpmiDeviceInformationData.c
+++ b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type38/MiscIpmiDeviceInformationData.c
@@ -3,13 +3,7 @@
Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2015, Hisilicon Limited. All rights reserved.<BR>
Copyright (c) 2015, Linaro Limited. 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 distribution. The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
Module Name:
diff --git a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type38/MiscIpmiDeviceInformationFunction.c b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type38/MiscIpmiDeviceInformationFunction.c
index f198237e4d..6e8efc02b9 100644
--- a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type38/MiscIpmiDeviceInformationFunction.c
+++ b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type38/MiscIpmiDeviceInformationFunction.c
@@ -3,13 +3,7 @@
Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2015, Hisilicon Limited. All rights reserved.<BR>
Copyright (c) 2015, Linaro Limited. 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 distribution. The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
Module Name:
diff --git a/Silicon/Hisilicon/Drivers/SnpPlatform/SnpPlatform.c b/Silicon/Hisilicon/Drivers/SnpPlatform/SnpPlatform.c
index 0d6e86e754..2f08b328df 100644
--- a/Silicon/Hisilicon/Drivers/SnpPlatform/SnpPlatform.c
+++ b/Silicon/Hisilicon/Drivers/SnpPlatform/SnpPlatform.c
@@ -3,13 +3,7 @@
* Copyright (c) 2017, Hisilicon Limited. All rights reserved.
* Copyright (c) 2017, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Hisilicon/Drivers/SnpPlatform/SnpPlatform.inf b/Silicon/Hisilicon/Drivers/SnpPlatform/SnpPlatform.inf
index 3301abfc51..6f4f23b100 100644
--- a/Silicon/Hisilicon/Drivers/SnpPlatform/SnpPlatform.inf
+++ b/Silicon/Hisilicon/Drivers/SnpPlatform/SnpPlatform.inf
@@ -3,13 +3,7 @@
# Copyright (c) 2017, Hisilicon Limited. All rights reserved.
# Copyright (c) 2017, Linaro Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
diff --git a/Silicon/Hisilicon/Drivers/UpdateFdtDxe/UpdateFdtDxe.c b/Silicon/Hisilicon/Drivers/UpdateFdtDxe/UpdateFdtDxe.c
index 699a820108..4473a3252c 100644
--- a/Silicon/Hisilicon/Drivers/UpdateFdtDxe/UpdateFdtDxe.c
+++ b/Silicon/Hisilicon/Drivers/UpdateFdtDxe/UpdateFdtDxe.c
@@ -3,13 +3,7 @@
* Copyright (c) 2015, Hisilicon Limited. All rights reserved.
* Copyright (c) 2015, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Hisilicon/Drivers/UpdateFdtDxe/UpdateFdtDxe.inf b/Silicon/Hisilicon/Drivers/UpdateFdtDxe/UpdateFdtDxe.inf
index ccdcae7acf..477373f4cb 100644
--- a/Silicon/Hisilicon/Drivers/UpdateFdtDxe/UpdateFdtDxe.inf
+++ b/Silicon/Hisilicon/Drivers/UpdateFdtDxe/UpdateFdtDxe.inf
@@ -3,13 +3,7 @@
# Copyright (c) 2015, Hisilicon Limited. All rights reserved.
# Copyright (c) 2015, Linaro Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
diff --git a/Silicon/Hisilicon/Drivers/VersionInfoPeim/VersionInfoPeim.c b/Silicon/Hisilicon/Drivers/VersionInfoPeim/VersionInfoPeim.c
index 40e9137d78..0477343aae 100644
--- a/Silicon/Hisilicon/Drivers/VersionInfoPeim/VersionInfoPeim.c
+++ b/Silicon/Hisilicon/Drivers/VersionInfoPeim/VersionInfoPeim.c
@@ -3,13 +3,7 @@
* Copyright (c) 2016, Hisilicon Limited. All rights reserved.
* Copyright (c) 2016, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Hisilicon/Drivers/VersionInfoPeim/VersionInfoPeim.inf b/Silicon/Hisilicon/Drivers/VersionInfoPeim/VersionInfoPeim.inf
index ac39411a77..dfdda2f403 100644
--- a/Silicon/Hisilicon/Drivers/VersionInfoPeim/VersionInfoPeim.inf
+++ b/Silicon/Hisilicon/Drivers/VersionInfoPeim/VersionInfoPeim.inf
@@ -3,13 +3,7 @@
# Copyright (c) 2016, Hisilicon Limited. All rights reserved.
# Copyright (c) 2016, Linaro Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
diff --git a/Silicon/Hisilicon/Drivers/VirtualEhciPciIo/VirtualEhciPciIo.c b/Silicon/Hisilicon/Drivers/VirtualEhciPciIo/VirtualEhciPciIo.c
index 63de50b8c3..669992144a 100644
--- a/Silicon/Hisilicon/Drivers/VirtualEhciPciIo/VirtualEhciPciIo.c
+++ b/Silicon/Hisilicon/Drivers/VirtualEhciPciIo/VirtualEhciPciIo.c
@@ -3,13 +3,7 @@
* Copyright (c) 2016, Hisilicon Limited. All rights reserved.
* Copyright (c) 2016, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Hisilicon/Drivers/VirtualEhciPciIo/VirtualEhciPciIo.inf b/Silicon/Hisilicon/Drivers/VirtualEhciPciIo/VirtualEhciPciIo.inf
index 5b917fd3fd..e1f3707d4f 100644
--- a/Silicon/Hisilicon/Drivers/VirtualEhciPciIo/VirtualEhciPciIo.inf
+++ b/Silicon/Hisilicon/Drivers/VirtualEhciPciIo/VirtualEhciPciIo.inf
@@ -3,13 +3,7 @@
# Copyright (c) 2016, Hisilicon Limited. All rights reserved.
# Copyright (c) 2016, Linaro Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
diff --git a/Silicon/Hisilicon/Hi1610/Drivers/IoInitDxe/IoInitDxe.c b/Silicon/Hisilicon/Hi1610/Drivers/IoInitDxe/IoInitDxe.c
index 3e272f8f11..f9940869c2 100644
--- a/Silicon/Hisilicon/Hi1610/Drivers/IoInitDxe/IoInitDxe.c
+++ b/Silicon/Hisilicon/Hi1610/Drivers/IoInitDxe/IoInitDxe.c
@@ -3,13 +3,7 @@
* Copyright (c) 2015, Hisilicon Limited. All rights reserved.
* Copyright (c) 2015, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Hisilicon/Hi1610/Drivers/IoInitDxe/IoInitDxe.inf b/Silicon/Hisilicon/Hi1610/Drivers/IoInitDxe/IoInitDxe.inf
index aa8e3c9c0b..30fd829bcd 100644
--- a/Silicon/Hisilicon/Hi1610/Drivers/IoInitDxe/IoInitDxe.inf
+++ b/Silicon/Hisilicon/Hi1610/Drivers/IoInitDxe/IoInitDxe.inf
@@ -3,13 +3,7 @@
# Copyright (c) 2015, Hisilicon Limited. All rights reserved.
# Copyright (c) 2015, Linaro Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
diff --git a/Silicon/Hisilicon/Hi1610/Drivers/PcieInit1610/PcieInit.c b/Silicon/Hisilicon/Hi1610/Drivers/PcieInit1610/PcieInit.c
index 5fc0ead5c1..954655d470 100644
--- a/Silicon/Hisilicon/Hi1610/Drivers/PcieInit1610/PcieInit.c
+++ b/Silicon/Hisilicon/Hi1610/Drivers/PcieInit1610/PcieInit.c
@@ -3,13 +3,7 @@
* Copyright (c) 2016, Hisilicon Limited. All rights reserved.
* Copyright (c) 2016, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Hisilicon/Hi1610/Drivers/PcieInit1610/PcieInit.h b/Silicon/Hisilicon/Hi1610/Drivers/PcieInit1610/PcieInit.h
index 466eb8168c..55928cd6e0 100644
--- a/Silicon/Hisilicon/Hi1610/Drivers/PcieInit1610/PcieInit.h
+++ b/Silicon/Hisilicon/Hi1610/Drivers/PcieInit1610/PcieInit.h
@@ -3,13 +3,7 @@
* Copyright (c) 2016, Hisilicon Limited. All rights reserved.
* Copyright (c) 2016, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Hisilicon/Hi1610/Drivers/PcieInit1610/PcieInitDxe.inf b/Silicon/Hisilicon/Hi1610/Drivers/PcieInit1610/PcieInitDxe.inf
index 61b091f659..25d301f210 100644
--- a/Silicon/Hisilicon/Hi1610/Drivers/PcieInit1610/PcieInitDxe.inf
+++ b/Silicon/Hisilicon/Hi1610/Drivers/PcieInit1610/PcieInitDxe.inf
@@ -3,13 +3,7 @@
# Copyright (c) 2016, Hisilicon Limited. All rights reserved.
# Copyright (c) 2016, Linaro Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
diff --git a/Silicon/Hisilicon/Hi1610/Drivers/PcieInit1610/PcieInitLib.c b/Silicon/Hisilicon/Hi1610/Drivers/PcieInit1610/PcieInitLib.c
index c1c3fbb0a7..dfe8c3b103 100644
--- a/Silicon/Hisilicon/Hi1610/Drivers/PcieInit1610/PcieInitLib.c
+++ b/Silicon/Hisilicon/Hi1610/Drivers/PcieInit1610/PcieInitLib.c
@@ -3,13 +3,7 @@
* Copyright (c) 2016, Hisilicon Limited. All rights reserved.
* Copyright (c) 2016, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Hisilicon/Hi1610/Drivers/PcieInit1610/PcieInitLib.h b/Silicon/Hisilicon/Hi1610/Drivers/PcieInit1610/PcieInitLib.h
index e96c53c4fe..553caaa301 100644
--- a/Silicon/Hisilicon/Hi1610/Drivers/PcieInit1610/PcieInitLib.h
+++ b/Silicon/Hisilicon/Hi1610/Drivers/PcieInit1610/PcieInitLib.h
@@ -3,13 +3,7 @@
* Copyright (c) 2016, Hisilicon Limited. All rights reserved.
* Copyright (c) 2016, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Hisilicon/Hi1610/Drivers/PcieInit1610/PcieKernelApi.h b/Silicon/Hisilicon/Hi1610/Drivers/PcieInit1610/PcieKernelApi.h
index db895973dc..99e881efe7 100644
--- a/Silicon/Hisilicon/Hi1610/Drivers/PcieInit1610/PcieKernelApi.h
+++ b/Silicon/Hisilicon/Hi1610/Drivers/PcieInit1610/PcieKernelApi.h
@@ -3,13 +3,7 @@
* Copyright (c) 2016, Hisilicon Limited. All rights reserved.
* Copyright (c) 2016, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Hisilicon/Hi1610/Hi1610.dec b/Silicon/Hisilicon/Hi1610/Hi1610.dec
index 6ea4867662..ac099ab117 100644
--- a/Silicon/Hisilicon/Hi1610/Hi1610.dec
+++ b/Silicon/Hisilicon/Hi1610/Hi1610.dec
@@ -3,13 +3,7 @@
# Copyright (c) 2018, Hisilicon Limited. All rights reserved.
# Copyright (c) 2018, Linaro Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
diff --git a/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/AcpiTablesHi1610.inf b/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/AcpiTablesHi1610.inf
index caef3da460..6c4674983c 100644
--- a/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/AcpiTablesHi1610.inf
+++ b/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/AcpiTablesHi1610.inf
@@ -6,13 +6,7 @@
# Copyright (c) 2015, Hisilicon Limited. All rights reserved.
# Copyright (c) 2015, Linaro Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
# Based on the files under ArmPlatformPkg/ArmJunoPkg/AcpiTables/
#
diff --git a/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/D03Mcfg.aslc b/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/D03Mcfg.aslc
index 7e5c8efa2f..30e9878cda 100644
--- a/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/D03Mcfg.aslc
+++ b/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/D03Mcfg.aslc
@@ -1,10 +1,7 @@
/*
* Copyright (c) 2016 Hisilicon Limited
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the BSD License which accompanies
- * this distribution, and is available at
- * http://opensource.org/licenses/bsd-license.php
+ *. All rights reserved.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*
*/
diff --git a/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/Dsdt/CPU.asl b/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/Dsdt/CPU.asl
index e995295747..f98570aa34 100644
--- a/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/Dsdt/CPU.asl
+++ b/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/Dsdt/CPU.asl
@@ -4,13 +4,7 @@
Copyright (c) 2014, ARM Ltd. All rights reserved.<BR>
Copyright (c) 2015, Hisilicon Limited. All rights reserved.<BR>
Copyright (c) 2015, Linaro Limited. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
Based on the files under ArmPlatformPkg/ArmJunoPkg/AcpiTables/
diff --git a/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/Dsdt/Com.asl b/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/Dsdt/Com.asl
index 30ada36c2b..0f28b19d52 100644
--- a/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/Dsdt/Com.asl
+++ b/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/Dsdt/Com.asl
@@ -4,13 +4,7 @@
Copyright (c) 2014, ARM Ltd. All rights reserved.<BR>
Copyright (c) 2015, Hisilicon Limited. All rights reserved.<BR>
Copyright (c) 2015, Linaro Limited. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
Based on the files under ArmPlatformPkg/ArmJunoPkg/AcpiTables/
diff --git a/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/Dsdt/D03Hns.asl b/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/Dsdt/D03Hns.asl
index 765ca19fb3..59c886f6ed 100644
--- a/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/Dsdt/D03Hns.asl
+++ b/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/Dsdt/D03Hns.asl
@@ -2,13 +2,7 @@
Differentiated System Description Table Fields (DSDT)
Copyright (c) 2014, ARM Ltd. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/Dsdt/D03Mbig.asl b/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/Dsdt/D03Mbig.asl
index 640fb3ae6a..044da507ae 100644
--- a/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/Dsdt/D03Mbig.asl
+++ b/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/Dsdt/D03Mbig.asl
@@ -2,13 +2,7 @@
Differentiated System Description Table Fields (DSDT)
Copyright (c) 2014, ARM Ltd. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/Dsdt/D03Pci.asl b/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/Dsdt/D03Pci.asl
index 5b0134552c..67e1d2b798 100644
--- a/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/Dsdt/D03Pci.asl
+++ b/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/Dsdt/D03Pci.asl
@@ -4,13 +4,7 @@
* Copyright (c) 2016, Hisilicon Limited. All rights reserved.
* Copyright (c) 2016, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
* Based on the files under ArmPlatformPkg/ArmJunoPkg/AcpiTables/
*
diff --git a/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/Dsdt/D03Sas.asl b/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/Dsdt/D03Sas.asl
index 7b5d4ded70..b106a23a71 100644
--- a/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/Dsdt/D03Sas.asl
+++ b/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/Dsdt/D03Sas.asl
@@ -4,13 +4,7 @@
Copyright (c) 2014, ARM Ltd. All rights reserved.<BR>
Copyright (c) 2015, Hisilicon Limited. All rights reserved.<BR>
Copyright (c) 2015, Linaro Limited. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/Dsdt/D03Usb.asl b/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/Dsdt/D03Usb.asl
index 9132965ef7..b890308657 100644
--- a/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/Dsdt/D03Usb.asl
+++ b/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/Dsdt/D03Usb.asl
@@ -4,13 +4,7 @@
Copyright (c) 2014, ARM Ltd. All rights reserved.<BR>
Copyright (c) 2015, Hisilicon Limited. All rights reserved.<BR>
Copyright (c) 2015, Linaro Limited. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
Based on the files under ArmPlatformPkg/ArmJunoPkg/AcpiTables/
diff --git a/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/Dsdt/DsdtHi1610.asl b/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/Dsdt/DsdtHi1610.asl
index 4185f8017b..40669052d0 100644
--- a/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/Dsdt/DsdtHi1610.asl
+++ b/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/Dsdt/DsdtHi1610.asl
@@ -4,13 +4,7 @@
Copyright (c) 2014, ARM Ltd. All rights reserved.<BR>
Copyright (c) 2015, Hisilicon Limited. All rights reserved.<BR>
Copyright (c) 2015, Linaro Limited. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
Based on the files under ArmPlatformPkg/ArmJunoPkg/AcpiTables/
diff --git a/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/Dsdt/Lpc.asl b/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/Dsdt/Lpc.asl
index d4b2372578..2ed1cb97a2 100644
--- a/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/Dsdt/Lpc.asl
+++ b/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/Dsdt/Lpc.asl
@@ -2,13 +2,7 @@
*
* Copyright (c) 2016 Hisilicon Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/Facs.aslc b/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/Facs.aslc
index d5bc299cea..049364e636 100644
--- a/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/Facs.aslc
+++ b/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/Facs.aslc
@@ -5,13 +5,7 @@
* Copyright (c) 2015, Hisilicon Limited. All rights reserved.
* Copyright (c) 2015, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
* Based on the files under ArmPlatformPkg/ArmJunoPkg/AcpiTables/
*
diff --git a/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/Fadt.aslc b/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/Fadt.aslc
index 025b42cadd..75714990cf 100644
--- a/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/Fadt.aslc
+++ b/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/Fadt.aslc
@@ -5,13 +5,7 @@
* Copyright (c) 2015, Hisilicon Limited. All rights reserved.
* Copyright (c) 2015, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
* Based on the files under ArmPlatformPkg/ArmJunoPkg/AcpiTables/
*
diff --git a/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/Gtdt.aslc b/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/Gtdt.aslc
index 3feb99e88c..958d7c94e4 100644
--- a/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/Gtdt.aslc
+++ b/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/Gtdt.aslc
@@ -5,13 +5,7 @@
* Copyright (c) 2015, Hisilicon Limited. All rights reserved.
* Copyright (c) 2015, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
* Based on the files under ArmPlatformPkg/ArmJunoPkg/AcpiTables/
*
diff --git a/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/Hi1610Platform.h b/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/Hi1610Platform.h
index 4b1e4d3aad..1aed66daf9 100644
--- a/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/Hi1610Platform.h
+++ b/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/Hi1610Platform.h
@@ -4,13 +4,7 @@
* Copyright (c) 2015-2018, Hisilicon Limited. All rights reserved.
* Copyright (c) 2015-2018, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
* Based on the files under ArmPlatformPkg/ArmJunoPkg/AcpiTables/
*
diff --git a/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/MadtHi1610.aslc b/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/MadtHi1610.aslc
index f302dd6f5c..ee06c1516b 100644
--- a/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/MadtHi1610.aslc
+++ b/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/MadtHi1610.aslc
@@ -7,13 +7,7 @@
*
* This program and the accompanying materials
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
* Based on the files under ArmPlatformPkg/ArmJunoPkg/AcpiTables/
*
diff --git a/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/Slit.aslc b/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/Slit.aslc
index 8b7aee4d9d..ec92dc9d32 100644
--- a/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/Slit.aslc
+++ b/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/Slit.aslc
@@ -1,10 +1,7 @@
/*
* Copyright (c) 2013 Linaro Limited
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the BSD License which accompanies
- * this distribution, and is available at
- * http://opensource.org/licenses/bsd-license.php
+ *. All rights reserved.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*
* Contributors:
* Yi Li - yi.li@linaro.org
diff --git a/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/Srat.aslc b/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/Srat.aslc
index 99df1a4d94..ee0b11db65 100644
--- a/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/Srat.aslc
+++ b/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/Srat.aslc
@@ -1,10 +1,7 @@
/*
* Copyright (c) 2013 Linaro Limited
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the BSD License which accompanies
- * this distribution, and is available at
- * http://opensource.org/licenses/bsd-license.php
+ *. All rights reserved.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*
* Contributors:
* Yi Li - yi.li@linaro.org
diff --git a/Silicon/Hisilicon/Hi1610/Include/PlatformArch.h b/Silicon/Hisilicon/Hi1610/Include/PlatformArch.h
index 1ebddca4e5..9112c67af0 100644
--- a/Silicon/Hisilicon/Hi1610/Include/PlatformArch.h
+++ b/Silicon/Hisilicon/Hi1610/Include/PlatformArch.h
@@ -3,13 +3,7 @@
* Copyright (c) 2015 - 2018, Hisilicon Limited. All rights reserved.
* Copyright (c) 2015 - 2018, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Hisilicon/Hi1610/Library/Hi161xPciPlatformLib/Hi161xPciPlatformLib.c b/Silicon/Hisilicon/Hi1610/Library/Hi161xPciPlatformLib/Hi161xPciPlatformLib.c
index dad848e714..4fb092009a 100644
--- a/Silicon/Hisilicon/Hi1610/Library/Hi161xPciPlatformLib/Hi161xPciPlatformLib.c
+++ b/Silicon/Hisilicon/Hi1610/Library/Hi161xPciPlatformLib/Hi161xPciPlatformLib.c
@@ -3,13 +3,7 @@
* Copyright (c) 2018, Hisilicon Limited. All rights reserved.
* Copyright (c) 2018, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Hisilicon/Hi1610/Library/Hi161xPciPlatformLib/Hi161xPciPlatformLib.inf b/Silicon/Hisilicon/Hi1610/Library/Hi161xPciPlatformLib/Hi161xPciPlatformLib.inf
index 274cad0abf..d4fa50d19d 100644
--- a/Silicon/Hisilicon/Hi1610/Library/Hi161xPciPlatformLib/Hi161xPciPlatformLib.inf
+++ b/Silicon/Hisilicon/Hi1610/Library/Hi161xPciPlatformLib/Hi161xPciPlatformLib.inf
@@ -5,12 +5,7 @@
# Copyright (c) 2017 - 2018, Linaro Ltd. All rights reserved.<BR>
# Copyright (c) 2018, Hisilicon Ltd. 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 distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php.
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#
##
diff --git a/Silicon/Hisilicon/Hi1610/Library/Hi161xPciSegmentLib/Hi161xPciSegmentLib.inf b/Silicon/Hisilicon/Hi1610/Library/Hi161xPciSegmentLib/Hi161xPciSegmentLib.inf
index cd2ae88102..72e32b14dc 100644
--- a/Silicon/Hisilicon/Hi1610/Library/Hi161xPciSegmentLib/Hi161xPciSegmentLib.inf
+++ b/Silicon/Hisilicon/Hi1610/Library/Hi161xPciSegmentLib/Hi161xPciSegmentLib.inf
@@ -5,12 +5,7 @@
# Copyright (c) 2017 - 2018, Linaro Ltd. All rights reserved.<BR>
# Copyright (c) 2018, Hisilicon Ltd. 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 distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php.
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#
##
diff --git a/Silicon/Hisilicon/Hi1610/Library/Hi161xPciSegmentLib/PciSegmentLib.c b/Silicon/Hisilicon/Hi1610/Library/Hi161xPciSegmentLib/PciSegmentLib.c
index 2e66244a47..d756b69193 100644
--- a/Silicon/Hisilicon/Hi1610/Library/Hi161xPciSegmentLib/PciSegmentLib.c
+++ b/Silicon/Hisilicon/Hi1610/Library/Hi161xPciSegmentLib/PciSegmentLib.c
@@ -4,14 +4,7 @@
Copyright (c) 2007 - 2012, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2017, Linaro, Ltd. 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 distribution. The full
- text of the license may be found at
- http://opensource.org/licenses/bsd-license.php.
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Hisilicon/Hi1616/D05AcpiTables/AcpiTablesHi1616.inf b/Silicon/Hisilicon/Hi1616/D05AcpiTables/AcpiTablesHi1616.inf
index d313936b89..a617650244 100644
--- a/Silicon/Hisilicon/Hi1616/D05AcpiTables/AcpiTablesHi1616.inf
+++ b/Silicon/Hisilicon/Hi1616/D05AcpiTables/AcpiTablesHi1616.inf
@@ -6,13 +6,7 @@
# Copyright (c) 2015-2016, Hisilicon Limited. All rights reserved.
# Copyright (c) 2015-2016, Linaro Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
# Based on the files under Hisilicon/Hi1610/Hi1610AcpiTables/
#
diff --git a/Silicon/Hisilicon/Hi1616/D05AcpiTables/D05Mcfg.aslc b/Silicon/Hisilicon/Hi1616/D05AcpiTables/D05Mcfg.aslc
index 64807b1714..7190cc4db5 100644
--- a/Silicon/Hisilicon/Hi1616/D05AcpiTables/D05Mcfg.aslc
+++ b/Silicon/Hisilicon/Hi1616/D05AcpiTables/D05Mcfg.aslc
@@ -1,10 +1,7 @@
/*
* Copyright (c) 2016 Hisilicon Limited
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the BSD License which accompanies
- * this distribution, and is available at
- * http://opensource.org/licenses/bsd-license.php
+ *. All rights reserved.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*
*/
diff --git a/Silicon/Hisilicon/Hi1616/D05AcpiTables/D05Slit.aslc b/Silicon/Hisilicon/Hi1616/D05AcpiTables/D05Slit.aslc
index 0845d661ff..d64cb19b32 100644
--- a/Silicon/Hisilicon/Hi1616/D05AcpiTables/D05Slit.aslc
+++ b/Silicon/Hisilicon/Hi1616/D05AcpiTables/D05Slit.aslc
@@ -1,11 +1,8 @@
/*
* Copyright (c) 2016 Linaro Limited
* Copyright (c) 2016 Hisilicon Limited
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the BSD License which accompanies
- * this distribution, and is available at
- * http://opensource.org/licenses/bsd-license.php
+ *. All rights reserved.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*
* Contributors:
* Yi Li - yi.li@linaro.org
diff --git a/Silicon/Hisilicon/Hi1616/D05AcpiTables/D05Spcr.aslc b/Silicon/Hisilicon/Hi1616/D05AcpiTables/D05Spcr.aslc
index 0cda87023e..eb13773e40 100644
--- a/Silicon/Hisilicon/Hi1616/D05AcpiTables/D05Spcr.aslc
+++ b/Silicon/Hisilicon/Hi1616/D05AcpiTables/D05Spcr.aslc
@@ -4,13 +4,7 @@
* Copyright (c) 2016, Hisilicon Limited. All rights reserved.
* Copyright (c) 2016 Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
* Based on the files under ArmPlatformPkg/ArmJunoPkg/AcpiTables/
*
diff --git a/Silicon/Hisilicon/Hi1616/D05AcpiTables/D05Srat.aslc b/Silicon/Hisilicon/Hi1616/D05AcpiTables/D05Srat.aslc
index 8ea0c4b3e0..e61d840ed4 100644
--- a/Silicon/Hisilicon/Hi1616/D05AcpiTables/D05Srat.aslc
+++ b/Silicon/Hisilicon/Hi1616/D05AcpiTables/D05Srat.aslc
@@ -1,11 +1,8 @@
/*
* Copyright (c) 2013 Linaro Limited
* Copyright (c) 2016 Hisilicon Limited
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the BSD License which accompanies
- * this distribution, and is available at
- * http://opensource.org/licenses/bsd-license.php
+ *. All rights reserved.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*
* Contributors:
* Yi Li - yi.li@linaro.org
diff --git a/Silicon/Hisilicon/Hi1616/D05AcpiTables/Dsdt/CPU.asl b/Silicon/Hisilicon/Hi1616/D05AcpiTables/Dsdt/CPU.asl
index 5ecbf5046d..c11e02646e 100644
--- a/Silicon/Hisilicon/Hi1616/D05AcpiTables/Dsdt/CPU.asl
+++ b/Silicon/Hisilicon/Hi1616/D05AcpiTables/Dsdt/CPU.asl
@@ -4,13 +4,7 @@
Copyright (c) 2014, ARM Ltd. All rights reserved.<BR>
Copyright (c) 2015-2016, Hisilicon Limited. All rights reserved.<BR>
Copyright (c) 2015-2016, Linaro Limited. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
Based on the files under ArmPlatformPkg/ArmJunoPkg/AcpiTables/
diff --git a/Silicon/Hisilicon/Hi1616/D05AcpiTables/Dsdt/Com.asl b/Silicon/Hisilicon/Hi1616/D05AcpiTables/Dsdt/Com.asl
index 2cc44fcb2e..d62645f398 100644
--- a/Silicon/Hisilicon/Hi1616/D05AcpiTables/Dsdt/Com.asl
+++ b/Silicon/Hisilicon/Hi1616/D05AcpiTables/Dsdt/Com.asl
@@ -4,13 +4,7 @@
Copyright (c) 2014, ARM Ltd. All rights reserved.<BR>
Copyright (c) 2015-2016, Hisilicon Limited. All rights reserved.<BR>
Copyright (c) 2015-2016, Linaro Limited. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Hisilicon/Hi1616/D05AcpiTables/Dsdt/D05Hns.asl b/Silicon/Hisilicon/Hi1616/D05AcpiTables/Dsdt/D05Hns.asl
index 7aa04afa29..bd8fd13dc7 100644
--- a/Silicon/Hisilicon/Hi1616/D05AcpiTables/Dsdt/D05Hns.asl
+++ b/Silicon/Hisilicon/Hi1616/D05AcpiTables/Dsdt/D05Hns.asl
@@ -4,13 +4,7 @@
Copyright (c) 2014, ARM Ltd. All rights reserved.<BR>
Copyright (c) 2016, Hisilicon Limited. All rights reserved.
- This program and the accompanying materials
- are licensed and made available under the terms and conditions of the BSD License
- which accompanies this distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Hisilicon/Hi1616/D05AcpiTables/Dsdt/D05I2c.asl b/Silicon/Hisilicon/Hi1616/D05AcpiTables/Dsdt/D05I2c.asl
index 3cc60d15dd..9a21323a3b 100644
--- a/Silicon/Hisilicon/Hi1616/D05AcpiTables/Dsdt/D05I2c.asl
+++ b/Silicon/Hisilicon/Hi1616/D05AcpiTables/Dsdt/D05I2c.asl
@@ -4,13 +4,7 @@
Copyright (c) 2014, ARM Ltd. All rights reserved.<BR>
Copyright (c) 2015-2016, Hisilicon Limited. All rights reserved.<BR>
Copyright (c) 2015-2016, Linaro Limited. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
Based on the files under ArmPlatformPkg/ArmJunoPkg/AcpiTables/
diff --git a/Silicon/Hisilicon/Hi1616/D05AcpiTables/Dsdt/D05Mbig.asl b/Silicon/Hisilicon/Hi1616/D05AcpiTables/Dsdt/D05Mbig.asl
index 60d07a1a92..3f4d396dad 100644
--- a/Silicon/Hisilicon/Hi1616/D05AcpiTables/Dsdt/D05Mbig.asl
+++ b/Silicon/Hisilicon/Hi1616/D05AcpiTables/Dsdt/D05Mbig.asl
@@ -3,13 +3,7 @@
Copyright (c) 2014, ARM Ltd. All rights reserved.<BR>
Copyright (c) 2015-2016, Hisilicon Limited. All rights reserved.
- This program and the accompanying materials
- are licensed and made available under the terms and conditions of the BSD License
- which accompanies this distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Hisilicon/Hi1616/D05AcpiTables/Dsdt/D05Pci.asl b/Silicon/Hisilicon/Hi1616/D05AcpiTables/Dsdt/D05Pci.asl
index 3f09e5e568..91b6fe26e3 100644
--- a/Silicon/Hisilicon/Hi1616/D05AcpiTables/Dsdt/D05Pci.asl
+++ b/Silicon/Hisilicon/Hi1616/D05AcpiTables/Dsdt/D05Pci.asl
@@ -4,13 +4,7 @@
* Copyright (c) 2016, Hisilicon Limited. All rights reserved.
* Copyright (c) 2016, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
* Based on the files under ArmPlatformPkg/ArmJunoPkg/AcpiTables/
*
diff --git a/Silicon/Hisilicon/Hi1616/D05AcpiTables/Dsdt/D05Sas.asl b/Silicon/Hisilicon/Hi1616/D05AcpiTables/Dsdt/D05Sas.asl
index d5b7e2fedf..9e7256ff55 100644
--- a/Silicon/Hisilicon/Hi1616/D05AcpiTables/Dsdt/D05Sas.asl
+++ b/Silicon/Hisilicon/Hi1616/D05AcpiTables/Dsdt/D05Sas.asl
@@ -4,13 +4,7 @@
Copyright (c) 2014, ARM Ltd. All rights reserved.<BR>
Copyright (c) 2015-2016, Hisilicon Limited. All rights reserved.<BR>
Copyright (c) 2015-2016, Linaro Limited. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Hisilicon/Hi1616/D05AcpiTables/Dsdt/D05Usb.asl b/Silicon/Hisilicon/Hi1616/D05AcpiTables/Dsdt/D05Usb.asl
index 43e6f9210d..39feb146c7 100644
--- a/Silicon/Hisilicon/Hi1616/D05AcpiTables/Dsdt/D05Usb.asl
+++ b/Silicon/Hisilicon/Hi1616/D05AcpiTables/Dsdt/D05Usb.asl
@@ -4,13 +4,7 @@
Copyright (c) 2014, ARM Ltd. All rights reserved.<BR>
Copyright (c) 2015-2016, Hisilicon Limited. All rights reserved.<BR>
Copyright (c) 2015-2016, Linaro Limited. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
Based on the files under ArmPlatformPkg/ArmJunoPkg/AcpiTables/
diff --git a/Silicon/Hisilicon/Hi1616/D05AcpiTables/Dsdt/DsdtHi1616.asl b/Silicon/Hisilicon/Hi1616/D05AcpiTables/Dsdt/DsdtHi1616.asl
index b4fc53873f..061bf9235a 100644
--- a/Silicon/Hisilicon/Hi1616/D05AcpiTables/Dsdt/DsdtHi1616.asl
+++ b/Silicon/Hisilicon/Hi1616/D05AcpiTables/Dsdt/DsdtHi1616.asl
@@ -4,13 +4,7 @@
Copyright (c) 2014, ARM Ltd. All rights reserved.<BR>
Copyright (c) 2015-2016, Hisilicon Limited. All rights reserved.<BR>
Copyright (c) 2015-2016, Linaro Limited. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
Based on the files under ArmPlatformPkg/ArmJunoPkg/AcpiTables/
diff --git a/Silicon/Hisilicon/Hi1616/D05AcpiTables/Dsdt/Lpc.asl b/Silicon/Hisilicon/Hi1616/D05AcpiTables/Dsdt/Lpc.asl
index d4b2372578..2ed1cb97a2 100644
--- a/Silicon/Hisilicon/Hi1616/D05AcpiTables/Dsdt/Lpc.asl
+++ b/Silicon/Hisilicon/Hi1616/D05AcpiTables/Dsdt/Lpc.asl
@@ -2,13 +2,7 @@
*
* Copyright (c) 2016 Hisilicon Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Hisilicon/Hi1616/D05AcpiTables/Facs.aslc b/Silicon/Hisilicon/Hi1616/D05AcpiTables/Facs.aslc
index a5e2e7d82b..556de4ea19 100644
--- a/Silicon/Hisilicon/Hi1616/D05AcpiTables/Facs.aslc
+++ b/Silicon/Hisilicon/Hi1616/D05AcpiTables/Facs.aslc
@@ -5,13 +5,7 @@
* Copyright (c) 2015 - 2016, Hisilicon Limited. All rights reserved.
* Copyright (c) 2015 - 2016, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
* Based on the files under ArmPlatformPkg/ArmJunoPkg/AcpiTables/
*
diff --git a/Silicon/Hisilicon/Hi1616/D05AcpiTables/Fadt.aslc b/Silicon/Hisilicon/Hi1616/D05AcpiTables/Fadt.aslc
index 67fa4d6af9..c59e5e774a 100644
--- a/Silicon/Hisilicon/Hi1616/D05AcpiTables/Fadt.aslc
+++ b/Silicon/Hisilicon/Hi1616/D05AcpiTables/Fadt.aslc
@@ -5,13 +5,7 @@
* Copyright (c) 2015 - 2016, Hisilicon Limited. All rights reserved.
* Copyright (c) 2015 - 2016, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
* Based on the files under ArmPlatformPkg/ArmJunoPkg/AcpiTables/
*
diff --git a/Silicon/Hisilicon/Hi1616/D05AcpiTables/Gtdt.aslc b/Silicon/Hisilicon/Hi1616/D05AcpiTables/Gtdt.aslc
index 9f27696cf0..df8f266d9a 100644
--- a/Silicon/Hisilicon/Hi1616/D05AcpiTables/Gtdt.aslc
+++ b/Silicon/Hisilicon/Hi1616/D05AcpiTables/Gtdt.aslc
@@ -5,13 +5,7 @@
* Copyright (c) 2015 - 2016, Hisilicon Limited. All rights reserved.
* Copyright (c) 2015 - 2016, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
* Based on the files under ArmPlatformPkg/ArmJunoPkg/AcpiTables/
*
diff --git a/Silicon/Hisilicon/Hi1616/D05AcpiTables/Hi1616Platform.h b/Silicon/Hisilicon/Hi1616/D05AcpiTables/Hi1616Platform.h
index 455cc191f0..f94dd4e42a 100644
--- a/Silicon/Hisilicon/Hi1616/D05AcpiTables/Hi1616Platform.h
+++ b/Silicon/Hisilicon/Hi1616/D05AcpiTables/Hi1616Platform.h
@@ -4,13 +4,7 @@
* Copyright (c) 2015-2018, Hisilicon Limited. All rights reserved.
* Copyright (c) 2015-2016, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
* Based on the files under ArmPlatformPkg/ArmJunoPkg/AcpiTables/
*
diff --git a/Silicon/Hisilicon/Hi1616/D05AcpiTables/MadtHi1616.aslc b/Silicon/Hisilicon/Hi1616/D05AcpiTables/MadtHi1616.aslc
index 54605a6edb..f74f0bbe85 100644
--- a/Silicon/Hisilicon/Hi1616/D05AcpiTables/MadtHi1616.aslc
+++ b/Silicon/Hisilicon/Hi1616/D05AcpiTables/MadtHi1616.aslc
@@ -7,13 +7,7 @@
*
* This program and the accompanying materials
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
* Based on the files under ArmPlatformPkg/ArmJunoPkg/AcpiTables/
*
diff --git a/Silicon/Hisilicon/Hi1616/Hi1616.dec b/Silicon/Hisilicon/Hi1616/Hi1616.dec
index 7dad0ab91a..7371b0d3e3 100644
--- a/Silicon/Hisilicon/Hi1616/Hi1616.dec
+++ b/Silicon/Hisilicon/Hi1616/Hi1616.dec
@@ -3,13 +3,7 @@
# Copyright (c) 2018, Hisilicon Limited. All rights reserved.
# Copyright (c) 2018, Linaro Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
diff --git a/Silicon/Hisilicon/Hi1616/Include/PlatformArch.h b/Silicon/Hisilicon/Hi1616/Include/PlatformArch.h
index e02e4bdabd..ec58cb9129 100644
--- a/Silicon/Hisilicon/Hi1616/Include/PlatformArch.h
+++ b/Silicon/Hisilicon/Hi1616/Include/PlatformArch.h
@@ -3,13 +3,7 @@
* Copyright (c) 2018, Hisilicon Limited. All rights reserved.
* Copyright (c) 2018, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Hisilicon/Hi1616/Pptt/Pptt.c b/Silicon/Hisilicon/Hi1616/Pptt/Pptt.c
index 4cdbb4f797..6ec849abad 100644
--- a/Silicon/Hisilicon/Hi1616/Pptt/Pptt.c
+++ b/Silicon/Hisilicon/Hi1616/Pptt/Pptt.c
@@ -3,13 +3,7 @@
* Copyright (c) 2018, Hisilicon Limited. All rights reserved.
* Copyright (c) 2018, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
* Based on the files under Platform/ARM/JunoPkg/AcpiTables/
*
diff --git a/Silicon/Hisilicon/Hi1616/Pptt/Pptt.h b/Silicon/Hisilicon/Hi1616/Pptt/Pptt.h
index 01926e1e98..a0ad31a990 100644
--- a/Silicon/Hisilicon/Hi1616/Pptt/Pptt.h
+++ b/Silicon/Hisilicon/Hi1616/Pptt/Pptt.h
@@ -3,13 +3,7 @@
* Copyright (c) 2018, Hisilicon Limited. All rights reserved.
* Copyright (c) 2018, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
* Based on the files under Platform/ARM/JunoPkg/AcpiTables/
*
diff --git a/Silicon/Hisilicon/Hi1616/Pptt/Pptt.inf b/Silicon/Hisilicon/Hi1616/Pptt/Pptt.inf
index ff6f772d94..8f5fff2b10 100644
--- a/Silicon/Hisilicon/Hi1616/Pptt/Pptt.inf
+++ b/Silicon/Hisilicon/Hi1616/Pptt/Pptt.inf
@@ -3,13 +3,7 @@
* Copyright (c) 2018, Hisilicon Limited. All rights reserved.
* Copyright (c) 2018, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
* Based on the files under Platform/ARM/JunoPkg/AcpiTables/
*
diff --git a/Silicon/Hisilicon/Hi1620/Drivers/Apei/Apei.c b/Silicon/Hisilicon/Hi1620/Drivers/Apei/Apei.c
index 0eb6b763c7..334446602d 100644
--- a/Silicon/Hisilicon/Hi1620/Drivers/Apei/Apei.c
+++ b/Silicon/Hisilicon/Hi1620/Drivers/Apei/Apei.c
@@ -3,13 +3,7 @@
* Copyright (c) 2018, Hisilicon Limited. All rights reserved.
* Copyright (c) 2018, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
#include <Library/ArmSmcLib.h>
diff --git a/Silicon/Hisilicon/Hi1620/Drivers/Apei/Apei.h b/Silicon/Hisilicon/Hi1620/Drivers/Apei/Apei.h
index ed8ec417cb..d5e4a5d4c9 100644
--- a/Silicon/Hisilicon/Hi1620/Drivers/Apei/Apei.h
+++ b/Silicon/Hisilicon/Hi1620/Drivers/Apei/Apei.h
@@ -3,13 +3,7 @@
* Copyright (c) 2018, Hisilicon Limited. All rights reserved.
* Copyright (c) 2018, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
#ifndef _APEI_H_
diff --git a/Silicon/Hisilicon/Hi1620/Drivers/Apei/Apei.inf b/Silicon/Hisilicon/Hi1620/Drivers/Apei/Apei.inf
index c9573ea8c1..b4dc87b6bc 100644
--- a/Silicon/Hisilicon/Hi1620/Drivers/Apei/Apei.inf
+++ b/Silicon/Hisilicon/Hi1620/Drivers/Apei/Apei.inf
@@ -3,13 +3,7 @@
* Copyright (c) 2018, Hisilicon Limited. All rights reserved.
* Copyright (c) 2018, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Hisilicon/Hi1620/Drivers/Apei/Bert/Bert.c b/Silicon/Hisilicon/Hi1620/Drivers/Apei/Bert/Bert.c
index aa94a09e88..d8368c42af 100644
--- a/Silicon/Hisilicon/Hi1620/Drivers/Apei/Bert/Bert.c
+++ b/Silicon/Hisilicon/Hi1620/Drivers/Apei/Bert/Bert.c
@@ -3,13 +3,7 @@
* Copyright (c) 2018, Hisilicon Limited. All rights reserved.
* Copyright (c) 2018, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Hisilicon/Hi1620/Drivers/Apei/Bert/Bert.h b/Silicon/Hisilicon/Hi1620/Drivers/Apei/Bert/Bert.h
index 36a0c58966..015fb8156a 100644
--- a/Silicon/Hisilicon/Hi1620/Drivers/Apei/Bert/Bert.h
+++ b/Silicon/Hisilicon/Hi1620/Drivers/Apei/Bert/Bert.h
@@ -3,13 +3,7 @@
* Copyright (c) 2018, Hisilicon Limited. All rights reserved.
* Copyright (c) 2018, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Hisilicon/Hi1620/Drivers/Apei/Einj/Einj.c b/Silicon/Hisilicon/Hi1620/Drivers/Apei/Einj/Einj.c
index 6b076bb2b2..c71022c619 100644
--- a/Silicon/Hisilicon/Hi1620/Drivers/Apei/Einj/Einj.c
+++ b/Silicon/Hisilicon/Hi1620/Drivers/Apei/Einj/Einj.c
@@ -3,13 +3,7 @@
* Copyright (c) 2018, Hisilicon Limited. All rights reserved.
* Copyright (c) 2018, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
#include "Einj.h"
diff --git a/Silicon/Hisilicon/Hi1620/Drivers/Apei/Einj/Einj.h b/Silicon/Hisilicon/Hi1620/Drivers/Apei/Einj/Einj.h
index 861300d4e7..67a8c8a108 100644
--- a/Silicon/Hisilicon/Hi1620/Drivers/Apei/Einj/Einj.h
+++ b/Silicon/Hisilicon/Hi1620/Drivers/Apei/Einj/Einj.h
@@ -3,13 +3,7 @@
* Copyright (c) 2018, Hisilicon Limited. All rights reserved.
* Copyright (c) 2018, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Hisilicon/Hi1620/Drivers/Apei/ErrorSource/Ghes.c b/Silicon/Hisilicon/Hi1620/Drivers/Apei/ErrorSource/Ghes.c
index 6d69b90e9b..5a2d6f03fe 100644
--- a/Silicon/Hisilicon/Hi1620/Drivers/Apei/ErrorSource/Ghes.c
+++ b/Silicon/Hisilicon/Hi1620/Drivers/Apei/ErrorSource/Ghes.c
@@ -3,13 +3,7 @@
* Copyright (c) 2018, Hisilicon Limited. All rights reserved.
* Copyright (c) 2018, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Hisilicon/Hi1620/Drivers/Apei/ErrorSource/Ghes.h b/Silicon/Hisilicon/Hi1620/Drivers/Apei/ErrorSource/Ghes.h
index 44cd1f9577..86854557a9 100644
--- a/Silicon/Hisilicon/Hi1620/Drivers/Apei/ErrorSource/Ghes.h
+++ b/Silicon/Hisilicon/Hi1620/Drivers/Apei/ErrorSource/Ghes.h
@@ -3,13 +3,7 @@
* Copyright (c) 2018, Hisilicon Limited. All rights reserved.
* Copyright (c) 2018, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Hisilicon/Hi1620/Drivers/Apei/Erst/Erst.c b/Silicon/Hisilicon/Hi1620/Drivers/Apei/Erst/Erst.c
index bf3c34853a..a2537bb84a 100644
--- a/Silicon/Hisilicon/Hi1620/Drivers/Apei/Erst/Erst.c
+++ b/Silicon/Hisilicon/Hi1620/Drivers/Apei/Erst/Erst.c
@@ -3,13 +3,7 @@
* Copyright (c) 2018, Hisilicon Limited. All rights reserved.
* Copyright (c) 2018, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
#include "Erst.h"
diff --git a/Silicon/Hisilicon/Hi1620/Drivers/Apei/Erst/Erst.h b/Silicon/Hisilicon/Hi1620/Drivers/Apei/Erst/Erst.h
index 899f7d9d4f..f1c830e401 100644
--- a/Silicon/Hisilicon/Hi1620/Drivers/Apei/Erst/Erst.h
+++ b/Silicon/Hisilicon/Hi1620/Drivers/Apei/Erst/Erst.h
@@ -3,13 +3,7 @@
* Copyright (c) 2018, Hisilicon Limited. All rights reserved.
* Copyright (c) 2018, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Hisilicon/Hi1620/Drivers/Apei/Hest/Hest.c b/Silicon/Hisilicon/Hi1620/Drivers/Apei/Hest/Hest.c
index 26818157db..923d8bf0ec 100644
--- a/Silicon/Hisilicon/Hi1620/Drivers/Apei/Hest/Hest.c
+++ b/Silicon/Hisilicon/Hi1620/Drivers/Apei/Hest/Hest.c
@@ -3,13 +3,7 @@
* Copyright (c) 2018, Hisilicon Limited. All rights reserved.
* Copyright (c) 2018, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Hisilicon/Hi1620/Drivers/Apei/Hest/Hest.h b/Silicon/Hisilicon/Hi1620/Drivers/Apei/Hest/Hest.h
index 94f66496e6..8bed751689 100644
--- a/Silicon/Hisilicon/Hi1620/Drivers/Apei/Hest/Hest.h
+++ b/Silicon/Hisilicon/Hi1620/Drivers/Apei/Hest/Hest.h
@@ -3,13 +3,7 @@
* Copyright (c) 2018, Hisilicon Limited. All rights reserved.
* Copyright (c) 2018, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Hisilicon/Hi1620/Drivers/Apei/OemApeiHi1620.c b/Silicon/Hisilicon/Hi1620/Drivers/Apei/OemApeiHi1620.c
index 145c4732a6..8bdacbae6e 100644
--- a/Silicon/Hisilicon/Hi1620/Drivers/Apei/OemApeiHi1620.c
+++ b/Silicon/Hisilicon/Hi1620/Drivers/Apei/OemApeiHi1620.c
@@ -3,13 +3,7 @@
* Copyright (c) 2018, Hisilicon Limited. All rights reserved.
* Copyright (c) 2018, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Hisilicon/Hi1620/Drivers/Apei/OemApeiHi1620.h b/Silicon/Hisilicon/Hi1620/Drivers/Apei/OemApeiHi1620.h
index e6fb386a62..fb62cab4e3 100644
--- a/Silicon/Hisilicon/Hi1620/Drivers/Apei/OemApeiHi1620.h
+++ b/Silicon/Hisilicon/Hi1620/Drivers/Apei/OemApeiHi1620.h
@@ -3,13 +3,7 @@
* Copyright (c) 2018, Hisilicon Limited. All rights reserved.
* Copyright (c) 2018, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Hisilicon/Hi1620/Drivers/Pl011DebugSerialPortInitDxe/Pl011DebugSerialPortInitDxe.c b/Silicon/Hisilicon/Hi1620/Drivers/Pl011DebugSerialPortInitDxe/Pl011DebugSerialPortInitDxe.c
index 8f83737327..29537dc341 100644
--- a/Silicon/Hisilicon/Hi1620/Drivers/Pl011DebugSerialPortInitDxe/Pl011DebugSerialPortInitDxe.c
+++ b/Silicon/Hisilicon/Hi1620/Drivers/Pl011DebugSerialPortInitDxe/Pl011DebugSerialPortInitDxe.c
@@ -3,13 +3,7 @@
Copyright (c) 2016 - 2018, Hisilicon Limited. All rights reserved.
Copyright (c) 2016 - 2018, Linaro Limited. All rights reserved.
- This program and the accompanying materials
- are licensed and made available under the terms and conditions of the BSD License
- which accompanies this distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Hisilicon/Hi1620/Drivers/Pl011DebugSerialPortInitDxe/Pl011DebugSerialPortInitDxe.inf b/Silicon/Hisilicon/Hi1620/Drivers/Pl011DebugSerialPortInitDxe/Pl011DebugSerialPortInitDxe.inf
index 8c91bdf0f4..47f03c2014 100644
--- a/Silicon/Hisilicon/Hi1620/Drivers/Pl011DebugSerialPortInitDxe/Pl011DebugSerialPortInitDxe.inf
+++ b/Silicon/Hisilicon/Hi1620/Drivers/Pl011DebugSerialPortInitDxe/Pl011DebugSerialPortInitDxe.inf
@@ -3,13 +3,7 @@
# Copyright (c) 2016 - 2018, Hisilicon Limited. All rights reserved.
# Copyright (c) 2016 - 2018, Linaro Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
diff --git a/Silicon/Hisilicon/Hi1620/Hi1620.dec b/Silicon/Hisilicon/Hi1620/Hi1620.dec
index 1e72da892f..9134248efc 100644
--- a/Silicon/Hisilicon/Hi1620/Hi1620.dec
+++ b/Silicon/Hisilicon/Hi1620/Hi1620.dec
@@ -3,13 +3,7 @@
# Copyright (c) 2018, Hisilicon Limited. All rights reserved.
# Copyright (c) 2018, Linaro Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
diff --git a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/AcpiTablesHi1620.inf b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/AcpiTablesHi1620.inf
index 8df53a8378..19e4aa3dab 100644
--- a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/AcpiTablesHi1620.inf
+++ b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/AcpiTablesHi1620.inf
@@ -6,13 +6,7 @@
# Copyright (c) 2018, Hisilicon Limited. All rights reserved.
# Copyright (c) 2018, Linaro Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
# Based on the files under ArmPlatformPkg/ArmJunoPkg/AcpiTables/
#
diff --git a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/CPU.asl b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/CPU.asl
index ef8dae4d01..cbd8a693fc 100644
--- a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/CPU.asl
+++ b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/CPU.asl
@@ -4,13 +4,7 @@
Copyright (c) 2014, ARM Ltd. All rights reserved.<BR>
Copyright (c) 2018, Hisilicon Limited. All rights reserved.<BR>
Copyright (c) 2015, Linaro Limited. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
Based on the files under ArmPlatformPkg/ArmJunoPkg/AcpiTables/
diff --git a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Com.asl b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Com.asl
index 7b7f102b1b..06c3955379 100644
--- a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Com.asl
+++ b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Com.asl
@@ -4,13 +4,7 @@
Copyright (c) 2014, ARM Ltd. All rights reserved.<BR>
Copyright (c) 2018, Hisilicon Limited. All rights reserved.<BR>
Copyright (c) 2015, Linaro Limited. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
Based on the files under ArmPlatformPkg/ArmJunoPkg/AcpiTables/
diff --git a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/DsdtHi1620.asl b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/DsdtHi1620.asl
index 7e26ba22b7..95e4d96c27 100644
--- a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/DsdtHi1620.asl
+++ b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/DsdtHi1620.asl
@@ -4,13 +4,7 @@
Copyright (c) 2014, ARM Ltd. All rights reserved.<BR>
Copyright (c) 2018, Hisilicon Limited. All rights reserved.<BR>
Copyright (c) 2015, Linaro Limited. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
Based on the files under ArmPlatformPkg/ArmJunoPkg/AcpiTables/
diff --git a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Hi1620Apei.asl b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Hi1620Apei.asl
index 0970ed9b99..d9f2c5d149 100644
--- a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Hi1620Apei.asl
+++ b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Hi1620Apei.asl
@@ -2,13 +2,7 @@
*
* Copyright (c) 2018 Hisilicon Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
//Define a control method APEI
diff --git a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Hi1620Ged.asl b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Hi1620Ged.asl
index 6664c0c681..8e5ac84509 100644
--- a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Hi1620Ged.asl
+++ b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Hi1620Ged.asl
@@ -4,13 +4,7 @@
* Copyright (c) 2018, Hisilicon Limited. All rights reserved.<BR>
* Copyright (c) 2016, Linaro Limited. 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 distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Hi1620Mbig.asl b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Hi1620Mbig.asl
index b98cb2a01c..4253f504b1 100644
--- a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Hi1620Mbig.asl
+++ b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Hi1620Mbig.asl
@@ -2,13 +2,7 @@
Differentiated System Description Table Fields (DSDT)
Copyright (c) 2014, ARM Ltd. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Hi1620Mctp.asl b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Hi1620Mctp.asl
index d039e8a110..63573fc93a 100644
--- a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Hi1620Mctp.asl
+++ b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Hi1620Mctp.asl
@@ -4,13 +4,7 @@
Copyright (c) 2014, ARM Ltd. All rights reserved.<BR>
Copyright (c) 2018, Hisilicon Limited. All rights reserved.<BR>
Copyright (c) 2015, Linaro Limited. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
Based on the files under ArmPlatformPkg/ArmJunoPkg/AcpiTables/
diff --git a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Hi1620Pci.asl b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Hi1620Pci.asl
index c1083dc16a..ab89cbec30 100644
--- a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Hi1620Pci.asl
+++ b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Hi1620Pci.asl
@@ -4,13 +4,7 @@
* Copyright (c) 2018, Hisilicon Limited. All rights reserved.
* Copyright (c) 2016, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
* Based on the files under ArmPlatformPkg/ArmJunoPkg/AcpiTables/
*
diff --git a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Hi1620Power.asl b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Hi1620Power.asl
index 39553e01af..721f85f76a 100644
--- a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Hi1620Power.asl
+++ b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Hi1620Power.asl
@@ -4,13 +4,7 @@
Copyright (c) 2014, ARM Ltd. All rights reserved.<BR>
Copyright (c) 2018, Hisilicon Limited. All rights reserved.<BR>
Copyright (c) 2016, Linaro Limited. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
Based on the files under ArmPlatformPkg/ArmJunoPkg/AcpiTables/
diff --git a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Hi1620Rde.asl b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Hi1620Rde.asl
index 1dcf1bba7e..d1d06b4790 100644
--- a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Hi1620Rde.asl
+++ b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Hi1620Rde.asl
@@ -4,13 +4,7 @@
Copyright (c) 2014, ARM Ltd. All rights reserved.<BR>
Copyright (c) 2018, Hisilicon Limited. All rights reserved.<BR>
Copyright (c) 2015, Linaro Limited. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
Based on the files under ArmPlatformPkg/ArmJunoPkg/AcpiTables/
diff --git a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Hi1620Sec.asl b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Hi1620Sec.asl
index bba455468e..84b3ceaaca 100644
--- a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Hi1620Sec.asl
+++ b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Hi1620Sec.asl
@@ -4,13 +4,7 @@
Copyright (c) 2014, ARM Ltd. All rights reserved.<BR>
Copyright (c) 2018, Hisilicon Limited. All rights reserved.<BR>
Copyright (c) 2018, Linaro Limited. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
Based on the files under ArmPlatformPkg/ArmJunoPkg/AcpiTables/
diff --git a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Hi1620Socip4_i2c100k.asl b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Hi1620Socip4_i2c100k.asl
index 622355ade0..d934831ab8 100644
--- a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Hi1620Socip4_i2c100k.asl
+++ b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Hi1620Socip4_i2c100k.asl
@@ -2,13 +2,7 @@
*
* Copyright (c) 2018 Hisilicon Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Hi1620Socip4_i2c400k.asl b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Hi1620Socip4_i2c400k.asl
index 5db4284467..1247184fec 100644
--- a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Hi1620Socip4_i2c400k.asl
+++ b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Hi1620Socip4_i2c400k.asl
@@ -2,13 +2,7 @@
*
* Copyright (c) 2018 Hisilicon Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/LpcUart_clk.asl b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/LpcUart_clk.asl
index 14e36353ad..afdecf1db4 100644
--- a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/LpcUart_clk.asl
+++ b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/LpcUart_clk.asl
@@ -4,13 +4,7 @@
Copyright (c) 2014, ARM Ltd. All rights reserved.<BR>
Copyright (c) 2018, Hisilicon Limited. All rights reserved.<BR>
Copyright (c) 2015, Linaro Limited. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
Based on the files under ArmPlatformPkg/ArmJunoPkg/AcpiTables/
diff --git a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Pv680UncorePmu.asl b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Pv680UncorePmu.asl
index 65c3eccf0a..3f75108f53 100644
--- a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Pv680UncorePmu.asl
+++ b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Pv680UncorePmu.asl
@@ -4,13 +4,7 @@
Copyright (c) 2017, ARM Ltd. All rights reserved.<BR>
Copyright (c) 2018, Hisilicon Limited. All rights reserved.<BR>
Copyright (c) 2017, Linaro Limited. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
Based on the files under ArmPlatformPkg/ArmJunoPkg/AcpiTables/
diff --git a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/ipmi.asl b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/ipmi.asl
index 555fe39936..0745332676 100644
--- a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/ipmi.asl
+++ b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/ipmi.asl
@@ -2,13 +2,7 @@
*
* Copyright (c) 2018 Hisilicon Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Facs.aslc b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Facs.aslc
index 9e57936b85..1fb43feb39 100644
--- a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Facs.aslc
+++ b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Facs.aslc
@@ -5,13 +5,7 @@
* Copyright (c) 2018, Hisilicon Limited. All rights reserved.
* Copyright (c) 2015, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
* Based on the files under ArmPlatformPkg/ArmJunoPkg/AcpiTables/
*
diff --git a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Fadt.aslc b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Fadt.aslc
index 2ec860ad09..b5ce896085 100644
--- a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Fadt.aslc
+++ b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Fadt.aslc
@@ -5,13 +5,7 @@
* Copyright (c) 2018, Hisilicon Limited. All rights reserved.
* Copyright (c) 2015, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
* Based on the files under ArmPlatformPkg/ArmJunoPkg/AcpiTables/
*
diff --git a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Gtdt.aslc b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Gtdt.aslc
index 5cab639cc5..e9f8e3f37d 100644
--- a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Gtdt.aslc
+++ b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Gtdt.aslc
@@ -5,13 +5,7 @@
* Copyright (c) 2018, Hisilicon Limited. All rights reserved.
* Copyright (c) 2015, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
* Based on the files under ArmPlatformPkg/ArmJunoPkg/AcpiTables/
*
diff --git a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620Dbg2.aslc b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620Dbg2.aslc
index 05c284186b..886929ed7d 100644
--- a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620Dbg2.aslc
+++ b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620Dbg2.aslc
@@ -1,11 +1,8 @@
/*
* Copyright (c) 2018 Linaro Limited
* Copyright (c) 2018 Hisilicon Limited
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the BSD License which accompanies
- * this distribution, and is available at
- * http://opensource.org/licenses/bsd-license.php
+ *. All rights reserved.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*
*/
diff --git a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620Mcfg.aslc b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620Mcfg.aslc
index 2d719ef562..fb19344f11 100644
--- a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620Mcfg.aslc
+++ b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620Mcfg.aslc
@@ -1,10 +1,7 @@
/*
* Copyright (c) 2018 Hisilicon Limited
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the BSD License which accompanies
- * this distribution, and is available at
- * http://opensource.org/licenses/bsd-license.php
+ *. All rights reserved.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*
*/
diff --git a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620Platform.h b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620Platform.h
index eaf3ff10e3..c7c6093f02 100644
--- a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620Platform.h
+++ b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620Platform.h
@@ -4,13 +4,7 @@
* Copyright (c) 2018, Hisilicon Limited. All rights reserved.
* Copyright (c) 2015-2018, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
* Based on the files under ArmPlatformPkg/ArmJunoPkg/AcpiTables/
*
diff --git a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620Slit.aslc b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620Slit.aslc
index 53ae9a9235..145828108a 100644
--- a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620Slit.aslc
+++ b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620Slit.aslc
@@ -1,10 +1,7 @@
/*
* Copyright (c) 2013 Linaro Limited
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the BSD License which accompanies
- * this distribution, and is available at
- * http://opensource.org/licenses/bsd-license.php
+ *. All rights reserved.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*
* Contributors:
* Yi Li - yi.li@linaro.org
diff --git a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620Spcr.aslc b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620Spcr.aslc
index a9768d4ba2..e97f78d2c1 100644
--- a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620Spcr.aslc
+++ b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620Spcr.aslc
@@ -4,13 +4,7 @@
* Copyright (c) 2018, Hisilicon Limited. All rights reserved.
* Copyright (c) 2016 Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
* Based on the files under ArmPlatformPkg/ArmJunoPkg/AcpiTables/
*
diff --git a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620Srat.aslc b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620Srat.aslc
index d77bddefc8..6850e42a4b 100644
--- a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620Srat.aslc
+++ b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620Srat.aslc
@@ -1,10 +1,7 @@
/*
* Copyright (c) 2013 Linaro Limited
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the BSD License which accompanies
- * this distribution, and is available at
- * http://opensource.org/licenses/bsd-license.php
+ *. All rights reserved.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*
* Contributors:
* Yi Li - yi.li@linaro.org
diff --git a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/MadtHi1620.aslc b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/MadtHi1620.aslc
index d3de69a3ef..416200d56b 100644
--- a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/MadtHi1620.aslc
+++ b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/MadtHi1620.aslc
@@ -7,13 +7,7 @@
*
* This program and the accompanying materials
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
* Based on the files under ArmPlatformPkg/ArmJunoPkg/AcpiTables/
*
diff --git a/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/MemoryConfig.hfr b/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/MemoryConfig.hfr
index c709975c38..9bd4e77502 100644
--- a/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/MemoryConfig.hfr
+++ b/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/MemoryConfig.hfr
@@ -5,13 +5,7 @@
* Copyright (c) 2017 - 2018, Hisilicon Limited. All rights reserved.
* Copyright (c) 2017 - 2018, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/MemoryConfig.uni b/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/MemoryConfig.uni
index 0ecf5e59cf..025bb25a61 100644
--- a/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/MemoryConfig.uni
+++ b/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/MemoryConfig.uni
@@ -5,13 +5,7 @@
* Copyright (c) 2017 - 2018, Hisilicon Limited. All rights reserved.
* Copyright (c) 2017 - 2018, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/MiscConfig.hfr b/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/MiscConfig.hfr
index 16ce27b95b..1abdc4696f 100644
--- a/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/MiscConfig.hfr
+++ b/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/MiscConfig.hfr
@@ -5,13 +5,7 @@
* Copyright (c) 2017 - 2018, Hisilicon Limited. All rights reserved.
* Copyright (c) 2017 - 2018, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
form formid = MISC_CONFIG_FORM_ID,
diff --git a/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/MiscConfig.uni b/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/MiscConfig.uni
index 2fd92fedff..98c946e0c8 100644
--- a/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/MiscConfig.uni
+++ b/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/MiscConfig.uni
@@ -5,13 +5,7 @@
* Copyright (c) 2017 - 2018, Hisilicon Limited. All rights reserved.
* Copyright (c) 2017 - 2018, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/OemConfig.c b/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/OemConfig.c
index 012d45bc02..e9bdcf2fd3 100644
--- a/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/OemConfig.c
+++ b/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/OemConfig.c
@@ -3,13 +3,7 @@ The OEM config reference implementation
Copyright (c) 2018, Hisilicon Limited. All rights reserved.
Copyright (c) 2018, Linaro Limited. All rights reserved.
-This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution. The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/OemConfig.h b/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/OemConfig.h
index f91400150c..ea4dfc5b1a 100644
--- a/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/OemConfig.h
+++ b/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/OemConfig.h
@@ -3,13 +3,7 @@ The Oem config reference implement
Copyright (c) 2018, Hisilicon Limited. All rights reserved.
Copyright (c) 2018, Linaro Limited. All rights reserved.
-This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution. The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/OemConfigUi.h b/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/OemConfigUi.h
index 792e544c22..1e962de1ec 100644
--- a/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/OemConfigUi.h
+++ b/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/OemConfigUi.h
@@ -2,13 +2,7 @@
Copyright (c) 2018, Hisilicon Limited. All rights reserved.
Copyright (c) 2018, Linaro Limited. All rights reserved.
-This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution. The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
Module Name:
diff --git a/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/OemConfigUiLib.inf b/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/OemConfigUiLib.inf
index 72b9378c55..73d0ab2a95 100644
--- a/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/OemConfigUiLib.inf
+++ b/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/OemConfigUiLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2018, Hisilicon Limited. All rights reserved.
# Copyright (c) 2018, Linaro Limited. All rights reserved.
-# This program and the accompanying materials are licensed and made available under
-# the terms and conditions of the BSD License that accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php.
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
[Defines]
diff --git a/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/OemConfigUiLib.uni b/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/OemConfigUiLib.uni
index 0b2c63a625..5a285d62f0 100644
--- a/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/OemConfigUiLib.uni
+++ b/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/OemConfigUiLib.uni
@@ -5,13 +5,7 @@
* Copyright (c) 2017 - 2018, Hisilicon Limited. All rights reserved.
* Copyright (c) 2017 - 2018, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/OemConfigUiLibStrings.uni b/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/OemConfigUiLibStrings.uni
index afc048e6cd..3e5896ebe2 100644
--- a/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/OemConfigUiLibStrings.uni
+++ b/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/OemConfigUiLibStrings.uni
@@ -5,13 +5,7 @@
* Copyright (c) 2017 - 2018, Hisilicon Limited. All rights reserved.
* Copyright (c) 2017 - 2018, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/OemConfigVfr.vfr b/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/OemConfigVfr.vfr
index 470e9ace3d..1c0f83d4ae 100644
--- a/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/OemConfigVfr.vfr
+++ b/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/OemConfigVfr.vfr
@@ -5,13 +5,7 @@
* Copyright (c) 2017 - 2018, Hisilicon Limited. All rights reserved.
* Copyright (c) 2017 - 2018, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
#include "OemConfigUi.h"
diff --git a/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/PcieConfig.hfr b/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/PcieConfig.hfr
index 7cf7cdd29b..86da046399 100644
--- a/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/PcieConfig.hfr
+++ b/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/PcieConfig.hfr
@@ -5,13 +5,7 @@
* Copyright (c) 2017 - 2018, Hisilicon Limited. All rights reserved.
* Copyright (c) 2017 - 2018, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
form formid = PCIE_CONFIG_FORM_ID,
diff --git a/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/PcieConfigStrings.uni b/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/PcieConfigStrings.uni
index d87d30f975..ade4ba3ae6 100644
--- a/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/PcieConfigStrings.uni
+++ b/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/PcieConfigStrings.uni
@@ -5,13 +5,7 @@
* Copyright (c) 2017 - 2018, Hisilicon Limited. All rights reserved.
* Copyright (c) 2017 - 2018, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/PciePortConfig.hfr b/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/PciePortConfig.hfr
index 1a8942157c..64f7a58798 100644
--- a/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/PciePortConfig.hfr
+++ b/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/PciePortConfig.hfr
@@ -5,13 +5,7 @@
* Copyright (c) 2017 - 2018, Hisilicon Limited. All rights reserved.
* Copyright (c) 2017 - 2018, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
oneof varid = OEM_CONFIG_DATA.PciePort[INDEX],
diff --git a/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/RasConfig.hfr b/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/RasConfig.hfr
index 7c0ea53061..4321566039 100644
--- a/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/RasConfig.hfr
+++ b/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/RasConfig.hfr
@@ -4,13 +4,7 @@
//
// Copyright (c) 2018, Hisilicon Limited. All rights reserved.
// Copyright (c) 2018, Linaro Limited. All rights reserved.
-// This program and the accompanying materials
-// are licensed and made available under the terms and conditions of the BSD License
-// which accompanies this distribution. The full text of the license may be found at
-// http://opensource.org/licenses/bsd-license.php
-//
-// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+// SPDX-License-Identifier: BSD-2-Clause-Patent
//
//**/
form formid = RAS_CONFIG_FORM_ID,
diff --git a/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/RasConfig.uni b/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/RasConfig.uni
index 551c65fa5f..89d9ccd1ce 100644
--- a/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/RasConfig.uni
+++ b/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/RasConfig.uni
@@ -5,13 +5,7 @@
// Copyright (c) 2018, Hisilicon Limited. All rights reserved.
// Copyright (c) 2018, Linaro Limited. All rights reserved.
//
-// This program and the accompanying materials are licensed and made available under
-// the terms and conditions of the BSD License that accompanies this distribution.
-// The full text of the license may be found at
-// http://opensource.org/licenses/bsd-license.php.
-//
-// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+// SPDX-License-Identifier: BSD-2-Clause-Patent
//
// **/
#langdef en-US "English"
diff --git a/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/iBMCConfig.hfr b/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/iBMCConfig.hfr
index 4d295a8593..1832241d98 100644
--- a/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/iBMCConfig.hfr
+++ b/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/iBMCConfig.hfr
@@ -4,13 +4,7 @@
//
// Copyright (c) 2018, Hisilicon Limited. All rights reserved.
// Copyright (c) 2018, Linaro Limited. All rights reserved.
-// This program and the accompanying materials
-// are licensed and made available under the terms and conditions of the BSD License
-// which accompanies this distribution. The full text of the license may be found at
-// http://opensource.org/licenses/bsd-license.php
-//
-// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+// SPDX-License-Identifier: BSD-2-Clause-Patent
//
//**/
form formid = IBMC_CONFIG_FORM_ID,
diff --git a/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/iBMCConfig.uni b/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/iBMCConfig.uni
index e12e433760..5aad6bd0bd 100644
--- a/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/iBMCConfig.uni
+++ b/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/iBMCConfig.uni
@@ -5,13 +5,7 @@
// Copyright (c) 2018, Hisilicon Limited. All rights reserved.
// Copyright (c) 2018, Linaro Limited. All rights reserved.
//
-// This program and the accompanying materials are licensed and made available under
-// the terms and conditions of the BSD License that accompanies this distribution.
-// The full text of the license may be found at
-// http://opensource.org/licenses/bsd-license.php.
-//
-// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+// SPDX-License-Identifier: BSD-2-Clause-Patent
//
// **/
#langdef en-US "English"
diff --git a/Silicon/Hisilicon/Hi1620/Include/PlatformArch.h b/Silicon/Hisilicon/Hi1620/Include/PlatformArch.h
index f3ad45f6c6..0999ac60b5 100644
--- a/Silicon/Hisilicon/Hi1620/Include/PlatformArch.h
+++ b/Silicon/Hisilicon/Hi1620/Include/PlatformArch.h
@@ -3,13 +3,7 @@
* Copyright (c) 2018, Hisilicon Limited. All rights reserved.
* Copyright (c) 2018, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Hisilicon/Hi1620/Library/Hi1620PciPlatformLib/Hi1620PciPlatformLib.c b/Silicon/Hisilicon/Hi1620/Library/Hi1620PciPlatformLib/Hi1620PciPlatformLib.c
index ff77974c0f..80643b8165 100644
--- a/Silicon/Hisilicon/Hi1620/Library/Hi1620PciPlatformLib/Hi1620PciPlatformLib.c
+++ b/Silicon/Hisilicon/Hi1620/Library/Hi1620PciPlatformLib/Hi1620PciPlatformLib.c
@@ -3,13 +3,7 @@
* Copyright (c) 2018, Hisilicon Limited. All rights reserved.
* Copyright (c) 2018, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Hisilicon/Hi1620/Library/Hi1620PciPlatformLib/Hi1620PciPlatformLib.inf b/Silicon/Hisilicon/Hi1620/Library/Hi1620PciPlatformLib/Hi1620PciPlatformLib.inf
index 7648322522..b0b2cb9b50 100644
--- a/Silicon/Hisilicon/Hi1620/Library/Hi1620PciPlatformLib/Hi1620PciPlatformLib.inf
+++ b/Silicon/Hisilicon/Hi1620/Library/Hi1620PciPlatformLib/Hi1620PciPlatformLib.inf
@@ -5,12 +5,7 @@
# Copyright (c) 2017 - 2018, Linaro Ltd. All rights reserved.<BR>
# Copyright (c) 2018, Hisilicon Ltd. 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 distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php.
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#
##
diff --git a/Silicon/Hisilicon/Hi1620/Pptt/Pptt.c b/Silicon/Hisilicon/Hi1620/Pptt/Pptt.c
index 944b4b9507..a3d4083966 100644
--- a/Silicon/Hisilicon/Hi1620/Pptt/Pptt.c
+++ b/Silicon/Hisilicon/Hi1620/Pptt/Pptt.c
@@ -3,13 +3,7 @@
* Copyright (c) 2018, Hisilicon Limited. All rights reserved.
* Copyright (c) 2018, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
* Based on the files under Platform/ARM/JunoPkg/AcpiTables/
*
diff --git a/Silicon/Hisilicon/Hi1620/Pptt/Pptt.h b/Silicon/Hisilicon/Hi1620/Pptt/Pptt.h
index 5f2ec67cb9..30ba5fff65 100644
--- a/Silicon/Hisilicon/Hi1620/Pptt/Pptt.h
+++ b/Silicon/Hisilicon/Hi1620/Pptt/Pptt.h
@@ -3,13 +3,7 @@
* Copyright (c) 2018, Hisilicon Limited. All rights reserved.
* Copyright (c) 2018, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
* Based on the files under Platform/ARM/JunoPkg/AcpiTables/
*
diff --git a/Silicon/Hisilicon/Hi1620/Pptt/Pptt.inf b/Silicon/Hisilicon/Hi1620/Pptt/Pptt.inf
index f8a5ed33a4..835e7557ea 100644
--- a/Silicon/Hisilicon/Hi1620/Pptt/Pptt.inf
+++ b/Silicon/Hisilicon/Hi1620/Pptt/Pptt.inf
@@ -3,13 +3,7 @@
* Copyright (c) 2018, Hisilicon Limited. All rights reserved.
* Copyright (c) 2018, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
* Based on the files under Platform/ARM/JunoPkg/AcpiTables/
*
diff --git a/Silicon/Hisilicon/Hi3660/Hi3660.dec b/Silicon/Hisilicon/Hi3660/Hi3660.dec
index 72de61e063..f4ca0d7850 100644
--- a/Silicon/Hisilicon/Hi3660/Hi3660.dec
+++ b/Silicon/Hisilicon/Hi3660/Hi3660.dec
@@ -1,13 +1,7 @@
#
# Copyright (c) 2018, Linaro Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
[Defines]
diff --git a/Silicon/Hisilicon/Hi3660/Include/Hi3660.h b/Silicon/Hisilicon/Hi3660/Include/Hi3660.h
index 6e0587f778..7617191f52 100644
--- a/Silicon/Hisilicon/Hi3660/Include/Hi3660.h
+++ b/Silicon/Hisilicon/Hi3660/Include/Hi3660.h
@@ -2,13 +2,7 @@
*
* Copyright (c) 2018, Linaro Ltd. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Hisilicon/Hi6220/Hi6220.dec b/Silicon/Hisilicon/Hi6220/Hi6220.dec
index 002bc66da5..cb49583355 100644
--- a/Silicon/Hisilicon/Hi6220/Hi6220.dec
+++ b/Silicon/Hisilicon/Hi6220/Hi6220.dec
@@ -1,13 +1,7 @@
#
# Copyright (c) 2014-2017, Linaro Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
[Defines]
diff --git a/Silicon/Hisilicon/Hi6220/Include/Hi6220.h b/Silicon/Hisilicon/Hi6220/Include/Hi6220.h
index 9b25089557..d3b2c79503 100644
--- a/Silicon/Hisilicon/Hi6220/Include/Hi6220.h
+++ b/Silicon/Hisilicon/Hi6220/Include/Hi6220.h
@@ -2,13 +2,7 @@
*
* Copyright (c) 2014-2017, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Hisilicon/Hi6220/Include/Hi6220RegsPeri.h b/Silicon/Hisilicon/Hi6220/Include/Hi6220RegsPeri.h
index 0db8af37d2..c2e9d5dc9f 100644
--- a/Silicon/Hisilicon/Hi6220/Include/Hi6220RegsPeri.h
+++ b/Silicon/Hisilicon/Hi6220/Include/Hi6220RegsPeri.h
@@ -2,13 +2,7 @@
*
* Copyright (c) 2018, Linaro Ltd. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Hisilicon/HisiPkg.dec b/Silicon/Hisilicon/HisiPkg.dec
index 30b2226b04..63f50f7a43 100644
--- a/Silicon/Hisilicon/HisiPkg.dec
+++ b/Silicon/Hisilicon/HisiPkg.dec
@@ -3,13 +3,7 @@
# Copyright (c) 2015-2016, Hisilicon Limited. All rights reserved.
# Copyright (c) 2015-2016, Linaro Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
diff --git a/Silicon/Hisilicon/Hisilicon.dsc.inc b/Silicon/Hisilicon/Hisilicon.dsc.inc
index 8a9812b9ed..7ce677b27e 100644
--- a/Silicon/Hisilicon/Hisilicon.dsc.inc
+++ b/Silicon/Hisilicon/Hisilicon.dsc.inc
@@ -3,13 +3,7 @@
# Copyright (c) 2016, Hisilicon Limited. All rights reserved.
# Copyright (c) 2016, Linaro Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#
diff --git a/Silicon/Hisilicon/Hisilicon.fdf.inc b/Silicon/Hisilicon/Hisilicon.fdf.inc
index 4699d80459..733f53c802 100644
--- a/Silicon/Hisilicon/Hisilicon.fdf.inc
+++ b/Silicon/Hisilicon/Hisilicon.fdf.inc
@@ -3,13 +3,7 @@
# Copyright (c) 2016, Hisilicon Limited. All rights reserved.
# Copyright (c) 2016, Linaro Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
diff --git a/Silicon/Hisilicon/Include/Guid/MemoryMapData.h b/Silicon/Hisilicon/Include/Guid/MemoryMapData.h
index 5e418f970f..af7b6456a8 100644
--- a/Silicon/Hisilicon/Include/Guid/MemoryMapData.h
+++ b/Silicon/Hisilicon/Include/Guid/MemoryMapData.h
@@ -3,13 +3,7 @@
* Copyright (c) 2015, Hisilicon Limited. All rights reserved.
* Copyright (c) 2015, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Hisilicon/Include/Guid/VersionInfoHobGuid.h b/Silicon/Hisilicon/Include/Guid/VersionInfoHobGuid.h
index a61a244a92..9eeb0a5f74 100644
--- a/Silicon/Hisilicon/Include/Guid/VersionInfoHobGuid.h
+++ b/Silicon/Hisilicon/Include/Guid/VersionInfoHobGuid.h
@@ -3,13 +3,7 @@
* Copyright (c) 2016, Hisilicon Limited. All rights reserved.
* Copyright (c) 2016, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Hisilicon/Include/Library/AcpiNextLib.h b/Silicon/Hisilicon/Include/Library/AcpiNextLib.h
index 2abffb65fc..ea2aa34c6d 100644
--- a/Silicon/Hisilicon/Include/Library/AcpiNextLib.h
+++ b/Silicon/Hisilicon/Include/Library/AcpiNextLib.h
@@ -4,13 +4,7 @@
* Copyright (c) 2015, Hisilicon Limited. All rights reserved.
* Copyright (c) 2015, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Hisilicon/Include/Library/BmcConfigBootLib.h b/Silicon/Hisilicon/Include/Library/BmcConfigBootLib.h
index d937234226..acee9c4477 100644
--- a/Silicon/Hisilicon/Include/Library/BmcConfigBootLib.h
+++ b/Silicon/Hisilicon/Include/Library/BmcConfigBootLib.h
@@ -3,13 +3,7 @@
* Copyright (c) 2017, Hisilicon Limited. All rights reserved.
* Copyright (c) 2017, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Hisilicon/Include/Library/CpldIoLib.h b/Silicon/Hisilicon/Include/Library/CpldIoLib.h
index afc6b9164b..c059d8fcd0 100644
--- a/Silicon/Hisilicon/Include/Library/CpldIoLib.h
+++ b/Silicon/Hisilicon/Include/Library/CpldIoLib.h
@@ -3,13 +3,7 @@
* Copyright (c) 2015, Hisilicon Limited. All rights reserved.
* Copyright (c) 2015, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Hisilicon/Include/Library/FdtUpdateLib.h b/Silicon/Hisilicon/Include/Library/FdtUpdateLib.h
index 94fc3d31f1..ec58988a00 100644
--- a/Silicon/Hisilicon/Include/Library/FdtUpdateLib.h
+++ b/Silicon/Hisilicon/Include/Library/FdtUpdateLib.h
@@ -3,13 +3,7 @@
* Copyright (c) 2015, Hisilicon Limited. All rights reserved.
* Copyright (c) 2015, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Hisilicon/Include/Library/HwMemInitLib.h b/Silicon/Hisilicon/Include/Library/HwMemInitLib.h
index e1310e854c..21f5c7482d 100644
--- a/Silicon/Hisilicon/Include/Library/HwMemInitLib.h
+++ b/Silicon/Hisilicon/Include/Library/HwMemInitLib.h
@@ -3,13 +3,7 @@
* Copyright (c) 2015, Hisilicon Limited. All rights reserved.
* Copyright (c) 2015, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Hisilicon/Include/Library/I2CLib.h b/Silicon/Hisilicon/Include/Library/I2CLib.h
index 36e9f5f5f6..fc8b818e8d 100644
--- a/Silicon/Hisilicon/Include/Library/I2CLib.h
+++ b/Silicon/Hisilicon/Include/Library/I2CLib.h
@@ -3,13 +3,7 @@
* Copyright (c) 2015, Hisilicon Limited. All rights reserved.
* Copyright (c) 2015, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Hisilicon/Include/Library/OemConfigData.h b/Silicon/Hisilicon/Include/Library/OemConfigData.h
index f120e3123c..1af44f92af 100644
--- a/Silicon/Hisilicon/Include/Library/OemConfigData.h
+++ b/Silicon/Hisilicon/Include/Library/OemConfigData.h
@@ -3,13 +3,7 @@
* Copyright (c) 2017 - 2018, Hisilicon Limited. All rights reserved.
* Copyright (c) 2017 - 2018, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Hisilicon/Include/Library/OemDevicePath.h b/Silicon/Hisilicon/Include/Library/OemDevicePath.h
index 9d66c21ffe..164dfafc43 100644
--- a/Silicon/Hisilicon/Include/Library/OemDevicePath.h
+++ b/Silicon/Hisilicon/Include/Library/OemDevicePath.h
@@ -3,13 +3,7 @@
* Copyright (c) 2015 - 2017, Hisilicon Limited. All rights reserved.
* Copyright (c) 2015 - 2017, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Hisilicon/Include/Library/OemMiscLib.h b/Silicon/Hisilicon/Include/Library/OemMiscLib.h
index b5a7688564..834fb9ceac 100644
--- a/Silicon/Hisilicon/Include/Library/OemMiscLib.h
+++ b/Silicon/Hisilicon/Include/Library/OemMiscLib.h
@@ -3,13 +3,7 @@
* Copyright (c) 2015, Hisilicon Limited. All rights reserved.
* Copyright (c) 2015, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Hisilicon/Include/Library/OemNicLib.h b/Silicon/Hisilicon/Include/Library/OemNicLib.h
index 66fe9a2e9b..e26154313c 100644
--- a/Silicon/Hisilicon/Include/Library/OemNicLib.h
+++ b/Silicon/Hisilicon/Include/Library/OemNicLib.h
@@ -3,13 +3,7 @@
* Copyright (c) 2018, Hisilicon Limited. All rights reserved.
* Copyright (c) 2018, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Hisilicon/Include/Library/OemSetVirtualMapDesc.h b/Silicon/Hisilicon/Include/Library/OemSetVirtualMapDesc.h
index da9a720bb9..399a8f9927 100644
--- a/Silicon/Hisilicon/Include/Library/OemSetVirtualMapDesc.h
+++ b/Silicon/Hisilicon/Include/Library/OemSetVirtualMapDesc.h
@@ -3,13 +3,7 @@
* Copyright (c) 2015, Hisilicon Limited. All rights reserved.
* Copyright (c) 2015, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Hisilicon/Include/Library/PlatformPciLib.h b/Silicon/Hisilicon/Include/Library/PlatformPciLib.h
index 5fdc3d3e0a..764818c785 100644
--- a/Silicon/Hisilicon/Include/Library/PlatformPciLib.h
+++ b/Silicon/Hisilicon/Include/Library/PlatformPciLib.h
@@ -3,13 +3,7 @@
* Copyright (c) 2016, Hisilicon Limited. All rights reserved.
* Copyright (c) 2016, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Hisilicon/Include/Protocol/HisiBoardNicProtocol.h b/Silicon/Hisilicon/Include/Protocol/HisiBoardNicProtocol.h
index 8a9d13c9e7..5a1ffece81 100644
--- a/Silicon/Hisilicon/Include/Protocol/HisiBoardNicProtocol.h
+++ b/Silicon/Hisilicon/Include/Protocol/HisiBoardNicProtocol.h
@@ -3,13 +3,7 @@
* Copyright (c) 2015, Hisilicon Limited. All rights reserved.
* Copyright (c) 2015, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Hisilicon/Include/Protocol/HisiPlatformSasProtocol.h b/Silicon/Hisilicon/Include/Protocol/HisiPlatformSasProtocol.h
index b5edb99d3c..fbbb84aa8d 100644
--- a/Silicon/Hisilicon/Include/Protocol/HisiPlatformSasProtocol.h
+++ b/Silicon/Hisilicon/Include/Protocol/HisiPlatformSasProtocol.h
@@ -3,13 +3,7 @@
* Copyright (c) 2018, Hisilicon Limited. All rights reserved.
* Copyright (c) 2018, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Hisilicon/Include/Protocol/HisiSpiFlashProtocol.h b/Silicon/Hisilicon/Include/Protocol/HisiSpiFlashProtocol.h
index b7ed9ceb35..2b430f04c4 100644
--- a/Silicon/Hisilicon/Include/Protocol/HisiSpiFlashProtocol.h
+++ b/Silicon/Hisilicon/Include/Protocol/HisiSpiFlashProtocol.h
@@ -3,13 +3,7 @@
* Copyright (c) 2015, Hisilicon Limited. All rights reserved.
* Copyright (c) 2015, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Hisilicon/Include/Protocol/IpmiInterfaceProtocol.h b/Silicon/Hisilicon/Include/Protocol/IpmiInterfaceProtocol.h
index c5f0f8551c..bb0ca4a088 100644
--- a/Silicon/Hisilicon/Include/Protocol/IpmiInterfaceProtocol.h
+++ b/Silicon/Hisilicon/Include/Protocol/IpmiInterfaceProtocol.h
@@ -3,13 +3,7 @@
* Copyright (c) 2016, Hisilicon Limited. All rights reserved.
* Copyright (c) 2016, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Hisilicon/Include/Protocol/NorFlashProtocol.h b/Silicon/Hisilicon/Include/Protocol/NorFlashProtocol.h
index 29e9de80c0..0342127466 100644
--- a/Silicon/Hisilicon/Include/Protocol/NorFlashProtocol.h
+++ b/Silicon/Hisilicon/Include/Protocol/NorFlashProtocol.h
@@ -3,13 +3,7 @@
* Copyright (c) 2015, Hisilicon Limited. All rights reserved.
* Copyright (c) 2015, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Hisilicon/Include/Protocol/PlatformSasProtocol.h b/Silicon/Hisilicon/Include/Protocol/PlatformSasProtocol.h
index 1e1892b011..54d25b5fbc 100644
--- a/Silicon/Hisilicon/Include/Protocol/PlatformSasProtocol.h
+++ b/Silicon/Hisilicon/Include/Protocol/PlatformSasProtocol.h
@@ -3,13 +3,7 @@
* Copyright (c) 2016, Hisilicon Limited. All rights reserved.
* Copyright (c) 2016, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Hisilicon/Include/Protocol/SnpPlatformProtocol.h b/Silicon/Hisilicon/Include/Protocol/SnpPlatformProtocol.h
index 0d9f0b45b1..f8686f8ef8 100644
--- a/Silicon/Hisilicon/Include/Protocol/SnpPlatformProtocol.h
+++ b/Silicon/Hisilicon/Include/Protocol/SnpPlatformProtocol.h
@@ -3,13 +3,7 @@
* Copyright (c) 2017, Hisilicon Limited. All rights reserved.
* Copyright (c) 2017, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Hisilicon/Include/Regs/HisiPcieV1RegOffset.h b/Silicon/Hisilicon/Include/Regs/HisiPcieV1RegOffset.h
index c8b97810fb..9385393379 100644
--- a/Silicon/Hisilicon/Include/Regs/HisiPcieV1RegOffset.h
+++ b/Silicon/Hisilicon/Include/Regs/HisiPcieV1RegOffset.h
@@ -3,13 +3,7 @@
* Copyright (c) 2016, Hisilicon Limited. All rights reserved.
* Copyright (c) 2016, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/AArch64/Helper.S b/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/AArch64/Helper.S
index 74e4aeeffc..70315041a6 100644
--- a/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/AArch64/Helper.S
+++ b/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/AArch64/Helper.S
@@ -3,13 +3,7 @@
// Copyright (c) 2015, Hisilicon Limited. All rights reserved.
// Copyright (c) 2015, Linaro Limited. All rights reserved.
//
-// This program and the accompanying materials
-// are licensed and made available under the terms and conditions of the BSD License
-// which accompanies this distribution. The full text of the license may be found at
-// http://opensource.org/licenses/bsd-license.php
-//
-// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+// SPDX-License-Identifier: BSD-2-Clause-Patent
//
// Based on the files under ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/
//
diff --git a/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLib.c b/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLib.c
index 4962543f55..0a00cd9d3e 100644
--- a/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLib.c
+++ b/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLib.c
@@ -4,13 +4,7 @@
* Copyright (c) 2015, Hisilicon Limited. All rights reserved.
* Copyright (c) 2015, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
* Based on the files under ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/
*
diff --git a/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLib.inf b/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLib.inf
index 4ce5f5fea1..83c3f4bf19 100644
--- a/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLib.inf
+++ b/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLib.inf
@@ -3,13 +3,7 @@
# Copyright (c) 2015, Hisilicon Limited. All rights reserved.
# Copyright (c) 2015, Linaro Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
# Based on the files under ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/
#
diff --git a/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLibMem.c b/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLibMem.c
index c5a745a44b..9c11784a63 100644
--- a/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLibMem.c
+++ b/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLibMem.c
@@ -4,13 +4,7 @@
* Copyright (c) 2015, Hisilicon Limited. All rights reserved.
* Copyright (c) 2015, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
* Based on the files under ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/
*
diff --git a/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLibSec.inf b/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLibSec.inf
index e22208da30..ac587deedf 100644
--- a/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLibSec.inf
+++ b/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLibSec.inf
@@ -3,13 +3,7 @@
# Copyright (c) 2015, Hisilicon Limited. All rights reserved.
# Copyright (c) 2015, Linaro Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
# Based on the files under ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/
#
diff --git a/Silicon/Hisilicon/Library/BmcConfigBootLib/BmcConfigBootLib.c b/Silicon/Hisilicon/Library/BmcConfigBootLib/BmcConfigBootLib.c
index 08a9c9cd81..431806a623 100644
--- a/Silicon/Hisilicon/Library/BmcConfigBootLib/BmcConfigBootLib.c
+++ b/Silicon/Hisilicon/Library/BmcConfigBootLib/BmcConfigBootLib.c
@@ -3,13 +3,7 @@
* Copyright (c) 2017, Hisilicon Limited. All rights reserved.
* Copyright (c) 2017, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
#include <Uefi.h>
diff --git a/Silicon/Hisilicon/Library/BmcConfigBootLib/BmcConfigBootLib.inf b/Silicon/Hisilicon/Library/BmcConfigBootLib/BmcConfigBootLib.inf
index d6b5248fcd..c5776791a1 100644
--- a/Silicon/Hisilicon/Library/BmcConfigBootLib/BmcConfigBootLib.inf
+++ b/Silicon/Hisilicon/Library/BmcConfigBootLib/BmcConfigBootLib.inf
@@ -3,13 +3,7 @@
# Copyright (c) 2015, Hisilicon Limited. All rights reserved.
# Copyright (c) 2015, Linaro Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
diff --git a/Silicon/Hisilicon/Library/CpldIoLib/CpldIoLib.c b/Silicon/Hisilicon/Library/CpldIoLib/CpldIoLib.c
index 72bb7f5305..adb712b9e5 100644
--- a/Silicon/Hisilicon/Library/CpldIoLib/CpldIoLib.c
+++ b/Silicon/Hisilicon/Library/CpldIoLib/CpldIoLib.c
@@ -3,13 +3,7 @@
* Copyright (c) 2015, Hisilicon Limited. All rights reserved.
* Copyright (c) 2015, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Hisilicon/Library/CpldIoLib/CpldIoLib.inf b/Silicon/Hisilicon/Library/CpldIoLib/CpldIoLib.inf
index d3378a020b..ef84a9fe3a 100644
--- a/Silicon/Hisilicon/Library/CpldIoLib/CpldIoLib.inf
+++ b/Silicon/Hisilicon/Library/CpldIoLib/CpldIoLib.inf
@@ -3,13 +3,7 @@
# Copyright (c) 2015, Hisilicon Limited. All rights reserved.
# Copyright (c) 2015, Linaro Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
diff --git a/Silicon/Hisilicon/Library/CpldIoLib/CpldIoLibRuntime.c b/Silicon/Hisilicon/Library/CpldIoLib/CpldIoLibRuntime.c
index d3275276c2..5f20debd4f 100644
--- a/Silicon/Hisilicon/Library/CpldIoLib/CpldIoLibRuntime.c
+++ b/Silicon/Hisilicon/Library/CpldIoLib/CpldIoLibRuntime.c
@@ -3,13 +3,7 @@
* Copyright (c) 2016, Hisilicon Limited. All rights reserved.
* Copyright (c) 2016, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Hisilicon/Library/CpldIoLib/CpldIoLibRuntime.inf b/Silicon/Hisilicon/Library/CpldIoLib/CpldIoLibRuntime.inf
index 34c464f4f0..b57b6e2866 100644
--- a/Silicon/Hisilicon/Library/CpldIoLib/CpldIoLibRuntime.inf
+++ b/Silicon/Hisilicon/Library/CpldIoLib/CpldIoLibRuntime.inf
@@ -3,13 +3,7 @@
# Copyright (c) 2016, Hisilicon Limited. All rights reserved.
# Copyright (c) 2016, Linaro Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
diff --git a/Silicon/Hisilicon/Library/DS3231RealTimeClockLib/DS3231RealTimeClock.h b/Silicon/Hisilicon/Library/DS3231RealTimeClockLib/DS3231RealTimeClock.h
index d1e6c41dd7..da18d0f558 100644
--- a/Silicon/Hisilicon/Library/DS3231RealTimeClockLib/DS3231RealTimeClock.h
+++ b/Silicon/Hisilicon/Library/DS3231RealTimeClockLib/DS3231RealTimeClock.h
@@ -4,13 +4,7 @@
* Copyright (c) 2015, Hisilicon Limited. All rights reserved.
* Copyright (c) 2015, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
* Based on the files under ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.inf
**/
diff --git a/Silicon/Hisilicon/Library/DS3231RealTimeClockLib/DS3231RealTimeClockLib.c b/Silicon/Hisilicon/Library/DS3231RealTimeClockLib/DS3231RealTimeClockLib.c
index 03349fa4ff..30dc864142 100644
--- a/Silicon/Hisilicon/Library/DS3231RealTimeClockLib/DS3231RealTimeClockLib.c
+++ b/Silicon/Hisilicon/Library/DS3231RealTimeClockLib/DS3231RealTimeClockLib.c
@@ -8,13 +8,7 @@
Copyright (c) 2015, Hisilicon Limited. All rights reserved.<BR>
Copyright (c) 2015, Linaro Limited. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
Based on the files under ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.inf
diff --git a/Silicon/Hisilicon/Library/DS3231RealTimeClockLib/DS3231RealTimeClockLib.inf b/Silicon/Hisilicon/Library/DS3231RealTimeClockLib/DS3231RealTimeClockLib.inf
index 17d59ee462..35042e07ed 100644
--- a/Silicon/Hisilicon/Library/DS3231RealTimeClockLib/DS3231RealTimeClockLib.inf
+++ b/Silicon/Hisilicon/Library/DS3231RealTimeClockLib/DS3231RealTimeClockLib.inf
@@ -5,12 +5,7 @@
# Copyright (c) 2015, Hisilicon Limited. All rights reserved.
# Copyright (c) 2015, Linaro Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#
# Based on the files under ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.inf
diff --git a/Silicon/Hisilicon/Library/Dw8250SerialPortLib/Dw8250SerialPortLib.c b/Silicon/Hisilicon/Library/Dw8250SerialPortLib/Dw8250SerialPortLib.c
index ce70ca5ee1..d98970ff75 100644
--- a/Silicon/Hisilicon/Library/Dw8250SerialPortLib/Dw8250SerialPortLib.c
+++ b/Silicon/Hisilicon/Library/Dw8250SerialPortLib/Dw8250SerialPortLib.c
@@ -4,13 +4,7 @@
Copyright (c) 2006 - 2009, Intel Corporation
Copyright (c) 2015 - 2016, Hisilicon Limited. All rights reserved.
Copyright (c) 2015 - 2016, Linaro Limited. All rights reserved.
- All rights reserved. This program and the accompanying materials
- are licensed and made available under the terms and conditions of the BSD License
- which accompanies this distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
Based on the files under ArmPlatformPkg/Library/PL011SerialPortLib/
**/
diff --git a/Silicon/Hisilicon/Library/Dw8250SerialPortLib/Dw8250SerialPortLib.h b/Silicon/Hisilicon/Library/Dw8250SerialPortLib/Dw8250SerialPortLib.h
index 5e80257289..0eecb21f5d 100644
--- a/Silicon/Hisilicon/Library/Dw8250SerialPortLib/Dw8250SerialPortLib.h
+++ b/Silicon/Hisilicon/Library/Dw8250SerialPortLib/Dw8250SerialPortLib.h
@@ -4,13 +4,7 @@
* Copyright (c) 2015-2016, Hisilicon Limited. All rights reserved.
* Copyright (c) 2015-2016, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
* Based on the files under ArmPlatformPkg/Library/PL011SerialPortLib/
**/
diff --git a/Silicon/Hisilicon/Library/Dw8250SerialPortLib/Dw8250SerialPortLib.inf b/Silicon/Hisilicon/Library/Dw8250SerialPortLib/Dw8250SerialPortLib.inf
index df65d4ba05..d5eb7b3d29 100644
--- a/Silicon/Hisilicon/Library/Dw8250SerialPortLib/Dw8250SerialPortLib.inf
+++ b/Silicon/Hisilicon/Library/Dw8250SerialPortLib/Dw8250SerialPortLib.inf
@@ -3,13 +3,7 @@
# Copyright (c) 2011, ARM Ltd. All rights reserved.<BR>
# Copyright (c) 2015-2016, Hisilicon Limited. All rights reserved.<BR>
# Copyright (c) 2015-2016, Linaro Limited. 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 distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
# Based on the files under ArmPlatformPkg/Library/PL011SerialPortLib/
#**/
diff --git a/Silicon/Hisilicon/Library/Dw8250SerialPortRuntimeLib/Dw8250SerialPortRuntimeLib.c b/Silicon/Hisilicon/Library/Dw8250SerialPortRuntimeLib/Dw8250SerialPortRuntimeLib.c
index d092659228..8c68eb21c8 100644
--- a/Silicon/Hisilicon/Library/Dw8250SerialPortRuntimeLib/Dw8250SerialPortRuntimeLib.c
+++ b/Silicon/Hisilicon/Library/Dw8250SerialPortRuntimeLib/Dw8250SerialPortRuntimeLib.c
@@ -4,13 +4,7 @@
* Copyright (c) 2015, Hisilicon Limited. All rights reserved.
* Copyright (c) 2015, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
* Based on the files under ArmPlatformPkg/Library/PL011SerialPortLib/
**/
diff --git a/Silicon/Hisilicon/Library/Dw8250SerialPortRuntimeLib/Dw8250SerialPortRuntimeLib.h b/Silicon/Hisilicon/Library/Dw8250SerialPortRuntimeLib/Dw8250SerialPortRuntimeLib.h
index f5dcb9ec8d..e86282b10e 100644
--- a/Silicon/Hisilicon/Library/Dw8250SerialPortRuntimeLib/Dw8250SerialPortRuntimeLib.h
+++ b/Silicon/Hisilicon/Library/Dw8250SerialPortRuntimeLib/Dw8250SerialPortRuntimeLib.h
@@ -4,13 +4,7 @@
* Copyright (c) 2015-2016, Hisilicon Limited. All rights reserved.
* Copyright (c) 2015-2016, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
* Based on the files under ArmPlatformPkg/Library/PL011SerialPortLib/
**/
diff --git a/Silicon/Hisilicon/Library/Dw8250SerialPortRuntimeLib/Dw8250SerialPortRuntimeLib.inf b/Silicon/Hisilicon/Library/Dw8250SerialPortRuntimeLib/Dw8250SerialPortRuntimeLib.inf
index 2cedcb1004..3c4e528f7b 100644
--- a/Silicon/Hisilicon/Library/Dw8250SerialPortRuntimeLib/Dw8250SerialPortRuntimeLib.inf
+++ b/Silicon/Hisilicon/Library/Dw8250SerialPortRuntimeLib/Dw8250SerialPortRuntimeLib.inf
@@ -3,13 +3,7 @@
# Copyright (c) 2011, ARM Ltd. All rights reserved.<BR>
# Copyright (c) 2015-2016, Hisilicon Limited. All rights reserved.<BR>
# Copyright (c) 2015-2016, Linaro Limited. 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 distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
# Based on the files under ArmPlatformPkg/Library/PL011SerialPortLib/
#**/
diff --git a/Silicon/Hisilicon/Library/I2CLib/I2CHw.h b/Silicon/Hisilicon/Library/I2CLib/I2CHw.h
index 6fd7b8183e..1fa824f768 100644
--- a/Silicon/Hisilicon/Library/I2CLib/I2CHw.h
+++ b/Silicon/Hisilicon/Library/I2CLib/I2CHw.h
@@ -3,13 +3,7 @@
* Copyright (c) 2015, Hisilicon Limited. All rights reserved.
* Copyright (c) 2015, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Hisilicon/Library/I2CLib/I2CLib.c b/Silicon/Hisilicon/Library/I2CLib/I2CLib.c
index 63d9e2af25..2059512024 100644
--- a/Silicon/Hisilicon/Library/I2CLib/I2CLib.c
+++ b/Silicon/Hisilicon/Library/I2CLib/I2CLib.c
@@ -3,13 +3,7 @@
* Copyright (c) 2015, Hisilicon Limited. All rights reserved.
* Copyright (c) 2015, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Hisilicon/Library/I2CLib/I2CLib.inf b/Silicon/Hisilicon/Library/I2CLib/I2CLib.inf
index e9520b3953..d2edbb28a3 100644
--- a/Silicon/Hisilicon/Library/I2CLib/I2CLib.inf
+++ b/Silicon/Hisilicon/Library/I2CLib/I2CLib.inf
@@ -3,13 +3,7 @@
# Copyright (c) 2015, Hisilicon Limited. All rights reserved.
# Copyright (c) 2015, Linaro Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
diff --git a/Silicon/Hisilicon/Library/I2CLib/I2CLibCommon.c b/Silicon/Hisilicon/Library/I2CLib/I2CLibCommon.c
index 499c2d7a22..fbe3a4e0a5 100644
--- a/Silicon/Hisilicon/Library/I2CLib/I2CLibCommon.c
+++ b/Silicon/Hisilicon/Library/I2CLib/I2CLibCommon.c
@@ -3,13 +3,7 @@
* Copyright (c) 2015, Hisilicon Limited. All rights reserved.
* Copyright (c) 2015, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Hisilicon/Library/I2CLib/I2CLibInternal.h b/Silicon/Hisilicon/Library/I2CLib/I2CLibInternal.h
index 14297296e9..32e923a508 100644
--- a/Silicon/Hisilicon/Library/I2CLib/I2CLibInternal.h
+++ b/Silicon/Hisilicon/Library/I2CLib/I2CLibInternal.h
@@ -3,13 +3,7 @@
* Copyright (c) 2015, Hisilicon Limited. All rights reserved.
* Copyright (c) 2015, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Hisilicon/Library/I2CLib/I2CLibRuntime.c b/Silicon/Hisilicon/Library/I2CLib/I2CLibRuntime.c
index 678b5a0082..237fe5e00d 100644
--- a/Silicon/Hisilicon/Library/I2CLib/I2CLibRuntime.c
+++ b/Silicon/Hisilicon/Library/I2CLib/I2CLibRuntime.c
@@ -3,13 +3,7 @@
* Copyright (c) 2015, Hisilicon Limited. All rights reserved.
* Copyright (c) 2015, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Hisilicon/Library/I2CLib/I2CLibRuntime.inf b/Silicon/Hisilicon/Library/I2CLib/I2CLibRuntime.inf
index 6211373ce7..d53de09ea4 100644
--- a/Silicon/Hisilicon/Library/I2CLib/I2CLibRuntime.inf
+++ b/Silicon/Hisilicon/Library/I2CLib/I2CLibRuntime.inf
@@ -3,13 +3,7 @@
# Copyright (c) 2015, Hisilicon Limited. All rights reserved.
# Copyright (c) 2015, Linaro Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
diff --git a/Silicon/Hisilicon/Library/M41T83RealTimeClockLib/M41T83RealTimeClock.h b/Silicon/Hisilicon/Library/M41T83RealTimeClockLib/M41T83RealTimeClock.h
index d985055d9b..67b8657030 100644
--- a/Silicon/Hisilicon/Library/M41T83RealTimeClockLib/M41T83RealTimeClock.h
+++ b/Silicon/Hisilicon/Library/M41T83RealTimeClockLib/M41T83RealTimeClock.h
@@ -3,13 +3,7 @@
Copyright (c) 2018, Hisilicon Limited. All rights reserved.<BR>
Copyright (c) 2018, Linaro Limited. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Hisilicon/Library/M41T83RealTimeClockLib/M41T83RealTimeClockLib.c b/Silicon/Hisilicon/Library/M41T83RealTimeClockLib/M41T83RealTimeClockLib.c
index 0670f9c5f4..5131ce7e59 100644
--- a/Silicon/Hisilicon/Library/M41T83RealTimeClockLib/M41T83RealTimeClockLib.c
+++ b/Silicon/Hisilicon/Library/M41T83RealTimeClockLib/M41T83RealTimeClockLib.c
@@ -3,13 +3,7 @@
Copyright (c) 2018, Hisilicon Limited. All rights reserved.<BR>
Copyright (c) 2018, Linaro Limited. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Hisilicon/Library/M41T83RealTimeClockLib/M41T83RealTimeClockLib.inf b/Silicon/Hisilicon/Library/M41T83RealTimeClockLib/M41T83RealTimeClockLib.inf
index e0bf6b3f24..9344c6d376 100644
--- a/Silicon/Hisilicon/Library/M41T83RealTimeClockLib/M41T83RealTimeClockLib.inf
+++ b/Silicon/Hisilicon/Library/M41T83RealTimeClockLib/M41T83RealTimeClockLib.inf
@@ -3,13 +3,7 @@
# Copyright (c) 2018, Hisilicon Limited. All rights reserved.<BR>
# Copyright (c) 2018, Linaro Limited. 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 distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
diff --git a/Silicon/Hisilicon/Library/PlatformBootManagerLib/PlatformBm.c b/Silicon/Hisilicon/Library/PlatformBootManagerLib/PlatformBm.c
index aa8ddd45a5..f2e8bbdfae 100644
--- a/Silicon/Hisilicon/Library/PlatformBootManagerLib/PlatformBm.c
+++ b/Silicon/Hisilicon/Library/PlatformBootManagerLib/PlatformBm.c
@@ -5,13 +5,7 @@
Copyright (c) 2018, Hisilicon Limited. All rights reserved.
Copyright (c) 2018, Linaro Ltd. 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
- distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT
- WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Hisilicon/Library/PlatformBootManagerLib/PlatformBm.h b/Silicon/Hisilicon/Library/PlatformBootManagerLib/PlatformBm.h
index 4067e932f3..139978719c 100644
--- a/Silicon/Hisilicon/Library/PlatformBootManagerLib/PlatformBm.h
+++ b/Silicon/Hisilicon/Library/PlatformBootManagerLib/PlatformBm.h
@@ -5,13 +5,7 @@
Copyright (c) 2018, Hisilicon Limited. All rights reserved.
Copyright (c) 2018, Linaro Ltd. 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
- distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT
- WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Hisilicon/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf b/Silicon/Hisilicon/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
index 31aede26fc..1c4b52dde0 100644
--- a/Silicon/Hisilicon/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
+++ b/Silicon/Hisilicon/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
@@ -5,14 +5,7 @@
# Copyright (c) 2018, Hisilicon Limited. All rights reserved.
# Copyright (c) 2018, Linaro Ltd. 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
-# distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
-# IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Hisilicon/Library/PlatformFlashAccessLib/PlatformFlashAccessLibDxe.c b/Silicon/Hisilicon/Library/PlatformFlashAccessLib/PlatformFlashAccessLibDxe.c
index 585f7ef0e8..91dc13b6d0 100644
--- a/Silicon/Hisilicon/Library/PlatformFlashAccessLib/PlatformFlashAccessLibDxe.c
+++ b/Silicon/Hisilicon/Library/PlatformFlashAccessLib/PlatformFlashAccessLibDxe.c
@@ -5,13 +5,7 @@
Copyright (c) 2018, Linaro Limited. All rights reserved.
Copyright (c) 2016 - 2018, 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Hisilicon/Library/PlatformFlashAccessLib/PlatformFlashAccessLibDxe.inf b/Silicon/Hisilicon/Library/PlatformFlashAccessLib/PlatformFlashAccessLibDxe.inf
index ba209c9873..52811be560 100644
--- a/Silicon/Hisilicon/Library/PlatformFlashAccessLib/PlatformFlashAccessLibDxe.inf
+++ b/Silicon/Hisilicon/Library/PlatformFlashAccessLib/PlatformFlashAccessLibDxe.inf
@@ -5,13 +5,7 @@
# Copyright (c) 2018, Linaro Limited. All rights reserved.
# Copyright (c) 2016, 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 distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Hisilicon/Library/PlatformIntelBdsLib/IntelBdsPlatform.c b/Silicon/Hisilicon/Library/PlatformIntelBdsLib/IntelBdsPlatform.c
index dc23e46c1f..803148ebb3 100644
--- a/Silicon/Hisilicon/Library/PlatformIntelBdsLib/IntelBdsPlatform.c
+++ b/Silicon/Hisilicon/Library/PlatformIntelBdsLib/IntelBdsPlatform.c
@@ -7,13 +7,7 @@
Copyright (c) 2015, Hisilicon Limited. All rights reserved.
Copyright (c) 2015, Linaro Limited. All rights reserved.
- This program and the accompanying materials are licensed and made available
- under the terms and conditions of the BSD License which accompanies this
- distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT
- WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
Based on the files under ArmVirtPkg/Library/PlatformIntelBdsLib/
diff --git a/Silicon/Hisilicon/Library/PlatformIntelBdsLib/IntelBdsPlatform.h b/Silicon/Hisilicon/Library/PlatformIntelBdsLib/IntelBdsPlatform.h
index 4a912627a9..3347acc48f 100644
--- a/Silicon/Hisilicon/Library/PlatformIntelBdsLib/IntelBdsPlatform.h
+++ b/Silicon/Hisilicon/Library/PlatformIntelBdsLib/IntelBdsPlatform.h
@@ -5,13 +5,7 @@
Copyright (c) 2015, Hisilicon Limited. All rights reserved.<BR>
Copyright (c) 2015, Linaro Limited. 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
- distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT
- WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
Based on the files under ArmVirtPkg/Library/PlatformIntelBdsLib/
diff --git a/Silicon/Hisilicon/Library/PlatformIntelBdsLib/IntelBdsPlatformCommon.c b/Silicon/Hisilicon/Library/PlatformIntelBdsLib/IntelBdsPlatformCommon.c
index 9ea701db11..35996322ed 100644
--- a/Silicon/Hisilicon/Library/PlatformIntelBdsLib/IntelBdsPlatformCommon.c
+++ b/Silicon/Hisilicon/Library/PlatformIntelBdsLib/IntelBdsPlatformCommon.c
@@ -3,13 +3,7 @@
* Copyright (c) 2015, Hisilicon Limited. All rights reserved.
* Copyright (c) 2015, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Hisilicon/Library/PlatformIntelBdsLib/IntelBdsPlatformCommon.h b/Silicon/Hisilicon/Library/PlatformIntelBdsLib/IntelBdsPlatformCommon.h
index 73b901ab51..02114eda29 100644
--- a/Silicon/Hisilicon/Library/PlatformIntelBdsLib/IntelBdsPlatformCommon.h
+++ b/Silicon/Hisilicon/Library/PlatformIntelBdsLib/IntelBdsPlatformCommon.h
@@ -3,13 +3,7 @@
* Copyright (c) 2015, Hisilicon Limited. All rights reserved.
* Copyright (c) 2015, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Hisilicon/Library/PlatformIntelBdsLib/PlatformIntelBdsLib.inf b/Silicon/Hisilicon/Library/PlatformIntelBdsLib/PlatformIntelBdsLib.inf
index 0feec06392..0aa50e51db 100644
--- a/Silicon/Hisilicon/Library/PlatformIntelBdsLib/PlatformIntelBdsLib.inf
+++ b/Silicon/Hisilicon/Library/PlatformIntelBdsLib/PlatformIntelBdsLib.inf
@@ -7,14 +7,7 @@
# Copyright (c) 2015, Hisilicon Limited. All rights reserved.
# Copyright (c) 2015, Linaro Limited. All rights reserved.
#
-# This program and the accompanying materials are licensed and made available
-# under the terms and conditions of the BSD License which accompanies this
-# distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
-# IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
# Based on the files under ArmVirtPkg/Library/PlatformIntelBdsLib/
#
diff --git a/Silicon/Hisilicon/Library/VirtualRealTimeClockLib/RealTimeClockLib.c b/Silicon/Hisilicon/Library/VirtualRealTimeClockLib/RealTimeClockLib.c
index 1d93d7ebba..60edbce0f1 100644
--- a/Silicon/Hisilicon/Library/VirtualRealTimeClockLib/RealTimeClockLib.c
+++ b/Silicon/Hisilicon/Library/VirtualRealTimeClockLib/RealTimeClockLib.c
@@ -6,13 +6,7 @@
Copyright (c) 2015, Hisilicon Limited. All rights reserved.<BR>
Copyright (c) 2015, Linaro Limited. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
Based on the files under ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.inf
diff --git a/Silicon/Hisilicon/Library/VirtualRealTimeClockLib/RealTimeClockLib.inf b/Silicon/Hisilicon/Library/VirtualRealTimeClockLib/RealTimeClockLib.inf
index 35c01bff4f..8029dda436 100644
--- a/Silicon/Hisilicon/Library/VirtualRealTimeClockLib/RealTimeClockLib.inf
+++ b/Silicon/Hisilicon/Library/VirtualRealTimeClockLib/RealTimeClockLib.inf
@@ -3,13 +3,7 @@
# Copyright (c) 2015, Hisilicon Limited. All rights reserved.
# Copyright (c) 2015, Linaro Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
--
2.21.0.windows.1
^ permalink raw reply related [flat|nested] 63+ messages in thread* [[edk2-platforms][PATCH V2] 23/30] Silicon/Intel/KabylakeSiliconPkg: Replace BSD License with BSD+Patent License
2019-05-15 23:09 [[edk2-platforms][PATCH V2] 00/30] Change edk2-platforms/master to BSD+Patent License Michael D Kinney
` (21 preceding siblings ...)
2019-05-15 23:10 ` [[edk2-platforms][PATCH V2] 22/30] Silicon/Hisilicon: " Michael D Kinney
@ 2019-05-15 23:10 ` Michael D Kinney
2019-05-16 0:39 ` [edk2-devel] " Chiu, Chasel
2019-05-17 6:54 ` Kubacki, Michael A
2019-05-15 23:10 ` [[edk2-platforms][PATCH V2] 24/30] Silicon/Intel/LewisburgPkg: " Michael D Kinney
` (7 subsequent siblings)
30 siblings, 2 replies; 63+ messages in thread
From: Michael D Kinney @ 2019-05-15 23:10 UTC (permalink / raw)
To: devel; +Cc: Chasel Chiu, Michael Kubacki
https://bugzilla.tianocore.org/show_bug.cgi?id=1373
Replace BSD 2-Clause License with BSD+Patent License. This change is
based on the following emails:
https://lists.01.org/pipermail/edk2-devel/2019-February/036260.html
https://lists.01.org/pipermail/edk2-devel/2018-October/030385.html
RFCs with detailed process for the license change:
V3: https://lists.01.org/pipermail/edk2-devel/2019-March/038116.html
V2: https://lists.01.org/pipermail/edk2-devel/2019-March/037669.html
V1: https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html
Cc: Chasel Chiu <chasel.chiu@intel.com>
Cc: Michael Kubacki <michael.a.kubacki@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
.../Cpu/Include/ConfigBlock/CpuConfig.h | 8 +-------
.../Cpu/Include/ConfigBlock/CpuConfigFspData.h | 8 +-------
.../Cpu/Include/ConfigBlock/CpuConfigLibPreMemConfig.h | 8 +-------
.../Cpu/Include/ConfigBlock/CpuOverclockingConfig.h | 8 +-------
.../Cpu/Include/ConfigBlock/CpuPidTestConfig.h | 8 +-------
.../Cpu/Include/ConfigBlock/CpuPowerMgmtBasicConfig.h | 8 +-------
.../Cpu/Include/ConfigBlock/CpuPowerMgmtCustomConfig.h | 8 +-------
.../Cpu/Include/ConfigBlock/CpuPowerMgmtPsysConfig.h | 8 +-------
.../Cpu/Include/ConfigBlock/CpuPowerMgmtTestConfig.h | 8 +-------
.../Cpu/Include/ConfigBlock/CpuPowerMgmtVrConfig.h | 8 +-------
.../Cpu/Include/ConfigBlock/CpuTestConfig.h | 8 +-------
Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuAccess.h | 8 +-------
.../Intel/KabylakeSiliconPkg/Cpu/Include/CpuDataStruct.h | 8 +-------
.../KabylakeSiliconPkg/Cpu/Include/CpuPolicyCommon.h | 8 +-------
.../Intel/KabylakeSiliconPkg/Cpu/Include/CpuPowerMgmt.h | 8 +-------
Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuRegs.h | 8 +-------
.../Cpu/Include/Library/CpuMailboxLib.h | 8 +-------
.../Cpu/Include/Library/CpuPlatformLib.h | 8 +-------
.../Cpu/Include/Library/CpuPolicyLib.h | 8 +-------
.../Cpu/Include/Library/CpuPolicyLibPreMem.h | 8 +-------
.../Cpu/Include/Protocol/CpuGlobalNvsArea.h | 8 +-------
.../KabylakeSiliconPkg/Cpu/Include/Protocol/CpuInfo.h | 8 +-------
.../Cpu/IncludePrivate/CpuInitDataHob.h | 8 +-------
.../Cpu/IncludePrivate/CpuPrivateData.h | 8 +-------
.../Cpu/IncludePrivate/Library/CpuCommonLib.h | 8 +-------
.../Cpu/IncludePrivate/PowerMgmtNvsStruct.h | 8 +-------
.../BaseCpuMailboxLibNull/BaseCpuMailboxLibNull.c | 8 +-------
.../BaseCpuMailboxLibNull/BaseCpuMailboxLibNull.inf | 8 +-------
.../Cpu/Library/PeiCpuPolicyLib/CpuPrintPolicy.c | 8 +-------
.../Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicyLib.c | 8 +-------
.../Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicyLib.inf | 8 +-------
.../Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicyLibrary.h | 8 +-------
.../Cpu/Library/PeiCpuPolicyLibPreMem/CpuPrintPolicy.c | 8 +-------
.../Cpu/Library/PeiCpuPolicyLibPreMem/PeiCpuPolicyLib.c | 8 +-------
.../PeiCpuPolicyLibPreMem/PeiCpuPolicyLibPreMem.inf | 8 +-------
.../Library/PeiCpuPolicyLibPreMem/PeiCpuPolicyLibrary.h | 8 +-------
.../Library/PeiDxeSmmCpuPlatformLib/CpuPlatformLibrary.c | 8 +-------
.../Library/PeiDxeSmmCpuPlatformLib/CpuPlatformLibrary.h | 8 +-------
.../PeiDxeSmmCpuPlatformLib/PeiDxeSmmCpuPlatformLib.inf | 8 +-------
.../LibraryPrivate/PeiDxeSmmCpuCommonLib/CpuCommonLib.c | 8 +-------
.../PeiDxeSmmCpuCommonLib/PeiDxeSmmCpuCommonLib.inf | 8 +-------
.../Hsti/Dxe/BootFirmwareMediaProtection.c | 8 +-------
.../KabylakeSiliconPkg/Hsti/Dxe/DebugModeDisabled.c | 8 +-------
.../Hsti/Dxe/HardwareRootedBootIntegrity.c | 8 +-------
.../Intel/KabylakeSiliconPkg/Hsti/Dxe/HstiSiliconDxe.c | 8 +-------
.../Intel/KabylakeSiliconPkg/Hsti/Dxe/HstiSiliconDxe.h | 8 +-------
.../Intel/KabylakeSiliconPkg/Hsti/Dxe/HstiSiliconDxe.inf | 8 +-------
.../Hsti/Dxe/IntegratedDeviceDmaProtection.c | 8 +-------
.../Hsti/Dxe/MeasuredBootEnforcement.c | 8 +-------
.../Intel/KabylakeSiliconPkg/Hsti/Dxe/MpServiceHelp.c | 8 +-------
.../KabylakeSiliconPkg/Hsti/Dxe/SecureCpuConfiguration.c | 8 +-------
.../Hsti/Dxe/SecureIntegratedGraphicsConfiguration.c | 8 +-------
.../Hsti/Dxe/SecureMemoryMapConfiguration.c | 8 +-------
.../KabylakeSiliconPkg/Hsti/Dxe/SecurePCHConfiguration.c | 8 +-------
.../Hsti/Dxe/SecureSystemAgentConfiguration.c | 8 +-------
.../KabylakeSiliconPkg/Hsti/Dxe/SignedFirmwareUpdate.c | 8 +-------
Silicon/Intel/KabylakeSiliconPkg/Include/ConfigBlock.h | 8 +-------
.../Intel/KabylakeSiliconPkg/Include/HstiFeatureBit.h | 8 +-------
.../KabylakeSiliconPkg/Include/Library/AslUpdateLib.h | 8 +-------
.../KabylakeSiliconPkg/Include/Library/ConfigBlockLib.h | 8 +-------
.../Intel/KabylakeSiliconPkg/Include/Library/MmPciLib.h | 8 +-------
.../Include/Library/PeiSiPolicyUpdateLib.h | 8 +-------
.../Include/Library/SiConfigBlockLib.h | 8 +-------
.../KabylakeSiliconPkg/Include/Library/SiPolicyLib.h | 8 +-------
.../KabylakeSiliconPkg/Include/Library/SiliconInitLib.h | 8 +-------
Silicon/Intel/KabylakeSiliconPkg/Include/PcieRegs.h | 8 +-------
Silicon/Intel/KabylakeSiliconPkg/Include/Ppi/SiInitPpi.h | 8 +-------
Silicon/Intel/KabylakeSiliconPkg/Include/Ppi/SiPolicy.h | 8 +-------
.../Include/Protocol/SiPolicyProtocol.h | 8 +-------
.../Intel/KabylakeSiliconPkg/Include/SiPolicyStruct.h | 8 +-------
.../IncludePrivate/Library/PcieInitLib.h | 8 +-------
.../KabylakeSiliconPkg/IncludePrivate/SiConfigHob.h | 8 +-------
.../Intel/KabylakeSiliconPkg/KabylakeSiliconBuild.bat | 8 +-------
Silicon/Intel/KabylakeSiliconPkg/KabylakeSiliconPkg.dsc | 8 +-------
.../Intel/KabylakeSiliconPkg/KabylakeSiliconPrivate.dec | 8 +-------
.../Library/BaseConfigBlockLib/BaseConfigBlockLib.c | 8 +-------
.../Library/BaseConfigBlockLib/BaseConfigBlockLib.inf | 8 +-------
.../Library/BaseSiConfigBlockLib/BaseSiConfigBlockLib.c | 8 +-------
.../BaseSiConfigBlockLib/BaseSiConfigBlockLib.inf | 8 +-------
.../Library/DxeAslUpdateLib/DxeAslUpdateLib.c | 8 +-------
.../Library/DxeAslUpdateLib/DxeAslUpdateLib.inf | 8 +-------
.../Library/DxeAslUpdateLibNull/DxeAslUpdateLibNull.c | 8 +-------
.../Library/DxeAslUpdateLibNull/DxeAslUpdateLibNull.inf | 8 +-------
.../Library/DxeSiliconPolicyInitLib/DxePolicyInit.c | 8 +-------
.../Library/DxeSiliconPolicyInitLib/DxeSaPolicyInit.h | 8 +-------
.../DxeSiliconPolicyInitLib/DxeSiliconPolicyInitLib.inf | 8 +-------
.../Library/PeiDxeSmmMmPciLib/PeiDxeSmmMmPciLib.c | 8 +-------
.../Library/PeiDxeSmmMmPciLib/PeiDxeSmmMmPciLib.inf | 8 +-------
.../Library/PeiSiPolicyLib/PeiSiPolicyLib.c | 8 +-------
.../Library/PeiSiPolicyLib/PeiSiPolicyLib.inf | 8 +-------
.../Library/PeiSiPolicyLib/PeiSiPolicyLibPreMem.c | 8 +-------
.../Library/PeiSiPolicyLib/PeiSiPolicyLibrary.h | 8 +-------
.../Library/PeiSiPolicyLib/SiPrintPolicy.c | 8 +-------
.../Library/PeiSiliconPolicyInitLib/PeiPolicyInit.c | 8 +-------
.../Library/PeiSiliconPolicyInitLib/PeiPolicyInit.h | 8 +-------
.../PeiSiliconPolicyInitLib/PeiPolicyInitPreMem.c | 8 +-------
.../Library/PeiSiliconPolicyInitLib/PeiSiPolicyInit.h | 8 +-------
.../PeiSiliconPolicyInitLib/PeiSiliconPolicyInitLib.inf | 8 +-------
.../PeiPostMemSiliconPolicyInitLibDependency.inf | 8 +-------
.../PeiPreMemSiliconPolicyInitLibDependency.inf | 8 +-------
.../PeiSiliconPolicyInitLibDependency.c | 8 +-------
.../PeiSiliconPolicyInitLibFsp/PeiFspCpuPolicyInitLib.c | 8 +-------
.../PeiSiliconPolicyInitLibFsp/PeiFspMePolicyInitLib.c | 8 +-------
.../PeiSiliconPolicyInitLibFsp/PeiFspMiscUpdInitLib.c | 8 +-------
.../PeiSiliconPolicyInitLibFsp/PeiFspPchPolicyInitLib.c | 8 +-------
.../PeiSiliconPolicyInitLibFsp/PeiFspPolicyInitLib.c | 8 +-------
.../PeiSiliconPolicyInitLibFsp/PeiFspPolicyInitLib.h | 8 +-------
.../PeiSiliconPolicyInitLibFsp/PeiFspSaPolicyInitLib.c | 8 +-------
.../PeiSiliconPolicyInitLibFsp/PeiFspSiPolicyInitLib.c | 8 +-------
.../Library/PeiSiliconPolicyInitLibFsp/PeiPolicyInit.c | 8 +-------
.../Library/PeiSiliconPolicyInitLibFsp/PeiPolicyInit.h | 8 +-------
.../PeiSiliconPolicyInitLibFsp/PeiPolicyInitLib.h | 8 +-------
.../PeiSiliconPolicyInitLibFsp/PeiPolicyInitPreMem.c | 8 +-------
.../Library/PeiSiliconPolicyInitLibFsp/PeiSiPolicyInit.h | 8 +-------
.../PeiSiliconPolicyInitLibFsp.inf | 8 +-------
.../Library/SiliconInitLib/SiliconInit.c | 8 +-------
.../Library/SiliconInitLib/SiliconInitLib.inf | 8 +-------
.../Library/SiliconInitLib/SiliconInitPreMem.c | 8 +-------
.../Me/Include/ConfigBlock/MePeiConfig.h | 8 +-------
.../Me/Include/Library/PeiMePolicyLib.h | 8 +-------
Silicon/Intel/KabylakeSiliconPkg/Me/Include/MeChipset.h | 8 +-------
.../Intel/KabylakeSiliconPkg/Me/Include/MePolicyCommon.h | 8 +-------
.../Me/Library/PeiMePolicyLib/PeiMePolicyLib.c | 8 +-------
.../Me/Library/PeiMePolicyLib/PeiMePolicyLib.inf | 8 +-------
.../Me/Library/PeiMePolicyLib/PeiMePolicyLibrary.h | 8 +-------
.../Pch/AcpiTables/Dsdt/GpioAcpiDefines.h | 8 +-------
.../KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/GpioLib.asl | 8 +-------
.../Pch/AcpiTables/Dsdt/GpioLibObjects.asl | 8 +-------
.../KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/IrqLink.asl | 8 +-------
.../Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/Pch.asl | 8 +-------
.../Pch/AcpiTables/Dsdt/PchAcpiTables.inf | 8 +-------
.../KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchHda.asl | 8 +-------
.../KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchHeci.asl | 8 +-------
.../KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchIsh.asl | 8 +-------
.../KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchNvs.asl | 8 +-------
.../KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchPcie.asl | 8 +-------
.../Pch/AcpiTables/Dsdt/PchRstPcieStorage.asl | 8 +-------
.../KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchSata.asl | 8 +-------
.../KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchScs.asl | 8 +-------
.../Pch/AcpiTables/Dsdt/PchSerialIo.asl | 8 +-------
.../KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchXdci.asl | 8 +-------
.../KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchXhci.asl | 8 +-------
.../Pch/AcpiTables/Dsdt/TraceHubDebug.asl | 8 +-------
.../KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/usbsbd.asl | 8 +-------
.../Pch/Include/ConfigBlock/Cio2Config.h | 8 +-------
.../Pch/Include/ConfigBlock/DciConfig.h | 8 +-------
.../Pch/Include/ConfigBlock/DmiConfig.h | 8 +-------
.../Pch/Include/ConfigBlock/EspiConfig.h | 8 +-------
.../Pch/Include/ConfigBlock/FlashProtectionConfig.h | 8 +-------
.../Pch/Include/ConfigBlock/HdAudioConfig.h | 8 +-------
.../Pch/Include/ConfigBlock/HpetConfig.h | 8 +-------
.../Pch/Include/ConfigBlock/HsioConfig.h | 8 +-------
.../Pch/Include/ConfigBlock/HsioPcieConfig.h | 8 +-------
.../Pch/Include/ConfigBlock/HsioSataConfig.h | 8 +-------
.../Pch/Include/ConfigBlock/InterruptConfig.h | 8 +-------
.../Pch/Include/ConfigBlock/IoApicConfig.h | 8 +-------
.../Pch/Include/ConfigBlock/IshConfig.h | 8 +-------
.../Pch/Include/ConfigBlock/LanConfig.h | 8 +-------
.../Pch/Include/ConfigBlock/LockDownConfig.h | 8 +-------
.../Pch/Include/ConfigBlock/LpcConfig.h | 8 +-------
.../Pch/Include/ConfigBlock/P2sbConfig.h | 8 +-------
.../Pch/Include/ConfigBlock/PchGeneralConfig.h | 8 +-------
.../Pch/Include/ConfigBlock/PcieRpConfig.h | 8 +-------
.../Pch/Include/ConfigBlock/PmConfig.h | 8 +-------
.../Pch/Include/ConfigBlock/Port61Config.h | 8 +-------
.../Pch/Include/ConfigBlock/SataConfig.h | 8 +-------
.../Pch/Include/ConfigBlock/ScsConfig.h | 8 +-------
.../Pch/Include/ConfigBlock/SerialIoConfig.h | 8 +-------
.../Pch/Include/ConfigBlock/SerialIrqConfig.h | 8 +-------
.../Pch/Include/ConfigBlock/SmbusConfig.h | 8 +-------
.../Pch/Include/ConfigBlock/SpiConfig.h | 8 +-------
.../Pch/Include/ConfigBlock/ThermalConfig.h | 8 +-------
.../Pch/Include/ConfigBlock/TraceHubConfig.h | 8 +-------
.../Pch/Include/ConfigBlock/UsbConfig.h | 8 +-------
.../Pch/Include/ConfigBlock/WatchDogConfig.h | 8 +-------
.../Intel/KabylakeSiliconPkg/Pch/Include/GpioConfig.h | 8 +-------
.../Intel/KabylakeSiliconPkg/Pch/Include/GpioPinsSklH.h | 8 +-------
.../Intel/KabylakeSiliconPkg/Pch/Include/GpioPinsSklLp.h | 8 +-------
.../KabylakeSiliconPkg/Pch/Include/Library/GpioLib.h | 8 +-------
.../Pch/Include/Library/GpioNativeLib.h | 8 +-------
.../KabylakeSiliconPkg/Pch/Include/Library/OcWdtLib.h | 8 +-------
.../Pch/Include/Library/PchCycleDecodingLib.h | 8 +-------
.../KabylakeSiliconPkg/Pch/Include/Library/PchEspiLib.h | 8 +-------
.../KabylakeSiliconPkg/Pch/Include/Library/PchGbeLib.h | 8 +-------
.../KabylakeSiliconPkg/Pch/Include/Library/PchHsioLib.h | 8 +-------
.../KabylakeSiliconPkg/Pch/Include/Library/PchInfoLib.h | 8 +-------
.../KabylakeSiliconPkg/Pch/Include/Library/PchP2sbLib.h | 8 +-------
.../Pch/Include/Library/PchPcieRpLib.h | 8 +-------
.../KabylakeSiliconPkg/Pch/Include/Library/PchPcrLib.h | 8 +-------
.../KabylakeSiliconPkg/Pch/Include/Library/PchPmcLib.h | 8 +-------
.../Pch/Include/Library/PchPolicyLib.h | 8 +-------
.../KabylakeSiliconPkg/Pch/Include/Library/PchPsfLib.h | 8 +-------
.../KabylakeSiliconPkg/Pch/Include/Library/PchResetLib.h | 8 +-------
.../Pch/Include/Library/PchSbiAccessLib.h | 8 +-------
.../Pch/Include/Library/PchSerialIoLib.h | 8 +-------
.../Pch/Include/Library/PchSerialIoUartLib.h | 8 +-------
.../Pch/Include/Library/PchSmmControlLib.h | 8 +-------
.../Pch/Include/Library/PchWdtCommonLib.h | 8 +-------
.../KabylakeSiliconPkg/Pch/Include/Library/SecPchLib.h | 8 +-------
.../Pch/Include/Library/SpiFlashCommonLib.h | 8 +-------
.../KabylakeSiliconPkg/Pch/Include/Library/SpiLib.h | 8 +-------
.../Pch/Include/Library/TraceHubInitLib.h | 8 +-------
Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchAccess.h | 8 +-------
Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchLimits.h | 8 +-------
.../Pch/Include/PchPcieStorageDetectHob.h | 8 +-------
.../KabylakeSiliconPkg/Pch/Include/PchPolicyCommon.h | 8 +-------
.../Pch/Include/PchPreMemPolicyCommon.h | 8 +-------
.../Pch/Include/PchReservedResources.h | 8 +-------
.../Pch/Include/PchResetPlatformSpecific.h | 8 +-------
.../Intel/KabylakeSiliconPkg/Pch/Include/Ppi/PchReset.h | 8 +-------
Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Ppi/Spi.h | 8 +-------
Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Ppi/Wdt.h | 8 +-------
.../Pch/Include/Protocol/PchAcpiSmiDispatch.h | 8 +-------
.../Pch/Include/Protocol/PchEmmcTuning.h | 8 +-------
.../Pch/Include/Protocol/PchEspiSmiDispatch.h | 8 +-------
.../Pch/Include/Protocol/PchGpioUnlockSmiDispatch.h | 8 +-------
.../KabylakeSiliconPkg/Pch/Include/Protocol/PchInfo.h | 8 +-------
.../Pch/Include/Protocol/PchPcieSmiDispatch.h | 8 +-------
.../KabylakeSiliconPkg/Pch/Include/Protocol/PchReset.h | 8 +-------
.../Pch/Include/Protocol/PchSmiDispatch.h | 8 +-------
.../Pch/Include/Protocol/PchSmmIoTrapControl.h | 8 +-------
.../Pch/Include/Protocol/PchSmmPeriodicTimerControl.h | 8 +-------
.../Pch/Include/Protocol/PchTcoSmiDispatch.h | 8 +-------
.../KabylakeSiliconPkg/Pch/Include/Protocol/SerialGpio.h | 8 +-------
.../Intel/KabylakeSiliconPkg/Pch/Include/Protocol/Spi.h | 8 +-------
.../Intel/KabylakeSiliconPkg/Pch/Include/Protocol/Wdt.h | 8 +-------
.../KabylakeSiliconPkg/Pch/Include/Register/PchRegsCam.h | 8 +-------
.../KabylakeSiliconPkg/Pch/Include/Register/PchRegsDci.h | 8 +-------
.../KabylakeSiliconPkg/Pch/Include/Register/PchRegsDmi.h | 8 +-------
.../KabylakeSiliconPkg/Pch/Include/Register/PchRegsFia.h | 8 +-------
.../Pch/Include/Register/PchRegsGpio.h | 8 +-------
.../KabylakeSiliconPkg/Pch/Include/Register/PchRegsHda.h | 8 +-------
.../Pch/Include/Register/PchRegsHsio.h | 8 +-------
.../KabylakeSiliconPkg/Pch/Include/Register/PchRegsIsh.h | 8 +-------
.../Pch/Include/Register/PchRegsItss.h | 8 +-------
.../KabylakeSiliconPkg/Pch/Include/Register/PchRegsLan.h | 8 +-------
.../KabylakeSiliconPkg/Pch/Include/Register/PchRegsLpc.h | 8 +-------
.../Pch/Include/Register/PchRegsP2sb.h | 8 +-------
.../Pch/Include/Register/PchRegsPcie.h | 8 +-------
.../KabylakeSiliconPkg/Pch/Include/Register/PchRegsPcr.h | 8 +-------
.../KabylakeSiliconPkg/Pch/Include/Register/PchRegsPmc.h | 8 +-------
.../KabylakeSiliconPkg/Pch/Include/Register/PchRegsPsf.h | 8 +-------
.../Pch/Include/Register/PchRegsPsth.h | 8 +-------
.../Pch/Include/Register/PchRegsSata.h | 8 +-------
.../KabylakeSiliconPkg/Pch/Include/Register/PchRegsScs.h | 8 +-------
.../Pch/Include/Register/PchRegsSerialIo.h | 8 +-------
.../Pch/Include/Register/PchRegsSmbus.h | 8 +-------
.../KabylakeSiliconPkg/Pch/Include/Register/PchRegsSpi.h | 8 +-------
.../Pch/Include/Register/PchRegsThermal.h | 8 +-------
.../Pch/Include/Register/PchRegsTraceHub.h | 8 +-------
.../KabylakeSiliconPkg/Pch/Include/Register/PchRegsUsb.h | 8 +-------
.../Pch/IncludePrivate/Library/DxePchHdaNhlt.h | 8 +-------
.../Pch/IncludePrivate/Library/GpioPrivateLib.h | 8 +-------
.../Pch/IncludePrivate/Library/I2cMasterCommonLib.h | 8 +-------
.../Pch/IncludePrivate/Library/PchHdaLib.h | 8 +-------
.../Pch/IncludePrivate/Library/PchInitCommonLib.h | 8 +-------
.../Pch/IncludePrivate/Library/PchPciExpressHelpersLib.h | 8 +-------
.../Pch/IncludePrivate/Library/PchPsfPrivateLib.h | 8 +-------
.../Pch/IncludePrivate/Library/PchSmbusCommonLib.h | 8 +-------
.../Pch/IncludePrivate/Library/PchSpiCommonLib.h | 8 +-------
.../Pch/IncludePrivate/Library/PeiI2cMasterLib.h | 8 +-------
.../Pch/IncludePrivate/Library/RstPrivateLib.h | 8 +-------
.../KabylakeSiliconPkg/Pch/IncludePrivate/PchConfigHob.h | 8 +-------
.../Pch/IncludePrivate/PchHdaEndpoints.h | 8 +-------
.../Pch/IncludePrivate/Protocol/PchNvs.h | 8 +-------
.../Pch/IncludePrivate/Protocol/PchNvsArea.h | 8 +-------
.../Pch/IncludePrivate/Protocol/PcieIoTrap.h | 8 +-------
.../Pch/Library/BaseResetSystemLib/BaseResetSystemLib.c | 8 +-------
.../Library/BaseResetSystemLib/BaseResetSystemLib.inf | 8 +-------
.../Pch/Library/BaseSmbusLib/BaseSmbusLib.c | 8 +-------
.../Pch/Library/BaseSmbusLib/BaseSmbusLib.inf | 8 +-------
.../Pch/Library/DxeResetSystemLib/DxeResetSystemLib.c | 8 +-------
.../Pch/Library/DxeResetSystemLib/DxeResetSystemLib.inf | 8 +-------
.../DxeRuntimeResetSystemLib/DxeRuntimeResetSystemLib.c | 8 +-------
.../DxeRuntimeResetSystemLib.inf | 8 +-------
.../Pch/Library/PeiDxeSmmGpioLib/GpioInit.c | 8 +-------
.../Pch/Library/PeiDxeSmmGpioLib/GpioLib.c | 8 +-------
.../Pch/Library/PeiDxeSmmGpioLib/GpioLibrary.h | 8 +-------
.../Pch/Library/PeiDxeSmmGpioLib/GpioNativeLib.c | 8 +-------
.../Pch/Library/PeiDxeSmmGpioLib/PchSklGpioData.c | 8 +-------
.../Pch/Library/PeiDxeSmmGpioLib/PeiDxeSmmGpioLib.inf | 8 +-------
.../PeiDxeSmmPchCycleDecodingLib/PchCycleDecodingLib.c | 8 +-------
.../PeiDxeSmmPchCycleDecodingLib.inf | 8 +-------
.../Pch/Library/PeiDxeSmmPchGbeLib/PchGbeLib.c | 8 +-------
.../Library/PeiDxeSmmPchGbeLib/PeiDxeSmmPchGbeLib.inf | 8 +-------
.../Pch/Library/PeiDxeSmmPchHsioLib/PchHsioLib.c | 8 +-------
.../Library/PeiDxeSmmPchHsioLib/PeiDxeSmmPchHsioLib.inf | 8 +-------
.../Pch/Library/PeiDxeSmmPchInfoLib/PchInfoLib.c | 8 +-------
.../Pch/Library/PeiDxeSmmPchInfoLib/PchInfoStrLib.c | 8 +-------
.../Library/PeiDxeSmmPchInfoLib/PeiDxeSmmPchInfoLib.inf | 8 +-------
.../Pch/Library/PeiDxeSmmPchP2sbLib/PchP2sbLib.c | 8 +-------
.../Library/PeiDxeSmmPchP2sbLib/PeiDxeSmmPchP2sbLib.inf | 8 +-------
.../Pch/Library/PeiDxeSmmPchPcieRpLib/PchPcieRpLib.c | 8 +-------
.../PeiDxeSmmPchPcieRpLib/PeiDxeSmmPchPcieRpLib.inf | 8 +-------
.../Pch/Library/PeiDxeSmmPchPcrLib/PchPcrLib.c | 8 +-------
.../Library/PeiDxeSmmPchPcrLib/PeiDxeSmmPchPcrLib.inf | 8 +-------
.../Pch/Library/PeiDxeSmmPchPmcLib/PchPmcLib.c | 8 +-------
.../Library/PeiDxeSmmPchPmcLib/PeiDxeSmmPchPmcLib.inf | 8 +-------
.../Pch/Library/PeiDxeSmmPchPsfLib/PchPsfLib.c | 8 +-------
.../Library/PeiDxeSmmPchPsfLib/PeiDxeSmmPchPsfLib.inf | 8 +-------
.../Library/PeiDxeSmmPchSbiAccessLib/PchSbiAccessLib.c | 8 +-------
.../PeiDxeSmmPchSbiAccessLib.inf | 8 +-------
.../PeiDxeSmmPchSerialIoLib/PeiDxeSmmPchSerialIoLib.c | 8 +-------
.../PeiDxeSmmPchSerialIoLib/PeiDxeSmmPchSerialIoLib.inf | 8 +-------
.../PeiDxeSmmPchWdtCommonLib.inf | 8 +-------
.../Pch/Library/PeiDxeSmmPchWdtCommonLib/WdtCommon.c | 8 +-------
.../Pch/Library/PeiOcWdtLib/PeiOcWdtLib.c | 8 +-------
.../Pch/Library/PeiOcWdtLib/PeiOcWdtLib.inf | 8 +-------
.../Pch/Library/PeiOcWdtLibNull/PeiOcWdtLibNull.c | 8 +-------
.../Pch/Library/PeiOcWdtLibNull/PeiOcWdtLibNull.inf | 8 +-------
.../Pch/Library/PeiPchPolicyLib/PchPreMemPrintPolicy.c | 8 +-------
.../Pch/Library/PeiPchPolicyLib/PchPrintPolicy.c | 8 +-------
.../Pch/Library/PeiPchPolicyLib/PchSamplePolicyLib.c | 8 +-------
.../Library/PeiPchPolicyLib/PchSamplePreMemPolicyLib.c | 8 +-------
.../Pch/Library/PeiPchPolicyLib/PeiPchPolicyLib.c | 8 +-------
.../Pch/Library/PeiPchPolicyLib/PeiPchPolicyLib.inf | 8 +-------
.../Pch/Library/PeiPchPolicyLib/PeiPchPolicyLibrary.h | 8 +-------
.../Pch/Library/PeiPchPolicyLib/PeiPchPreMemPolicyLib.c | 8 +-------
.../Pch/Library/PeiPchResetLib/PchReset.c | 8 +-------
.../Pch/Library/PeiPchResetLib/PeiPchResetLib.inf | 8 +-------
.../Pch/Library/PeiResetSystemLib/PeiResetSystemLib.c | 8 +-------
.../Pch/Library/PeiResetSystemLib/PeiResetSystemLib.inf | 8 +-------
.../Library/PeiResetSystemLib/PeiResetSystemLibFsp.inf | 8 +-------
.../KabylakeSiliconPkg/Pch/Library/PeiSpiLib/PeiSpiLib.c | 8 +-------
.../Pch/Library/PeiSpiLib/PeiSpiLib.inf | 8 +-------
.../SmmSpiFlashCommonLib/SmmSpiFlashCommonLib.inf | 8 +-------
.../Pch/Library/SmmSpiFlashCommonLib/SpiFlashCommon.c | 8 +-------
.../Library/SmmSpiFlashCommonLib/SpiFlashCommonSmmLib.c | 8 +-------
.../BasePchSpiCommonLib/BasePchSpiCommonLib.inf | 8 +-------
.../Pch/LibraryPrivate/BasePchSpiCommonLib/SpiCommon.c | 8 +-------
.../Pch/LibraryPrivate/DxePchHdaLib/DxePchHdaLib.inf | 8 +-------
.../Pch/LibraryPrivate/DxePchHdaLib/PchHdaEndpoints.c | 8 +-------
.../Pch/LibraryPrivate/DxePchHdaLib/PchHdaLib.c | 8 +-------
.../Pch/LibraryPrivate/DxePchHdaLib/PchHdaNhltConfig.c | 8 +-------
.../PeiDxeI2cMasterCommonLib/I2cMasterCommonLib.c | 8 +-------
.../PeiDxeI2cMasterCommonLib.inf | 8 +-------
.../PeiDxeSmmGpioPrivateLib/GpioNativePrivateLib.c | 8 +-------
.../PeiDxeSmmGpioPrivateLib/GpioPrivateLib.c | 8 +-------
.../PeiDxeSmmGpioPrivateLib/PchSklGpioPrivateData.c | 8 +-------
.../PeiDxeSmmGpioPrivateLib/PeiDxeSmmGpioPrivateLib.inf | 8 +-------
.../PeiDxeSmmPchInitCommonLib/PchInitCommon.c | 8 +-------
.../LibraryPrivate/PeiDxeSmmPchInitCommonLib/PchRpfn.c | 8 +-------
.../PeiDxeSmmPchInitCommonLib.inf | 8 +-------
.../PchPciExpressHelpersLibrary.c | 8 +-------
.../PchPciExpressHelpersLibrary.h | 8 +-------
.../PeiDxeSmmPchPciExpressHelpersLib.inf | 8 +-------
.../PeiDxeSmmPchPsfPrivateLib/PchPsfPrivateLib.c | 8 +-------
.../PeiDxeSmmPchPsfPrivateLib.inf | 8 +-------
.../PeiDxeSmmPchSmbusCommonLib/PchSmbusExec.c | 8 +-------
.../PeiDxeSmmPchSmbusCommonLib.inf | 8 +-------
.../PeiDxeSmmRstPrivateLib/PeiDxeSmmRstPrivateLib.c | 8 +-------
.../PeiDxeSmmRstPrivateLib/PeiDxeSmmRstPrivateLib.inf | 8 +-------
.../Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchAcpi.c | 8 +-------
.../KabylakeSiliconPkg/Pch/PchInit/Dxe/PchCio2Acpi.c | 8 +-------
.../KabylakeSiliconPkg/Pch/PchInit/Dxe/PchHdaAcpi.c | 8 +-------
.../Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInit.c | 8 +-------
.../Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInit.h | 8 +-------
.../KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxe.c | 8 +-------
.../KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxe.inf | 8 +-------
.../KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxeFsp.inf | 8 +-------
.../KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitFsp.c | 8 +-------
.../Pch/PchInit/Dxe/PchRstPcieStorage.c | 8 +-------
.../Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchSata.c | 8 +-------
.../Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchScs.c | 8 +-------
.../KabylakeSiliconPkg/Pch/PchInit/Dxe/PchSerialIo.c | 8 +-------
.../KabylakeSiliconPkg/Pch/PchInit/Dxe/PchSerialIoDxe.c | 8 +-------
.../Pch/PchInit/Smm/PchBiosWriteProtect.c | 8 +-------
.../Pch/PchInit/Smm/PchGpioSxIsolationSmm.c | 8 +-------
.../KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.c | 8 +-------
.../KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.h | 8 +-------
.../KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.inf | 8 +-------
.../KabylakeSiliconPkg/Pch/PchInit/Smm/PchLanSxSmm.c | 8 +-------
.../KabylakeSiliconPkg/Pch/PchInit/Smm/PchPcieSmm.c | 8 +-------
.../KabylakeSiliconPkg/Pch/PchInit/Smm/PchPort61hSmm.c | 8 +-------
.../KabylakeSiliconPkg/Pch/PchInit/Smm/PchSpiAsync.c | 8 +-------
.../KabylakeSiliconPkg/Pch/PchInit/Smm/PchXhciSxSmm.c | 8 +-------
.../KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/IoTrap.c | 8 +-------
.../KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/IoTrap.h | 8 +-------
.../Pch/PchSmiDispatcher/Smm/PchSmiDispatch.c | 8 +-------
.../Pch/PchSmiDispatcher/Smm/PchSmiDispatcher.inf | 8 +-------
.../KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmm.h | 8 +-------
.../Pch/PchSmiDispatcher/Smm/PchSmmCore.c | 8 +-------
.../Pch/PchSmiDispatcher/Smm/PchSmmEspi.c | 8 +-------
.../Pch/PchSmiDispatcher/Smm/PchSmmEspi.h | 8 +-------
.../Pch/PchSmiDispatcher/Smm/PchSmmGpi.c | 8 +-------
.../Pch/PchSmiDispatcher/Smm/PchSmmHelpers.c | 8 +-------
.../Pch/PchSmiDispatcher/Smm/PchSmmHelpers.h | 8 +-------
.../Pch/PchSmiDispatcher/Smm/PchSmmPeriodicTimer.c | 8 +-------
.../Pch/PchSmiDispatcher/Smm/PchSmmPowerButton.c | 8 +-------
.../Pch/PchSmiDispatcher/Smm/PchSmmSw.c | 8 +-------
.../Pch/PchSmiDispatcher/Smm/PchSmmSx.c | 8 +-------
.../Pch/PchSmiDispatcher/Smm/PchSmmUsb.c | 8 +-------
.../Pch/PchSmiDispatcher/Smm/PchxSmmHelpers.c | 8 +-------
.../Pch/PchSmiDispatcher/Smm/PchxSmmHelpers.h | 8 +-------
.../Pch/SmmControl/RuntimeDxe/SmmControl.inf | 8 +-------
.../Pch/SmmControl/RuntimeDxe/SmmControlDriver.c | 8 +-------
.../Pch/SmmControl/RuntimeDxe/SmmControlDriver.h | 8 +-------
Silicon/Intel/KabylakeSiliconPkg/Pch/Spi/Smm/PchSpi.c | 8 +-------
Silicon/Intel/KabylakeSiliconPkg/Pch/Spi/Smm/PchSpi.h | 8 +-------
.../Intel/KabylakeSiliconPkg/Pch/Spi/Smm/PchSpiSmm.inf | 8 +-------
.../SampleCode/Include/Library/SecPlatformLib.h | 8 +-------
.../Include/Guid/DataHubStatusCodeRecord.h | 8 +-------
.../IntelFrameworkPkg/Include/Guid/SmramMemoryReserve.h | 8 +-------
.../IntelFrameworkPkg/Include/Protocol/DataHub.h | 8 +-------
.../IntelFrameworkPkg/Include/Protocol/Legacy8259.h | 8 +-------
.../IntelFrameworkPkg/Include/Protocol/LegacyBios.h | 8 +-------
.../IntelFrameworkPkg/Include/Protocol/LegacyInterrupt.h | 8 +-------
.../SampleCode/MdeModulePkg/Include/Guid/AcpiS3Context.h | 9 +--------
.../MdeModulePkg/Include/Guid/ConsoleOutDevice.h | 8 +-------
.../MdeModulePkg/Include/Guid/MemoryTypeInformation.h | 8 +-------
.../MdeModulePkg/Include/Library/ResetSystemLib.h | 8 +-------
.../SampleCode/MdeModulePkg/Include/Ppi/SmmAccess.h | 9 +--------
.../SampleCode/MdeModulePkg/Include/Ppi/SmmControl.h | 9 +--------
.../MdeModulePkg/Include/Protocol/SmmVariable.h | 8 +-------
.../SampleCode/Pch/AcpiTables/Dsdt/PchSmb.asl | 8 +-------
Silicon/Intel/KabylakeSiliconPkg/SiPkg.dec | 8 +-------
Silicon/Intel/KabylakeSiliconPkg/SiPkgBuildOption.dsc | 8 +-------
Silicon/Intel/KabylakeSiliconPkg/SiPkgCommonLib.dsc | 8 +-------
Silicon/Intel/KabylakeSiliconPkg/SiPkgDxe.dsc | 8 +-------
Silicon/Intel/KabylakeSiliconPkg/SiPkgDxeLib.dsc | 8 +-------
Silicon/Intel/KabylakeSiliconPkg/SiPkgPei.dsc | 8 +-------
Silicon/Intel/KabylakeSiliconPkg/SiPkgPeiLib.dsc | 8 +-------
.../SystemAgent/AcpiTables/Dmar/Dmar.aslc | 8 +-------
.../SystemAgent/AcpiTables/Dmar/Dmar.h | 8 +-------
.../SystemAgent/AcpiTables/HostBus.asl | 8 +-------
.../SystemAgent/AcpiTables/SaAcpiTables.inf | 8 +-------
.../SystemAgent/AcpiTables/SaSsdt/Igfx.asl | 8 +-------
.../SystemAgent/AcpiTables/SaSsdt/IgfxCommon.asl | 8 +-------
.../SystemAgent/AcpiTables/SaSsdt/IgfxDsm.asl | 8 +-------
.../SystemAgent/AcpiTables/SaSsdt/IgfxOpGbda.asl | 8 +-------
.../SystemAgent/AcpiTables/SaSsdt/IgfxOpRn.asl | 8 +-------
.../SystemAgent/AcpiTables/SaSsdt/IgfxOpSbcb.asl | 8 +-------
.../SystemAgent/AcpiTables/SaSsdt/Sa.asl | 8 +-------
.../SystemAgent/AcpiTables/SaSsdt/SaNvs.asl | 8 +-------
.../SystemAgent/AcpiTables/SaSsdt/SaSsdt.asl | 8 +-------
.../SystemAgent/AcpiTables/SaSsdt/SaSsdt.inf | 8 +-------
.../SystemAgent/Include/ConfigBlock/GraphicsDxeConfig.h | 8 +-------
.../SystemAgent/Include/ConfigBlock/GraphicsPeiConfig.h | 8 +-------
.../SystemAgent/Include/ConfigBlock/MemoryConfig.h | 8 +-------
.../SystemAgent/Include/ConfigBlock/MiscDxeConfig.h | 8 +-------
.../Include/ConfigBlock/SaMiscPeiPreMemConfig.h | 8 +-------
.../SystemAgent/Include/ConfigBlock/VtdConfig.h | 8 +-------
.../SystemAgent/Include/DmaRemappingTable.h | 8 +-------
.../SystemAgent/Include/Library/DxeSaPolicyLib.h | 8 +-------
.../SystemAgent/Include/Library/PeiSaPolicyLib.h | 8 +-------
.../SystemAgent/Include/Library/SaPlatformLib.h | 8 +-------
.../KabylakeSiliconPkg/SystemAgent/Include/MemInfoHob.h | 8 +-------
.../SystemAgent/Include/Protocol/GopPolicy.h | 8 +-------
.../SystemAgent/Include/Protocol/IgdOpRegion.h | 8 +-------
.../SystemAgent/Include/Protocol/MemInfo.h | 8 +-------
.../SystemAgent/Include/Protocol/SaGlobalNvsArea.h | 8 +-------
.../SystemAgent/Include/Protocol/SaNvs.h | 8 +-------
.../SystemAgent/Include/Protocol/SaPolicy.h | 8 +-------
.../KabylakeSiliconPkg/SystemAgent/Include/SaAccess.h | 8 +-------
.../SystemAgent/Include/SaPolicyCommon.h | 8 +-------
.../KabylakeSiliconPkg/SystemAgent/Include/SaRegs.h | 8 +-------
.../SystemAgent/IncludePrivate/SaConfigHob.h | 8 +-------
.../SystemAgent/Library/DxeSaPolicyLib/DxeSaPolicyLib.c | 8 +-------
.../Library/DxeSaPolicyLib/DxeSaPolicyLib.inf | 8 +-------
.../Library/DxeSaPolicyLib/DxeSaPolicyLibrary.h | 8 +-------
.../PeiDxeSmmSaPlatformLib/PeiDxeSmmSaPlatformLib.inf | 8 +-------
.../Library/PeiDxeSmmSaPlatformLib/SaPlatformLibrary.c | 8 +-------
.../Library/PeiDxeSmmSaPlatformLib/SaPlatformLibrary.h | 8 +-------
.../Library/PeiSaPolicyLib/Ia32/MrcOemPlatform.S | 8 +-------
.../Library/PeiSaPolicyLib/Ia32/MrcOemPlatform.asm | 8 +-------
.../Library/PeiSaPolicyLib/Ia32/MrcOemPlatform.nasm | 8 +-------
.../SystemAgent/Library/PeiSaPolicyLib/MrcOemPlatform.c | 8 +-------
.../SystemAgent/Library/PeiSaPolicyLib/MrcOemPlatform.h | 8 +-------
.../SystemAgent/Library/PeiSaPolicyLib/PeiSaPolicyLib.c | 8 +-------
.../Library/PeiSaPolicyLib/PeiSaPolicyLib.inf | 8 +-------
.../Library/PeiSaPolicyLib/PeiSaPolicyLibSample.c | 8 +-------
.../Library/PeiSaPolicyLib/PeiSaPolicyLibrary.h | 8 +-------
.../SystemAgent/Library/PeiSaPolicyLib/SaPrintPolicy.c | 8 +-------
.../SystemAgent/MemoryInit/Include/MrcCommonTypes.h | 8 +-------
.../SystemAgent/MemoryInit/Include/MrcInterface.h | 8 +-------
.../SystemAgent/MemoryInit/Include/MrcRmtData.h | 8 +-------
.../SystemAgent/MemoryInit/Include/MrcSpdData.h | 8 +-------
.../SystemAgent/MemoryInit/Include/MrcTypes.h | 8 +-------
.../SystemAgent/SaInit/Dxe/GraphicsInit.c | 8 +-------
.../SystemAgent/SaInit/Dxe/GraphicsInit.h | 8 +-------
.../SystemAgent/SaInit/Dxe/IgdOpRegion.c | 8 +-------
.../SystemAgent/SaInit/Dxe/IgdOpRegion.h | 8 +-------
.../KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaAcpi.c | 8 +-------
.../KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaInit.h | 8 +-------
.../SystemAgent/SaInit/Dxe/SaInitDxe.c | 8 +-------
.../SystemAgent/SaInit/Dxe/SaInitDxe.h | 8 +-------
.../SystemAgent/SaInit/Dxe/SaInitDxe.inf | 8 +-------
.../KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/VTd.c | 8 +-------
.../KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/VTd.h | 8 +-------
.../SystemAgent/SmmAccess/Dxe/SmmAccess.inf | 8 +-------
.../SystemAgent/SmmAccess/Dxe/SmmAccessDriver.c | 8 +-------
.../SystemAgent/SmmAccess/Dxe/SmmAccessDriver.h | 8 +-------
492 files changed, 492 insertions(+), 3447 deletions(-)
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuConfig.h
index 863a4fcdf8..6de5efbede 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuConfig.h
@@ -2,13 +2,7 @@
CPU Config Block.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _CPU_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuConfigFspData.h b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuConfigFspData.h
index 8f333cffeb..53e6d45fe5 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuConfigFspData.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuConfigFspData.h
@@ -2,13 +2,7 @@
FSP CPU Data Config Block.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _CPU_CONFIG_FSP_DATA_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuConfigLibPreMemConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuConfigLibPreMemConfig.h
index 19e41287ce..4823b1d713 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuConfigLibPreMemConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuConfigLibPreMemConfig.h
@@ -2,13 +2,7 @@
CPU PreMemory Config Block.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _CPU_CONFIG_LIB_PREMEM_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuOverclockingConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuOverclockingConfig.h
index 735e79c491..7a6d89ebda 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuOverclockingConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuOverclockingConfig.h
@@ -2,13 +2,7 @@
CPU Overclocking Config Block.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _CPU_OVERCLOCKING_PREMEM_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPidTestConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPidTestConfig.h
index d8b5a2ed98..c55f9a0cc3 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPidTestConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPidTestConfig.h
@@ -2,13 +2,7 @@
CPU PID Config Block.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _CPU_PID_TEST_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgmtBasicConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgmtBasicConfig.h
index 68dc9195ae..6fe9126377 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgmtBasicConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgmtBasicConfig.h
@@ -2,13 +2,7 @@
CPU Power Management Basic Config Block.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _CPU_POWER_MGMT_BASIC_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgmtCustomConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgmtCustomConfig.h
index edb8182db5..026a1aff5f 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgmtCustomConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgmtCustomConfig.h
@@ -2,13 +2,7 @@
CPU Power Managment Custom Config Block.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _CPU_POWER_MGMT_CUSTOM_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgmtPsysConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgmtPsysConfig.h
index 05b1efd5b6..75b49dbe7a 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgmtPsysConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgmtPsysConfig.h
@@ -2,13 +2,7 @@
CPU Power Management Psys(Platform) Config Block.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _CPU_POWER_MGMT_PSYS_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgmtTestConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgmtTestConfig.h
index bf6e829fa3..ab0c194e76 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgmtTestConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgmtTestConfig.h
@@ -2,13 +2,7 @@
CPU Power Management Test Config Block.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _CPU_POWER_MGMT_TEST_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgmtVrConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgmtVrConfig.h
index ad4ed76250..802f585819 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgmtVrConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgmtVrConfig.h
@@ -2,13 +2,7 @@
CPU Power Management VR Config Block.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _CPU_POWER_MGMT_VR_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuTestConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuTestConfig.h
index 2b1fa5b3a5..2cdf834a89 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuTestConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuTestConfig.h
@@ -2,13 +2,7 @@
CPU Test Config Block.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _CPU_TEST_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuAccess.h b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuAccess.h
index dc62fea6eb..62a0323cb0 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuAccess.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuAccess.h
@@ -2,13 +2,7 @@
Macros to simplify and abstract the interface to CPU configuration.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _CPUACCESS_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuDataStruct.h b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuDataStruct.h
index e7caafa416..2dc7be45d2 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuDataStruct.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuDataStruct.h
@@ -2,13 +2,7 @@
This file declares various data structures used in CPU reference code.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuPolicyCommon.h b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuPolicyCommon.h
index a8ee41ec99..775fc6ce65 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuPolicyCommon.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuPolicyCommon.h
@@ -2,13 +2,7 @@
CPU Policy structure definition which will contain several config blocks during runtime.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _CPU_POLICY_COMMON_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuPowerMgmt.h b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuPowerMgmt.h
index 612b166010..4a14004fdf 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuPowerMgmt.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuPowerMgmt.h
@@ -2,13 +2,7 @@
This file contains define definitions specific to processor
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuRegs.h b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuRegs.h
index 21b6dd6f4b..3b92fd677f 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuRegs.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuRegs.h
@@ -10,13 +10,7 @@
- Definitions beginning with "N_" are the bit position
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _CPU_REGS_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Library/CpuMailboxLib.h b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Library/CpuMailboxLib.h
index 0c2df2ff80..4d36a90ad1 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Library/CpuMailboxLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Library/CpuMailboxLib.h
@@ -2,13 +2,7 @@
Header file for Cpu Mailbox Lib.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Library/CpuPlatformLib.h b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Library/CpuPlatformLib.h
index d1ccc5e7fb..462b083e6a 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Library/CpuPlatformLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Library/CpuPlatformLib.h
@@ -2,13 +2,7 @@
Header file for CpuPlatform Lib.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Library/CpuPolicyLib.h b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Library/CpuPolicyLib.h
index f05c5743d7..4ed5719491 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Library/CpuPolicyLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Library/CpuPolicyLib.h
@@ -2,13 +2,7 @@
Prototype of the CpuPolicy library.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _CPU_POLICY_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Library/CpuPolicyLibPreMem.h b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Library/CpuPolicyLibPreMem.h
index 905937ec88..9e7518f91c 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Library/CpuPolicyLibPreMem.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Library/CpuPolicyLibPreMem.h
@@ -2,13 +2,7 @@
Prototype of the CpuPolicy library.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _CPU_PREMEM_POLICY_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Protocol/CpuGlobalNvsArea.h b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Protocol/CpuGlobalNvsArea.h
index 6e807a3504..59c0f812c5 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Protocol/CpuGlobalNvsArea.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Protocol/CpuGlobalNvsArea.h
@@ -6,13 +6,7 @@
@note Data structures defined in this protocol are not naturally aligned.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _CPU_GLOBAL_NVS_AREA_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Protocol/CpuInfo.h b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Protocol/CpuInfo.h
index d59994471d..f0095908f3 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Protocol/CpuInfo.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Protocol/CpuInfo.h
@@ -2,13 +2,7 @@
Protocol used to report CPU information
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _CPU_INFO_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/IncludePrivate/CpuInitDataHob.h b/Silicon/Intel/KabylakeSiliconPkg/Cpu/IncludePrivate/CpuInitDataHob.h
index cdc6c463b6..58c968df89 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/IncludePrivate/CpuInitDataHob.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/IncludePrivate/CpuInitDataHob.h
@@ -2,13 +2,7 @@
Struct and GUID definitions for CpuInitDataHob.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _CPU_INIT_DATA_HOB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/IncludePrivate/CpuPrivateData.h b/Silicon/Intel/KabylakeSiliconPkg/Cpu/IncludePrivate/CpuPrivateData.h
index 13ca1f2a01..4cc60651c3 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/IncludePrivate/CpuPrivateData.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/IncludePrivate/CpuPrivateData.h
@@ -2,13 +2,7 @@
Struct definition for CpuPrivateData.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _CPU_PRIVATE_DATA_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/IncludePrivate/Library/CpuCommonLib.h b/Silicon/Intel/KabylakeSiliconPkg/Cpu/IncludePrivate/Library/CpuCommonLib.h
index 8099236d88..759fa84175 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/IncludePrivate/Library/CpuCommonLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/IncludePrivate/Library/CpuCommonLib.h
@@ -2,13 +2,7 @@
Header file for Cpu Common Lib implementation.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/IncludePrivate/PowerMgmtNvsStruct.h b/Silicon/Intel/KabylakeSiliconPkg/Cpu/IncludePrivate/PowerMgmtNvsStruct.h
index e7f7c19279..bd3fddb86f 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/IncludePrivate/PowerMgmtNvsStruct.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/IncludePrivate/PowerMgmtNvsStruct.h
@@ -2,13 +2,7 @@
This file contains CPU Gnvs Struct specific to processor
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _POWER_MGMT_NVS_STRUCT_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/BaseCpuMailboxLibNull/BaseCpuMailboxLibNull.c b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/BaseCpuMailboxLibNull/BaseCpuMailboxLibNull.c
index ed964d00c3..bc2e93a1ac 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/BaseCpuMailboxLibNull/BaseCpuMailboxLibNull.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/BaseCpuMailboxLibNull/BaseCpuMailboxLibNull.c
@@ -2,13 +2,7 @@
Mailbox Library.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include <Uefi.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/BaseCpuMailboxLibNull/BaseCpuMailboxLibNull.inf b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/BaseCpuMailboxLibNull/BaseCpuMailboxLibNull.inf
index 0426e05802..0799aa891b 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/BaseCpuMailboxLibNull/BaseCpuMailboxLibNull.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/BaseCpuMailboxLibNull/BaseCpuMailboxLibNull.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/CpuPrintPolicy.c b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/CpuPrintPolicy.c
index f871c21e6a..f13ca92661 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/CpuPrintPolicy.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/CpuPrintPolicy.c
@@ -2,13 +2,7 @@
This file is PeiCpuPolicy library.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include "PeiCpuPolicyLibrary.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicyLib.c b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicyLib.c
index 49331f1471..cb7f379e0f 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicyLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicyLib.c
@@ -2,13 +2,7 @@
This file is PeiCpuPolicy library.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include "PeiCpuPolicyLibrary.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicyLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicyLib.inf
index 24e9819e34..e0f4ee03ee 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicyLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicyLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicyLibrary.h b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicyLibrary.h
index 81301b475e..d2a475591d 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicyLibrary.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicyLibrary.h
@@ -2,13 +2,7 @@
Header file for the PeiCpuPolicyLib library.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PEI_CPU_POLICY_LIBRARY_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/CpuPrintPolicy.c b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/CpuPrintPolicy.c
index 1807604405..d7ffd0b600 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/CpuPrintPolicy.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/CpuPrintPolicy.c
@@ -2,13 +2,7 @@
This file is PeiCpuPolicy library.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include "PeiCpuPolicyLibrary.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/PeiCpuPolicyLib.c b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/PeiCpuPolicyLib.c
index 7d27c0b6dc..35041322a7 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/PeiCpuPolicyLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/PeiCpuPolicyLib.c
@@ -2,13 +2,7 @@
This file is PeiCpuPolicy library.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include "PeiCpuPolicyLibrary.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/PeiCpuPolicyLibPreMem.inf b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/PeiCpuPolicyLibPreMem.inf
index df6e20baef..a18ea79147 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/PeiCpuPolicyLibPreMem.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/PeiCpuPolicyLibPreMem.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/PeiCpuPolicyLibrary.h b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/PeiCpuPolicyLibrary.h
index 8c039b4591..553b7a8ca9 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/PeiCpuPolicyLibrary.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/PeiCpuPolicyLibrary.h
@@ -2,13 +2,7 @@
Header file for the PeiCpuPolicyLib library.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PEI_CPU_POLICY_LIBRARY_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiDxeSmmCpuPlatformLib/CpuPlatformLibrary.c b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiDxeSmmCpuPlatformLib/CpuPlatformLibrary.c
index 830803a909..0cf2cc8a1f 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiDxeSmmCpuPlatformLib/CpuPlatformLibrary.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiDxeSmmCpuPlatformLib/CpuPlatformLibrary.c
@@ -2,13 +2,7 @@
CPU Platform Lib implementation.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiDxeSmmCpuPlatformLib/CpuPlatformLibrary.h b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiDxeSmmCpuPlatformLib/CpuPlatformLibrary.h
index d5b8ed9ae4..3fcdbcb402 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiDxeSmmCpuPlatformLib/CpuPlatformLibrary.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiDxeSmmCpuPlatformLib/CpuPlatformLibrary.h
@@ -2,13 +2,7 @@
Header file for Cpu Platform Lib implementation.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiDxeSmmCpuPlatformLib/PeiDxeSmmCpuPlatformLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiDxeSmmCpuPlatformLib/PeiDxeSmmCpuPlatformLib.inf
index 2a123ae708..21d441a577 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiDxeSmmCpuPlatformLib/PeiDxeSmmCpuPlatformLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiDxeSmmCpuPlatformLib/PeiDxeSmmCpuPlatformLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/LibraryPrivate/PeiDxeSmmCpuCommonLib/CpuCommonLib.c b/Silicon/Intel/KabylakeSiliconPkg/Cpu/LibraryPrivate/PeiDxeSmmCpuCommonLib/CpuCommonLib.c
index 100bd1464c..4fa713612b 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/LibraryPrivate/PeiDxeSmmCpuCommonLib/CpuCommonLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/LibraryPrivate/PeiDxeSmmCpuCommonLib/CpuCommonLib.c
@@ -2,13 +2,7 @@
CPU Common Lib implementation.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/LibraryPrivate/PeiDxeSmmCpuCommonLib/PeiDxeSmmCpuCommonLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Cpu/LibraryPrivate/PeiDxeSmmCpuCommonLib/PeiDxeSmmCpuCommonLib.inf
index 70d33ce354..e5c546d67a 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/LibraryPrivate/PeiDxeSmmCpuCommonLib/PeiDxeSmmCpuCommonLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/LibraryPrivate/PeiDxeSmmCpuCommonLib/PeiDxeSmmCpuCommonLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/BootFirmwareMediaProtection.c b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/BootFirmwareMediaProtection.c
index bf272036c4..a255e7e514 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/BootFirmwareMediaProtection.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/BootFirmwareMediaProtection.c
@@ -2,13 +2,7 @@
This file contains the tests for the BootFirmwareMediaProtection BIT
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/DebugModeDisabled.c b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/DebugModeDisabled.c
index e96535cf03..0a9d381a53 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/DebugModeDisabled.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/DebugModeDisabled.c
@@ -2,13 +2,7 @@
This file contains the tests for the DebugModeDisabled Bit
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/HardwareRootedBootIntegrity.c b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/HardwareRootedBootIntegrity.c
index beca056028..d159039b35 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/HardwareRootedBootIntegrity.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/HardwareRootedBootIntegrity.c
@@ -2,13 +2,7 @@
This file contains the tests for the HardwareRootedBootIntegrity bit
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/HstiSiliconDxe.c b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/HstiSiliconDxe.c
index e9a26cac80..3b40893266 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/HstiSiliconDxe.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/HstiSiliconDxe.c
@@ -2,13 +2,7 @@
This file contains DXE driver for testing and publishing HSTI
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/HstiSiliconDxe.h b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/HstiSiliconDxe.h
index b2b48a2152..08094dbbc1 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/HstiSiliconDxe.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/HstiSiliconDxe.h
@@ -2,13 +2,7 @@
This file contains the required header files for the HSTI Silicon DXE driver
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/HstiSiliconDxe.inf b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/HstiSiliconDxe.inf
index 854343da38..52e3b6ceba 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/HstiSiliconDxe.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/HstiSiliconDxe.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/IntegratedDeviceDmaProtection.c b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/IntegratedDeviceDmaProtection.c
index d45cc586ba..184ec609ba 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/IntegratedDeviceDmaProtection.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/IntegratedDeviceDmaProtection.c
@@ -2,13 +2,7 @@
This file contains the tests for the IntegratedDeviceDMAProtection bit
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/MeasuredBootEnforcement.c b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/MeasuredBootEnforcement.c
index 6d88a64060..c05e6d6ec6 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/MeasuredBootEnforcement.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/MeasuredBootEnforcement.c
@@ -2,13 +2,7 @@
This file contains the tests for the MeasuredBootEnforcement BIT
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/MpServiceHelp.c b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/MpServiceHelp.c
index f1e7a8d946..bac52664b5 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/MpServiceHelp.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/MpServiceHelp.c
@@ -2,13 +2,7 @@
This file contains the mpservices helper functions
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureCpuConfiguration.c b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureCpuConfiguration.c
index 8abb3caf1f..68fda2d634 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureCpuConfiguration.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureCpuConfiguration.c
@@ -2,13 +2,7 @@
This file contains the tests for the SecureCPUConfiguration bit
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureIntegratedGraphicsConfiguration.c b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureIntegratedGraphicsConfiguration.c
index c70ac41cf6..e53d45ee12 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureIntegratedGraphicsConfiguration.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureIntegratedGraphicsConfiguration.c
@@ -2,13 +2,7 @@
This file contains the tests for the SecureIntegratedGraphics bit
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include "HstiSiliconDxe.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureMemoryMapConfiguration.c b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureMemoryMapConfiguration.c
index 00dd3092a1..a3c9bbebea 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureMemoryMapConfiguration.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureMemoryMapConfiguration.c
@@ -2,13 +2,7 @@
This file contains the tests for the SecureMemoryMapConfiguration bit
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecurePCHConfiguration.c b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecurePCHConfiguration.c
index 7274c5556a..2d73c26eb2 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecurePCHConfiguration.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecurePCHConfiguration.c
@@ -2,13 +2,7 @@
This file contains the tests for the SecuePCHConfiguration bit
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include "HstiSiliconDxe.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureSystemAgentConfiguration.c b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureSystemAgentConfiguration.c
index 2f498cd532..d08a85b87e 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureSystemAgentConfiguration.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureSystemAgentConfiguration.c
@@ -2,13 +2,7 @@
This file contains the tests for the SecureSystemAgentConfiguration bit
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SignedFirmwareUpdate.c b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SignedFirmwareUpdate.c
index 79dabc690e..aab48e02e6 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SignedFirmwareUpdate.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SignedFirmwareUpdate.c
@@ -2,13 +2,7 @@
This file contains the tests for the SignedFirmwareUpdate bit
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Include/ConfigBlock.h b/Silicon/Intel/KabylakeSiliconPkg/Include/ConfigBlock.h
index 246582e9ee..dd91a55e79 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Include/ConfigBlock.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Include/ConfigBlock.h
@@ -2,13 +2,7 @@
Header file for Config Block Lib implementation
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Include/HstiFeatureBit.h b/Silicon/Intel/KabylakeSiliconPkg/Include/HstiFeatureBit.h
index cdbe75ae18..12baf4e378 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Include/HstiFeatureBit.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Include/HstiFeatureBit.h
@@ -3,13 +3,7 @@
including error string definitions
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Include/Library/AslUpdateLib.h b/Silicon/Intel/KabylakeSiliconPkg/Include/Library/AslUpdateLib.h
index dc76e33557..d58b6d6458 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Include/Library/AslUpdateLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Include/Library/AslUpdateLib.h
@@ -6,13 +6,7 @@
restrictions, etc).
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Include/Library/ConfigBlockLib.h b/Silicon/Intel/KabylakeSiliconPkg/Include/Library/ConfigBlockLib.h
index cc437b93bf..04c8ec5cca 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Include/Library/ConfigBlockLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Include/Library/ConfigBlockLib.h
@@ -2,13 +2,7 @@
Header file for Config Block Lib implementation
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Include/Library/MmPciLib.h b/Silicon/Intel/KabylakeSiliconPkg/Include/Library/MmPciLib.h
index b4f8b41e1b..9049675679 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Include/Library/MmPciLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Include/Library/MmPciLib.h
@@ -2,13 +2,7 @@
Get Pci Express address library implementation.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Include/Library/PeiSiPolicyUpdateLib.h b/Silicon/Intel/KabylakeSiliconPkg/Include/Library/PeiSiPolicyUpdateLib.h
index 184b04f5de..7c9517bdb1 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Include/Library/PeiSiPolicyUpdateLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Include/Library/PeiSiPolicyUpdateLib.h
@@ -2,13 +2,7 @@
Header file for PEI SiPolicyUpdate Library.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Include/Library/SiConfigBlockLib.h b/Silicon/Intel/KabylakeSiliconPkg/Include/Library/SiConfigBlockLib.h
index 56527478b4..1534eb59d0 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Include/Library/SiConfigBlockLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Include/Library/SiConfigBlockLib.h
@@ -2,13 +2,7 @@
Prototype of the SiConfigBlockLib library.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Include/Library/SiPolicyLib.h b/Silicon/Intel/KabylakeSiliconPkg/Include/Library/SiPolicyLib.h
index 98d3ad25e0..7bd26863b5 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Include/Library/SiPolicyLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Include/Library/SiPolicyLib.h
@@ -2,13 +2,7 @@
Prototype of the SiPolicyLib library.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Include/Library/SiliconInitLib.h b/Silicon/Intel/KabylakeSiliconPkg/Include/Library/SiliconInitLib.h
index d10e7cf0b8..0028c9d911 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Include/Library/SiliconInitLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Include/Library/SiliconInitLib.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Include/PcieRegs.h b/Silicon/Intel/KabylakeSiliconPkg/Include/PcieRegs.h
index 3a3b22fd83..d91a450023 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Include/PcieRegs.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Include/PcieRegs.h
@@ -11,13 +11,7 @@
Definitions beginning with "N_" are the bit position
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Include/Ppi/SiInitPpi.h b/Silicon/Intel/KabylakeSiliconPkg/Include/Ppi/SiInitPpi.h
index 6d2b857ac6..b8643b3ede 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Include/Ppi/SiInitPpi.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Include/Ppi/SiInitPpi.h
@@ -3,13 +3,7 @@
init
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Include/Ppi/SiPolicy.h b/Silicon/Intel/KabylakeSiliconPkg/Include/Ppi/SiPolicy.h
index 044dadc022..3088eb89e6 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Include/Ppi/SiPolicy.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Include/Ppi/SiPolicy.h
@@ -5,13 +5,7 @@
over to silicon DXE modules.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Include/Protocol/SiPolicyProtocol.h b/Silicon/Intel/KabylakeSiliconPkg/Include/Protocol/SiPolicyProtocol.h
index 91fcad80a0..ff3b92ba1b 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Include/Protocol/SiPolicyProtocol.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Include/Protocol/SiPolicyProtocol.h
@@ -2,13 +2,7 @@
Protocol used for specifying platform related Silicon information and policy setting.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Include/SiPolicyStruct.h b/Silicon/Intel/KabylakeSiliconPkg/Include/SiPolicyStruct.h
index f1facc4300..375844e506 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Include/SiPolicyStruct.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Include/SiPolicyStruct.h
@@ -2,13 +2,7 @@
Intel reference code configuration policies.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/IncludePrivate/Library/PcieInitLib.h b/Silicon/Intel/KabylakeSiliconPkg/IncludePrivate/Library/PcieInitLib.h
index f8c3c3b43d..f800b78809 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/IncludePrivate/Library/PcieInitLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/IncludePrivate/Library/PcieInitLib.h
@@ -2,13 +2,7 @@
PCIe Initialization Library header file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/IncludePrivate/SiConfigHob.h b/Silicon/Intel/KabylakeSiliconPkg/IncludePrivate/SiConfigHob.h
index 676e5e433b..dbbcfa997c 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/IncludePrivate/SiConfigHob.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/IncludePrivate/SiConfigHob.h
@@ -3,13 +3,7 @@
related Intel silicon information and config setting.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/KabylakeSiliconBuild.bat b/Silicon/Intel/KabylakeSiliconPkg/KabylakeSiliconBuild.bat
index 98d94cf310..c384ca0a1f 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/KabylakeSiliconBuild.bat
+++ b/Silicon/Intel/KabylakeSiliconPkg/KabylakeSiliconBuild.bat
@@ -1,13 +1,7 @@
@REM @file
@REM
@REM Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-@REM This program and the accompanying materials
-@REM are licensed and made available under the terms and conditions of the BSD License
-@REM which accompanies this distribution. The full text of the license may be found at
-@REM http://opensource.org/licenses/bsd-license.php
-@REM
-@REM THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-@REM WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+@REM SPDX-License-Identifier: BSD-2-Clause-Patent
@REM
@call edksetup.bat
diff --git a/Silicon/Intel/KabylakeSiliconPkg/KabylakeSiliconPkg.dsc b/Silicon/Intel/KabylakeSiliconPkg/KabylakeSiliconPkg.dsc
index cbb2a8bec4..5b114ae99e 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/KabylakeSiliconPkg.dsc
+++ b/Silicon/Intel/KabylakeSiliconPkg/KabylakeSiliconPkg.dsc
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017 - 2019, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Intel/KabylakeSiliconPkg/KabylakeSiliconPrivate.dec b/Silicon/Intel/KabylakeSiliconPkg/KabylakeSiliconPrivate.dec
index 163bd429f8..0c013af8b6 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/KabylakeSiliconPrivate.dec
+++ b/Silicon/Intel/KabylakeSiliconPkg/KabylakeSiliconPrivate.dec
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/BaseConfigBlockLib/BaseConfigBlockLib.c b/Silicon/Intel/KabylakeSiliconPkg/Library/BaseConfigBlockLib/BaseConfigBlockLib.c
index a411547ccb..b9bd6f3a48 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/BaseConfigBlockLib/BaseConfigBlockLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/BaseConfigBlockLib/BaseConfigBlockLib.c
@@ -2,13 +2,7 @@
Library functions for Config Block management.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include <ConfigBlock.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/BaseConfigBlockLib/BaseConfigBlockLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Library/BaseConfigBlockLib/BaseConfigBlockLib.inf
index f544c75a6c..646c5b189c 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/BaseConfigBlockLib/BaseConfigBlockLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/BaseConfigBlockLib/BaseConfigBlockLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/BaseSiConfigBlockLib/BaseSiConfigBlockLib.c b/Silicon/Intel/KabylakeSiliconPkg/Library/BaseSiConfigBlockLib/BaseSiConfigBlockLib.c
index 98ff9e3410..8596933549 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/BaseSiConfigBlockLib/BaseSiConfigBlockLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/BaseSiConfigBlockLib/BaseSiConfigBlockLib.c
@@ -3,13 +3,7 @@
to config block header.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include <ConfigBlock.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/BaseSiConfigBlockLib/BaseSiConfigBlockLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Library/BaseSiConfigBlockLib/BaseSiConfigBlockLib.inf
index 5961b1a6b2..c9a70c10c8 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/BaseSiConfigBlockLib/BaseSiConfigBlockLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/BaseSiConfigBlockLib/BaseSiConfigBlockLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLib/DxeAslUpdateLib.c b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLib/DxeAslUpdateLib.c
index ea85be4a11..e6ab43db6d 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLib/DxeAslUpdateLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLib/DxeAslUpdateLib.c
@@ -7,13 +7,7 @@
This library uses the ACPI Support protocol.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include <Base.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLib/DxeAslUpdateLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLib/DxeAslUpdateLib.inf
index 0b24bbe71e..7a100128f3 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLib/DxeAslUpdateLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLib/DxeAslUpdateLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLibNull/DxeAslUpdateLibNull.c b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLibNull/DxeAslUpdateLibNull.c
index 834315d236..490a09ddb5 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLibNull/DxeAslUpdateLibNull.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLibNull/DxeAslUpdateLibNull.c
@@ -7,13 +7,7 @@
This library uses the ACPI Support protocol.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include <Base.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLibNull/DxeAslUpdateLibNull.inf b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLibNull/DxeAslUpdateLibNull.inf
index 3805dbf1dd..a3c8aef60a 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLibNull/DxeAslUpdateLibNull.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLibNull/DxeAslUpdateLibNull.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeSiliconPolicyInitLib/DxePolicyInit.c b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeSiliconPolicyInitLib/DxePolicyInit.c
index ac870bee84..694c896879 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeSiliconPolicyInitLib/DxePolicyInit.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeSiliconPolicyInitLib/DxePolicyInit.c
@@ -2,13 +2,7 @@
This file is SampleCode for Intel PEI Platform Policy initialization.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeSiliconPolicyInitLib/DxeSaPolicyInit.h b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeSiliconPolicyInitLib/DxeSaPolicyInit.h
index ebc5023f7b..855a89fc23 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeSiliconPolicyInitLib/DxeSaPolicyInit.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeSiliconPolicyInitLib/DxeSaPolicyInit.h
@@ -2,13 +2,7 @@
Header file for the SaPolicyInitDxe Driver.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _SA_POLICY_INIT_DXE_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeSiliconPolicyInitLib/DxeSiliconPolicyInitLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeSiliconPolicyInitLib/DxeSiliconPolicyInitLib.inf
index fbce84e78f..1997f43ab4 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeSiliconPolicyInitLib/DxeSiliconPolicyInitLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeSiliconPolicyInitLib/DxeSiliconPolicyInitLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiDxeSmmMmPciLib/PeiDxeSmmMmPciLib.c b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiDxeSmmMmPciLib/PeiDxeSmmMmPciLib.c
index 3688872019..51a06528e0 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiDxeSmmMmPciLib/PeiDxeSmmMmPciLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiDxeSmmMmPciLib/PeiDxeSmmMmPciLib.c
@@ -2,13 +2,7 @@
This file contains routines that get PCI Express Address
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include <Library/BaseLib.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiDxeSmmMmPciLib/PeiDxeSmmMmPciLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiDxeSmmMmPciLib/PeiDxeSmmMmPciLib.inf
index 24cae56d04..8ae40a0c9e 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiDxeSmmMmPciLib/PeiDxeSmmMmPciLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiDxeSmmMmPciLib/PeiDxeSmmMmPciLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLib.c b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLib.c
index b7db139ded..813b868fcf 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLib.c
@@ -3,13 +3,7 @@
Policy and installs RC Policy PPI.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLib.inf
index 134f60be5e..1d992cfbbd 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLibPreMem.c b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLibPreMem.c
index 3f80b990e9..e0d83cb467 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLibPreMem.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLibPreMem.c
@@ -3,13 +3,7 @@
Policy and installs RC Policy PPI.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLibrary.h b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLibrary.h
index 4c6ba6309d..f090e58868 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLibrary.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLibrary.h
@@ -2,13 +2,7 @@
Header file for the PeiSiPolicyLib library.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/SiPrintPolicy.c b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/SiPrintPolicy.c
index 16cfb52565..623f30de45 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/SiPrintPolicy.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/SiPrintPolicy.c
@@ -2,13 +2,7 @@
This file is PeiSiPolicyLib library for printing Policy settings.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiPolicyInit.c b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiPolicyInit.c
index c3a96e5ad2..0de415ad19 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiPolicyInit.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiPolicyInit.c
@@ -2,13 +2,7 @@
This file is SampleCode for Intel PEI Platform Policy initialization.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiPolicyInit.h b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiPolicyInit.h
index e85724411a..c38294cfbe 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiPolicyInit.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiPolicyInit.h
@@ -2,13 +2,7 @@
Header file for the PolicyInitPei PEIM.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiPolicyInitPreMem.c b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiPolicyInitPreMem.c
index c402dee3a4..fd76b4fac3 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiPolicyInitPreMem.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiPolicyInitPreMem.c
@@ -2,13 +2,7 @@
This file is SampleCode for Intel PEI Platform Policy initialization.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiSiPolicyInit.h b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiSiPolicyInit.h
index 4f4a80b9ae..47ede26b05 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiSiPolicyInit.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiSiPolicyInit.h
@@ -2,13 +2,7 @@
Header file for the PeiSiPolicyInit
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiSiliconPolicyInitLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiSiliconPolicyInitLib.inf
index ac37f17eae..7982a5d87f 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiSiliconPolicyInitLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiSiliconPolicyInitLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibDependency/PeiPostMemSiliconPolicyInitLibDependency.inf b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibDependency/PeiPostMemSiliconPolicyInitLibDependency.inf
index 243a70f30d..2bca431712 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibDependency/PeiPostMemSiliconPolicyInitLibDependency.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibDependency/PeiPostMemSiliconPolicyInitLibDependency.inf
@@ -5,13 +5,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibDependency/PeiPreMemSiliconPolicyInitLibDependency.inf b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibDependency/PeiPreMemSiliconPolicyInitLibDependency.inf
index fd54b0bf7d..45a30da9ac 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibDependency/PeiPreMemSiliconPolicyInitLibDependency.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibDependency/PeiPreMemSiliconPolicyInitLibDependency.inf
@@ -5,13 +5,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibDependency/PeiSiliconPolicyInitLibDependency.c b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibDependency/PeiSiliconPolicyInitLibDependency.c
index 1db1582ff2..4c3be83c21 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibDependency/PeiSiliconPolicyInitLibDependency.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibDependency/PeiSiliconPolicyInitLibDependency.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspCpuPolicyInitLib.c b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspCpuPolicyInitLib.c
index 282f774831..72a797a0ea 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspCpuPolicyInitLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspCpuPolicyInitLib.c
@@ -2,13 +2,7 @@
Implementation of Fsp PCH Policy Initialization.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspMePolicyInitLib.c b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspMePolicyInitLib.c
index d97bf8be57..e72a06f5d3 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspMePolicyInitLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspMePolicyInitLib.c
@@ -2,13 +2,7 @@
Implementation of Fsp Me Policy Initialization.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspMiscUpdInitLib.c b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspMiscUpdInitLib.c
index b9329e4c8a..6d1a982bfb 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspMiscUpdInitLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspMiscUpdInitLib.c
@@ -2,13 +2,7 @@
Implementation of Fsp Misc UPD Initialization.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspPchPolicyInitLib.c b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspPchPolicyInitLib.c
index 3f7e297c0b..46c143553c 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspPchPolicyInitLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspPchPolicyInitLib.c
@@ -2,13 +2,7 @@
Implementation of Fsp PCH Policy Initialization.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspPolicyInitLib.c b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspPolicyInitLib.c
index 4e82a0cc31..1136996684 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspPolicyInitLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspPolicyInitLib.c
@@ -2,13 +2,7 @@
Instance of Fsp Policy Initialization Library.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspPolicyInitLib.h b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspPolicyInitLib.h
index a17b642a1d..52f20777ec 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspPolicyInitLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspPolicyInitLib.h
@@ -2,13 +2,7 @@
Internal header file for Fsp Policy Initialization Library.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspSaPolicyInitLib.c b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspSaPolicyInitLib.c
index 3d218f8ba9..51b72c360a 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspSaPolicyInitLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspSaPolicyInitLib.c
@@ -2,13 +2,7 @@
Implementation of Fsp SA Policy Initialization.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspSiPolicyInitLib.c b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspSiPolicyInitLib.c
index 49601b1496..bffabe61d0 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspSiPolicyInitLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspSiPolicyInitLib.c
@@ -2,13 +2,7 @@
Implementation of Fsp SI Policy Initialization.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiPolicyInit.c b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiPolicyInit.c
index abed092c46..06210927d4 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiPolicyInit.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiPolicyInit.c
@@ -2,13 +2,7 @@
This file is SampleCode for Intel PEI Platform Policy initialization.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiPolicyInit.h b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiPolicyInit.h
index e85724411a..c38294cfbe 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiPolicyInit.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiPolicyInit.h
@@ -2,13 +2,7 @@
Header file for the PolicyInitPei PEIM.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiPolicyInitLib.h b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiPolicyInitLib.h
index b5a7f4eef3..ae289f884e 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiPolicyInitLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiPolicyInitLib.h
@@ -2,13 +2,7 @@
Header file for the PolicyInitPei Library.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiPolicyInitPreMem.c b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiPolicyInitPreMem.c
index 35baba3183..ed391db583 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiPolicyInitPreMem.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiPolicyInitPreMem.c
@@ -2,13 +2,7 @@
This file is SampleCode for Intel PEI Platform Policy initialization.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiSiPolicyInit.h b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiSiPolicyInit.h
index 4f4a80b9ae..47ede26b05 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiSiPolicyInit.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiSiPolicyInit.h
@@ -2,13 +2,7 @@
Header file for the PeiSiPolicyInit
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiSiliconPolicyInitLibFsp.inf b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiSiliconPolicyInitLibFsp.inf
index 7f0d7a5dec..9ffb84fa1e 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiSiliconPolicyInitLibFsp.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiSiliconPolicyInitLibFsp.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/SiliconInitLib/SiliconInit.c b/Silicon/Intel/KabylakeSiliconPkg/Library/SiliconInitLib/SiliconInit.c
index 47ca04b98c..d09bec0489 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/SiliconInitLib/SiliconInit.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/SiliconInitLib/SiliconInit.c
@@ -2,13 +2,7 @@
Source code file for Platform Init PEI module
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/SiliconInitLib/SiliconInitLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Library/SiliconInitLib/SiliconInitLib.inf
index f26eea6be6..9007f299bb 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/SiliconInitLib/SiliconInitLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/SiliconInitLib/SiliconInitLib.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/SiliconInitLib/SiliconInitPreMem.c b/Silicon/Intel/KabylakeSiliconPkg/Library/SiliconInitLib/SiliconInitPreMem.c
index bb21872e1e..65a67a6795 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/SiliconInitLib/SiliconInitPreMem.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/SiliconInitLib/SiliconInitPreMem.c
@@ -2,13 +2,7 @@
Source code file for Platform Init Pre-Memory PEI module
Copyright (c) 2017 - 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Me/Include/ConfigBlock/MePeiConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Me/Include/ConfigBlock/MePeiConfig.h
index 2ec0d556b1..1d082d5854 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Me/Include/ConfigBlock/MePeiConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Me/Include/ConfigBlock/MePeiConfig.h
@@ -2,13 +2,7 @@
ME config block for PEI phase
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _ME_PEI_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Me/Include/Library/PeiMePolicyLib.h b/Silicon/Intel/KabylakeSiliconPkg/Me/Include/Library/PeiMePolicyLib.h
index 20afe4c46e..bca35e19d3 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Me/Include/Library/PeiMePolicyLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Me/Include/Library/PeiMePolicyLib.h
@@ -2,13 +2,7 @@
Prototype of the MePolicyLibPei library.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PEI_ME_POLICY_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Me/Include/MeChipset.h b/Silicon/Intel/KabylakeSiliconPkg/Me/Include/MeChipset.h
index 11ee04ad12..2ea9da8c2c 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Me/Include/MeChipset.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Me/Include/MeChipset.h
@@ -22,13 +22,7 @@
as "_ME_" without [generation_name] inserted.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _ME_CHIPSET_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Me/Include/MePolicyCommon.h b/Silicon/Intel/KabylakeSiliconPkg/Me/Include/MePolicyCommon.h
index 0243982c80..04d787a0f5 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Me/Include/MePolicyCommon.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Me/Include/MePolicyCommon.h
@@ -2,13 +2,7 @@
Definition for ME common policy
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _ME_POLICY_COMMON_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLib.c b/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLib.c
index 94a84a0478..31c7d59d1d 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLib.c
@@ -2,13 +2,7 @@
This file is PeiMePolicy library.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include "PeiMePolicyLibrary.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLib.inf
index 3c6e325772..ea247181a4 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLibrary.h b/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLibrary.h
index 85e8e2b154..a908bb6c24 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLibrary.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLibrary.h
@@ -2,13 +2,7 @@
Header file for the PeiMePolicy library.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PEI_ME_POLICY_LIBRARY_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/GpioAcpiDefines.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/GpioAcpiDefines.h
index 9cde7e862d..32507d4d11 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/GpioAcpiDefines.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/GpioAcpiDefines.h
@@ -1,13 +1,7 @@
/**@file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/GpioLib.asl b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/GpioLib.asl
index b9809bd2ab..db97d4b20d 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/GpioLib.asl
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/GpioLib.asl
@@ -1,13 +1,7 @@
/**@file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
include("GpioLibObjects.asl")
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/GpioLibObjects.asl b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/GpioLibObjects.asl
index 1468aedba4..ba1bf8cb93 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/GpioLibObjects.asl
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/GpioLibObjects.asl
@@ -1,13 +1,7 @@
/**@file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/IrqLink.asl b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/IrqLink.asl
index 51d88f1e5a..dfb09b95b0 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/IrqLink.asl
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/IrqLink.asl
@@ -2,13 +2,7 @@
ACPI DSDT table
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/Pch.asl b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/Pch.asl
index 34f3f6877f..b655572a96 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/Pch.asl
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/Pch.asl
@@ -1,13 +1,7 @@
/**@file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchAcpiTables.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchAcpiTables.inf
index ec99fb847a..14d5b28c33 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchAcpiTables.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchAcpiTables.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchHda.asl b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchHda.asl
index 151ee1fdd8..86a2523eed 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchHda.asl
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchHda.asl
@@ -1,13 +1,7 @@
/**@file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchHeci.asl b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchHeci.asl
index c79ee8d6cd..10f6c687b4 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchHeci.asl
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchHeci.asl
@@ -2,13 +2,7 @@
ACPI DSDT table for MEI1
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchIsh.asl b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchIsh.asl
index 42f12ff266..b792109478 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchIsh.asl
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchIsh.asl
@@ -2,13 +2,7 @@
ACPI DSDT table for ISH
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchNvs.asl b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchNvs.asl
index 7c4a0cc23c..db3ca89608 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchNvs.asl
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchNvs.asl
@@ -1,13 +1,7 @@
/**@file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchPcie.asl b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchPcie.asl
index 8628735184..edffaf28d0 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchPcie.asl
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchPcie.asl
@@ -1,13 +1,7 @@
/**@file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchRstPcieStorage.asl b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchRstPcieStorage.asl
index 701cf6891a..a9d3756a74 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchRstPcieStorage.asl
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchRstPcieStorage.asl
@@ -1,13 +1,7 @@
/**@file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchSata.asl b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchSata.asl
index d7f51f2b9b..17d32ade9d 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchSata.asl
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchSata.asl
@@ -1,13 +1,7 @@
/**@file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchScs.asl b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchScs.asl
index 808c73e06c..2707ad3a0b 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchScs.asl
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchScs.asl
@@ -2,13 +2,7 @@
ACPI DSDT table for SCS Controllers
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchSerialIo.asl b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchSerialIo.asl
index f33ee887e7..deaf57400f 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchSerialIo.asl
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchSerialIo.asl
@@ -1,13 +1,7 @@
/**@file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchXdci.asl b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchXdci.asl
index 54c1242178..432669a692 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchXdci.asl
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchXdci.asl
@@ -1,13 +1,7 @@
/**@file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchXhci.asl b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchXhci.asl
index 873246f662..d261973583 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchXhci.asl
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchXhci.asl
@@ -1,13 +1,7 @@
/**@file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/TraceHubDebug.asl b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/TraceHubDebug.asl
index a8e4f0b34c..35a2232bc4 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/TraceHubDebug.asl
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/TraceHubDebug.asl
@@ -2,13 +2,7 @@
Trace Hub debug library for ASL code.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/usbsbd.asl b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/usbsbd.asl
index 5036b4b771..acb948f699 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/usbsbd.asl
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/usbsbd.asl
@@ -1,13 +1,7 @@
/**@file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/Cio2Config.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/Cio2Config.h
index 187d4cd506..a3e15daede 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/Cio2Config.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/Cio2Config.h
@@ -2,13 +2,7 @@
CIO2 policy
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _CIO2_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/DciConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/DciConfig.h
index aba0677abc..37cb469db6 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/DciConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/DciConfig.h
@@ -2,13 +2,7 @@
Dci policy
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _DCI_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/DmiConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/DmiConfig.h
index 2fd5d1b171..e8ff6d91d6 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/DmiConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/DmiConfig.h
@@ -2,13 +2,7 @@
DMI policy
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _DMI_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/EspiConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/EspiConfig.h
index c952bf9f31..c00e5a81be 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/EspiConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/EspiConfig.h
@@ -2,13 +2,7 @@
Espi policy
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _ESPI_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/FlashProtectionConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/FlashProtectionConfig.h
index b55aaa705a..77f43a80fc 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/FlashProtectionConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/FlashProtectionConfig.h
@@ -2,13 +2,7 @@
FlashProtection policy
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _FLASH_PROTECTION_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HdAudioConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HdAudioConfig.h
index a0ebbbd84d..6498d84646 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HdAudioConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HdAudioConfig.h
@@ -2,13 +2,7 @@
HDAUDIO policy
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _HDAUDIO_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HpetConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HpetConfig.h
index 30928e5d08..7c2721a3cb 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HpetConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HpetConfig.h
@@ -2,13 +2,7 @@
HPET policy
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _HPET_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HsioConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HsioConfig.h
index e4973fc25e..a463d40814 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HsioConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HsioConfig.h
@@ -2,13 +2,7 @@
HSIO policy
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _HSIO_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HsioPcieConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HsioPcieConfig.h
index cf7bd6251a..c4043bee3e 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HsioPcieConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HsioPcieConfig.h
@@ -2,13 +2,7 @@
HSIO pcie policy
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _HSIO_PCIE_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HsioSataConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HsioSataConfig.h
index 53c1a01a17..fb1c2fa279 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HsioSataConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HsioSataConfig.h
@@ -2,13 +2,7 @@
Hsio Sata policy
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _HSIO_SATA_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/InterruptConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/InterruptConfig.h
index 3b8e247a31..6a032dbe0b 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/InterruptConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/InterruptConfig.h
@@ -2,13 +2,7 @@
Interrupt policy
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _INTERRUPT_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/IoApicConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/IoApicConfig.h
index c96e3a3a04..603b876fb8 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/IoApicConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/IoApicConfig.h
@@ -2,13 +2,7 @@
IoApic policy
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _IOAPIC_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/IshConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/IshConfig.h
index 6a4f6c9ee0..6ffdb0946f 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/IshConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/IshConfig.h
@@ -2,13 +2,7 @@
ISH policy
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _ISH_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/LanConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/LanConfig.h
index 980f3ac709..873a131e61 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/LanConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/LanConfig.h
@@ -2,13 +2,7 @@
Lan policy
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _LAN_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/LockDownConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/LockDownConfig.h
index f083b3b50c..4f7526f3eb 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/LockDownConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/LockDownConfig.h
@@ -2,13 +2,7 @@
Lock down policy
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _LOCK_DOWN_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/LpcConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/LpcConfig.h
index be1613a5c2..85fb80c403 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/LpcConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/LpcConfig.h
@@ -2,13 +2,7 @@
Lpc policy
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _LPC_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/P2sbConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/P2sbConfig.h
index 60b9828ebf..5a61e10299 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/P2sbConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/P2sbConfig.h
@@ -2,13 +2,7 @@
P2sb policy
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _P2SB_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/PchGeneralConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/PchGeneralConfig.h
index c946e9a116..9873061049 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/PchGeneralConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/PchGeneralConfig.h
@@ -2,13 +2,7 @@
PCH General policy
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PCH_GENERAL_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/PcieRpConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/PcieRpConfig.h
index 873386afe7..d3d92378bd 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/PcieRpConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/PcieRpConfig.h
@@ -2,13 +2,7 @@
Pcie root port policy
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PCH_PCIE_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/PmConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/PmConfig.h
index f483987c97..fc899ab864 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/PmConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/PmConfig.h
@@ -2,13 +2,7 @@
Power Management policy
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PM_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/Port61Config.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/Port61Config.h
index d8b9cf6145..aa897d0e86 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/Port61Config.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/Port61Config.h
@@ -2,13 +2,7 @@
Port 61h policy
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PORT_61_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SataConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SataConfig.h
index 0dc76e0c23..368e470af8 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SataConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SataConfig.h
@@ -2,13 +2,7 @@
Sata policy
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _SATA_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/ScsConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/ScsConfig.h
index 05a2f5dbfa..ba8ab17429 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/ScsConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/ScsConfig.h
@@ -2,13 +2,7 @@
Scs policy
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _SCS_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SerialIoConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SerialIoConfig.h
index 5caa24310a..529c89f3bf 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SerialIoConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SerialIoConfig.h
@@ -2,13 +2,7 @@
Serial IO policy
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _SERIAL_IO_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SerialIrqConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SerialIrqConfig.h
index b64579cd92..38ab7ca013 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SerialIrqConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SerialIrqConfig.h
@@ -2,13 +2,7 @@
Serial IRQ policy
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _SERIAL_IRQ_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SmbusConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SmbusConfig.h
index 78ac72aa87..c2f5b07636 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SmbusConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SmbusConfig.h
@@ -2,13 +2,7 @@
Smbus policy
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _SMBUS_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SpiConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SpiConfig.h
index 688fa314cb..e97f88cf71 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SpiConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SpiConfig.h
@@ -2,13 +2,7 @@
Spi policy
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _SPI_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/ThermalConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/ThermalConfig.h
index 8963da6ee7..b64948ac05 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/ThermalConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/ThermalConfig.h
@@ -2,13 +2,7 @@
Thermal policy
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _THERMAL_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/TraceHubConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/TraceHubConfig.h
index 5455c40514..a284dd3840 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/TraceHubConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/TraceHubConfig.h
@@ -2,13 +2,7 @@
Trace Hub policy
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _TRACEHUB_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/UsbConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/UsbConfig.h
index c2cef0aa43..0936e8321a 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/UsbConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/UsbConfig.h
@@ -2,13 +2,7 @@
USB policy
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _USB_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/WatchDogConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/WatchDogConfig.h
index 610c1092fb..a01481af64 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/WatchDogConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/WatchDogConfig.h
@@ -2,13 +2,7 @@
WatchDog policy
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _WATCH_DOG_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/GpioConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/GpioConfig.h
index 8b26020da2..9967241df3 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/GpioConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/GpioConfig.h
@@ -2,13 +2,7 @@
Header file for GpioConfig structure used by GPIO library.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _GPIO_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/GpioPinsSklH.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/GpioPinsSklH.h
index 5230656791..c8629ab12e 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/GpioPinsSklH.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/GpioPinsSklH.h
@@ -2,13 +2,7 @@
GPIO pins for SKL-PCH-H,
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _GPIO_PINS_SKL_H_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/GpioPinsSklLp.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/GpioPinsSklLp.h
index 999b417011..73a982b240 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/GpioPinsSklLp.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/GpioPinsSklLp.h
@@ -2,13 +2,7 @@
GPIO pins for SKL-PCH-LP,
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _GPIO_PINS_SKL_LP_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/GpioLib.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/GpioLib.h
index 5362beeea3..30ac4abc8b 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/GpioLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/GpioLib.h
@@ -7,13 +7,7 @@
returned in this case will be 0xFF.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _GPIO_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/GpioNativeLib.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/GpioNativeLib.h
index 5f2c57fd34..dab6708971 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/GpioNativeLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/GpioNativeLib.h
@@ -3,13 +3,7 @@
All function in this library is available for PEI, DXE, and SMM,
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _GPIO_NATIVE_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/OcWdtLib.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/OcWdtLib.h
index 9f5da64dff..b58c0d7acd 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/OcWdtLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/OcWdtLib.h
@@ -2,13 +2,7 @@
Header file for OC WDT Library.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _OC_WDT_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchCycleDecodingLib.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchCycleDecodingLib.h
index 8247f8f3c8..1b24e94f74 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchCycleDecodingLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchCycleDecodingLib.h
@@ -2,13 +2,7 @@
Header file for PchCycleDecodingLib.
Copyright (c) 2017 - 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PCH_CYCLE_DECODING_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchEspiLib.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchEspiLib.h
index 2096645375..479a4cc375 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchEspiLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchEspiLib.h
@@ -3,13 +3,7 @@
All function in this library is available for PEI, DXE, and SMM,
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchGbeLib.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchGbeLib.h
index 5461286634..9fa03a98c7 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchGbeLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchGbeLib.h
@@ -2,13 +2,7 @@
Header file for PchGbeLib.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PCH_GBE_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchHsioLib.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchHsioLib.h
index 65076800a9..9b775b3ce5 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchHsioLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchHsioLib.h
@@ -2,13 +2,7 @@
Header file for PchHsioLib.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PCH_HSIO_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchInfoLib.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchInfoLib.h
index 5902b92f18..8b0c123048 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchInfoLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchInfoLib.h
@@ -2,13 +2,7 @@
Header file for PchInfoLib.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PCH_INFO_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchP2sbLib.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchP2sbLib.h
index 8083ac4efd..6161016312 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchP2sbLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchP2sbLib.h
@@ -2,13 +2,7 @@
Header file for PchP2sbLib.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PCH_P2SB_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchPcieRpLib.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchPcieRpLib.h
index d5084772dd..1975465841 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchPcieRpLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchPcieRpLib.h
@@ -2,13 +2,7 @@
Header file for PchPcieRpLib.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PCH_PCIERP_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchPcrLib.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchPcrLib.h
index 149168993f..968e59e412 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchPcrLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchPcrLib.h
@@ -2,13 +2,7 @@
Header file for PchPcrLib.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PCH_PCR_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchPmcLib.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchPmcLib.h
index 61a955802a..ec98e07100 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchPmcLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchPmcLib.h
@@ -2,13 +2,7 @@
Header file for PchPmcLib.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PCH_PMC_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchPolicyLib.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchPolicyLib.h
index f4e3659960..cd7622e00c 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchPolicyLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchPolicyLib.h
@@ -2,13 +2,7 @@
Prototype of the PeiPchPolicy library.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PEI_PCH_POLICY_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchPsfLib.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchPsfLib.h
index 4a2924f8f6..a2b4a9c2bc 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchPsfLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchPsfLib.h
@@ -4,13 +4,7 @@
It's not expected to be used in platform code.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PCH_PSF_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchResetLib.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchResetLib.h
index 448cd21f50..6a2c57a202 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchResetLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchResetLib.h
@@ -2,13 +2,7 @@
Header file for PCH RESET Driver.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PCH_RESET_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchSbiAccessLib.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchSbiAccessLib.h
index 87d3318260..a11cc224e7 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchSbiAccessLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchSbiAccessLib.h
@@ -2,13 +2,7 @@
Header file for PchSbiAccessLib.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PCH_SBI_ACCESS_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchSerialIoLib.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchSerialIoLib.h
index 4ee5a9713e..6b2ba73061 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchSerialIoLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchSerialIoLib.h
@@ -2,13 +2,7 @@
Header file for PCH Serial IO Lib implementation.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PCH_SERIAL_IO_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchSerialIoUartLib.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchSerialIoUartLib.h
index 66c5945a7b..ac729c2bcf 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchSerialIoUartLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchSerialIoUartLib.h
@@ -2,13 +2,7 @@
Header file for PCH Serial IO UART Lib implementation.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PCH_SERIAL_IO_UART_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchSmmControlLib.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchSmmControlLib.h
index cdeeae5e6d..6cca4b7cb4 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchSmmControlLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchSmmControlLib.h
@@ -2,13 +2,7 @@
Header file for SMM Control PEI Library.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PCH_SMM_CONTROL_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchWdtCommonLib.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchWdtCommonLib.h
index f89e42a546..fde5d785c8 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchWdtCommonLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchWdtCommonLib.h
@@ -2,13 +2,7 @@
Library that contains common parts of WdtPei and WdtDxe. Not a standalone module.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PCH_WDT_COMMON_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/SecPchLib.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/SecPchLib.h
index ba9586a7a2..fc7b42889f 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/SecPchLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/SecPchLib.h
@@ -3,13 +3,7 @@
All function in this library is available for SEC
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _SEC_PCH_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/SpiFlashCommonLib.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/SpiFlashCommonLib.h
index 12dfaeb440..0c5e72258c 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/SpiFlashCommonLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/SpiFlashCommonLib.h
@@ -3,13 +3,7 @@
internal structure and functions used by SpiFlashCommonLib.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/SpiLib.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/SpiLib.h
index 6af66f8869..c3a64eab90 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/SpiLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/SpiLib.h
@@ -2,13 +2,7 @@
Library to initialize SPI services for future SPI accesses.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/TraceHubInitLib.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/TraceHubInitLib.h
index 23cb544d67..85e4e32d23 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/TraceHubInitLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/TraceHubInitLib.h
@@ -4,13 +4,7 @@
But do not support UEFI RUNTIME environment call.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _TRACE_HUB_INIT_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchAccess.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchAccess.h
index 2c457e3a1e..399f618c70 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchAccess.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchAccess.h
@@ -2,13 +2,7 @@
Macros that simplify accessing PCH devices's PCI registers.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PCH_ACCESS_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchLimits.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchLimits.h
index 905a4778ce..710ae04aee 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchLimits.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchLimits.h
@@ -2,13 +2,7 @@
Build time limits of PCH resources.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PCH_LIMITS_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchPcieStorageDetectHob.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchPcieStorageDetectHob.h
index 664f66f296..f28c3c2804 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchPcieStorageDetectHob.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchPcieStorageDetectHob.h
@@ -3,13 +3,7 @@
Definitions required to create PcieStorageInfoHob
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchPolicyCommon.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchPolicyCommon.h
index 67b255fe97..807bf3c10b 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchPolicyCommon.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchPolicyCommon.h
@@ -2,13 +2,7 @@
PCH configuration based on PCH policy
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PCH_POLICY_COMMON_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchPreMemPolicyCommon.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchPreMemPolicyCommon.h
index 8bd4c9b960..1b492b9fe9 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchPreMemPolicyCommon.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchPreMemPolicyCommon.h
@@ -2,13 +2,7 @@
PCH configuration based on PCH policy
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PCH_PREMEM_POLICY_COMMON_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchReservedResources.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchReservedResources.h
index e5de75c0e3..d54d8736c4 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchReservedResources.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchReservedResources.h
@@ -2,13 +2,7 @@
PCH preserved MMIO resource definitions.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PCH_PRESERVED_RESOURCES_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchResetPlatformSpecific.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchResetPlatformSpecific.h
index c19677cccd..ff49f818ca 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchResetPlatformSpecific.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchResetPlatformSpecific.h
@@ -2,13 +2,7 @@
PCH Reset Platform Specific definitions.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PCH_RESET_PLATFORM_SPECIFIC_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Ppi/PchReset.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Ppi/PchReset.h
index 951dac00dc..bb66f5dfde 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Ppi/PchReset.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Ppi/PchReset.h
@@ -2,13 +2,7 @@
PCH Reset PPI
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Ppi/Spi.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Ppi/Spi.h
index cd98f3601c..e11f82edca 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Ppi/Spi.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Ppi/Spi.h
@@ -3,13 +3,7 @@
Intel(R) PCH SPI Host Controller Compatibility Interface.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PCH_SPI_PPI_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Ppi/Wdt.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Ppi/Wdt.h
index b0bb6bccbd..a97be47abb 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Ppi/Wdt.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Ppi/Wdt.h
@@ -2,13 +2,7 @@
Watchdog Timer PPI
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PEI_WDT_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchAcpiSmiDispatch.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchAcpiSmiDispatch.h
index eb08a89f00..68f76fc411 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchAcpiSmiDispatch.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchAcpiSmiDispatch.h
@@ -2,13 +2,7 @@
APIs of PCH ACPI SMI Dispatch Protocol.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PCH_ACPI_SMI_DISPATCH_PROTOCOL_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchEmmcTuning.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchEmmcTuning.h
index ad1db3833a..4423cc1c79 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchEmmcTuning.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchEmmcTuning.h
@@ -2,13 +2,7 @@
PCH eMMC HS400 Tuning Protocol
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PCH_EMMC_TUNING_PROTOCOL_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchEspiSmiDispatch.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchEspiSmiDispatch.h
index 7d7d3a5339..f3e2e05eda 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchEspiSmiDispatch.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchEspiSmiDispatch.h
@@ -2,13 +2,7 @@
SmmEspiDispatch Protocol
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PCH_ESPI_SMI_DISPATCH_PROTOCOL_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchGpioUnlockSmiDispatch.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchGpioUnlockSmiDispatch.h
index 392733117b..4df549ec31 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchGpioUnlockSmiDispatch.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchGpioUnlockSmiDispatch.h
@@ -2,13 +2,7 @@
APIs of PCH GPIO UNLOCK SMI Dispatch Protocol.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PCH_GPIO_UNLOCK_SMI_DISPATCH_PROTOCOL_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchInfo.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchInfo.h
index ff81aebddf..312269e74b 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchInfo.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchInfo.h
@@ -2,13 +2,7 @@
This file defines the PCH Info Protocol.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PCH_INFO_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchPcieSmiDispatch.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchPcieSmiDispatch.h
index b80597ae9b..cff66f4366 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchPcieSmiDispatch.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchPcieSmiDispatch.h
@@ -2,13 +2,7 @@
APIs of PCH PCIE SMI Dispatch Protocol.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PCH_PCIE_SMI_DISPATCH_PROTOCOL_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchReset.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchReset.h
index b39543b36e..b2911ade7e 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchReset.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchReset.h
@@ -2,13 +2,7 @@
PCH Reset Protocol
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PCH_RESET_PROTOCOL_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchSmiDispatch.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchSmiDispatch.h
index 4f0508b238..3e301cb66d 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchSmiDispatch.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchSmiDispatch.h
@@ -2,13 +2,7 @@
APIs of PCH SMI Dispatch Protocol.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PCH_SMI_DISPATCH_PROTOCOL_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchSmmIoTrapControl.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchSmmIoTrapControl.h
index 5d0a4d34cf..d94dc2c480 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchSmmIoTrapControl.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchSmmIoTrapControl.h
@@ -2,13 +2,7 @@
PCH SMM IO Trap Control Protocol
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PCH_SMM_IO_TRAP_CONTROL_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchSmmPeriodicTimerControl.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchSmmPeriodicTimerControl.h
index 95c680e75c..4e2c73e28d 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchSmmPeriodicTimerControl.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchSmmPeriodicTimerControl.h
@@ -2,13 +2,7 @@
PCH SMM Periodic Timer Control Protocol
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PCH_SMM_PERIODIC_TIMER_CONTROL_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchTcoSmiDispatch.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchTcoSmiDispatch.h
index 457cdb682c..60c627f778 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchTcoSmiDispatch.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchTcoSmiDispatch.h
@@ -2,13 +2,7 @@
APIs of PCH TCO SMI Dispatch Protocol.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PCH_TCO_SMI_DISPATCH_PROTOCOL_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/SerialGpio.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/SerialGpio.h
index 4bc396132d..22663ce8d9 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/SerialGpio.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/SerialGpio.h
@@ -3,13 +3,7 @@
Intel(R) Serial Data over GPIO Pin functionality Protocol Interface.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PCH_SERIAL_GPIO_PROTOCOL_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/Spi.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/Spi.h
index e4ce8fb472..8c66e5063f 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/Spi.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/Spi.h
@@ -3,13 +3,7 @@
Intel(R) PCH SPI Host Controller Compatibility Interface.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PCH_SPI_PROTOCOL_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/Wdt.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/Wdt.h
index 4a65e016e6..171fe8aebc 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/Wdt.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/Wdt.h
@@ -2,13 +2,7 @@
Watchdog Timer protocol
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _DXE_WDT_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsCam.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsCam.h
index c4be5c27e7..0e16b63d29 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsCam.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsCam.h
@@ -22,13 +22,7 @@
as "_PCH_" without [generation_name] inserted.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PCH_REGS_CAM_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsDci.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsDci.h
index d38bd7f0c4..72b4d086e2 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsDci.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsDci.h
@@ -22,13 +22,7 @@
as "_PCH_" without [generation_name] inserted.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PCH_REGS_DCI_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsDmi.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsDmi.h
index 942aeda324..c94a384c79 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsDmi.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsDmi.h
@@ -22,13 +22,7 @@
as "_PCH_" without [generation_name] inserted.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PCH_REGS_DMI_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsFia.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsFia.h
index c9e08ca854..537e83c25a 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsFia.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsFia.h
@@ -22,13 +22,7 @@
as "_PCH_" without [generation_name] inserted.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PCH_REGS_FIA_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsGpio.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsGpio.h
index a6b2c4a8e5..a8649a23a1 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsGpio.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsGpio.h
@@ -22,13 +22,7 @@
as "_PCH_" without [generation_name] inserted.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PCH_REGS_GPIO_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsHda.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsHda.h
index 1d5c0e9e76..c598c3b439 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsHda.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsHda.h
@@ -22,13 +22,7 @@
as "_PCH_" without [generation_name] inserted.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PCH_REGS_HDA_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsHsio.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsHsio.h
index faa938e5a5..635320056e 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsHsio.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsHsio.h
@@ -2,13 +2,7 @@
Register definition for HSIO
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PCH_REGS_HSIO_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsIsh.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsIsh.h
index 687a153f30..4cf546b288 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsIsh.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsIsh.h
@@ -22,13 +22,7 @@
as "_PCH_" without [generation_name] inserted.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PCH_REGS_ISH_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsItss.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsItss.h
index 21269155b5..45ba22490e 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsItss.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsItss.h
@@ -22,13 +22,7 @@
as "_PCH_" without [generation_name] inserted.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PCH_REGS_ITSS_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsLan.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsLan.h
index bb4c2c15a9..974ca27c26 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsLan.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsLan.h
@@ -22,13 +22,7 @@
as "_PCH_" without [generation_name] inserted.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PCH_REGS_LAN_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsLpc.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsLpc.h
index 7c6f639260..052680e9f0 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsLpc.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsLpc.h
@@ -22,13 +22,7 @@
as "_PCH_" without [generation_name] inserted.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PCH_REGS_LPC_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsP2sb.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsP2sb.h
index b2779ab0ce..7619bf27cd 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsP2sb.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsP2sb.h
@@ -22,13 +22,7 @@
as "_PCH_" without [generation_name] inserted.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PCH_REGS_P2SB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsPcie.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsPcie.h
index 704f77c52f..0a1530743f 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsPcie.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsPcie.h
@@ -22,13 +22,7 @@
as "_PCH_" without [generation_name] inserted.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PCH_REGS_PCIE_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsPcr.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsPcr.h
index eac209a149..49aa13b52b 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsPcr.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsPcr.h
@@ -22,13 +22,7 @@
as "_PCH_" without [generation_name] inserted.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PCH_REGS_PCR_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsPmc.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsPmc.h
index d4c048ffe3..91b4a5f9a6 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsPmc.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsPmc.h
@@ -22,13 +22,7 @@
as "_PCH_" without [generation_name] inserted.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PCH_REGS_PMC_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsPsf.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsPsf.h
index c52f1e721d..ba5c5ce26b 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsPsf.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsPsf.h
@@ -22,13 +22,7 @@
as "_PCH_" without [generation_name] inserted.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PCH_REGS_PSF_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsPsth.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsPsth.h
index b312f7100e..0e599fef2b 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsPsth.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsPsth.h
@@ -22,13 +22,7 @@
as "_PCH_" without [generation_name] inserted.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PCH_REGS_PSTH_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsSata.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsSata.h
index 88d066ea28..5f62bb538d 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsSata.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsSata.h
@@ -22,13 +22,7 @@
as "_PCH_" without [generation_name] inserted.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PCH_REGS_SATA_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsScs.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsScs.h
index b1872adbe6..7af90cfe0c 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsScs.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsScs.h
@@ -22,13 +22,7 @@
as "_PCH_" without [generation_name] inserted.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PCH_REGS_SCS_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsSerialIo.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsSerialIo.h
index 461b935fde..eab67649ee 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsSerialIo.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsSerialIo.h
@@ -22,13 +22,7 @@
as "_PCH_" without [generation_name] inserted.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PCH_REGS_SERIAL_IO_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsSmbus.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsSmbus.h
index 9682040879..d52133fa3a 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsSmbus.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsSmbus.h
@@ -22,13 +22,7 @@
as "_PCH_" without [generation_name] inserted.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PCH_REGS_SMBUS_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsSpi.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsSpi.h
index f43c676797..6d7bf8f59a 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsSpi.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsSpi.h
@@ -22,13 +22,7 @@
as "_PCH_" without [generation_name] inserted.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PCH_REGS_SPI_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsThermal.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsThermal.h
index fe43d210ab..cdeaaab6a4 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsThermal.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsThermal.h
@@ -22,13 +22,7 @@
as "_PCH_" without [generation_name] inserted.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PCH_REGS_THERMAL_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsTraceHub.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsTraceHub.h
index 513b022f08..53526c8753 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsTraceHub.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsTraceHub.h
@@ -22,13 +22,7 @@
as "_PCH_" without [generation_name] inserted.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsUsb.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsUsb.h
index 7dfe90815f..56a864cf4b 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsUsb.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsUsb.h
@@ -22,13 +22,7 @@
as "_PCH_" without [generation_name] inserted.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PCH_REGS_USB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/DxePchHdaNhlt.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/DxePchHdaNhlt.h
index 5e7674a412..366b9d6707 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/DxePchHdaNhlt.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/DxePchHdaNhlt.h
@@ -2,13 +2,7 @@
Header file for DxePchHdaLib - NHLT structure definitions.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/GpioPrivateLib.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/GpioPrivateLib.h
index f555182bc4..395d009adf 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/GpioPrivateLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/GpioPrivateLib.h
@@ -3,13 +3,7 @@
All function in this library is available for PEI, DXE, and SMM,
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _GPIO_PRIVATE_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/I2cMasterCommonLib.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/I2cMasterCommonLib.h
index 8f0a1adf38..9c8335861d 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/I2cMasterCommonLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/I2cMasterCommonLib.h
@@ -2,13 +2,7 @@
Implement the I2C port control.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchHdaLib.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchHdaLib.h
index f3f7c27340..e7d5fdc3dc 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchHdaLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchHdaLib.h
@@ -2,13 +2,7 @@
This library provides PCH HD Audio functions.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchInitCommonLib.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchInitCommonLib.h
index 8c016c624f..449b38f111 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchInitCommonLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchInitCommonLib.h
@@ -2,13 +2,7 @@
Header file for PCH Init Common Lib
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PCH_INIT_COMMON_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchPciExpressHelpersLib.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchPciExpressHelpersLib.h
index 49c89a2fcc..2c800ca8e0 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchPciExpressHelpersLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchPciExpressHelpersLib.h
@@ -2,13 +2,7 @@
Header file for PCH PCI Express helpers library
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PCH_PCI_EXPRESS_HELPERS_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchPsfPrivateLib.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchPsfPrivateLib.h
index ad390103ce..e72cc87a27 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchPsfPrivateLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchPsfPrivateLib.h
@@ -2,13 +2,7 @@
Header file for PchPsfPrivateLib.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PCH_PSF_PRIVATE_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchSmbusCommonLib.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchSmbusCommonLib.h
index 5c2a6c30e2..e6494a1a38 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchSmbusCommonLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchSmbusCommonLib.h
@@ -2,13 +2,7 @@
PCH Smbus Protocol
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PCH_SMBUS_COMMON_LIB_H
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchSpiCommonLib.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchSpiCommonLib.h
index 8b6b6a6c97..d408289ea2 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchSpiCommonLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchSpiCommonLib.h
@@ -2,13 +2,7 @@
Header file for the PCH SPI Common Driver.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PCH_SPI_COMMON_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PeiI2cMasterLib.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PeiI2cMasterLib.h
index da4cfc6d19..78c07f20c6 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PeiI2cMasterLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PeiI2cMasterLib.h
@@ -2,13 +2,7 @@
PEI I2C Master module
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/RstPrivateLib.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/RstPrivateLib.h
index 2301c9fc0f..28edfda991 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/RstPrivateLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/RstPrivateLib.h
@@ -2,13 +2,7 @@
Header file for Rst Library
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/PchConfigHob.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/PchConfigHob.h
index fb372e92ac..9827beb085 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/PchConfigHob.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/PchConfigHob.h
@@ -2,13 +2,7 @@
The GUID definition for PchConfigHob
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PCH_CONFIG_HOB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/PchHdaEndpoints.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/PchHdaEndpoints.h
index 97f7be6c11..4c3f1795c0 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/PchHdaEndpoints.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/PchHdaEndpoints.h
@@ -2,13 +2,7 @@
Header file for PchHdaLib Endpoint descriptors.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Protocol/PchNvs.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Protocol/PchNvs.h
index ac288a56d0..b071061883 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Protocol/PchNvs.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Protocol/PchNvs.h
@@ -2,13 +2,7 @@
This file defines the PCH NVS Protocol.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PCH_NVS_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Protocol/PchNvsArea.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Protocol/PchNvsArea.h
index 66c119f577..c82498bde5 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Protocol/PchNvsArea.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Protocol/PchNvsArea.h
@@ -1,13 +1,7 @@
/**@file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Protocol/PcieIoTrap.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Protocol/PcieIoTrap.h
index 26d13b7a7d..8e05dd2c0a 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Protocol/PcieIoTrap.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Protocol/PcieIoTrap.h
@@ -2,13 +2,7 @@
This file defines the PCH PCIE IoTrap Protocol.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PCH_PCIE_IOTRAP_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseResetSystemLib/BaseResetSystemLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseResetSystemLib/BaseResetSystemLib.c
index f6f708172e..0fddff71a1 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseResetSystemLib/BaseResetSystemLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseResetSystemLib/BaseResetSystemLib.c
@@ -2,13 +2,7 @@
System reset library services.
Copyright (c) 2017 - 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include <Uefi.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseResetSystemLib/BaseResetSystemLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseResetSystemLib/BaseResetSystemLib.inf
index 2af43b5091..4c46216b44 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseResetSystemLib/BaseResetSystemLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseResetSystemLib/BaseResetSystemLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseSmbusLib/BaseSmbusLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseSmbusLib/BaseSmbusLib.c
index 17e42dfd0b..5d09e18613 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseSmbusLib/BaseSmbusLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseSmbusLib/BaseSmbusLib.c
@@ -2,13 +2,7 @@
PCH SMBUS library implementation built upon I/O library.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseSmbusLib/BaseSmbusLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseSmbusLib/BaseSmbusLib.inf
index a737f7105f..2894d137b9 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseSmbusLib/BaseSmbusLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseSmbusLib/BaseSmbusLib.inf
@@ -6,13 +6,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeResetSystemLib/DxeResetSystemLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeResetSystemLib/DxeResetSystemLib.c
index c591bdddef..51facacf08 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeResetSystemLib/DxeResetSystemLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeResetSystemLib/DxeResetSystemLib.c
@@ -2,13 +2,7 @@
System reset library services.
Copyright (c) 2017 - 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include <Base.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeResetSystemLib/DxeResetSystemLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeResetSystemLib/DxeResetSystemLib.inf
index 1736c3189e..aa8877140a 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeResetSystemLib/DxeResetSystemLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeResetSystemLib/DxeResetSystemLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeRuntimeResetSystemLib/DxeRuntimeResetSystemLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeRuntimeResetSystemLib/DxeRuntimeResetSystemLib.c
index 2bd8828836..9d09b3681b 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeRuntimeResetSystemLib/DxeRuntimeResetSystemLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeRuntimeResetSystemLib/DxeRuntimeResetSystemLib.c
@@ -2,13 +2,7 @@
System reset library services.
Copyright (c) 2017 - 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include <Base.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeRuntimeResetSystemLib/DxeRuntimeResetSystemLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeRuntimeResetSystemLib/DxeRuntimeResetSystemLib.inf
index 801876dd93..6b27661603 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeRuntimeResetSystemLib/DxeRuntimeResetSystemLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeRuntimeResetSystemLib/DxeRuntimeResetSystemLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/GpioInit.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/GpioInit.c
index 6e0c1c8b46..5d4d758e57 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/GpioInit.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/GpioInit.c
@@ -2,13 +2,7 @@
This file contains routines for GPIO initialization
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include "GpioLibrary.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/GpioLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/GpioLib.c
index bf76d40963..9679f657f3 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/GpioLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/GpioLib.c
@@ -2,13 +2,7 @@
This file contains routines for GPIO
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include "GpioLibrary.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/GpioLibrary.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/GpioLibrary.h
index 97a5287067..ed4f2f8023 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/GpioLibrary.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/GpioLibrary.h
@@ -2,13 +2,7 @@
Header file for GPIO Lib implementation.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _GPIO_LIBRARY_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/GpioNativeLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/GpioNativeLib.c
index e57e3ecbfa..a4f6466ed4 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/GpioNativeLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/GpioNativeLib.c
@@ -2,13 +2,7 @@
This file contains routines for GPIO native and chipset specific usage
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include "GpioLibrary.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/PchSklGpioData.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/PchSklGpioData.c
index c36792139c..42f57df921 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/PchSklGpioData.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/PchSklGpioData.c
@@ -2,13 +2,7 @@
This file contains SKL specific GPIO information
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include "GpioLibrary.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/PeiDxeSmmGpioLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/PeiDxeSmmGpioLib.inf
index 747fa67199..1282118d55 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/PeiDxeSmmGpioLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/PeiDxeSmmGpioLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchCycleDecodingLib/PchCycleDecodingLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchCycleDecodingLib/PchCycleDecodingLib.c
index 1f13b094fc..540e5ba116 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchCycleDecodingLib/PchCycleDecodingLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchCycleDecodingLib/PchCycleDecodingLib.c
@@ -2,13 +2,7 @@
PCH cycle deocding configuration and query library.
Copyright (c) 2017 - 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include <Base.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchCycleDecodingLib/PeiDxeSmmPchCycleDecodingLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchCycleDecodingLib/PeiDxeSmmPchCycleDecodingLib.inf
index 446703d918..24d08f662f 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchCycleDecodingLib/PeiDxeSmmPchCycleDecodingLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchCycleDecodingLib/PeiDxeSmmPchCycleDecodingLib.inf
@@ -6,13 +6,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchGbeLib/PchGbeLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchGbeLib/PchGbeLib.c
index 277923bdcc..d3bdfd2fc8 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchGbeLib/PchGbeLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchGbeLib/PchGbeLib.c
@@ -4,13 +4,7 @@
But do not support UEFI RUNTIME environment call.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchGbeLib/PeiDxeSmmPchGbeLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchGbeLib/PeiDxeSmmPchGbeLib.inf
index b05d82fce1..bfcb71ec20 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchGbeLib/PeiDxeSmmPchGbeLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchGbeLib/PeiDxeSmmPchGbeLib.inf
@@ -6,13 +6,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchHsioLib/PchHsioLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchHsioLib/PchHsioLib.c
index d3e6094954..d7483ebd97 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchHsioLib/PchHsioLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchHsioLib/PchHsioLib.c
@@ -4,13 +4,7 @@
But do not support UEFI RUNTIME environment call.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchHsioLib/PeiDxeSmmPchHsioLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchHsioLib/PeiDxeSmmPchHsioLib.inf
index f233f3e673..11a32ad78e 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchHsioLib/PeiDxeSmmPchHsioLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchHsioLib/PeiDxeSmmPchHsioLib.inf
@@ -6,13 +6,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchInfoLib/PchInfoLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchInfoLib/PchInfoLib.c
index 3f72e006c8..a1c20ba04f 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchInfoLib/PchInfoLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchInfoLib/PchInfoLib.c
@@ -5,13 +5,7 @@
But do not support UEFI RUNTIME environment call.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include <Base.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchInfoLib/PchInfoStrLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchInfoLib/PchInfoStrLib.c
index 6fb06eac2f..05b8587263 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchInfoLib/PchInfoStrLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchInfoLib/PchInfoStrLib.c
@@ -5,13 +5,7 @@
But do not support UEFI RUNTIME environment call.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include <Base.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchInfoLib/PeiDxeSmmPchInfoLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchInfoLib/PeiDxeSmmPchInfoLib.inf
index 35566d8243..44d56ea838 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchInfoLib/PeiDxeSmmPchInfoLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchInfoLib/PeiDxeSmmPchInfoLib.inf
@@ -6,13 +6,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchP2sbLib/PchP2sbLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchP2sbLib/PchP2sbLib.c
index dba89d3edc..ca3a222979 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchP2sbLib/PchP2sbLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchP2sbLib/PchP2sbLib.c
@@ -4,13 +4,7 @@
But do not support UEFI RUNTIME environment call.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchP2sbLib/PeiDxeSmmPchP2sbLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchP2sbLib/PeiDxeSmmPchP2sbLib.inf
index 115175f8a2..da3390c4ca 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchP2sbLib/PeiDxeSmmPchP2sbLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchP2sbLib/PeiDxeSmmPchP2sbLib.inf
@@ -6,13 +6,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcieRpLib/PchPcieRpLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcieRpLib/PchPcieRpLib.c
index 6b8a51d8d2..43caf3e9bd 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcieRpLib/PchPcieRpLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcieRpLib/PchPcieRpLib.c
@@ -4,13 +4,7 @@
But do not support UEFI RUNTIME environment call.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcieRpLib/PeiDxeSmmPchPcieRpLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcieRpLib/PeiDxeSmmPchPcieRpLib.inf
index 79ddb969ae..6b22411162 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcieRpLib/PeiDxeSmmPchPcieRpLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcieRpLib/PeiDxeSmmPchPcieRpLib.inf
@@ -6,13 +6,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcrLib/PchPcrLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcrLib/PchPcrLib.c
index e2585c36e0..b07a903d44 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcrLib/PchPcrLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcrLib/PchPcrLib.c
@@ -4,13 +4,7 @@
But do not support UEFI RUNTIME environment call.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcrLib/PeiDxeSmmPchPcrLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcrLib/PeiDxeSmmPchPcrLib.inf
index fdc523143f..2de45d5240 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcrLib/PeiDxeSmmPchPcrLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcrLib/PeiDxeSmmPchPcrLib.inf
@@ -6,13 +6,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPmcLib/PchPmcLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPmcLib/PchPmcLib.c
index 1985d5d133..790af0a7a1 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPmcLib/PchPmcLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPmcLib/PchPmcLib.c
@@ -4,13 +4,7 @@
But do not support UEFI RUNTIME environment call.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPmcLib/PeiDxeSmmPchPmcLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPmcLib/PeiDxeSmmPchPmcLib.inf
index bd3a33ff70..8b46a59b67 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPmcLib/PeiDxeSmmPchPmcLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPmcLib/PeiDxeSmmPchPmcLib.inf
@@ -6,13 +6,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPsfLib/PchPsfLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPsfLib/PchPsfLib.c
index 08a28f7e6d..a6f484f47b 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPsfLib/PchPsfLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPsfLib/PchPsfLib.c
@@ -2,13 +2,7 @@
This file contains PSF routines
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include <Base.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPsfLib/PeiDxeSmmPchPsfLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPsfLib/PeiDxeSmmPchPsfLib.inf
index 941f5a72dd..82db84c539 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPsfLib/PeiDxeSmmPchPsfLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPsfLib/PeiDxeSmmPchPsfLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchSbiAccessLib/PchSbiAccessLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchSbiAccessLib/PchSbiAccessLib.c
index 9434b7f236..85a699689e 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchSbiAccessLib/PchSbiAccessLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchSbiAccessLib/PchSbiAccessLib.c
@@ -2,13 +2,7 @@
PCH SBI access library.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchSbiAccessLib/PeiDxeSmmPchSbiAccessLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchSbiAccessLib/PeiDxeSmmPchSbiAccessLib.inf
index 38ca8dce0e..be8b2f55dc 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchSbiAccessLib/PeiDxeSmmPchSbiAccessLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchSbiAccessLib/PeiDxeSmmPchSbiAccessLib.inf
@@ -6,13 +6,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchSerialIoLib/PeiDxeSmmPchSerialIoLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchSerialIoLib/PeiDxeSmmPchSerialIoLib.c
index 7d24ed1269..03e2c60a5e 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchSerialIoLib/PeiDxeSmmPchSerialIoLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchSerialIoLib/PeiDxeSmmPchSerialIoLib.c
@@ -4,13 +4,7 @@
But do not support UEFI RUNTIME environment call.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchSerialIoLib/PeiDxeSmmPchSerialIoLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchSerialIoLib/PeiDxeSmmPchSerialIoLib.inf
index 28ee07ee15..fc25c3001d 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchSerialIoLib/PeiDxeSmmPchSerialIoLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchSerialIoLib/PeiDxeSmmPchSerialIoLib.inf
@@ -6,13 +6,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchWdtCommonLib/PeiDxeSmmPchWdtCommonLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchWdtCommonLib/PeiDxeSmmPchWdtCommonLib.inf
index 723ad14ced..95e4893d6c 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchWdtCommonLib/PeiDxeSmmPchWdtCommonLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchWdtCommonLib/PeiDxeSmmPchWdtCommonLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchWdtCommonLib/WdtCommon.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchWdtCommonLib/WdtCommon.c
index 00a2fef78d..50d2dd638e 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchWdtCommonLib/WdtCommon.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchWdtCommonLib/WdtCommon.c
@@ -2,13 +2,7 @@
Library that contains common parts of WdtPei and WdtDxe. Not a standalone module.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include <Uefi/UefiBaseType.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLib/PeiOcWdtLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLib/PeiOcWdtLib.c
index 0996b02ea6..e8c8dab6e7 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLib/PeiOcWdtLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLib/PeiOcWdtLib.c
@@ -2,13 +2,7 @@
The PEI Library Implements OcWdt Support.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLib/PeiOcWdtLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLib/PeiOcWdtLib.inf
index a2b8f71784..32a1df1b64 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLib/PeiOcWdtLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLib/PeiOcWdtLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLibNull/PeiOcWdtLibNull.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLibNull/PeiOcWdtLibNull.c
index fdde6803c3..ccd6c73599 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLibNull/PeiOcWdtLibNull.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLibNull/PeiOcWdtLibNull.c
@@ -2,13 +2,7 @@
The Null PEI Library Implements OcWdt Support.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLibNull/PeiOcWdtLibNull.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLibNull/PeiOcWdtLibNull.inf
index 93c951d49c..dbe58c6acd 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLibNull/PeiOcWdtLibNull.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLibNull/PeiOcWdtLibNull.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchPreMemPrintPolicy.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchPreMemPrintPolicy.c
index 650d414247..b7fcb0944e 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchPreMemPrintPolicy.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchPreMemPrintPolicy.c
@@ -2,13 +2,7 @@
Print whole PCH_PREMEM_POLICY_PPI
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include "PeiPchPolicyLibrary.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchPrintPolicy.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchPrintPolicy.c
index 13a8f9fbd6..72a78e5faf 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchPrintPolicy.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchPrintPolicy.c
@@ -2,13 +2,7 @@
Print whole PCH_POLICY_PPI
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include "PeiPchPolicyLibrary.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchSamplePolicyLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchSamplePolicyLib.c
index 4e57b72d6e..62b621ce2f 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchSamplePolicyLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchSamplePolicyLib.c
@@ -2,13 +2,7 @@
This file is to load sample board policy.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include "PeiPchPolicyLibrary.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchSamplePreMemPolicyLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchSamplePreMemPolicyLib.c
index fcefd76e8e..6cf9d9069e 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchSamplePreMemPolicyLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchSamplePreMemPolicyLib.c
@@ -2,13 +2,7 @@
This file is to load sample board policy.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include "PeiPchPolicyLibrary.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyLib.c
index f0f9f33f71..201c49b3a8 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyLib.c
@@ -2,13 +2,7 @@
This file is PeiPchPolicy library.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include "PeiPchPolicyLibrary.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyLib.inf
index d4d4ac1e54..39004319aa 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyLibrary.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyLibrary.h
index 9be618d38a..f8d01614ac 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyLibrary.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyLibrary.h
@@ -2,13 +2,7 @@
Header file for the PeiPchPolicy library.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PEI_PCH_POLICY_LIBRARY_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPreMemPolicyLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPreMemPolicyLib.c
index 5480cf3d5c..b5c1a39399 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPreMemPolicyLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPreMemPolicyLib.c
@@ -2,13 +2,7 @@
This file is PeiPchPreMemPolicy library.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include "PeiPchPolicyLibrary.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchResetLib/PchReset.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchResetLib/PchReset.c
index 1a30bf31f6..20e5d36892 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchResetLib/PchReset.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchResetLib/PchReset.c
@@ -2,13 +2,7 @@
PCH RESET PEIM DRIVER.
Copyright (c) 2017 - 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include <PiPei.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchResetLib/PeiPchResetLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchResetLib/PeiPchResetLib.inf
index b03a986313..b04f4006ef 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchResetLib/PeiPchResetLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchResetLib/PeiPchResetLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiResetSystemLib/PeiResetSystemLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiResetSystemLib/PeiResetSystemLib.c
index 9429b0ecf4..6f12abf111 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiResetSystemLib/PeiResetSystemLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiResetSystemLib/PeiResetSystemLib.c
@@ -2,13 +2,7 @@
System reset library services.
Copyright (c) 2017 - 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include <Base.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiResetSystemLib/PeiResetSystemLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiResetSystemLib/PeiResetSystemLib.inf
index a259bdf6ec..18a92a6f18 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiResetSystemLib/PeiResetSystemLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiResetSystemLib/PeiResetSystemLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiResetSystemLib/PeiResetSystemLibFsp.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiResetSystemLib/PeiResetSystemLibFsp.inf
index 9abb7c2107..e7284e6668 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiResetSystemLib/PeiResetSystemLibFsp.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiResetSystemLib/PeiResetSystemLibFsp.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiSpiLib/PeiSpiLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiSpiLib/PeiSpiLib.c
index ecd6878490..aadc367a9f 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiSpiLib/PeiSpiLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiSpiLib/PeiSpiLib.c
@@ -2,13 +2,7 @@
PCH SPI PEI Library implements the SPI Host Controller Interface.
Copyright (c) 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiSpiLib/PeiSpiLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiSpiLib/PeiSpiLib.inf
index 9240b6ef06..31f4ffe43a 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiSpiLib/PeiSpiLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiSpiLib/PeiSpiLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2019, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/SmmSpiFlashCommonLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/SmmSpiFlashCommonLib.inf
index c7b3e864eb..d712b9e5f7 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/SmmSpiFlashCommonLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/SmmSpiFlashCommonLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/SpiFlashCommon.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/SpiFlashCommon.c
index d95f51af41..7ee7ffab50 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/SpiFlashCommon.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/SpiFlashCommon.c
@@ -3,13 +3,7 @@
for module use.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/SpiFlashCommonSmmLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/SpiFlashCommonSmmLib.c
index 8d2238dbf1..11133163d2 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/SpiFlashCommonSmmLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/SpiFlashCommonSmmLib.c
@@ -2,13 +2,7 @@
SMM Library instance of SPI Flash Common Library Class
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/BasePchSpiCommonLib/BasePchSpiCommonLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/BasePchSpiCommonLib/BasePchSpiCommonLib.inf
index 128f7adcea..599b07d3d3 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/BasePchSpiCommonLib/BasePchSpiCommonLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/BasePchSpiCommonLib/BasePchSpiCommonLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/BasePchSpiCommonLib/SpiCommon.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/BasePchSpiCommonLib/SpiCommon.c
index 0b708d4aad..58757a8cba 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/BasePchSpiCommonLib/SpiCommon.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/BasePchSpiCommonLib/SpiCommon.c
@@ -2,13 +2,7 @@
PCH SPI Common Driver implements the SPI Host Controller Compatibility Interface.
Copyright (c) 2017 - 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include <Uefi/UefiBaseType.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/DxePchHdaLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/DxePchHdaLib.inf
index 52d7c8bbaf..04940c75c1 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/DxePchHdaLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/DxePchHdaLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/PchHdaEndpoints.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/PchHdaEndpoints.c
index 11c6ec0269..31ea72bc55 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/PchHdaEndpoints.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/PchHdaEndpoints.c
@@ -2,13 +2,7 @@
This file contains HD Audio NHLT Endpoints definitions
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/PchHdaLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/PchHdaLib.c
index e577cd9038..2e93507a8a 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/PchHdaLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/PchHdaLib.c
@@ -2,13 +2,7 @@
PCH HD Audio Library implementation.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/PchHdaNhltConfig.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/PchHdaNhltConfig.c
index 46096a0ac3..6e56d357f5 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/PchHdaNhltConfig.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/PchHdaNhltConfig.c
@@ -2,13 +2,7 @@
This file contains HD Audio NHLT Configuration BLOBs
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeI2cMasterCommonLib/I2cMasterCommonLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeI2cMasterCommonLib/I2cMasterCommonLib.c
index 32814bf773..16a2c73a77 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeI2cMasterCommonLib/I2cMasterCommonLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeI2cMasterCommonLib/I2cMasterCommonLib.c
@@ -2,13 +2,7 @@
Implement the I2C controller driver.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeI2cMasterCommonLib/PeiDxeI2cMasterCommonLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeI2cMasterCommonLib/PeiDxeI2cMasterCommonLib.inf
index a6af85a4a0..5218191d8a 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeI2cMasterCommonLib/PeiDxeI2cMasterCommonLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeI2cMasterCommonLib/PeiDxeI2cMasterCommonLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivateLib/GpioNativePrivateLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivateLib/GpioNativePrivateLib.c
index 89bf0a73ee..d47ae6fd55 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivateLib/GpioNativePrivateLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivateLib/GpioNativePrivateLib.c
@@ -3,13 +3,7 @@
used by Reference Code only.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include <Base.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivateLib/GpioPrivateLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivateLib/GpioPrivateLib.c
index b386e071f7..bc660b0906 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivateLib/GpioPrivateLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivateLib/GpioPrivateLib.c
@@ -2,13 +2,7 @@
This file contains GPIO routines for RC usage
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include <Base.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivateLib/PchSklGpioPrivateData.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivateLib/PchSklGpioPrivateData.c
index 3d8b128a1c..6cf855d692 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivateLib/PchSklGpioPrivateData.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivateLib/PchSklGpioPrivateData.c
@@ -2,13 +2,7 @@
This file contains SKL specific GPIO information
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include <Base.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivateLib/PeiDxeSmmGpioPrivateLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivateLib/PeiDxeSmmGpioPrivateLib.inf
index d2542a1673..7986358ce1 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivateLib/PeiDxeSmmGpioPrivateLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivateLib/PeiDxeSmmGpioPrivateLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchInitCommonLib/PchInitCommon.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchInitCommonLib/PchInitCommon.c
index a49bbc5c18..ed088bd642 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchInitCommonLib/PchInitCommon.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchInitCommonLib/PchInitCommon.c
@@ -2,13 +2,7 @@
Pch common library for PCH INIT PEI/DXE/SMM modules
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchInitCommonLib/PchRpfn.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchInitCommonLib/PchRpfn.c
index 77dd285430..1cd4884bc9 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchInitCommonLib/PchRpfn.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchInitCommonLib/PchRpfn.c
@@ -2,13 +2,7 @@
This file contains functions that configures PCI Express Root Ports function swapping.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include <Uefi/UefiBaseType.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchInitCommonLib/PeiDxeSmmPchInitCommonLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchInitCommonLib/PeiDxeSmmPchInitCommonLib.inf
index df4900d964..52ab228442 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchInitCommonLib/PeiDxeSmmPchInitCommonLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchInitCommonLib/PeiDxeSmmPchInitCommonLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPciExpressHelpersLib/PchPciExpressHelpersLibrary.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPciExpressHelpersLib/PchPciExpressHelpersLibrary.c
index 815b800db7..04145d8373 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPciExpressHelpersLib/PchPciExpressHelpersLibrary.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPciExpressHelpersLib/PchPciExpressHelpersLibrary.c
@@ -2,13 +2,7 @@
This file contains routines that support PCI Express initialization
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include "PchPciExpressHelpersLibrary.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPciExpressHelpersLib/PchPciExpressHelpersLibrary.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPciExpressHelpersLib/PchPciExpressHelpersLibrary.h
index bd59b5346e..7fe8985946 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPciExpressHelpersLib/PchPciExpressHelpersLibrary.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPciExpressHelpersLib/PchPciExpressHelpersLibrary.h
@@ -2,13 +2,7 @@
Header file for PCH Pci Express helps library implementation.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PCH_PCI_EXPRESS_HELPERS_LIBRARY_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPciExpressHelpersLib/PeiDxeSmmPchPciExpressHelpersLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPciExpressHelpersLib/PeiDxeSmmPchPciExpressHelpersLib.inf
index b02f311f02..39dc89670a 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPciExpressHelpersLib/PeiDxeSmmPchPciExpressHelpersLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPciExpressHelpersLib/PeiDxeSmmPchPciExpressHelpersLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPsfPrivateLib/PchPsfPrivateLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPsfPrivateLib/PchPsfPrivateLib.c
index ef579c825d..55124c0cb9 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPsfPrivateLib/PchPsfPrivateLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPsfPrivateLib/PchPsfPrivateLib.c
@@ -2,13 +2,7 @@
This file contains PSF routines for RC usage
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include <Base.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPsfPrivateLib/PeiDxeSmmPchPsfPrivateLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPsfPrivateLib/PeiDxeSmmPchPsfPrivateLib.inf
index 6995171b10..0d7050500a 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPsfPrivateLib/PeiDxeSmmPchPsfPrivateLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPsfPrivateLib/PeiDxeSmmPchPsfPrivateLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchSmbusCommonLib/PchSmbusExec.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchSmbusCommonLib/PchSmbusExec.c
index ad5c784bff..abdc06cd70 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchSmbusCommonLib/PchSmbusExec.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchSmbusCommonLib/PchSmbusExec.c
@@ -2,13 +2,7 @@
PCH Smbus Executive Code (common PEI/DXE/SMM code)
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include <Uefi/UefiBaseType.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchSmbusCommonLib/PeiDxeSmmPchSmbusCommonLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchSmbusCommonLib/PeiDxeSmmPchSmbusCommonLib.inf
index 54a67614af..78324e1fef 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchSmbusCommonLib/PeiDxeSmmPchSmbusCommonLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchSmbusCommonLib/PeiDxeSmmPchSmbusCommonLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmRstPrivateLib/PeiDxeSmmRstPrivateLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmRstPrivateLib/PeiDxeSmmRstPrivateLib.c
index 7436a76ec1..e97d48f777 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmRstPrivateLib/PeiDxeSmmRstPrivateLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmRstPrivateLib/PeiDxeSmmRstPrivateLib.c
@@ -2,13 +2,7 @@
Routines for Rst remapping
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmRstPrivateLib/PeiDxeSmmRstPrivateLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmRstPrivateLib/PeiDxeSmmRstPrivateLib.inf
index 1bbcc7eda7..413d0c86f8 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmRstPrivateLib/PeiDxeSmmRstPrivateLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmRstPrivateLib/PeiDxeSmmRstPrivateLib.inf
@@ -6,13 +6,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchAcpi.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchAcpi.c
index 789b61170d..a0e3996664 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchAcpi.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchAcpi.c
@@ -2,13 +2,7 @@
This is the driver that initializes the Intel PCH.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include "PchInit.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchCio2Acpi.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchCio2Acpi.c
index f0abea1323..0769655757 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchCio2Acpi.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchCio2Acpi.c
@@ -2,13 +2,7 @@
Initializes PCH CIO2 device ACPI data.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchHdaAcpi.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchHdaAcpi.c
index 732dc8905d..f8839c47b5 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchHdaAcpi.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchHdaAcpi.c
@@ -2,13 +2,7 @@
Initializes the PCH HD Audio ACPI Tables.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInit.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInit.c
index 0428479b50..40c814f460 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInit.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInit.c
@@ -2,13 +2,7 @@
This is the Common driver that initializes the Intel PCH.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include "PchInit.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInit.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInit.h
index a05697d337..516606e604 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInit.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInit.h
@@ -2,13 +2,7 @@
Header file for PCH Initialization Driver.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PCH_INITIALIZATION_DRIVER_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxe.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxe.c
index 1857b7f3c5..bd3efd8eda 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxe.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxe.c
@@ -2,13 +2,7 @@
This is the Uefi driver that initializes the Intel PCH.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include "PchInit.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxe.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxe.inf
index 0242dcbe9a..49ede590e8 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxe.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxe.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxeFsp.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxeFsp.inf
index 18feffd894..68c1bca40c 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxeFsp.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxeFsp.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitFsp.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitFsp.c
index 9307b8fc4c..56052d8c9f 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitFsp.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitFsp.c
@@ -2,13 +2,7 @@
This is the FSP driver that initializes the Intel PCH.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include "PchInit.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchRstPcieStorage.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchRstPcieStorage.c
index 801abf2602..bcd8bb8232 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchRstPcieStorage.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchRstPcieStorage.c
@@ -3,13 +3,7 @@
In order to use this feature, Intel RST Driver is required
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include "PchInit.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchSata.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchSata.c
index d1f2948de6..fabb536df0 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchSata.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchSata.c
@@ -2,13 +2,7 @@
Perform related functions for PCH Sata in DXE phase
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include <PchInit.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchScs.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchScs.c
index 34227826b4..defe183965 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchScs.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchScs.c
@@ -2,13 +2,7 @@
Initializes PCH Storage and Communications Subsystem Controllers.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include <PchInit.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchSerialIo.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchSerialIo.c
index 013c729ddf..93f07fa906 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchSerialIo.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchSerialIo.c
@@ -2,13 +2,7 @@
Initializes Serial IO Controllers.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include <PchInit.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchSerialIoDxe.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchSerialIoDxe.c
index 3b951092b5..077012bd25 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchSerialIoDxe.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchSerialIoDxe.c
@@ -2,13 +2,7 @@
Initializes Serial IO Controllers.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include <PchInit.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchBiosWriteProtect.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchBiosWriteProtect.c
index cfaf0d57bd..c1bc98bb6b 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchBiosWriteProtect.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchBiosWriteProtect.c
@@ -2,13 +2,7 @@
PCH BIOS Write Protect Driver.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include "PchInitSmm.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchGpioSxIsolationSmm.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchGpioSxIsolationSmm.c
index 4c3dd6cf11..4cad3c6230 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchGpioSxIsolationSmm.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchGpioSxIsolationSmm.c
@@ -2,13 +2,7 @@
PCH GPIO Sx Isolation Driver Entry
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include "PchInitSmm.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.c
index c6e1809946..d2dba930ff 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.c
@@ -2,13 +2,7 @@
PCH Init Smm module for PCH specific SMI handlers.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include "PchInitSmm.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.h
index 58ef567cc0..44f151c243 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.h
@@ -2,13 +2,7 @@
Header file for PCH Init SMM Handler
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.inf
index 458eac090e..ea6692f6d9 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchLanSxSmm.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchLanSxSmm.c
index d05cb61bbc..8c2496a79e 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchLanSxSmm.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchLanSxSmm.c
@@ -2,13 +2,7 @@
PCH LAN Sx handler implementation.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchPcieSmm.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchPcieSmm.c
index b4234f649c..aed33bba25 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchPcieSmm.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchPcieSmm.c
@@ -2,13 +2,7 @@
PCH Pcie SMM Driver Entry
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include "PchInitSmm.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchPort61hSmm.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchPort61hSmm.c
index 0717f38291..6267607a46 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchPort61hSmm.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchPort61hSmm.c
@@ -2,13 +2,7 @@
PCH Port 61h bit-4 toggling in SMM IO Trap
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchSpiAsync.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchSpiAsync.c
index 463de1dba8..139a60631c 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchSpiAsync.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchSpiAsync.c
@@ -2,13 +2,7 @@
PCH SPI Async SMI handler.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include "PchInitSmm.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchXhciSxSmm.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchXhciSxSmm.c
index f17b125d4f..72603e36e7 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchXhciSxSmm.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchXhciSxSmm.c
@@ -2,13 +2,7 @@
PCH xHCI Sx handler implementation.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/IoTrap.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/IoTrap.c
index ffb2105719..ea794669ba 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/IoTrap.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/IoTrap.c
@@ -2,13 +2,7 @@
Main implementation source file for the Io Trap SMM driver
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include "PchSmmHelpers.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/IoTrap.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/IoTrap.h
index 99bb3527f7..13ad2f6f1b 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/IoTrap.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/IoTrap.h
@@ -2,13 +2,7 @@
Defines and prototypes for the IoTrap SMM driver
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _IO_TRAP_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmiDispatch.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmiDispatch.c
index a0bd9aaaa1..5f8c9375ea 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmiDispatch.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmiDispatch.c
@@ -2,13 +2,7 @@
This function handle the register/unregister of PCH specific SMI events.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include "PchSmmHelpers.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmiDispatcher.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmiDispatcher.inf
index a593d631d3..46c4c72617 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmiDispatcher.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmiDispatcher.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmm.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmm.h
index 3eebdc1daf..508832e76e 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmm.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmm.h
@@ -2,13 +2,7 @@
Prototypes and defines for the PCH SMM Dispatcher.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef PCH_SMM_H
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmCore.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmCore.c
index 77f0561ce4..0c494bffef 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmCore.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmCore.c
@@ -3,13 +3,7 @@
and the abstraction of the PCH SMI sources.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include "PchSmm.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmEspi.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmEspi.c
index a4a7380737..a8a3a3dac6 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmEspi.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmEspi.c
@@ -2,13 +2,7 @@
eSPI SMI implementation
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmEspi.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmEspi.h
index da600495c0..af152414f5 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmEspi.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmEspi.h
@@ -2,13 +2,7 @@
eSPI SMI Dispatch header
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmGpi.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmGpi.c
index fd79538d3a..5690b91465 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmGpi.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmGpi.c
@@ -2,13 +2,7 @@
File to contain all the hardware specific stuff for the Smm Gpi dispatch protocol.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include "PchSmmHelpers.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmHelpers.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmHelpers.c
index fea1ac9165..24bdf6a6e5 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmHelpers.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmHelpers.c
@@ -2,13 +2,7 @@
Helper functions for PCH SMM dispatcher.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include "PchSmmHelpers.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmHelpers.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmHelpers.h
index 44a8936790..dffd0e3944 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmHelpers.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmHelpers.h
@@ -2,13 +2,7 @@
Helper functions for PCH SMM
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef PCH_SMM_HELPERS_H
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmPeriodicTimer.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmPeriodicTimer.c
index 324eaeb7e8..29afe30817 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmPeriodicTimer.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmPeriodicTimer.c
@@ -2,13 +2,7 @@
File to contain all the hardware specific stuff for the Periodical Timer dispatch protocol.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include "PchSmmHelpers.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmPowerButton.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmPowerButton.c
index 404d2a31bc..82f0f6ffb2 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmPowerButton.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmPowerButton.c
@@ -2,13 +2,7 @@
File to contain all the hardware specific stuff for the Smm Power Button dispatch protocol.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include <PchSmmHelpers.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmSw.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmSw.c
index c285c677f1..ccaac28794 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmSw.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmSw.c
@@ -2,13 +2,7 @@
File to contain all the hardware specific stuff for the Smm Sw dispatch protocol.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include "PchSmmHelpers.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmSx.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmSx.c
index 523cea27aa..6fbe87c75d 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmSx.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmSx.c
@@ -2,13 +2,7 @@
File to contain all the hardware specific stuff for the Smm Sx dispatch protocol.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include "PchSmmHelpers.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmUsb.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmUsb.c
index 71c11ed71d..f5ed3a1892 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmUsb.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmUsb.c
@@ -2,13 +2,7 @@
File to contain all the hardware specific stuff for the Smm USB dispatch protocol.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include "PchSmmHelpers.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchxSmmHelpers.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchxSmmHelpers.c
index d4f4603eea..4d2a926491 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchxSmmHelpers.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchxSmmHelpers.c
@@ -3,13 +3,7 @@
and the abstraction of the PCH SMI sources.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include "PchSmmHelpers.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchxSmmHelpers.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchxSmmHelpers.h
index 273bed32bc..08bf728da0 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchxSmmHelpers.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchxSmmHelpers.h
@@ -3,13 +3,7 @@
and the abstraction of the PCH SMI sources.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PCHX_SMM_HELPERS_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/SmmControl/RuntimeDxe/SmmControl.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/SmmControl/RuntimeDxe/SmmControl.inf
index 2871b6c7c4..2695eaf9af 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/SmmControl/RuntimeDxe/SmmControl.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/SmmControl/RuntimeDxe/SmmControl.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/SmmControl/RuntimeDxe/SmmControlDriver.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/SmmControl/RuntimeDxe/SmmControlDriver.c
index 96727dde8f..7abac4e110 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/SmmControl/RuntimeDxe/SmmControlDriver.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/SmmControl/RuntimeDxe/SmmControlDriver.c
@@ -2,13 +2,7 @@
This is the driver that publishes the SMM Control Protocol.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include "SmmControlDriver.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/SmmControl/RuntimeDxe/SmmControlDriver.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/SmmControl/RuntimeDxe/SmmControlDriver.h
index 110b93a3ca..fbb108f9d8 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/SmmControl/RuntimeDxe/SmmControlDriver.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/SmmControl/RuntimeDxe/SmmControlDriver.h
@@ -2,13 +2,7 @@
Header file for SMM Control Driver.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _SMM_CONTROL_DRIVER_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Spi/Smm/PchSpi.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Spi/Smm/PchSpi.c
index 5cc808aa9d..1d84d06134 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Spi/Smm/PchSpi.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Spi/Smm/PchSpi.c
@@ -2,13 +2,7 @@
PCH SPI SMM Driver implements the SPI Host Controller Compatibility Interface.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include "PchSpi.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Spi/Smm/PchSpi.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Spi/Smm/PchSpi.h
index e3b6d7fd90..43e158b604 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Spi/Smm/PchSpi.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Spi/Smm/PchSpi.h
@@ -2,13 +2,7 @@
Header file for the PCH SPI SMM Driver.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PCH_SPI_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Spi/Smm/PchSpiSmm.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/Spi/Smm/PchSpiSmm.inf
index 52f83a9953..964489064a 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Spi/Smm/PchSpiSmm.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Spi/Smm/PchSpiSmm.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/Include/Library/SecPlatformLib.h b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/Include/Library/SecPlatformLib.h
index f9bbc931aa..bf4f75effb 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/Include/Library/SecPlatformLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/Include/Library/SecPlatformLib.h
@@ -2,13 +2,7 @@
Prototype of SEC Platform hook library.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkModulePkg/Include/Guid/DataHubStatusCodeRecord.h b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkModulePkg/Include/Guid/DataHubStatusCodeRecord.h
index d18a2eda21..7611700179 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkModulePkg/Include/Guid/DataHubStatusCodeRecord.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkModulePkg/Include/Guid/DataHubStatusCodeRecord.h
@@ -2,13 +2,7 @@
GUID used to identify Data Hub records logged by Status Code Protocol.
Copyright (c) 2006 - 2010, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include/Guid/SmramMemoryReserve.h b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include/Guid/SmramMemoryReserve.h
index 04589cf040..9918c768ba 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include/Guid/SmramMemoryReserve.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include/Guid/SmramMemoryReserve.h
@@ -9,13 +9,7 @@
This GUIDed HOB can be used to convey the existence of the T-SEG reservation and H-SEG usage
Copyright (c) 2007 - 2010, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
@par Revision Reference:
GUIDs defined in SmmCis spec version 0.9.
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include/Protocol/DataHub.h b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include/Protocol/DataHub.h
index ce73e3e8a6..4890ef7895 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include/Protocol/DataHub.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include/Protocol/DataHub.h
@@ -4,13 +4,7 @@
has been logged. This protocol may only be called <= TPL_NOTIFY.
Copyright (c) 2007 - 2010, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
@par Revision Reference:
The Data Hub Protocol is defined in Framework for EFI Data Hub Specification
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include/Protocol/Legacy8259.h b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include/Protocol/Legacy8259.h
index c12936f2d2..6a2e4669db 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include/Protocol/Legacy8259.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include/Protocol/Legacy8259.h
@@ -3,13 +3,7 @@
PCI IRQ routing needed to program the PCI Interrupt Line register.
Copyright (c) 2007 - 2010, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
@par Revision Reference:
This protocol is defined in Framework for EFI Compatibility Support Module spec
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include/Protocol/LegacyBios.h b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include/Protocol/LegacyBios.h
index a5f8f8abf7..e60afb6dcd 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include/Protocol/LegacyBios.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include/Protocol/LegacyBios.h
@@ -10,13 +10,7 @@
environment. Reverse thunk is the code that does the opposite.
Copyright (c) 2007 - 2010, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
@par Revision Reference:
This protocol is defined in Framework for EFI Compatibility Support Module spec
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include/Protocol/LegacyInterrupt.h b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include/Protocol/LegacyInterrupt.h
index f06836a97c..f4944d4c79 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include/Protocol/LegacyInterrupt.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include/Protocol/LegacyInterrupt.h
@@ -2,13 +2,7 @@
This protocol abstracts the PIRQ programming from the generic EFI Compatibility Support Modules (CSMs).
Copyright (c) 2007 - 2010, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
@par Revision Reference:
This protocol is defined in Framework for the EFI Compatibility Support Module specification.
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Guid/AcpiS3Context.h b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Guid/AcpiS3Context.h
index 8f78e284f6..c5a995b8e8 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Guid/AcpiS3Context.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Guid/AcpiS3Context.h
@@ -3,14 +3,7 @@
Copyright (c) 2011 - 2012, 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 distribution. The
-full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Guid/ConsoleOutDevice.h b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Guid/ConsoleOutDevice.h
index 7ca3f424e5..0a9aef19c6 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Guid/ConsoleOutDevice.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Guid/ConsoleOutDevice.h
@@ -2,13 +2,7 @@
This GUID can be installed to the device handle to specify that the device is the console-out device.
Copyright (c) 2006 - 2010, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Guid/MemoryTypeInformation.h b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Guid/MemoryTypeInformation.h
index e3e2ec82fd..3b05c9a79e 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Guid/MemoryTypeInformation.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Guid/MemoryTypeInformation.h
@@ -8,13 +8,7 @@
be used to store the information for each memory type in Variable or HOB.
Copyright (c) 2006 - 2010, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Library/ResetSystemLib.h b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Library/ResetSystemLib.h
index 6cab22a80c..75d3e15ed7 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Library/ResetSystemLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Library/ResetSystemLib.h
@@ -3,13 +3,7 @@
methods that reset the whole system.
Copyright (c) 2005 - 2010, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Ppi/SmmAccess.h b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Ppi/SmmAccess.h
index 8255a4a1d1..83a8edb449 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Ppi/SmmAccess.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Ppi/SmmAccess.h
@@ -13,14 +13,7 @@
Copyright (c) 2010, 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 distribution. The
-full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Ppi/SmmControl.h b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Ppi/SmmControl.h
index fef5a3dca3..5bf1084a7a 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Ppi/SmmControl.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Ppi/SmmControl.h
@@ -11,14 +11,7 @@
Copyright (c) 2010, 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 distribution. The
- full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Protocol/SmmVariable.h b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Protocol/SmmVariable.h
index 7e72bee166..c2dbdb3651 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Protocol/SmmVariable.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Protocol/SmmVariable.h
@@ -3,13 +3,7 @@
and intended for use as a means to store data in the EFI SMM environment.
Copyright (c) 2010, 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/Pch/AcpiTables/Dsdt/PchSmb.asl b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/Pch/AcpiTables/Dsdt/PchSmb.asl
index 25c4960585..9f23b3bb3c 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/Pch/AcpiTables/Dsdt/PchSmb.asl
+++ b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/Pch/AcpiTables/Dsdt/PchSmb.asl
@@ -6,13 +6,7 @@
driver with SMBUS operation region support implemented for ACPI usage.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SiPkg.dec b/Silicon/Intel/KabylakeSiliconPkg/SiPkg.dec
index 078d10c520..a613079dd4 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SiPkg.dec
+++ b/Silicon/Intel/KabylakeSiliconPkg/SiPkg.dec
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017 - 2019, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SiPkgBuildOption.dsc b/Silicon/Intel/KabylakeSiliconPkg/SiPkgBuildOption.dsc
index f313e4c352..20132653bd 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SiPkgBuildOption.dsc
+++ b/Silicon/Intel/KabylakeSiliconPkg/SiPkgBuildOption.dsc
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SiPkgCommonLib.dsc b/Silicon/Intel/KabylakeSiliconPkg/SiPkgCommonLib.dsc
index eb7d43191f..920b02e410 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SiPkgCommonLib.dsc
+++ b/Silicon/Intel/KabylakeSiliconPkg/SiPkgCommonLib.dsc
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
#
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SiPkgDxe.dsc b/Silicon/Intel/KabylakeSiliconPkg/SiPkgDxe.dsc
index 4fe0f8d18c..c39bd56c0e 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SiPkgDxe.dsc
+++ b/Silicon/Intel/KabylakeSiliconPkg/SiPkgDxe.dsc
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SiPkgDxeLib.dsc b/Silicon/Intel/KabylakeSiliconPkg/SiPkgDxeLib.dsc
index 9697da6c30..8c194d8e7c 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SiPkgDxeLib.dsc
+++ b/Silicon/Intel/KabylakeSiliconPkg/SiPkgDxeLib.dsc
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SiPkgPei.dsc b/Silicon/Intel/KabylakeSiliconPkg/SiPkgPei.dsc
index a2bc1cd49f..8bd16c3845 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SiPkgPei.dsc
+++ b/Silicon/Intel/KabylakeSiliconPkg/SiPkgPei.dsc
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SiPkgPeiLib.dsc b/Silicon/Intel/KabylakeSiliconPkg/SiPkgPeiLib.dsc
index bb95ce3888..86e34ff359 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SiPkgPeiLib.dsc
+++ b/Silicon/Intel/KabylakeSiliconPkg/SiPkgPeiLib.dsc
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017 - 2019, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/Dmar/Dmar.aslc b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/Dmar/Dmar.aslc
index bf7b56e23e..cd3192639b 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/Dmar/Dmar.aslc
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/Dmar/Dmar.aslc
@@ -2,13 +2,7 @@
This file describes the contents of the ACPI DMA address Remapping
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include "Dmar.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/Dmar/Dmar.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/Dmar/Dmar.h
index aaa027806b..32aba45fc8 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/Dmar/Dmar.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/Dmar/Dmar.h
@@ -3,13 +3,7 @@
Some additional ACPI values are defined in Acpi1_0.h and Acpi2_0.h.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _SA_DMAR_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/HostBus.asl b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/HostBus.asl
index ea14d5d479..597a10dc08 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/HostBus.asl
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/HostBus.asl
@@ -6,13 +6,7 @@
@note This ASL file needs to be included as part of platform ACPI DSDT table.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaAcpiTables.inf b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaAcpiTables.inf
index ff39573378..1488d3ba61 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaAcpiTables.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaAcpiTables.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
################################################################################
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/Igfx.asl b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/Igfx.asl
index c853700c40..2770e91752 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/Igfx.asl
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/Igfx.asl
@@ -7,13 +7,7 @@
present in the system, etc.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxCommon.asl b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxCommon.asl
index 4d28ad0068..5f46e49ff6 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxCommon.asl
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxCommon.asl
@@ -4,13 +4,7 @@
i.e. hotkeys and other system interrupts.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
//
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxDsm.asl b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxDsm.asl
index 974f7b706d..a045242872 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxDsm.asl
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxDsm.asl
@@ -4,13 +4,7 @@
the Integrated Graphics Device (IGD) OpRegion/DSM mechanism
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxOpGbda.asl b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxOpGbda.asl
index cd86e25fca..4705df772d 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxOpGbda.asl
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxOpGbda.asl
@@ -4,13 +4,7 @@
the Integrated Graphics Device (IGD) OpRegion/Software SCI mechanism
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
Method (GBDA, 0, Serialized)
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxOpRn.asl b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxOpRn.asl
index 4e3b6c5522..4f85e17a0e 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxOpRn.asl
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxOpRn.asl
@@ -6,13 +6,7 @@
as described in the IGD OpRegion specification.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
//
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxOpSbcb.asl b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxOpSbcb.asl
index 1f688e3b4a..e6a6f67621 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxOpSbcb.asl
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxOpSbcb.asl
@@ -3,13 +3,7 @@
OpRegion/Software SCI mechanism.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/Sa.asl b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/Sa.asl
index 7bc2d80667..8b5ea28035 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/Sa.asl
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/Sa.asl
@@ -5,13 +5,7 @@
System Agent PCI Express* ports (PEG), iGfx and other devices.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/SaNvs.asl b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/SaNvs.asl
index 311810020f..179b6b95b8 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/SaNvs.asl
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/SaNvs.asl
@@ -1,13 +1,7 @@
/**@file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/SaSsdt.asl b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/SaSsdt.asl
index b19a3cfa7b..df187f593e 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/SaSsdt.asl
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/SaSsdt.asl
@@ -4,13 +4,7 @@
and BIOS.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/SaSsdt.inf b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/SaSsdt.inf
index 43d7819263..e5f234ec2a 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/SaSsdt.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/SaSsdt.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
################################################################################
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/GraphicsDxeConfig.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/GraphicsDxeConfig.h
index 8f746dcc95..81549871b7 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/GraphicsDxeConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/GraphicsDxeConfig.h
@@ -2,13 +2,7 @@
Graphics DXE Policy definitions
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _GRAPHICS_DXE_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/GraphicsPeiConfig.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/GraphicsPeiConfig.h
index ee294650bf..4063f800e8 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/GraphicsPeiConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/GraphicsPeiConfig.h
@@ -2,13 +2,7 @@
Policy definition for Internal Graphics Config Block (PostMem)
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _GRAPHICS_PEI_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/MemoryConfig.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/MemoryConfig.h
index 8f77fa720b..d64d3d3d0a 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/MemoryConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/MemoryConfig.h
@@ -2,13 +2,7 @@
Policy definition of Memory Config Block
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _MEMORY_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/MiscDxeConfig.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/MiscDxeConfig.h
index 18a5371c4b..08229cd33c 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/MiscDxeConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/MiscDxeConfig.h
@@ -2,13 +2,7 @@
MISC DXE policy definitions
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _MISC_DXE_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/SaMiscPeiPreMemConfig.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/SaMiscPeiPreMemConfig.h
index 0bf1934207..4aa02e3142 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/SaMiscPeiPreMemConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/SaMiscPeiPreMemConfig.h
@@ -2,13 +2,7 @@
Policy details for miscellaneous configuration in System Agent
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _SA_MISC_PEI_PREMEM_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/VtdConfig.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/VtdConfig.h
index 086d70849a..8430563788 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/VtdConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/VtdConfig.h
@@ -2,13 +2,7 @@
VT-d policy definitions.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _VTD_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/DmaRemappingTable.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/DmaRemappingTable.h
index 0c49f98f2c..08edcee410 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/DmaRemappingTable.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/DmaRemappingTable.h
@@ -2,13 +2,7 @@
This code defines ACPI DMA Remapping table related definitions.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _DMA_REMAPPING_TABLE_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Library/DxeSaPolicyLib.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Library/DxeSaPolicyLib.h
index 12274d797d..61457dfb59 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Library/DxeSaPolicyLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Library/DxeSaPolicyLib.h
@@ -2,13 +2,7 @@
Prototype of the DxeSaPolicyLib library.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _DXE_SA_POLICY_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Library/PeiSaPolicyLib.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Library/PeiSaPolicyLib.h
index 6348fd003e..28e648f4a0 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Library/PeiSaPolicyLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Library/PeiSaPolicyLib.h
@@ -2,13 +2,7 @@
Prototype of the PeiSaPolicy library.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PEI_SA_POLICY_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Library/SaPlatformLib.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Library/SaPlatformLib.h
index f3762e91a5..cf62e1a9e2 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Library/SaPlatformLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Library/SaPlatformLib.h
@@ -2,13 +2,7 @@
Header file for SaPlatformLib.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/MemInfoHob.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/MemInfoHob.h
index dbf93ac265..ae51195736 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/MemInfoHob.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/MemInfoHob.h
@@ -4,13 +4,7 @@
data hobs.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _MEM_INFO_HOB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/GopPolicy.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/GopPolicy.h
index e7e72e5e53..9a7f02353c 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/GopPolicy.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/GopPolicy.h
@@ -2,13 +2,7 @@
Interface definition for GopPolicy Protocol.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _GOP_POLICY_PROTOCOL_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/IgdOpRegion.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/IgdOpRegion.h
index b39ccc31d4..1410a8a309 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/IgdOpRegion.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/IgdOpRegion.h
@@ -3,13 +3,7 @@
an interface between system BIOS, ASL code, and Graphics drivers.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
@par Specification Reference:
- IGD OpRegion/Software SCI SPEC
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/MemInfo.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/MemInfo.h
index ceadd739d6..7d5dd03f55 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/MemInfo.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/MemInfo.h
@@ -4,13 +4,7 @@
of each dimm and rank.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _MEM_INFO_PROTOCOL_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/SaGlobalNvsArea.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/SaGlobalNvsArea.h
index 5daf183c1a..08ab89898b 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/SaGlobalNvsArea.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/SaGlobalNvsArea.h
@@ -4,13 +4,7 @@
used as a communications buffer between SMM/DXE/PEI code and ASL code.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _SYSTEM_AGENT_GLOBAL_NVS_AREA_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/SaNvs.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/SaNvs.h
index 8f6ec57304..01cdf6d56d 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/SaNvs.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/SaNvs.h
@@ -1,13 +1,7 @@
/**@file
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/SaPolicy.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/SaPolicy.h
index 577eaa8ffc..40a0ab884d 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/SaPolicy.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/SaPolicy.h
@@ -2,13 +2,7 @@
Interface definition details between System Agent and platform drivers during DXE phase.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _SA_POLICY_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/SaAccess.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/SaAccess.h
index 5d343ba57a..45caa7fe90 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/SaAccess.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/SaAccess.h
@@ -2,13 +2,7 @@
Macros to simplify and abstract the interface to PCI configuration.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _SAACCESS_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/SaPolicyCommon.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/SaPolicyCommon.h
index bfe6011763..dccd4c9b3b 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/SaPolicyCommon.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/SaPolicyCommon.h
@@ -2,13 +2,7 @@
Main System Agent Policy structure definition which will contain several config blocks during runtime.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _SA_POLICY_COMMON_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/SaRegs.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/SaRegs.h
index 5f92981f4b..2b518853bd 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/SaRegs.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/SaRegs.h
@@ -16,13 +16,7 @@
as "_SA_" without [generation_name] inserted.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _SA_REGS_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/IncludePrivate/SaConfigHob.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/IncludePrivate/SaConfigHob.h
index 02ec08fc96..16f31bbdfd 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/IncludePrivate/SaConfigHob.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/IncludePrivate/SaConfigHob.h
@@ -2,13 +2,7 @@
The GUID definition for SaConfigHob
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _SA_CONFIG_HOB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/DxeSaPolicyLib.c b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/DxeSaPolicyLib.c
index 4909ed8f62..67fe214d0e 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/DxeSaPolicyLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/DxeSaPolicyLib.c
@@ -2,13 +2,7 @@
This file provide services for DXE phase policy default initialization
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/DxeSaPolicyLib.inf b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/DxeSaPolicyLib.inf
index f75ecb1388..9eb389b14f 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/DxeSaPolicyLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/DxeSaPolicyLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/DxeSaPolicyLibrary.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/DxeSaPolicyLibrary.h
index f754072411..ec1b7d10e8 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/DxeSaPolicyLibrary.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/DxeSaPolicyLibrary.h
@@ -2,13 +2,7 @@
Header file for the DxeSaPolicy library.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _DXE_SA_POLICY_LIBRARY_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiDxeSmmSaPlatformLib/PeiDxeSmmSaPlatformLib.inf b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiDxeSmmSaPlatformLib/PeiDxeSmmSaPlatformLib.inf
index 860da17031..9fe71e5bac 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiDxeSmmSaPlatformLib/PeiDxeSmmSaPlatformLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiDxeSmmSaPlatformLib/PeiDxeSmmSaPlatformLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiDxeSmmSaPlatformLib/SaPlatformLibrary.c b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiDxeSmmSaPlatformLib/SaPlatformLibrary.c
index df662b0222..4fd3ffa64b 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiDxeSmmSaPlatformLib/SaPlatformLibrary.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiDxeSmmSaPlatformLib/SaPlatformLibrary.c
@@ -2,13 +2,7 @@
SA Platform Lib implementation.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include "SaPlatformLibrary.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiDxeSmmSaPlatformLib/SaPlatformLibrary.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiDxeSmmSaPlatformLib/SaPlatformLibrary.h
index 632b801ad2..1e7b0d051a 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiDxeSmmSaPlatformLib/SaPlatformLibrary.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiDxeSmmSaPlatformLib/SaPlatformLibrary.h
@@ -2,13 +2,7 @@
Header file for SA Platform Lib implementation.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/Ia32/MrcOemPlatform.S b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/Ia32/MrcOemPlatform.S
index d8fe66154a..74e5589d0b 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/Ia32/MrcOemPlatform.S
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/Ia32/MrcOemPlatform.S
@@ -1,13 +1,7 @@
## @file
#
# Copyright (c) 2017, 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 that accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php.
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/Ia32/MrcOemPlatform.asm b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/Ia32/MrcOemPlatform.asm
index bef8aafe1a..3899ef119e 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/Ia32/MrcOemPlatform.asm
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/Ia32/MrcOemPlatform.asm
@@ -2,13 +2,7 @@
; This file provides assembly 64-bit atomic reads/writes required for memory initialization.
;
; Copyright (c) 2017, 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 that accompanies this distribution.
-; The full text of the license may be found at
-; http://opensource.org/licenses/bsd-license.php.
-;
-; THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-; WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+; SPDX-License-Identifier: BSD-2-Clause-Patent
;
;;
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/Ia32/MrcOemPlatform.nasm b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/Ia32/MrcOemPlatform.nasm
index 5bc17065bd..03c1380f89 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/Ia32/MrcOemPlatform.nasm
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/Ia32/MrcOemPlatform.nasm
@@ -2,13 +2,7 @@
; This file provides assembly 64-bit atomic reads/writes required for memory initialization.
;
; Copyright (c) 2017, 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 that accompanies this distribution.
-; The full text of the license may be found at
-; http://opensource.org/licenses/bsd-license.php.
-;
-; THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-; WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+; SPDX-License-Identifier: BSD-2-Clause-Patent
;
;;
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/MrcOemPlatform.c b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/MrcOemPlatform.c
index e4d6f1b35c..f62651796a 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/MrcOemPlatform.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/MrcOemPlatform.c
@@ -2,13 +2,7 @@
This file is SampleCode for Intel SA PEI Policy initialization.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/MrcOemPlatform.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/MrcOemPlatform.h
index f561138b04..53440d5d80 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/MrcOemPlatform.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/MrcOemPlatform.h
@@ -4,13 +4,7 @@
This file is SampleCode for Intel SA PEI Policy initialization.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSaPolicyLib.c b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSaPolicyLib.c
index ddc83ba4b2..eb18d993e7 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSaPolicyLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSaPolicyLib.c
@@ -2,13 +2,7 @@
This file provides services for PEI policy default initialization
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include "PeiSaPolicyLibrary.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSaPolicyLib.inf b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSaPolicyLib.inf
index 0afd31b584..8fae4cee61 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSaPolicyLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSaPolicyLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSaPolicyLibSample.c b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSaPolicyLibSample.c
index a65349b29c..63e93094e1 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSaPolicyLibSample.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSaPolicyLibSample.c
@@ -2,13 +2,7 @@
This file provides services for Sample PEI policy default initialization.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include <SaPolicyCommon.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSaPolicyLibrary.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSaPolicyLibrary.h
index e7fe3d2fcf..a44f7343dd 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSaPolicyLibrary.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSaPolicyLibrary.h
@@ -2,13 +2,7 @@
Header file for the PeiSaPolicy library.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _PEI_SA_POLICY_LIBRARY_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/SaPrintPolicy.c b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/SaPrintPolicy.c
index 0a6ddb8a8f..8b3a81a1c4 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/SaPrintPolicy.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/SaPrintPolicy.c
@@ -2,13 +2,7 @@
This file provides service for PEI phase policy printing
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include "PeiSaPolicyLibrary.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcCommonTypes.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcCommonTypes.h
index 792b2ca58d..3b612e3177 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcCommonTypes.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcCommonTypes.h
@@ -2,13 +2,7 @@
This file contains the definitions common to the MRC API and other APIs.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _MrcCommonTypes_h_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcInterface.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcInterface.h
index 87ad005f03..8e6aa32ed8 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcInterface.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcInterface.h
@@ -2,13 +2,7 @@
This file includes all the data structures that the MRC considers "global data".
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _MrcInterface_h_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcRmtData.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcRmtData.h
index 51d40ff376..73cdb214f7 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcRmtData.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcRmtData.h
@@ -3,13 +3,7 @@
Compatible BIOS data (BDAT) table.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _MrcRmtData_h_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcSpdData.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcSpdData.h
index cbfeb1cd0a..304db700c0 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcSpdData.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcSpdData.h
@@ -2,13 +2,7 @@
SPD data format header file.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcTypes.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcTypes.h
index 5bb771089d..241e5adcb7 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcTypes.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcTypes.h
@@ -3,13 +3,7 @@
Include the the general MRC types
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _MRC_TYPES_H
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/GraphicsInit.c b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/GraphicsInit.c
index 1d438e3c85..045f82a31d 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/GraphicsInit.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/GraphicsInit.c
@@ -2,13 +2,7 @@
DXE driver for Initializing SystemAgent Graphics ACPI table initialization.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include "GraphicsInit.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/GraphicsInit.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/GraphicsInit.h
index b76f775b24..00e8c08b53 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/GraphicsInit.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/GraphicsInit.h
@@ -2,13 +2,7 @@
Header file for initialization of GT PowerManagement
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _GRAPHICS_INIT_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/IgdOpRegion.c b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/IgdOpRegion.c
index 8e7ef7bc29..b7e6cc44b1 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/IgdOpRegion.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/IgdOpRegion.c
@@ -4,13 +4,7 @@
The code in this file will load the driver and initialize the interface
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
@par Specification Reference:
- OpRegion / Software SCI SPEC
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/IgdOpRegion.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/IgdOpRegion.h
index 40616c4b82..1b960e4b11 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/IgdOpRegion.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/IgdOpRegion.h
@@ -3,13 +3,7 @@
Software SCI interface between system BIOS, ASL code, and Graphics drivers.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
@par Specification Reference:
- OpRegion / Software SCI SPEC
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaAcpi.c b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaAcpi.c
index 40aa155ead..09e23c250d 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaAcpi.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaAcpi.c
@@ -2,13 +2,7 @@
This is the driver that initializes the Intel System Agent.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include "SaInitDxe.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaInit.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaInit.h
index 7e9efc40bc..69cd9407eb 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaInit.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaInit.h
@@ -2,13 +2,7 @@
Header file for SA Common Initialization Driver.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _SA_INITIALIZATION_DRIVER_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaInitDxe.c b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaInitDxe.c
index 0948a91a72..8ea4f3eb84 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaInitDxe.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaInitDxe.c
@@ -2,13 +2,7 @@
This is the driver that initializes the Intel System Agent.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include "SaInitDxe.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaInitDxe.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaInitDxe.h
index 9381941b87..b77962fa2e 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaInitDxe.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaInitDxe.h
@@ -2,13 +2,7 @@
Header file for SA Initialization Driver.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _SA_INITIALIZATION_DXE_DRIVER_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaInitDxe.inf b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaInitDxe.inf
index 6b01b494cd..cc05f336b3 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaInitDxe.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaInitDxe.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/VTd.c b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/VTd.c
index ded44b661f..0adabd18bc 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/VTd.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/VTd.c
@@ -2,13 +2,7 @@
This code provides a initialization of intel VT-d (Virtualization Technology for Directed I/O).
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include "SaInitDxe.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/VTd.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/VTd.h
index fc84a7c41e..c74c5447ff 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/VTd.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/VTd.h
@@ -2,13 +2,7 @@
This code provides a initialization of intel VT-d (Virtualization Technology for Directed I/O).
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _VT_D_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccess.inf b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccess.inf
index 150716529c..93ab408206 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccess.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccess.inf
@@ -5,13 +5,7 @@
#
# Copyright (c) 2017, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccessDriver.c b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccessDriver.c
index 3e8fd96484..f03dbe3d27 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccessDriver.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccessDriver.c
@@ -3,13 +3,7 @@
instance for System Agent.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include "SmmAccessDriver.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccessDriver.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccessDriver.h
index 69e9e89b24..dbc1894af5 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccessDriver.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccessDriver.h
@@ -2,13 +2,7 @@
Header file for SMM Access Driver.
Copyright (c) 2017, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef _SMM_ACCESS_DRIVER_H_
--
2.21.0.windows.1
^ permalink raw reply related [flat|nested] 63+ messages in thread* Re: [edk2-devel] [[edk2-platforms][PATCH V2] 23/30] Silicon/Intel/KabylakeSiliconPkg: Replace BSD License with BSD+Patent License
2019-05-15 23:10 ` [[edk2-platforms][PATCH V2] 23/30] Silicon/Intel/KabylakeSiliconPkg: " Michael D Kinney
@ 2019-05-16 0:39 ` Chiu, Chasel
2019-05-17 6:54 ` Kubacki, Michael A
1 sibling, 0 replies; 63+ messages in thread
From: Chiu, Chasel @ 2019-05-16 0:39 UTC (permalink / raw)
To: devel@edk2.groups.io, Kinney, Michael D; +Cc: Kubacki, Michael A
Reviewed-by: Chasel Chiu <chasel.chiu@intel.com>
> -----Original Message-----
> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of
> Michael D Kinney
> Sent: Thursday, May 16, 2019 7:10 AM
> To: devel@edk2.groups.io
> Cc: Chiu, Chasel <chasel.chiu@intel.com>; Kubacki, Michael A
> <michael.a.kubacki@intel.com>
> Subject: [edk2-devel] [[edk2-platforms][PATCH V2] 23/30]
> Silicon/Intel/KabylakeSiliconPkg: Replace BSD License with BSD+Patent License
>
> https://bugzilla.tianocore.org/show_bug.cgi?id=1373
>
> Replace BSD 2-Clause License with BSD+Patent License. This change is
> based on the following emails:
>
> https://lists.01.org/pipermail/edk2-devel/2019-February/036260.html
> https://lists.01.org/pipermail/edk2-devel/2018-October/030385.html
>
> RFCs with detailed process for the license change:
>
> V3: https://lists.01.org/pipermail/edk2-devel/2019-March/038116.html
> V2: https://lists.01.org/pipermail/edk2-devel/2019-March/037669.html
> V1: https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html
>
> Cc: Chasel Chiu <chasel.chiu@intel.com>
> Cc: Michael Kubacki <michael.a.kubacki@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
> ---
> .../Cpu/Include/ConfigBlock/CpuConfig.h | 8 +-------
> .../Cpu/Include/ConfigBlock/CpuConfigFspData.h | 8 +-------
> .../Cpu/Include/ConfigBlock/CpuConfigLibPreMemConfig.h | 8 +-------
> .../Cpu/Include/ConfigBlock/CpuOverclockingConfig.h | 8 +-------
> .../Cpu/Include/ConfigBlock/CpuPidTestConfig.h | 8 +-------
> .../Cpu/Include/ConfigBlock/CpuPowerMgmtBasicConfig.h | 8 +-------
> .../Cpu/Include/ConfigBlock/CpuPowerMgmtCustomConfig.h | 8 +-------
> .../Cpu/Include/ConfigBlock/CpuPowerMgmtPsysConfig.h | 8 +-------
> .../Cpu/Include/ConfigBlock/CpuPowerMgmtTestConfig.h | 8 +-------
> .../Cpu/Include/ConfigBlock/CpuPowerMgmtVrConfig.h | 8 +-------
> .../Cpu/Include/ConfigBlock/CpuTestConfig.h | 8 +-------
> Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuAccess.h | 8 +-------
> .../Intel/KabylakeSiliconPkg/Cpu/Include/CpuDataStruct.h | 8 +-------
> .../KabylakeSiliconPkg/Cpu/Include/CpuPolicyCommon.h | 8 +-------
> .../Intel/KabylakeSiliconPkg/Cpu/Include/CpuPowerMgmt.h | 8 +-------
> Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuRegs.h | 8 +-------
> .../Cpu/Include/Library/CpuMailboxLib.h | 8 +-------
> .../Cpu/Include/Library/CpuPlatformLib.h | 8 +-------
> .../Cpu/Include/Library/CpuPolicyLib.h | 8 +-------
> .../Cpu/Include/Library/CpuPolicyLibPreMem.h | 8 +-------
> .../Cpu/Include/Protocol/CpuGlobalNvsArea.h | 8 +-------
> .../KabylakeSiliconPkg/Cpu/Include/Protocol/CpuInfo.h | 8 +-------
> .../Cpu/IncludePrivate/CpuInitDataHob.h | 8 +-------
> .../Cpu/IncludePrivate/CpuPrivateData.h | 8 +-------
> .../Cpu/IncludePrivate/Library/CpuCommonLib.h | 8 +-------
> .../Cpu/IncludePrivate/PowerMgmtNvsStruct.h | 8 +-------
> .../BaseCpuMailboxLibNull/BaseCpuMailboxLibNull.c | 8 +-------
> .../BaseCpuMailboxLibNull/BaseCpuMailboxLibNull.inf | 8 +-------
> .../Cpu/Library/PeiCpuPolicyLib/CpuPrintPolicy.c | 8 +-------
> .../Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicyLib.c | 8 +-------
> .../Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicyLib.inf | 8 +-------
> .../Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicyLibrary.h | 8 +-------
> .../Cpu/Library/PeiCpuPolicyLibPreMem/CpuPrintPolicy.c | 8 +-------
> .../Cpu/Library/PeiCpuPolicyLibPreMem/PeiCpuPolicyLib.c | 8 +-------
> .../PeiCpuPolicyLibPreMem/PeiCpuPolicyLibPreMem.inf | 8 +-------
> .../Library/PeiCpuPolicyLibPreMem/PeiCpuPolicyLibrary.h | 8 +-------
> .../Library/PeiDxeSmmCpuPlatformLib/CpuPlatformLibrary.c | 8 +-------
> .../Library/PeiDxeSmmCpuPlatformLib/CpuPlatformLibrary.h | 8 +-------
> .../PeiDxeSmmCpuPlatformLib/PeiDxeSmmCpuPlatformLib.inf | 8 +-------
> .../LibraryPrivate/PeiDxeSmmCpuCommonLib/CpuCommonLib.c | 8 +-------
> .../PeiDxeSmmCpuCommonLib/PeiDxeSmmCpuCommonLib.inf | 8 +-------
> .../Hsti/Dxe/BootFirmwareMediaProtection.c | 8 +-------
> .../KabylakeSiliconPkg/Hsti/Dxe/DebugModeDisabled.c | 8 +-------
> .../Hsti/Dxe/HardwareRootedBootIntegrity.c | 8 +-------
> .../Intel/KabylakeSiliconPkg/Hsti/Dxe/HstiSiliconDxe.c | 8 +-------
> .../Intel/KabylakeSiliconPkg/Hsti/Dxe/HstiSiliconDxe.h | 8 +-------
> .../Intel/KabylakeSiliconPkg/Hsti/Dxe/HstiSiliconDxe.inf | 8 +-------
> .../Hsti/Dxe/IntegratedDeviceDmaProtection.c | 8 +-------
> .../Hsti/Dxe/MeasuredBootEnforcement.c | 8 +-------
> .../Intel/KabylakeSiliconPkg/Hsti/Dxe/MpServiceHelp.c | 8 +-------
> .../KabylakeSiliconPkg/Hsti/Dxe/SecureCpuConfiguration.c | 8 +-------
> .../Hsti/Dxe/SecureIntegratedGraphicsConfiguration.c | 8 +-------
> .../Hsti/Dxe/SecureMemoryMapConfiguration.c | 8 +-------
> .../KabylakeSiliconPkg/Hsti/Dxe/SecurePCHConfiguration.c | 8 +-------
> .../Hsti/Dxe/SecureSystemAgentConfiguration.c | 8 +-------
> .../KabylakeSiliconPkg/Hsti/Dxe/SignedFirmwareUpdate.c | 8 +-------
> Silicon/Intel/KabylakeSiliconPkg/Include/ConfigBlock.h | 8 +-------
> .../Intel/KabylakeSiliconPkg/Include/HstiFeatureBit.h | 8 +-------
> .../KabylakeSiliconPkg/Include/Library/AslUpdateLib.h | 8 +-------
> .../KabylakeSiliconPkg/Include/Library/ConfigBlockLib.h | 8 +-------
> .../Intel/KabylakeSiliconPkg/Include/Library/MmPciLib.h | 8 +-------
> .../Include/Library/PeiSiPolicyUpdateLib.h | 8 +-------
> .../Include/Library/SiConfigBlockLib.h | 8 +-------
> .../KabylakeSiliconPkg/Include/Library/SiPolicyLib.h | 8 +-------
> .../KabylakeSiliconPkg/Include/Library/SiliconInitLib.h | 8 +-------
> Silicon/Intel/KabylakeSiliconPkg/Include/PcieRegs.h | 8 +-------
> Silicon/Intel/KabylakeSiliconPkg/Include/Ppi/SiInitPpi.h | 8 +-------
> Silicon/Intel/KabylakeSiliconPkg/Include/Ppi/SiPolicy.h | 8 +-------
> .../Include/Protocol/SiPolicyProtocol.h | 8 +-------
> .../Intel/KabylakeSiliconPkg/Include/SiPolicyStruct.h | 8 +-------
> .../IncludePrivate/Library/PcieInitLib.h | 8 +-------
> .../KabylakeSiliconPkg/IncludePrivate/SiConfigHob.h | 8 +-------
> .../Intel/KabylakeSiliconPkg/KabylakeSiliconBuild.bat | 8 +-------
> Silicon/Intel/KabylakeSiliconPkg/KabylakeSiliconPkg.dsc | 8 +-------
> .../Intel/KabylakeSiliconPkg/KabylakeSiliconPrivate.dec | 8 +-------
> .../Library/BaseConfigBlockLib/BaseConfigBlockLib.c | 8 +-------
> .../Library/BaseConfigBlockLib/BaseConfigBlockLib.inf | 8 +-------
> .../Library/BaseSiConfigBlockLib/BaseSiConfigBlockLib.c | 8 +-------
> .../BaseSiConfigBlockLib/BaseSiConfigBlockLib.inf | 8 +-------
> .../Library/DxeAslUpdateLib/DxeAslUpdateLib.c | 8 +-------
> .../Library/DxeAslUpdateLib/DxeAslUpdateLib.inf | 8 +-------
> .../Library/DxeAslUpdateLibNull/DxeAslUpdateLibNull.c | 8 +-------
> .../Library/DxeAslUpdateLibNull/DxeAslUpdateLibNull.inf | 8 +-------
> .../Library/DxeSiliconPolicyInitLib/DxePolicyInit.c | 8 +-------
> .../Library/DxeSiliconPolicyInitLib/DxeSaPolicyInit.h | 8 +-------
> .../DxeSiliconPolicyInitLib/DxeSiliconPolicyInitLib.inf | 8 +-------
> .../Library/PeiDxeSmmMmPciLib/PeiDxeSmmMmPciLib.c | 8 +-------
> .../Library/PeiDxeSmmMmPciLib/PeiDxeSmmMmPciLib.inf | 8 +-------
> .../Library/PeiSiPolicyLib/PeiSiPolicyLib.c | 8 +-------
> .../Library/PeiSiPolicyLib/PeiSiPolicyLib.inf | 8 +-------
> .../Library/PeiSiPolicyLib/PeiSiPolicyLibPreMem.c | 8 +-------
> .../Library/PeiSiPolicyLib/PeiSiPolicyLibrary.h | 8 +-------
> .../Library/PeiSiPolicyLib/SiPrintPolicy.c | 8 +-------
> .../Library/PeiSiliconPolicyInitLib/PeiPolicyInit.c | 8 +-------
> .../Library/PeiSiliconPolicyInitLib/PeiPolicyInit.h | 8 +-------
> .../PeiSiliconPolicyInitLib/PeiPolicyInitPreMem.c | 8 +-------
> .../Library/PeiSiliconPolicyInitLib/PeiSiPolicyInit.h | 8 +-------
> .../PeiSiliconPolicyInitLib/PeiSiliconPolicyInitLib.inf | 8 +-------
> .../PeiPostMemSiliconPolicyInitLibDependency.inf | 8 +-------
> .../PeiPreMemSiliconPolicyInitLibDependency.inf | 8 +-------
> .../PeiSiliconPolicyInitLibDependency.c | 8 +-------
> .../PeiSiliconPolicyInitLibFsp/PeiFspCpuPolicyInitLib.c | 8 +-------
> .../PeiSiliconPolicyInitLibFsp/PeiFspMePolicyInitLib.c | 8 +-------
> .../PeiSiliconPolicyInitLibFsp/PeiFspMiscUpdInitLib.c | 8 +-------
> .../PeiSiliconPolicyInitLibFsp/PeiFspPchPolicyInitLib.c | 8 +-------
> .../PeiSiliconPolicyInitLibFsp/PeiFspPolicyInitLib.c | 8 +-------
> .../PeiSiliconPolicyInitLibFsp/PeiFspPolicyInitLib.h | 8 +-------
> .../PeiSiliconPolicyInitLibFsp/PeiFspSaPolicyInitLib.c | 8 +-------
> .../PeiSiliconPolicyInitLibFsp/PeiFspSiPolicyInitLib.c | 8 +-------
> .../Library/PeiSiliconPolicyInitLibFsp/PeiPolicyInit.c | 8 +-------
> .../Library/PeiSiliconPolicyInitLibFsp/PeiPolicyInit.h | 8 +-------
> .../PeiSiliconPolicyInitLibFsp/PeiPolicyInitLib.h | 8 +-------
> .../PeiSiliconPolicyInitLibFsp/PeiPolicyInitPreMem.c | 8 +-------
> .../Library/PeiSiliconPolicyInitLibFsp/PeiSiPolicyInit.h | 8 +-------
> .../PeiSiliconPolicyInitLibFsp.inf | 8 +-------
> .../Library/SiliconInitLib/SiliconInit.c | 8 +-------
> .../Library/SiliconInitLib/SiliconInitLib.inf | 8 +-------
> .../Library/SiliconInitLib/SiliconInitPreMem.c | 8 +-------
> .../Me/Include/ConfigBlock/MePeiConfig.h | 8 +-------
> .../Me/Include/Library/PeiMePolicyLib.h | 8 +-------
> Silicon/Intel/KabylakeSiliconPkg/Me/Include/MeChipset.h | 8 +-------
> .../Intel/KabylakeSiliconPkg/Me/Include/MePolicyCommon.h | 8 +-------
> .../Me/Library/PeiMePolicyLib/PeiMePolicyLib.c | 8 +-------
> .../Me/Library/PeiMePolicyLib/PeiMePolicyLib.inf | 8 +-------
> .../Me/Library/PeiMePolicyLib/PeiMePolicyLibrary.h | 8 +-------
> .../Pch/AcpiTables/Dsdt/GpioAcpiDefines.h | 8 +-------
> .../KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/GpioLib.asl | 8 +-------
> .../Pch/AcpiTables/Dsdt/GpioLibObjects.asl | 8 +-------
> .../KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/IrqLink.asl | 8 +-------
> .../Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/Pch.asl | 8 +-------
> .../Pch/AcpiTables/Dsdt/PchAcpiTables.inf | 8 +-------
> .../KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchHda.asl | 8 +-------
> .../KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchHeci.asl | 8 +-------
> .../KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchIsh.asl | 8 +-------
> .../KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchNvs.asl | 8 +-------
> .../KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchPcie.asl | 8 +-------
> .../Pch/AcpiTables/Dsdt/PchRstPcieStorage.asl | 8 +-------
> .../KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchSata.asl | 8 +-------
> .../KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchScs.asl | 8 +-------
> .../Pch/AcpiTables/Dsdt/PchSerialIo.asl | 8 +-------
> .../KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchXdci.asl | 8 +-------
> .../KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchXhci.asl | 8 +-------
> .../Pch/AcpiTables/Dsdt/TraceHubDebug.asl | 8 +-------
> .../KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/usbsbd.asl | 8 +-------
> .../Pch/Include/ConfigBlock/Cio2Config.h | 8 +-------
> .../Pch/Include/ConfigBlock/DciConfig.h | 8 +-------
> .../Pch/Include/ConfigBlock/DmiConfig.h | 8 +-------
> .../Pch/Include/ConfigBlock/EspiConfig.h | 8 +-------
> .../Pch/Include/ConfigBlock/FlashProtectionConfig.h | 8 +-------
> .../Pch/Include/ConfigBlock/HdAudioConfig.h | 8 +-------
> .../Pch/Include/ConfigBlock/HpetConfig.h | 8 +-------
> .../Pch/Include/ConfigBlock/HsioConfig.h | 8 +-------
> .../Pch/Include/ConfigBlock/HsioPcieConfig.h | 8 +-------
> .../Pch/Include/ConfigBlock/HsioSataConfig.h | 8 +-------
> .../Pch/Include/ConfigBlock/InterruptConfig.h | 8 +-------
> .../Pch/Include/ConfigBlock/IoApicConfig.h | 8 +-------
> .../Pch/Include/ConfigBlock/IshConfig.h | 8 +-------
> .../Pch/Include/ConfigBlock/LanConfig.h | 8 +-------
> .../Pch/Include/ConfigBlock/LockDownConfig.h | 8 +-------
> .../Pch/Include/ConfigBlock/LpcConfig.h | 8 +-------
> .../Pch/Include/ConfigBlock/P2sbConfig.h | 8 +-------
> .../Pch/Include/ConfigBlock/PchGeneralConfig.h | 8 +-------
> .../Pch/Include/ConfigBlock/PcieRpConfig.h | 8 +-------
> .../Pch/Include/ConfigBlock/PmConfig.h | 8 +-------
> .../Pch/Include/ConfigBlock/Port61Config.h | 8 +-------
> .../Pch/Include/ConfigBlock/SataConfig.h | 8 +-------
> .../Pch/Include/ConfigBlock/ScsConfig.h | 8 +-------
> .../Pch/Include/ConfigBlock/SerialIoConfig.h | 8 +-------
> .../Pch/Include/ConfigBlock/SerialIrqConfig.h | 8 +-------
> .../Pch/Include/ConfigBlock/SmbusConfig.h | 8 +-------
> .../Pch/Include/ConfigBlock/SpiConfig.h | 8 +-------
> .../Pch/Include/ConfigBlock/ThermalConfig.h | 8 +-------
> .../Pch/Include/ConfigBlock/TraceHubConfig.h | 8 +-------
> .../Pch/Include/ConfigBlock/UsbConfig.h | 8 +-------
> .../Pch/Include/ConfigBlock/WatchDogConfig.h | 8 +-------
> .../Intel/KabylakeSiliconPkg/Pch/Include/GpioConfig.h | 8 +-------
> .../Intel/KabylakeSiliconPkg/Pch/Include/GpioPinsSklH.h | 8 +-------
> .../Intel/KabylakeSiliconPkg/Pch/Include/GpioPinsSklLp.h | 8 +-------
> .../KabylakeSiliconPkg/Pch/Include/Library/GpioLib.h | 8 +-------
> .../Pch/Include/Library/GpioNativeLib.h | 8 +-------
> .../KabylakeSiliconPkg/Pch/Include/Library/OcWdtLib.h | 8 +-------
> .../Pch/Include/Library/PchCycleDecodingLib.h | 8 +-------
> .../KabylakeSiliconPkg/Pch/Include/Library/PchEspiLib.h | 8 +-------
> .../KabylakeSiliconPkg/Pch/Include/Library/PchGbeLib.h | 8 +-------
> .../KabylakeSiliconPkg/Pch/Include/Library/PchHsioLib.h | 8 +-------
> .../KabylakeSiliconPkg/Pch/Include/Library/PchInfoLib.h | 8 +-------
> .../KabylakeSiliconPkg/Pch/Include/Library/PchP2sbLib.h | 8 +-------
> .../Pch/Include/Library/PchPcieRpLib.h | 8 +-------
> .../KabylakeSiliconPkg/Pch/Include/Library/PchPcrLib.h | 8 +-------
> .../KabylakeSiliconPkg/Pch/Include/Library/PchPmcLib.h | 8 +-------
> .../Pch/Include/Library/PchPolicyLib.h | 8 +-------
> .../KabylakeSiliconPkg/Pch/Include/Library/PchPsfLib.h | 8 +-------
> .../KabylakeSiliconPkg/Pch/Include/Library/PchResetLib.h | 8 +-------
> .../Pch/Include/Library/PchSbiAccessLib.h | 8 +-------
> .../Pch/Include/Library/PchSerialIoLib.h | 8 +-------
> .../Pch/Include/Library/PchSerialIoUartLib.h | 8 +-------
> .../Pch/Include/Library/PchSmmControlLib.h | 8 +-------
> .../Pch/Include/Library/PchWdtCommonLib.h | 8 +-------
> .../KabylakeSiliconPkg/Pch/Include/Library/SecPchLib.h | 8 +-------
> .../Pch/Include/Library/SpiFlashCommonLib.h | 8 +-------
> .../KabylakeSiliconPkg/Pch/Include/Library/SpiLib.h | 8 +-------
> .../Pch/Include/Library/TraceHubInitLib.h | 8 +-------
> Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchAccess.h | 8 +-------
> Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchLimits.h | 8 +-------
> .../Pch/Include/PchPcieStorageDetectHob.h | 8 +-------
> .../KabylakeSiliconPkg/Pch/Include/PchPolicyCommon.h | 8 +-------
> .../Pch/Include/PchPreMemPolicyCommon.h | 8 +-------
> .../Pch/Include/PchReservedResources.h | 8 +-------
> .../Pch/Include/PchResetPlatformSpecific.h | 8 +-------
> .../Intel/KabylakeSiliconPkg/Pch/Include/Ppi/PchReset.h | 8 +-------
> Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Ppi/Spi.h | 8 +-------
> Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Ppi/Wdt.h | 8 +-------
> .../Pch/Include/Protocol/PchAcpiSmiDispatch.h | 8 +-------
> .../Pch/Include/Protocol/PchEmmcTuning.h | 8 +-------
> .../Pch/Include/Protocol/PchEspiSmiDispatch.h | 8 +-------
> .../Pch/Include/Protocol/PchGpioUnlockSmiDispatch.h | 8 +-------
> .../KabylakeSiliconPkg/Pch/Include/Protocol/PchInfo.h | 8 +-------
> .../Pch/Include/Protocol/PchPcieSmiDispatch.h | 8 +-------
> .../KabylakeSiliconPkg/Pch/Include/Protocol/PchReset.h | 8 +-------
> .../Pch/Include/Protocol/PchSmiDispatch.h | 8 +-------
> .../Pch/Include/Protocol/PchSmmIoTrapControl.h | 8 +-------
> .../Pch/Include/Protocol/PchSmmPeriodicTimerControl.h | 8 +-------
> .../Pch/Include/Protocol/PchTcoSmiDispatch.h | 8 +-------
> .../KabylakeSiliconPkg/Pch/Include/Protocol/SerialGpio.h | 8 +-------
> .../Intel/KabylakeSiliconPkg/Pch/Include/Protocol/Spi.h | 8 +-------
> .../Intel/KabylakeSiliconPkg/Pch/Include/Protocol/Wdt.h | 8 +-------
> .../KabylakeSiliconPkg/Pch/Include/Register/PchRegsCam.h | 8 +-------
> .../KabylakeSiliconPkg/Pch/Include/Register/PchRegsDci.h | 8 +-------
> .../KabylakeSiliconPkg/Pch/Include/Register/PchRegsDmi.h | 8 +-------
> .../KabylakeSiliconPkg/Pch/Include/Register/PchRegsFia.h | 8 +-------
> .../Pch/Include/Register/PchRegsGpio.h | 8 +-------
> .../KabylakeSiliconPkg/Pch/Include/Register/PchRegsHda.h | 8 +-------
> .../Pch/Include/Register/PchRegsHsio.h | 8 +-------
> .../KabylakeSiliconPkg/Pch/Include/Register/PchRegsIsh.h | 8 +-------
> .../Pch/Include/Register/PchRegsItss.h | 8 +-------
> .../KabylakeSiliconPkg/Pch/Include/Register/PchRegsLan.h | 8 +-------
> .../KabylakeSiliconPkg/Pch/Include/Register/PchRegsLpc.h | 8 +-------
> .../Pch/Include/Register/PchRegsP2sb.h | 8 +-------
> .../Pch/Include/Register/PchRegsPcie.h | 8 +-------
> .../KabylakeSiliconPkg/Pch/Include/Register/PchRegsPcr.h | 8 +-------
> .../KabylakeSiliconPkg/Pch/Include/Register/PchRegsPmc.h | 8 +-------
> .../KabylakeSiliconPkg/Pch/Include/Register/PchRegsPsf.h | 8 +-------
> .../Pch/Include/Register/PchRegsPsth.h | 8 +-------
> .../Pch/Include/Register/PchRegsSata.h | 8 +-------
> .../KabylakeSiliconPkg/Pch/Include/Register/PchRegsScs.h | 8 +-------
> .../Pch/Include/Register/PchRegsSerialIo.h | 8 +-------
> .../Pch/Include/Register/PchRegsSmbus.h | 8 +-------
> .../KabylakeSiliconPkg/Pch/Include/Register/PchRegsSpi.h | 8 +-------
> .../Pch/Include/Register/PchRegsThermal.h | 8 +-------
> .../Pch/Include/Register/PchRegsTraceHub.h | 8 +-------
> .../KabylakeSiliconPkg/Pch/Include/Register/PchRegsUsb.h | 8 +-------
> .../Pch/IncludePrivate/Library/DxePchHdaNhlt.h | 8 +-------
> .../Pch/IncludePrivate/Library/GpioPrivateLib.h | 8 +-------
> .../Pch/IncludePrivate/Library/I2cMasterCommonLib.h | 8 +-------
> .../Pch/IncludePrivate/Library/PchHdaLib.h | 8 +-------
> .../Pch/IncludePrivate/Library/PchInitCommonLib.h | 8 +-------
> .../Pch/IncludePrivate/Library/PchPciExpressHelpersLib.h | 8 +-------
> .../Pch/IncludePrivate/Library/PchPsfPrivateLib.h | 8 +-------
> .../Pch/IncludePrivate/Library/PchSmbusCommonLib.h | 8 +-------
> .../Pch/IncludePrivate/Library/PchSpiCommonLib.h | 8 +-------
> .../Pch/IncludePrivate/Library/PeiI2cMasterLib.h | 8 +-------
> .../Pch/IncludePrivate/Library/RstPrivateLib.h | 8 +-------
> .../KabylakeSiliconPkg/Pch/IncludePrivate/PchConfigHob.h | 8 +-------
> .../Pch/IncludePrivate/PchHdaEndpoints.h | 8 +-------
> .../Pch/IncludePrivate/Protocol/PchNvs.h | 8 +-------
> .../Pch/IncludePrivate/Protocol/PchNvsArea.h | 8 +-------
> .../Pch/IncludePrivate/Protocol/PcieIoTrap.h | 8 +-------
> .../Pch/Library/BaseResetSystemLib/BaseResetSystemLib.c | 8 +-------
> .../Library/BaseResetSystemLib/BaseResetSystemLib.inf | 8 +-------
> .../Pch/Library/BaseSmbusLib/BaseSmbusLib.c | 8 +-------
> .../Pch/Library/BaseSmbusLib/BaseSmbusLib.inf | 8 +-------
> .../Pch/Library/DxeResetSystemLib/DxeResetSystemLib.c | 8 +-------
> .../Pch/Library/DxeResetSystemLib/DxeResetSystemLib.inf | 8 +-------
> .../DxeRuntimeResetSystemLib/DxeRuntimeResetSystemLib.c | 8 +-------
> .../DxeRuntimeResetSystemLib.inf | 8 +-------
> .../Pch/Library/PeiDxeSmmGpioLib/GpioInit.c | 8 +-------
> .../Pch/Library/PeiDxeSmmGpioLib/GpioLib.c | 8 +-------
> .../Pch/Library/PeiDxeSmmGpioLib/GpioLibrary.h | 8 +-------
> .../Pch/Library/PeiDxeSmmGpioLib/GpioNativeLib.c | 8 +-------
> .../Pch/Library/PeiDxeSmmGpioLib/PchSklGpioData.c | 8 +-------
> .../Pch/Library/PeiDxeSmmGpioLib/PeiDxeSmmGpioLib.inf | 8 +-------
> .../PeiDxeSmmPchCycleDecodingLib/PchCycleDecodingLib.c | 8 +-------
> .../PeiDxeSmmPchCycleDecodingLib.inf | 8 +-------
> .../Pch/Library/PeiDxeSmmPchGbeLib/PchGbeLib.c | 8 +-------
> .../Library/PeiDxeSmmPchGbeLib/PeiDxeSmmPchGbeLib.inf | 8 +-------
> .../Pch/Library/PeiDxeSmmPchHsioLib/PchHsioLib.c | 8 +-------
> .../Library/PeiDxeSmmPchHsioLib/PeiDxeSmmPchHsioLib.inf | 8 +-------
> .../Pch/Library/PeiDxeSmmPchInfoLib/PchInfoLib.c | 8 +-------
> .../Pch/Library/PeiDxeSmmPchInfoLib/PchInfoStrLib.c | 8 +-------
> .../Library/PeiDxeSmmPchInfoLib/PeiDxeSmmPchInfoLib.inf | 8 +-------
> .../Pch/Library/PeiDxeSmmPchP2sbLib/PchP2sbLib.c | 8 +-------
> .../Library/PeiDxeSmmPchP2sbLib/PeiDxeSmmPchP2sbLib.inf | 8 +-------
> .../Pch/Library/PeiDxeSmmPchPcieRpLib/PchPcieRpLib.c | 8 +-------
> .../PeiDxeSmmPchPcieRpLib/PeiDxeSmmPchPcieRpLib.inf | 8 +-------
> .../Pch/Library/PeiDxeSmmPchPcrLib/PchPcrLib.c | 8 +-------
> .../Library/PeiDxeSmmPchPcrLib/PeiDxeSmmPchPcrLib.inf | 8 +-------
> .../Pch/Library/PeiDxeSmmPchPmcLib/PchPmcLib.c | 8 +-------
> .../Library/PeiDxeSmmPchPmcLib/PeiDxeSmmPchPmcLib.inf | 8 +-------
> .../Pch/Library/PeiDxeSmmPchPsfLib/PchPsfLib.c | 8 +-------
> .../Library/PeiDxeSmmPchPsfLib/PeiDxeSmmPchPsfLib.inf | 8 +-------
> .../Library/PeiDxeSmmPchSbiAccessLib/PchSbiAccessLib.c | 8 +-------
> .../PeiDxeSmmPchSbiAccessLib.inf | 8 +-------
> .../PeiDxeSmmPchSerialIoLib/PeiDxeSmmPchSerialIoLib.c | 8 +-------
> .../PeiDxeSmmPchSerialIoLib/PeiDxeSmmPchSerialIoLib.inf | 8 +-------
> .../PeiDxeSmmPchWdtCommonLib.inf | 8 +-------
> .../Pch/Library/PeiDxeSmmPchWdtCommonLib/WdtCommon.c | 8 +-------
> .../Pch/Library/PeiOcWdtLib/PeiOcWdtLib.c | 8 +-------
> .../Pch/Library/PeiOcWdtLib/PeiOcWdtLib.inf | 8 +-------
> .../Pch/Library/PeiOcWdtLibNull/PeiOcWdtLibNull.c | 8 +-------
> .../Pch/Library/PeiOcWdtLibNull/PeiOcWdtLibNull.inf | 8 +-------
> .../Pch/Library/PeiPchPolicyLib/PchPreMemPrintPolicy.c | 8 +-------
> .../Pch/Library/PeiPchPolicyLib/PchPrintPolicy.c | 8 +-------
> .../Pch/Library/PeiPchPolicyLib/PchSamplePolicyLib.c | 8 +-------
> .../Library/PeiPchPolicyLib/PchSamplePreMemPolicyLib.c | 8 +-------
> .../Pch/Library/PeiPchPolicyLib/PeiPchPolicyLib.c | 8 +-------
> .../Pch/Library/PeiPchPolicyLib/PeiPchPolicyLib.inf | 8 +-------
> .../Pch/Library/PeiPchPolicyLib/PeiPchPolicyLibrary.h | 8 +-------
> .../Pch/Library/PeiPchPolicyLib/PeiPchPreMemPolicyLib.c | 8 +-------
> .../Pch/Library/PeiPchResetLib/PchReset.c | 8 +-------
> .../Pch/Library/PeiPchResetLib/PeiPchResetLib.inf | 8 +-------
> .../Pch/Library/PeiResetSystemLib/PeiResetSystemLib.c | 8 +-------
> .../Pch/Library/PeiResetSystemLib/PeiResetSystemLib.inf | 8 +-------
> .../Library/PeiResetSystemLib/PeiResetSystemLibFsp.inf | 8 +-------
> .../KabylakeSiliconPkg/Pch/Library/PeiSpiLib/PeiSpiLib.c | 8 +-------
> .../Pch/Library/PeiSpiLib/PeiSpiLib.inf | 8 +-------
> .../SmmSpiFlashCommonLib/SmmSpiFlashCommonLib.inf | 8 +-------
> .../Pch/Library/SmmSpiFlashCommonLib/SpiFlashCommon.c | 8 +-------
> .../Library/SmmSpiFlashCommonLib/SpiFlashCommonSmmLib.c | 8 +-------
> .../BasePchSpiCommonLib/BasePchSpiCommonLib.inf | 8 +-------
> .../Pch/LibraryPrivate/BasePchSpiCommonLib/SpiCommon.c | 8 +-------
> .../Pch/LibraryPrivate/DxePchHdaLib/DxePchHdaLib.inf | 8 +-------
> .../Pch/LibraryPrivate/DxePchHdaLib/PchHdaEndpoints.c | 8 +-------
> .../Pch/LibraryPrivate/DxePchHdaLib/PchHdaLib.c | 8 +-------
> .../Pch/LibraryPrivate/DxePchHdaLib/PchHdaNhltConfig.c | 8 +-------
> .../PeiDxeI2cMasterCommonLib/I2cMasterCommonLib.c | 8 +-------
> .../PeiDxeI2cMasterCommonLib.inf | 8 +-------
> .../PeiDxeSmmGpioPrivateLib/GpioNativePrivateLib.c | 8 +-------
> .../PeiDxeSmmGpioPrivateLib/GpioPrivateLib.c | 8 +-------
> .../PeiDxeSmmGpioPrivateLib/PchSklGpioPrivateData.c | 8 +-------
> .../PeiDxeSmmGpioPrivateLib/PeiDxeSmmGpioPrivateLib.inf | 8 +-------
> .../PeiDxeSmmPchInitCommonLib/PchInitCommon.c | 8 +-------
> .../LibraryPrivate/PeiDxeSmmPchInitCommonLib/PchRpfn.c | 8 +-------
> .../PeiDxeSmmPchInitCommonLib.inf | 8 +-------
> .../PchPciExpressHelpersLibrary.c | 8 +-------
> .../PchPciExpressHelpersLibrary.h | 8 +-------
> .../PeiDxeSmmPchPciExpressHelpersLib.inf | 8 +-------
> .../PeiDxeSmmPchPsfPrivateLib/PchPsfPrivateLib.c | 8 +-------
> .../PeiDxeSmmPchPsfPrivateLib.inf | 8 +-------
> .../PeiDxeSmmPchSmbusCommonLib/PchSmbusExec.c | 8 +-------
> .../PeiDxeSmmPchSmbusCommonLib.inf | 8 +-------
> .../PeiDxeSmmRstPrivateLib/PeiDxeSmmRstPrivateLib.c | 8 +-------
> .../PeiDxeSmmRstPrivateLib/PeiDxeSmmRstPrivateLib.inf | 8 +-------
> .../Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchAcpi.c | 8 +-------
> .../KabylakeSiliconPkg/Pch/PchInit/Dxe/PchCio2Acpi.c | 8 +-------
> .../KabylakeSiliconPkg/Pch/PchInit/Dxe/PchHdaAcpi.c | 8 +-------
> .../Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInit.c | 8 +-------
> .../Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInit.h | 8 +-------
> .../KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxe.c | 8 +-------
> .../KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxe.inf | 8 +-------
> .../KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxeFsp.inf | 8 +-------
> .../KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitFsp.c | 8 +-------
> .../Pch/PchInit/Dxe/PchRstPcieStorage.c | 8 +-------
> .../Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchSata.c | 8 +-------
> .../Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchScs.c | 8 +-------
> .../KabylakeSiliconPkg/Pch/PchInit/Dxe/PchSerialIo.c | 8 +-------
> .../KabylakeSiliconPkg/Pch/PchInit/Dxe/PchSerialIoDxe.c | 8 +-------
> .../Pch/PchInit/Smm/PchBiosWriteProtect.c | 8 +-------
> .../Pch/PchInit/Smm/PchGpioSxIsolationSmm.c | 8 +-------
> .../KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.c | 8 +-------
> .../KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.h | 8 +-------
> .../KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.inf | 8 +-------
> .../KabylakeSiliconPkg/Pch/PchInit/Smm/PchLanSxSmm.c | 8 +-------
> .../KabylakeSiliconPkg/Pch/PchInit/Smm/PchPcieSmm.c | 8 +-------
> .../KabylakeSiliconPkg/Pch/PchInit/Smm/PchPort61hSmm.c | 8 +-------
> .../KabylakeSiliconPkg/Pch/PchInit/Smm/PchSpiAsync.c | 8 +-------
> .../KabylakeSiliconPkg/Pch/PchInit/Smm/PchXhciSxSmm.c | 8 +-------
> .../KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/IoTrap.c | 8 +-------
> .../KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/IoTrap.h | 8 +-------
> .../Pch/PchSmiDispatcher/Smm/PchSmiDispatch.c | 8 +-------
> .../Pch/PchSmiDispatcher/Smm/PchSmiDispatcher.inf | 8 +-------
> .../KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmm.h | 8 +-------
> .../Pch/PchSmiDispatcher/Smm/PchSmmCore.c | 8 +-------
> .../Pch/PchSmiDispatcher/Smm/PchSmmEspi.c | 8 +-------
> .../Pch/PchSmiDispatcher/Smm/PchSmmEspi.h | 8 +-------
> .../Pch/PchSmiDispatcher/Smm/PchSmmGpi.c | 8 +-------
> .../Pch/PchSmiDispatcher/Smm/PchSmmHelpers.c | 8 +-------
> .../Pch/PchSmiDispatcher/Smm/PchSmmHelpers.h | 8 +-------
> .../Pch/PchSmiDispatcher/Smm/PchSmmPeriodicTimer.c | 8 +-------
> .../Pch/PchSmiDispatcher/Smm/PchSmmPowerButton.c | 8 +-------
> .../Pch/PchSmiDispatcher/Smm/PchSmmSw.c | 8 +-------
> .../Pch/PchSmiDispatcher/Smm/PchSmmSx.c | 8 +-------
> .../Pch/PchSmiDispatcher/Smm/PchSmmUsb.c | 8 +-------
> .../Pch/PchSmiDispatcher/Smm/PchxSmmHelpers.c | 8 +-------
> .../Pch/PchSmiDispatcher/Smm/PchxSmmHelpers.h | 8 +-------
> .../Pch/SmmControl/RuntimeDxe/SmmControl.inf | 8 +-------
> .../Pch/SmmControl/RuntimeDxe/SmmControlDriver.c | 8 +-------
> .../Pch/SmmControl/RuntimeDxe/SmmControlDriver.h | 8 +-------
> Silicon/Intel/KabylakeSiliconPkg/Pch/Spi/Smm/PchSpi.c | 8 +-------
> Silicon/Intel/KabylakeSiliconPkg/Pch/Spi/Smm/PchSpi.h | 8 +-------
> .../Intel/KabylakeSiliconPkg/Pch/Spi/Smm/PchSpiSmm.inf | 8 +-------
> .../SampleCode/Include/Library/SecPlatformLib.h | 8 +-------
> .../Include/Guid/DataHubStatusCodeRecord.h | 8 +-------
> .../IntelFrameworkPkg/Include/Guid/SmramMemoryReserve.h | 8 +-------
> .../IntelFrameworkPkg/Include/Protocol/DataHub.h | 8 +-------
> .../IntelFrameworkPkg/Include/Protocol/Legacy8259.h | 8 +-------
> .../IntelFrameworkPkg/Include/Protocol/LegacyBios.h | 8 +-------
> .../IntelFrameworkPkg/Include/Protocol/LegacyInterrupt.h | 8 +-------
> .../SampleCode/MdeModulePkg/Include/Guid/AcpiS3Context.h | 9 +--------
> .../MdeModulePkg/Include/Guid/ConsoleOutDevice.h | 8 +-------
> .../MdeModulePkg/Include/Guid/MemoryTypeInformation.h | 8 +-------
> .../MdeModulePkg/Include/Library/ResetSystemLib.h | 8 +-------
> .../SampleCode/MdeModulePkg/Include/Ppi/SmmAccess.h | 9 +--------
> .../SampleCode/MdeModulePkg/Include/Ppi/SmmControl.h | 9 +--------
> .../MdeModulePkg/Include/Protocol/SmmVariable.h | 8 +-------
> .../SampleCode/Pch/AcpiTables/Dsdt/PchSmb.asl | 8 +-------
> Silicon/Intel/KabylakeSiliconPkg/SiPkg.dec | 8 +-------
> Silicon/Intel/KabylakeSiliconPkg/SiPkgBuildOption.dsc | 8 +-------
> Silicon/Intel/KabylakeSiliconPkg/SiPkgCommonLib.dsc | 8 +-------
> Silicon/Intel/KabylakeSiliconPkg/SiPkgDxe.dsc | 8 +-------
> Silicon/Intel/KabylakeSiliconPkg/SiPkgDxeLib.dsc | 8 +-------
> Silicon/Intel/KabylakeSiliconPkg/SiPkgPei.dsc | 8 +-------
> Silicon/Intel/KabylakeSiliconPkg/SiPkgPeiLib.dsc | 8 +-------
> .../SystemAgent/AcpiTables/Dmar/Dmar.aslc | 8 +-------
> .../SystemAgent/AcpiTables/Dmar/Dmar.h | 8 +-------
> .../SystemAgent/AcpiTables/HostBus.asl | 8 +-------
> .../SystemAgent/AcpiTables/SaAcpiTables.inf | 8 +-------
> .../SystemAgent/AcpiTables/SaSsdt/Igfx.asl | 8 +-------
> .../SystemAgent/AcpiTables/SaSsdt/IgfxCommon.asl | 8 +-------
> .../SystemAgent/AcpiTables/SaSsdt/IgfxDsm.asl | 8 +-------
> .../SystemAgent/AcpiTables/SaSsdt/IgfxOpGbda.asl | 8 +-------
> .../SystemAgent/AcpiTables/SaSsdt/IgfxOpRn.asl | 8 +-------
> .../SystemAgent/AcpiTables/SaSsdt/IgfxOpSbcb.asl | 8 +-------
> .../SystemAgent/AcpiTables/SaSsdt/Sa.asl | 8 +-------
> .../SystemAgent/AcpiTables/SaSsdt/SaNvs.asl | 8 +-------
> .../SystemAgent/AcpiTables/SaSsdt/SaSsdt.asl | 8 +-------
> .../SystemAgent/AcpiTables/SaSsdt/SaSsdt.inf | 8 +-------
> .../SystemAgent/Include/ConfigBlock/GraphicsDxeConfig.h | 8 +-------
> .../SystemAgent/Include/ConfigBlock/GraphicsPeiConfig.h | 8 +-------
> .../SystemAgent/Include/ConfigBlock/MemoryConfig.h | 8 +-------
> .../SystemAgent/Include/ConfigBlock/MiscDxeConfig.h | 8 +-------
> .../Include/ConfigBlock/SaMiscPeiPreMemConfig.h | 8 +-------
> .../SystemAgent/Include/ConfigBlock/VtdConfig.h | 8 +-------
> .../SystemAgent/Include/DmaRemappingTable.h | 8 +-------
> .../SystemAgent/Include/Library/DxeSaPolicyLib.h | 8 +-------
> .../SystemAgent/Include/Library/PeiSaPolicyLib.h | 8 +-------
> .../SystemAgent/Include/Library/SaPlatformLib.h | 8 +-------
> .../KabylakeSiliconPkg/SystemAgent/Include/MemInfoHob.h | 8 +-------
> .../SystemAgent/Include/Protocol/GopPolicy.h | 8 +-------
> .../SystemAgent/Include/Protocol/IgdOpRegion.h | 8 +-------
> .../SystemAgent/Include/Protocol/MemInfo.h | 8 +-------
> .../SystemAgent/Include/Protocol/SaGlobalNvsArea.h | 8 +-------
> .../SystemAgent/Include/Protocol/SaNvs.h | 8 +-------
> .../SystemAgent/Include/Protocol/SaPolicy.h | 8 +-------
> .../KabylakeSiliconPkg/SystemAgent/Include/SaAccess.h | 8 +-------
> .../SystemAgent/Include/SaPolicyCommon.h | 8 +-------
> .../KabylakeSiliconPkg/SystemAgent/Include/SaRegs.h | 8 +-------
> .../SystemAgent/IncludePrivate/SaConfigHob.h | 8 +-------
> .../SystemAgent/Library/DxeSaPolicyLib/DxeSaPolicyLib.c | 8 +-------
> .../Library/DxeSaPolicyLib/DxeSaPolicyLib.inf | 8 +-------
> .../Library/DxeSaPolicyLib/DxeSaPolicyLibrary.h | 8 +-------
> .../PeiDxeSmmSaPlatformLib/PeiDxeSmmSaPlatformLib.inf | 8 +-------
> .../Library/PeiDxeSmmSaPlatformLib/SaPlatformLibrary.c | 8 +-------
> .../Library/PeiDxeSmmSaPlatformLib/SaPlatformLibrary.h | 8 +-------
> .../Library/PeiSaPolicyLib/Ia32/MrcOemPlatform.S | 8 +-------
> .../Library/PeiSaPolicyLib/Ia32/MrcOemPlatform.asm | 8 +-------
> .../Library/PeiSaPolicyLib/Ia32/MrcOemPlatform.nasm | 8 +-------
> .../SystemAgent/Library/PeiSaPolicyLib/MrcOemPlatform.c | 8 +-------
> .../SystemAgent/Library/PeiSaPolicyLib/MrcOemPlatform.h | 8 +-------
> .../SystemAgent/Library/PeiSaPolicyLib/PeiSaPolicyLib.c | 8 +-------
> .../Library/PeiSaPolicyLib/PeiSaPolicyLib.inf | 8 +-------
> .../Library/PeiSaPolicyLib/PeiSaPolicyLibSample.c | 8 +-------
> .../Library/PeiSaPolicyLib/PeiSaPolicyLibrary.h | 8 +-------
> .../SystemAgent/Library/PeiSaPolicyLib/SaPrintPolicy.c | 8 +-------
> .../SystemAgent/MemoryInit/Include/MrcCommonTypes.h | 8 +-------
> .../SystemAgent/MemoryInit/Include/MrcInterface.h | 8 +-------
> .../SystemAgent/MemoryInit/Include/MrcRmtData.h | 8 +-------
> .../SystemAgent/MemoryInit/Include/MrcSpdData.h | 8 +-------
> .../SystemAgent/MemoryInit/Include/MrcTypes.h | 8 +-------
> .../SystemAgent/SaInit/Dxe/GraphicsInit.c | 8 +-------
> .../SystemAgent/SaInit/Dxe/GraphicsInit.h | 8 +-------
> .../SystemAgent/SaInit/Dxe/IgdOpRegion.c | 8 +-------
> .../SystemAgent/SaInit/Dxe/IgdOpRegion.h | 8 +-------
> .../KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaAcpi.c | 8 +-------
> .../KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaInit.h | 8 +-------
> .../SystemAgent/SaInit/Dxe/SaInitDxe.c | 8 +-------
> .../SystemAgent/SaInit/Dxe/SaInitDxe.h | 8 +-------
> .../SystemAgent/SaInit/Dxe/SaInitDxe.inf | 8 +-------
> .../KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/VTd.c | 8 +-------
> .../KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/VTd.h | 8 +-------
> .../SystemAgent/SmmAccess/Dxe/SmmAccess.inf | 8 +-------
> .../SystemAgent/SmmAccess/Dxe/SmmAccessDriver.c | 8 +-------
> .../SystemAgent/SmmAccess/Dxe/SmmAccessDriver.h | 8 +-------
> 492 files changed, 492 insertions(+), 3447 deletions(-)
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuConfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuConfig.h
> index 863a4fcdf8..6de5efbede 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuConfig.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuConfig.h
> @@ -2,13 +2,7 @@
> CPU Config Block.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _CPU_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuConfigFspDat
> a.h
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuConfigFspDat
> a.h
> index 8f333cffeb..53e6d45fe5 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuConfigFspDat
> a.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuConfigFspDat
> a.h
> @@ -2,13 +2,7 @@
> FSP CPU Data Config Block.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _CPU_CONFIG_FSP_DATA_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuConfigLibPre
> MemConfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuConfigLibPre
> MemConfig.h
> index 19e41287ce..4823b1d713 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuConfigLibPre
> MemConfig.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuConfigLibPre
> MemConfig.h
> @@ -2,13 +2,7 @@
> CPU PreMemory Config Block.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _CPU_CONFIG_LIB_PREMEM_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuOverclocking
> Config.h
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuOverclocking
> Config.h
> index 735e79c491..7a6d89ebda 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuOverclocking
> Config.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuOverclocking
> Config.h
> @@ -2,13 +2,7 @@
> CPU Overclocking Config Block.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _CPU_OVERCLOCKING_PREMEM_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPidTestConfig
> .h
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPidTestConfig
> .h
> index d8b5a2ed98..c55f9a0cc3 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPidTestConfig
> .h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPidTestConfig
> .h
> @@ -2,13 +2,7 @@
> CPU PID Config Block.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _CPU_PID_TEST_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgmtB
> asicConfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgmtB
> asicConfig.h
> index 68dc9195ae..6fe9126377 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgmtB
> asicConfig.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgmtB
> asicConfig.h
> @@ -2,13 +2,7 @@
> CPU Power Management Basic Config Block.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _CPU_POWER_MGMT_BASIC_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgmtC
> ustomConfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgmtC
> ustomConfig.h
> index edb8182db5..026a1aff5f 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgmtC
> ustomConfig.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgmtC
> ustomConfig.h
> @@ -2,13 +2,7 @@
> CPU Power Managment Custom Config Block.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _CPU_POWER_MGMT_CUSTOM_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgmtP
> sysConfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgmtP
> sysConfig.h
> index 05b1efd5b6..75b49dbe7a 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgmtP
> sysConfig.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgmtP
> sysConfig.h
> @@ -2,13 +2,7 @@
> CPU Power Management Psys(Platform) Config Block.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _CPU_POWER_MGMT_PSYS_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgmtT
> estConfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgmtT
> estConfig.h
> index bf6e829fa3..ab0c194e76 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgmtT
> estConfig.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgmtT
> estConfig.h
> @@ -2,13 +2,7 @@
> CPU Power Management Test Config Block.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _CPU_POWER_MGMT_TEST_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgmtV
> rConfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgmtV
> rConfig.h
> index ad4ed76250..802f585819 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgmtV
> rConfig.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgmtV
> rConfig.h
> @@ -2,13 +2,7 @@
> CPU Power Management VR Config Block.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _CPU_POWER_MGMT_VR_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuTestConfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuTestConfig.h
> index 2b1fa5b3a5..2cdf834a89 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuTestConfig.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuTestConfig.h
> @@ -2,13 +2,7 @@
> CPU Test Config Block.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _CPU_TEST_CONFIG_H_
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuAccess.h
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuAccess.h
> index dc62fea6eb..62a0323cb0 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuAccess.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuAccess.h
> @@ -2,13 +2,7 @@
> Macros to simplify and abstract the interface to CPU configuration.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _CPUACCESS_H_
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuDataStruct.h
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuDataStruct.h
> index e7caafa416..2dc7be45d2 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuDataStruct.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuDataStruct.h
> @@ -2,13 +2,7 @@
> This file declares various data structures used in CPU reference code.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuPolicyCommon.h
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuPolicyCommon.h
> index a8ee41ec99..775fc6ce65 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuPolicyCommon.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuPolicyCommon.h
> @@ -2,13 +2,7 @@
> CPU Policy structure definition which will contain several config blocks during
> runtime.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _CPU_POLICY_COMMON_H_
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuPowerMgmt.h
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuPowerMgmt.h
> index 612b166010..4a14004fdf 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuPowerMgmt.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuPowerMgmt.h
> @@ -2,13 +2,7 @@
> This file contains define definitions specific to processor
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuRegs.h
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuRegs.h
> index 21b6dd6f4b..3b92fd677f 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuRegs.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuRegs.h
> @@ -10,13 +10,7 @@
> - Definitions beginning with "N_" are the bit position
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _CPU_REGS_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Library/CpuMailboxLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Library/CpuMailboxLib.h
> index 0c2df2ff80..4d36a90ad1 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Library/CpuMailboxLib.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Library/CpuMailboxLib.h
> @@ -2,13 +2,7 @@
> Header file for Cpu Mailbox Lib.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Library/CpuPlatformLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Library/CpuPlatformLib.h
> index d1ccc5e7fb..462b083e6a 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Library/CpuPlatformLib.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Library/CpuPlatformLib.h
> @@ -2,13 +2,7 @@
> Header file for CpuPlatform Lib.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Library/CpuPolicyLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Library/CpuPolicyLib.h
> index f05c5743d7..4ed5719491 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Library/CpuPolicyLib.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Library/CpuPolicyLib.h
> @@ -2,13 +2,7 @@
> Prototype of the CpuPolicy library.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _CPU_POLICY_LIB_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Library/CpuPolicyLibPreMem.
> h
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Library/CpuPolicyLibPreMem.
> h
> index 905937ec88..9e7518f91c 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Library/CpuPolicyLibPreMem.
> h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Library/CpuPolicyLibPreMem.
> h
> @@ -2,13 +2,7 @@
> Prototype of the CpuPolicy library.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _CPU_PREMEM_POLICY_LIB_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Protocol/CpuGlobalNvsArea.h
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Protocol/CpuGlobalNvsArea.h
> index 6e807a3504..59c0f812c5 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Protocol/CpuGlobalNvsArea.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Protocol/CpuGlobalNvsArea.h
> @@ -6,13 +6,7 @@
> @note Data structures defined in this protocol are not naturally aligned.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _CPU_GLOBAL_NVS_AREA_H_
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Protocol/CpuInfo.h
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Protocol/CpuInfo.h
> index d59994471d..f0095908f3 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Protocol/CpuInfo.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Protocol/CpuInfo.h
> @@ -2,13 +2,7 @@
> Protocol used to report CPU information
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _CPU_INFO_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/IncludePrivate/CpuInitDataHob.h
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/IncludePrivate/CpuInitDataHob.h
> index cdc6c463b6..58c968df89 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/IncludePrivate/CpuInitDataHob.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/IncludePrivate/CpuInitDataHob.h
> @@ -2,13 +2,7 @@
> Struct and GUID definitions for CpuInitDataHob.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _CPU_INIT_DATA_HOB_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/IncludePrivate/CpuPrivateData.h
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/IncludePrivate/CpuPrivateData.h
> index 13ca1f2a01..4cc60651c3 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/IncludePrivate/CpuPrivateData.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/IncludePrivate/CpuPrivateData.h
> @@ -2,13 +2,7 @@
> Struct definition for CpuPrivateData.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _CPU_PRIVATE_DATA_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/IncludePrivate/Library/CpuCommonLi
> b.h
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/IncludePrivate/Library/CpuCommonLi
> b.h
> index 8099236d88..759fa84175 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/IncludePrivate/Library/CpuCommonLi
> b.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/IncludePrivate/Library/CpuCommonLi
> b.h
> @@ -2,13 +2,7 @@
> Header file for Cpu Common Lib implementation.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/IncludePrivate/PowerMgmtNvsStruct.
> h
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/IncludePrivate/PowerMgmtNvsStruct.
> h
> index e7f7c19279..bd3fddb86f 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/IncludePrivate/PowerMgmtNvsStruct.
> h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/IncludePrivate/PowerMgmtNvsStruct.
> h
> @@ -2,13 +2,7 @@
> This file contains CPU Gnvs Struct specific to processor
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _POWER_MGMT_NVS_STRUCT_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/BaseCpuMailboxLibNull/BaseC
> puMailboxLibNull.c
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/BaseCpuMailboxLibNull/BaseC
> puMailboxLibNull.c
> index ed964d00c3..bc2e93a1ac 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/BaseCpuMailboxLibNull/BaseC
> puMailboxLibNull.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/BaseCpuMailboxLibNull/BaseC
> puMailboxLibNull.c
> @@ -2,13 +2,7 @@
> Mailbox Library.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include <Uefi.h>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/BaseCpuMailboxLibNull/BaseC
> puMailboxLibNull.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/BaseCpuMailboxLibNull/BaseC
> puMailboxLibNull.inf
> index 0426e05802..0799aa891b 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/BaseCpuMailboxLibNull/BaseC
> puMailboxLibNull.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/BaseCpuMailboxLibNull/BaseC
> puMailboxLibNull.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/CpuPrintPolicy
> .c
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/CpuPrintPolicy
> .c
> index f871c21e6a..f13ca92661 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/CpuPrintPolicy
> .c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/CpuPrintPolicy
> .c
> @@ -2,13 +2,7 @@
> This file is PeiCpuPolicy library.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "PeiCpuPolicyLibrary.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicyLi
> b.c
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicyLi
> b.c
> index 49331f1471..cb7f379e0f 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicyLi
> b.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicyLi
> b.c
> @@ -2,13 +2,7 @@
> This file is PeiCpuPolicy library.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "PeiCpuPolicyLibrary.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicyLi
> b.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicyLi
> b.inf
> index 24e9819e34..e0f4ee03ee 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicyLi
> b.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicyLi
> b.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicyLi
> brary.h
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicyLi
> brary.h
> index 81301b475e..d2a475591d 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicyLi
> brary.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicyLi
> brary.h
> @@ -2,13 +2,7 @@
> Header file for the PeiCpuPolicyLib library.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PEI_CPU_POLICY_LIBRARY_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/CpuP
> rintPolicy.c
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/CpuP
> rintPolicy.c
> index 1807604405..d7ffd0b600 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/CpuP
> rintPolicy.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/CpuP
> rintPolicy.c
> @@ -2,13 +2,7 @@
> This file is PeiCpuPolicy library.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "PeiCpuPolicyLibrary.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/PeiCp
> uPolicyLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/PeiCp
> uPolicyLib.c
> index 7d27c0b6dc..35041322a7 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/PeiCp
> uPolicyLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/PeiCp
> uPolicyLib.c
> @@ -2,13 +2,7 @@
> This file is PeiCpuPolicy library.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "PeiCpuPolicyLibrary.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/PeiCp
> uPolicyLibPreMem.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/PeiCp
> uPolicyLibPreMem.inf
> index df6e20baef..a18ea79147 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/PeiCp
> uPolicyLibPreMem.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/PeiCp
> uPolicyLibPreMem.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/PeiCp
> uPolicyLibrary.h
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/PeiCp
> uPolicyLibrary.h
> index 8c039b4591..553b7a8ca9 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/PeiCp
> uPolicyLibrary.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/PeiCp
> uPolicyLibrary.h
> @@ -2,13 +2,7 @@
> Header file for the PeiCpuPolicyLib library.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PEI_CPU_POLICY_LIBRARY_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiDxeSmmCpuPlatformLib/Cp
> uPlatformLibrary.c
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiDxeSmmCpuPlatformLib/Cp
> uPlatformLibrary.c
> index 830803a909..0cf2cc8a1f 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiDxeSmmCpuPlatformLib/Cp
> uPlatformLibrary.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiDxeSmmCpuPlatformLib/Cp
> uPlatformLibrary.c
> @@ -2,13 +2,7 @@
> CPU Platform Lib implementation.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiDxeSmmCpuPlatformLib/Cp
> uPlatformLibrary.h
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiDxeSmmCpuPlatformLib/Cp
> uPlatformLibrary.h
> index d5b8ed9ae4..3fcdbcb402 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiDxeSmmCpuPlatformLib/Cp
> uPlatformLibrary.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiDxeSmmCpuPlatformLib/Cp
> uPlatformLibrary.h
> @@ -2,13 +2,7 @@
> Header file for Cpu Platform Lib implementation.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiDxeSmmCpuPlatformLib/Pei
> DxeSmmCpuPlatformLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiDxeSmmCpuPlatformLib/Pe
> iDxeSmmCpuPlatformLib.inf
> index 2a123ae708..21d441a577 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiDxeSmmCpuPlatformLib/Pei
> DxeSmmCpuPlatformLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiDxeSmmCpuPlatformLib/Pe
> iDxeSmmCpuPlatformLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/LibraryPrivate/PeiDxeSmmCpuCommo
> nLib/CpuCommonLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/LibraryPrivate/PeiDxeSmmCpuCommo
> nLib/CpuCommonLib.c
> index 100bd1464c..4fa713612b 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/LibraryPrivate/PeiDxeSmmCpuCommo
> nLib/CpuCommonLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/LibraryPrivate/PeiDxeSmmCpuCommo
> nLib/CpuCommonLib.c
> @@ -2,13 +2,7 @@
> CPU Common Lib implementation.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/LibraryPrivate/PeiDxeSmmCpuCommo
> nLib/PeiDxeSmmCpuCommonLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/LibraryPrivate/PeiDxeSmmCpuCommo
> nLib/PeiDxeSmmCpuCommonLib.inf
> index 70d33ce354..e5c546d67a 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/LibraryPrivate/PeiDxeSmmCpuCommo
> nLib/PeiDxeSmmCpuCommonLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/LibraryPrivate/PeiDxeSmmCpuCommo
> nLib/PeiDxeSmmCpuCommonLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/BootFirmwareMediaProtection.c
> b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/BootFirmwareMediaProtection.c
> index bf272036c4..a255e7e514 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/BootFirmwareMediaProtection.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/BootFirmwareMediaProtection.c
> @@ -2,13 +2,7 @@
> This file contains the tests for the BootFirmwareMediaProtection BIT
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/DebugModeDisabled.c
> b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/DebugModeDisabled.c
> index e96535cf03..0a9d381a53 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/DebugModeDisabled.c
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/DebugModeDisabled.c
> @@ -2,13 +2,7 @@
> This file contains the tests for the DebugModeDisabled Bit
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/HardwareRootedBootIntegrity.c
> b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/HardwareRootedBootIntegrity.c
> index beca056028..d159039b35 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/HardwareRootedBootIntegrity.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/HardwareRootedBootIntegrity.c
> @@ -2,13 +2,7 @@
> This file contains the tests for the HardwareRootedBootIntegrity bit
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/HstiSiliconDxe.c
> b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/HstiSiliconDxe.c
> index e9a26cac80..3b40893266 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/HstiSiliconDxe.c
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/HstiSiliconDxe.c
> @@ -2,13 +2,7 @@
> This file contains DXE driver for testing and publishing HSTI
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/HstiSiliconDxe.h
> b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/HstiSiliconDxe.h
> index b2b48a2152..08094dbbc1 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/HstiSiliconDxe.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/HstiSiliconDxe.h
> @@ -2,13 +2,7 @@
> This file contains the required header files for the HSTI Silicon DXE driver
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/HstiSiliconDxe.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/HstiSiliconDxe.inf
> index 854343da38..52e3b6ceba 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/HstiSiliconDxe.inf
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/HstiSiliconDxe.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/IntegratedDeviceDmaProtection.c
> b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/IntegratedDeviceDmaProtection.c
> index d45cc586ba..184ec609ba 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/IntegratedDeviceDmaProtection.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/IntegratedDeviceDmaProtection.c
> @@ -2,13 +2,7 @@
> This file contains the tests for the IntegratedDeviceDMAProtection bit
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/MeasuredBootEnforcement.c
> b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/MeasuredBootEnforcement.c
> index 6d88a64060..c05e6d6ec6 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/MeasuredBootEnforcement.c
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/MeasuredBootEnforcement.c
> @@ -2,13 +2,7 @@
> This file contains the tests for the MeasuredBootEnforcement BIT
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/MpServiceHelp.c
> b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/MpServiceHelp.c
> index f1e7a8d946..bac52664b5 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/MpServiceHelp.c
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/MpServiceHelp.c
> @@ -2,13 +2,7 @@
> This file contains the mpservices helper functions
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureCpuConfiguration.c
> b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureCpuConfiguration.c
> index 8abb3caf1f..68fda2d634 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureCpuConfiguration.c
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureCpuConfiguration.c
> @@ -2,13 +2,7 @@
> This file contains the tests for the SecureCPUConfiguration bit
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureIntegratedGraphicsConfigur
> ation.c
> b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureIntegratedGraphicsConfigu
> ration.c
> index c70ac41cf6..e53d45ee12 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureIntegratedGraphicsConfigur
> ation.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureIntegratedGraphicsConfigu
> ration.c
> @@ -2,13 +2,7 @@
> This file contains the tests for the SecureIntegratedGraphics bit
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "HstiSiliconDxe.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureMemoryMapConfiguration.
> c
> b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureMemoryMapConfiguration.
> c
> index 00dd3092a1..a3c9bbebea 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureMemoryMapConfiguration.
> c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureMemoryMapConfiguration.
> c
> @@ -2,13 +2,7 @@
> This file contains the tests for the SecureMemoryMapConfiguration bit
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecurePCHConfiguration.c
> b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecurePCHConfiguration.c
> index 7274c5556a..2d73c26eb2 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecurePCHConfiguration.c
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecurePCHConfiguration.c
> @@ -2,13 +2,7 @@
> This file contains the tests for the SecuePCHConfiguration bit
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "HstiSiliconDxe.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureSystemAgentConfiguration.
> c
> b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureSystemAgentConfiguration.
> c
> index 2f498cd532..d08a85b87e 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureSystemAgentConfiguration.
> c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureSystemAgentConfiguration.
> c
> @@ -2,13 +2,7 @@
> This file contains the tests for the SecureSystemAgentConfiguration bit
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SignedFirmwareUpdate.c
> b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SignedFirmwareUpdate.c
> index 79dabc690e..aab48e02e6 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SignedFirmwareUpdate.c
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SignedFirmwareUpdate.c
> @@ -2,13 +2,7 @@
> This file contains the tests for the SignedFirmwareUpdate bit
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Include/ConfigBlock.h
> b/Silicon/Intel/KabylakeSiliconPkg/Include/ConfigBlock.h
> index 246582e9ee..dd91a55e79 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Include/ConfigBlock.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Include/ConfigBlock.h
> @@ -2,13 +2,7 @@
> Header file for Config Block Lib implementation
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Include/HstiFeatureBit.h
> b/Silicon/Intel/KabylakeSiliconPkg/Include/HstiFeatureBit.h
> index cdbe75ae18..12baf4e378 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Include/HstiFeatureBit.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Include/HstiFeatureBit.h
> @@ -3,13 +3,7 @@
> including error string definitions
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Include/Library/AslUpdateLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Include/Library/AslUpdateLib.h
> index dc76e33557..d58b6d6458 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Include/Library/AslUpdateLib.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Include/Library/AslUpdateLib.h
> @@ -6,13 +6,7 @@
> restrictions, etc).
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Include/Library/ConfigBlockLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Include/Library/ConfigBlockLib.h
> index cc437b93bf..04c8ec5cca 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Include/Library/ConfigBlockLib.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Include/Library/ConfigBlockLib.h
> @@ -2,13 +2,7 @@
> Header file for Config Block Lib implementation
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Include/Library/MmPciLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Include/Library/MmPciLib.h
> index b4f8b41e1b..9049675679 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Include/Library/MmPciLib.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Include/Library/MmPciLib.h
> @@ -2,13 +2,7 @@
> Get Pci Express address library implementation.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Include/Library/PeiSiPolicyUpdateLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Include/Library/PeiSiPolicyUpdateLib.h
> index 184b04f5de..7c9517bdb1 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Include/Library/PeiSiPolicyUpdateLib.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Include/Library/PeiSiPolicyUpdateLib.h
> @@ -2,13 +2,7 @@
> Header file for PEI SiPolicyUpdate Library.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Include/Library/SiConfigBlockLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Include/Library/SiConfigBlockLib.h
> index 56527478b4..1534eb59d0 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Include/Library/SiConfigBlockLib.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Include/Library/SiConfigBlockLib.h
> @@ -2,13 +2,7 @@
> Prototype of the SiConfigBlockLib library.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Include/Library/SiPolicyLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Include/Library/SiPolicyLib.h
> index 98d3ad25e0..7bd26863b5 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Include/Library/SiPolicyLib.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Include/Library/SiPolicyLib.h
> @@ -2,13 +2,7 @@
> Prototype of the SiPolicyLib library.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Include/Library/SiliconInitLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Include/Library/SiliconInitLib.h
> index d10e7cf0b8..0028c9d911 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Include/Library/SiliconInitLib.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Include/Library/SiliconInitLib.h
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Include/PcieRegs.h
> b/Silicon/Intel/KabylakeSiliconPkg/Include/PcieRegs.h
> index 3a3b22fd83..d91a450023 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Include/PcieRegs.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Include/PcieRegs.h
> @@ -11,13 +11,7 @@
> Definitions beginning with "N_" are the bit position
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Include/Ppi/SiInitPpi.h
> b/Silicon/Intel/KabylakeSiliconPkg/Include/Ppi/SiInitPpi.h
> index 6d2b857ac6..b8643b3ede 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Include/Ppi/SiInitPpi.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Include/Ppi/SiInitPpi.h
> @@ -3,13 +3,7 @@
> init
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Include/Ppi/SiPolicy.h
> b/Silicon/Intel/KabylakeSiliconPkg/Include/Ppi/SiPolicy.h
> index 044dadc022..3088eb89e6 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Include/Ppi/SiPolicy.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Include/Ppi/SiPolicy.h
> @@ -5,13 +5,7 @@
> over to silicon DXE modules.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Include/Protocol/SiPolicyProtocol.h
> b/Silicon/Intel/KabylakeSiliconPkg/Include/Protocol/SiPolicyProtocol.h
> index 91fcad80a0..ff3b92ba1b 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Include/Protocol/SiPolicyProtocol.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Include/Protocol/SiPolicyProtocol.h
> @@ -2,13 +2,7 @@
> Protocol used for specifying platform related Silicon information and policy
> setting.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Include/SiPolicyStruct.h
> b/Silicon/Intel/KabylakeSiliconPkg/Include/SiPolicyStruct.h
> index f1facc4300..375844e506 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Include/SiPolicyStruct.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Include/SiPolicyStruct.h
> @@ -2,13 +2,7 @@
> Intel reference code configuration policies.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/IncludePrivate/Library/PcieInitLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/IncludePrivate/Library/PcieInitLib.h
> index f8c3c3b43d..f800b78809 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/IncludePrivate/Library/PcieInitLib.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/IncludePrivate/Library/PcieInitLib.h
> @@ -2,13 +2,7 @@
> PCIe Initialization Library header file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/IncludePrivate/SiConfigHob.h
> b/Silicon/Intel/KabylakeSiliconPkg/IncludePrivate/SiConfigHob.h
> index 676e5e433b..dbbcfa997c 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/IncludePrivate/SiConfigHob.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/IncludePrivate/SiConfigHob.h
> @@ -3,13 +3,7 @@
> related Intel silicon information and config setting.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/KabylakeSiliconBuild.bat
> b/Silicon/Intel/KabylakeSiliconPkg/KabylakeSiliconBuild.bat
> index 98d94cf310..c384ca0a1f 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/KabylakeSiliconBuild.bat
> +++ b/Silicon/Intel/KabylakeSiliconPkg/KabylakeSiliconBuild.bat
> @@ -1,13 +1,7 @@
> @REM @file
> @REM
> @REM Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -@REM This program and the accompanying materials
> -@REM are licensed and made available under the terms and conditions of the
> BSD License
> -@REM which accompanies this distribution. The full text of the license may be
> found at
> -@REM http://opensource.org/licenses/bsd-license.php
> -@REM
> -@REM THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -@REM WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +@REM SPDX-License-Identifier: BSD-2-Clause-Patent
> @REM
>
> @call edksetup.bat
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/KabylakeSiliconPkg.dsc
> b/Silicon/Intel/KabylakeSiliconPkg/KabylakeSiliconPkg.dsc
> index cbb2a8bec4..5b114ae99e 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/KabylakeSiliconPkg.dsc
> +++ b/Silicon/Intel/KabylakeSiliconPkg/KabylakeSiliconPkg.dsc
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017 - 2019, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/KabylakeSiliconPrivate.dec
> b/Silicon/Intel/KabylakeSiliconPkg/KabylakeSiliconPrivate.dec
> index 163bd429f8..0c013af8b6 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/KabylakeSiliconPrivate.dec
> +++ b/Silicon/Intel/KabylakeSiliconPkg/KabylakeSiliconPrivate.dec
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/BaseConfigBlockLib/BaseConfigBloc
> kLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Library/BaseConfigBlockLib/BaseConfigBloc
> kLib.c
> index a411547ccb..b9bd6f3a48 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/BaseConfigBlockLib/BaseConfigBloc
> kLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/BaseConfigBlockLib/BaseConfigBloc
> kLib.c
> @@ -2,13 +2,7 @@
> Library functions for Config Block management.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include <ConfigBlock.h>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/BaseConfigBlockLib/BaseConfigBloc
> kLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Library/BaseConfigBlockLib/BaseConfigBloc
> kLib.inf
> index f544c75a6c..646c5b189c 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/BaseConfigBlockLib/BaseConfigBloc
> kLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/BaseConfigBlockLib/BaseConfigBloc
> kLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/BaseSiConfigBlockLib/BaseSiConfigB
> lockLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Library/BaseSiConfigBlockLib/BaseSiConfig
> BlockLib.c
> index 98ff9e3410..8596933549 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/BaseSiConfigBlockLib/BaseSiConfigB
> lockLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/BaseSiConfigBlockLib/BaseSiConfig
> BlockLib.c
> @@ -3,13 +3,7 @@
> to config block header.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include <ConfigBlock.h>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/BaseSiConfigBlockLib/BaseSiConfigB
> lockLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Library/BaseSiConfigBlockLib/BaseSiConfig
> BlockLib.inf
> index 5961b1a6b2..c9a70c10c8 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/BaseSiConfigBlockLib/BaseSiConfigB
> lockLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/BaseSiConfigBlockLib/BaseSiConfig
> BlockLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLib/DxeAslUpdateLib.
> c
> b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLib/DxeAslUpdateLib.
> c
> index ea85be4a11..e6ab43db6d 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLib/DxeAslUpdateLib.
> c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLib/DxeAslUpdateLib.
> c
> @@ -7,13 +7,7 @@
> This library uses the ACPI Support protocol.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include <Base.h>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLib/DxeAslUpdateLib.i
> nf
> b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLib/DxeAslUpdateLib.i
> nf
> index 0b24bbe71e..7a100128f3 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLib/DxeAslUpdateLib.i
> nf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLib/DxeAslUpdateLib.i
> nf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLibNull/DxeAslUpdate
> LibNull.c
> b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLibNull/DxeAslUpdate
> LibNull.c
> index 834315d236..490a09ddb5 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLibNull/DxeAslUpdate
> LibNull.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLibNull/DxeAslUpdate
> LibNull.c
> @@ -7,13 +7,7 @@
> This library uses the ACPI Support protocol.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include <Base.h>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLibNull/DxeAslUpdate
> LibNull.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLibNull/DxeAslUpdate
> LibNull.inf
> index 3805dbf1dd..a3c8aef60a 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLibNull/DxeAslUpdate
> LibNull.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLibNull/DxeAslUpdate
> LibNull.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeSiliconPolicyInitLib/DxePolicyInit
> .c
> b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeSiliconPolicyInitLib/DxePolicyInit
> .c
> index ac870bee84..694c896879 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeSiliconPolicyInitLib/DxePolicyInit
> .c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeSiliconPolicyInitLib/DxePolicyInit
> .c
> @@ -2,13 +2,7 @@
> This file is SampleCode for Intel PEI Platform Policy initialization.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeSiliconPolicyInitLib/DxeSaPolicyI
> nit.h
> b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeSiliconPolicyInitLib/DxeSaPolicyI
> nit.h
> index ebc5023f7b..855a89fc23 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeSiliconPolicyInitLib/DxeSaPolicyI
> nit.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeSiliconPolicyInitLib/DxeSaPolicyI
> nit.h
> @@ -2,13 +2,7 @@
> Header file for the SaPolicyInitDxe Driver.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _SA_POLICY_INIT_DXE_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeSiliconPolicyInitLib/DxeSiliconPo
> licyInitLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeSiliconPolicyInitLib/DxeSiliconPo
> licyInitLib.inf
> index fbce84e78f..1997f43ab4 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeSiliconPolicyInitLib/DxeSiliconPo
> licyInitLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeSiliconPolicyInitLib/DxeSiliconPo
> licyInitLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiDxeSmmMmPciLib/PeiDxeSmm
> MmPciLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiDxeSmmMmPciLib/PeiDxeSmm
> MmPciLib.c
> index 3688872019..51a06528e0 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiDxeSmmMmPciLib/PeiDxeSmm
> MmPciLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiDxeSmmMmPciLib/PeiDxeSmm
> MmPciLib.c
> @@ -2,13 +2,7 @@
> This file contains routines that get PCI Express Address
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include <Library/BaseLib.h>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiDxeSmmMmPciLib/PeiDxeSmm
> MmPciLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiDxeSmmMmPciLib/PeiDxeSmm
> MmPciLib.inf
> index 24cae56d04..8ae40a0c9e 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiDxeSmmMmPciLib/PeiDxeSmm
> MmPciLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiDxeSmmMmPciLib/PeiDxeSmm
> MmPciLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLib.c
> index b7db139ded..813b868fcf 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLib.c
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLib.c
> @@ -3,13 +3,7 @@
> Policy and installs RC Policy PPI.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLib.inf
> index 134f60be5e..1d992cfbbd 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLib.inf
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLibPreMe
> m.c
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLibPreMe
> m.c
> index 3f80b990e9..e0d83cb467 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLibPreMe
> m.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLibPreMe
> m.c
> @@ -3,13 +3,7 @@
> Policy and installs RC Policy PPI.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLibrary.h
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLibrary.h
> index 4c6ba6309d..f090e58868 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLibrary.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLibrary.h
> @@ -2,13 +2,7 @@
> Header file for the PeiSiPolicyLib library.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/SiPrintPolicy.c
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/SiPrintPolicy.c
> index 16cfb52565..623f30de45 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/SiPrintPolicy.c
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/SiPrintPolicy.c
> @@ -2,13 +2,7 @@
> This file is PeiSiPolicyLib library for printing Policy settings.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiPolicyInit.c
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiPolicyInit.
> c
> index c3a96e5ad2..0de415ad19 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiPolicyInit.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiPolicyInit.
> c
> @@ -2,13 +2,7 @@
> This file is SampleCode for Intel PEI Platform Policy initialization.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiPolicyInit.
> h
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiPolicyInit.
> h
> index e85724411a..c38294cfbe 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiPolicyInit.
> h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiPolicyInit.
> h
> @@ -2,13 +2,7 @@
> Header file for the PolicyInitPei PEIM.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiPolicyInitP
> reMem.c
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiPolicyInitP
> reMem.c
> index c402dee3a4..fd76b4fac3 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiPolicyInitP
> reMem.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiPolicyInitP
> reMem.c
> @@ -2,13 +2,7 @@
> This file is SampleCode for Intel PEI Platform Policy initialization.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiSiPolicyInit
> .h
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiSiPolicyIni
> t.h
> index 4f4a80b9ae..47ede26b05 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiSiPolicyInit
> .h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiSiPolicyIni
> t.h
> @@ -2,13 +2,7 @@
> Header file for the PeiSiPolicyInit
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiSiliconPoli
> cyInitLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiSiliconPoli
> cyInitLib.inf
> index ac37f17eae..7982a5d87f 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiSiliconPoli
> cyInitLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiSiliconPoli
> cyInitLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibDependency/
> PeiPostMemSiliconPolicyInitLibDependency.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibDependency/
> PeiPostMemSiliconPolicyInitLibDependency.inf
> index 243a70f30d..2bca431712 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibDependency/
> PeiPostMemSiliconPolicyInitLibDependency.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibDependency/
> PeiPostMemSiliconPolicyInitLibDependency.inf
> @@ -5,13 +5,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibDependency/
> PeiPreMemSiliconPolicyInitLibDependency.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibDependency/
> PeiPreMemSiliconPolicyInitLibDependency.inf
> index fd54b0bf7d..45a30da9ac 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibDependency/
> PeiPreMemSiliconPolicyInitLibDependency.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibDependency/
> PeiPreMemSiliconPolicyInitLibDependency.inf
> @@ -5,13 +5,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibDependency/
> PeiSiliconPolicyInitLibDependency.c
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibDependency/
> PeiSiliconPolicyInitLibDependency.c
> index 1db1582ff2..4c3be83c21 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibDependency/
> PeiSiliconPolicyInitLibDependency.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibDependency/
> PeiSiliconPolicyInitLibDependency.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspCpu
> PolicyInitLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspCp
> uPolicyInitLib.c
> index 282f774831..72a797a0ea 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspCpu
> PolicyInitLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspCp
> uPolicyInitLib.c
> @@ -2,13 +2,7 @@
> Implementation of Fsp PCH Policy Initialization.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspMe
> PolicyInitLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspMe
> PolicyInitLib.c
> index d97bf8be57..e72a06f5d3 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspMe
> PolicyInitLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspMe
> PolicyInitLib.c
> @@ -2,13 +2,7 @@
> Implementation of Fsp Me Policy Initialization.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspMis
> cUpdInitLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspMis
> cUpdInitLib.c
> index b9329e4c8a..6d1a982bfb 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspMis
> cUpdInitLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspMis
> cUpdInitLib.c
> @@ -2,13 +2,7 @@
> Implementation of Fsp Misc UPD Initialization.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspPch
> PolicyInitLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspPch
> PolicyInitLib.c
> index 3f7e297c0b..46c143553c 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspPch
> PolicyInitLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspPch
> PolicyInitLib.c
> @@ -2,13 +2,7 @@
> Implementation of Fsp PCH Policy Initialization.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspPoli
> cyInitLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspPoli
> cyInitLib.c
> index 4e82a0cc31..1136996684 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspPoli
> cyInitLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspPoli
> cyInitLib.c
> @@ -2,13 +2,7 @@
> Instance of Fsp Policy Initialization Library.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspPoli
> cyInitLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspPoli
> cyInitLib.h
> index a17b642a1d..52f20777ec 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspPoli
> cyInitLib.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspPoli
> cyInitLib.h
> @@ -2,13 +2,7 @@
> Internal header file for Fsp Policy Initialization Library.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspSaP
> olicyInitLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspSaP
> olicyInitLib.c
> index 3d218f8ba9..51b72c360a 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspSaP
> olicyInitLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspSaP
> olicyInitLib.c
> @@ -2,13 +2,7 @@
> Implementation of Fsp SA Policy Initialization.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspSiP
> olicyInitLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspSiP
> olicyInitLib.c
> index 49601b1496..bffabe61d0 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspSiP
> olicyInitLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspSiP
> olicyInitLib.c
> @@ -2,13 +2,7 @@
> Implementation of Fsp SI Policy Initialization.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiPolicyI
> nit.c
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiPolicyI
> nit.c
> index abed092c46..06210927d4 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiPolicyI
> nit.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiPolicyI
> nit.c
> @@ -2,13 +2,7 @@
> This file is SampleCode for Intel PEI Platform Policy initialization.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiPolicyI
> nit.h
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiPolicyI
> nit.h
> index e85724411a..c38294cfbe 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiPolicyI
> nit.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiPolicyI
> nit.h
> @@ -2,13 +2,7 @@
> Header file for the PolicyInitPei PEIM.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiPolicyI
> nitLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiPolicyI
> nitLib.h
> index b5a7f4eef3..ae289f884e 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiPolicyI
> nitLib.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiPolicyI
> nitLib.h
> @@ -2,13 +2,7 @@
> Header file for the PolicyInitPei Library.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiPolicyI
> nitPreMem.c
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiPolicyI
> nitPreMem.c
> index 35baba3183..ed391db583 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiPolicyI
> nitPreMem.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiPolicyI
> nitPreMem.c
> @@ -2,13 +2,7 @@
> This file is SampleCode for Intel PEI Platform Policy initialization.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiSiPolic
> yInit.h
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiSiPolic
> yInit.h
> index 4f4a80b9ae..47ede26b05 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiSiPolic
> yInit.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiSiPolic
> yInit.h
> @@ -2,13 +2,7 @@
> Header file for the PeiSiPolicyInit
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiSilicon
> PolicyInitLibFsp.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiSilicon
> PolicyInitLibFsp.inf
> index 7f0d7a5dec..9ffb84fa1e 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiSilicon
> PolicyInitLibFsp.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiSilicon
> PolicyInitLibFsp.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/SiliconInitLib/SiliconInit.c
> b/Silicon/Intel/KabylakeSiliconPkg/Library/SiliconInitLib/SiliconInit.c
> index 47ca04b98c..d09bec0489 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Library/SiliconInitLib/SiliconInit.c
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Library/SiliconInitLib/SiliconInit.c
> @@ -2,13 +2,7 @@
> Source code file for Platform Init PEI module
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/SiliconInitLib/SiliconInitLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Library/SiliconInitLib/SiliconInitLib.inf
> index f26eea6be6..9007f299bb 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Library/SiliconInitLib/SiliconInitLib.inf
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Library/SiliconInitLib/SiliconInitLib.inf
> @@ -2,13 +2,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/SiliconInitLib/SiliconInitPreMem.c
> b/Silicon/Intel/KabylakeSiliconPkg/Library/SiliconInitLib/SiliconInitPreMem.c
> index bb21872e1e..65a67a6795 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/SiliconInitLib/SiliconInitPreMem.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/SiliconInitLib/SiliconInitPreMem.c
> @@ -2,13 +2,7 @@
> Source code file for Platform Init Pre-Memory PEI module
>
> Copyright (c) 2017 - 2019, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Me/Include/ConfigBlock/MePeiConfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/Me/Include/ConfigBlock/MePeiConfig.h
> index 2ec0d556b1..1d082d5854 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Me/Include/ConfigBlock/MePeiConfig.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Me/Include/ConfigBlock/MePeiConfig.h
> @@ -2,13 +2,7 @@
> ME config block for PEI phase
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _ME_PEI_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Me/Include/Library/PeiMePolicyLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Me/Include/Library/PeiMePolicyLib.h
> index 20afe4c46e..bca35e19d3 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Me/Include/Library/PeiMePolicyLib.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Me/Include/Library/PeiMePolicyLib.h
> @@ -2,13 +2,7 @@
> Prototype of the MePolicyLibPei library.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PEI_ME_POLICY_LIB_H_
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Me/Include/MeChipset.h
> b/Silicon/Intel/KabylakeSiliconPkg/Me/Include/MeChipset.h
> index 11ee04ad12..2ea9da8c2c 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Me/Include/MeChipset.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Me/Include/MeChipset.h
> @@ -22,13 +22,7 @@
> as "_ME_" without [generation_name] inserted.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _ME_CHIPSET_H_
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Me/Include/MePolicyCommon.h
> b/Silicon/Intel/KabylakeSiliconPkg/Me/Include/MePolicyCommon.h
> index 0243982c80..04d787a0f5 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Me/Include/MePolicyCommon.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Me/Include/MePolicyCommon.h
> @@ -2,13 +2,7 @@
> Definition for ME common policy
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _ME_POLICY_COMMON_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLib.
> c
> b/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLib.
> c
> index 94a84a0478..31c7d59d1d 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLib.
> c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLib.
> c
> @@ -2,13 +2,7 @@
> This file is PeiMePolicy library.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "PeiMePolicyLibrary.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLib.
> inf
> b/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLib.
> inf
> index 3c6e325772..ea247181a4 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLib.
> inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLib.
> inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLibr
> ary.h
> b/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLib
> rary.h
> index 85e8e2b154..a908bb6c24 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLibr
> ary.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLib
> rary.h
> @@ -2,13 +2,7 @@
> Header file for the PeiMePolicy library.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PEI_ME_POLICY_LIBRARY_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/GpioAcpiDefines.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/GpioAcpiDefines.h
> index 9cde7e862d..32507d4d11 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/GpioAcpiDefines.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/GpioAcpiDefines.h
> @@ -1,13 +1,7 @@
> /**@file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/GpioLib.asl
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/GpioLib.asl
> index b9809bd2ab..db97d4b20d 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/GpioLib.asl
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/GpioLib.asl
> @@ -1,13 +1,7 @@
> /**@file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> include("GpioLibObjects.asl")
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/GpioLibObjects.asl
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/GpioLibObjects.asl
> index 1468aedba4..ba1bf8cb93 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/GpioLibObjects.asl
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/GpioLibObjects.asl
> @@ -1,13 +1,7 @@
> /**@file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/IrqLink.asl
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/IrqLink.asl
> index 51d88f1e5a..dfb09b95b0 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/IrqLink.asl
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/IrqLink.asl
> @@ -2,13 +2,7 @@
> ACPI DSDT table
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/Pch.asl
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/Pch.asl
> index 34f3f6877f..b655572a96 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/Pch.asl
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/Pch.asl
> @@ -1,13 +1,7 @@
> /**@file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchAcpiTables.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchAcpiTables.inf
> index ec99fb847a..14d5b28c33 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchAcpiTables.inf
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchAcpiTables.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchHda.asl
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchHda.asl
> index 151ee1fdd8..86a2523eed 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchHda.asl
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchHda.asl
> @@ -1,13 +1,7 @@
> /**@file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchHeci.asl
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchHeci.asl
> index c79ee8d6cd..10f6c687b4 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchHeci.asl
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchHeci.asl
> @@ -2,13 +2,7 @@
> ACPI DSDT table for MEI1
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchIsh.asl
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchIsh.asl
> index 42f12ff266..b792109478 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchIsh.asl
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchIsh.asl
> @@ -2,13 +2,7 @@
> ACPI DSDT table for ISH
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchNvs.asl
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchNvs.asl
> index 7c4a0cc23c..db3ca89608 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchNvs.asl
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchNvs.asl
> @@ -1,13 +1,7 @@
> /**@file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchPcie.asl
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchPcie.asl
> index 8628735184..edffaf28d0 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchPcie.asl
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchPcie.asl
> @@ -1,13 +1,7 @@
> /**@file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchRstPcieStorage.asl
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchRstPcieStorage.asl
> index 701cf6891a..a9d3756a74 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchRstPcieStorage.asl
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchRstPcieStorage.asl
> @@ -1,13 +1,7 @@
> /**@file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchSata.asl
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchSata.asl
> index d7f51f2b9b..17d32ade9d 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchSata.asl
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchSata.asl
> @@ -1,13 +1,7 @@
> /**@file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchScs.asl
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchScs.asl
> index 808c73e06c..2707ad3a0b 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchScs.asl
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchScs.asl
> @@ -2,13 +2,7 @@
> ACPI DSDT table for SCS Controllers
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchSerialIo.asl
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchSerialIo.asl
> index f33ee887e7..deaf57400f 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchSerialIo.asl
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchSerialIo.asl
> @@ -1,13 +1,7 @@
> /**@file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchXdci.asl
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchXdci.asl
> index 54c1242178..432669a692 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchXdci.asl
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchXdci.asl
> @@ -1,13 +1,7 @@
> /**@file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchXhci.asl
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchXhci.asl
> index 873246f662..d261973583 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchXhci.asl
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchXhci.asl
> @@ -1,13 +1,7 @@
> /**@file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/TraceHubDebug.asl
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/TraceHubDebug.asl
> index a8e4f0b34c..35a2232bc4 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/TraceHubDebug.asl
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/TraceHubDebug.asl
> @@ -2,13 +2,7 @@
> Trace Hub debug library for ASL code.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/usbsbd.asl
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/usbsbd.asl
> index 5036b4b771..acb948f699 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/usbsbd.asl
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/usbsbd.asl
> @@ -1,13 +1,7 @@
> /**@file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/Cio2Config.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/Cio2Config.h
> index 187d4cd506..a3e15daede 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/Cio2Config.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/Cio2Config.h
> @@ -2,13 +2,7 @@
> CIO2 policy
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _CIO2_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/DciConfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/DciConfig.h
> index aba0677abc..37cb469db6 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/DciConfig.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/DciConfig.h
> @@ -2,13 +2,7 @@
> Dci policy
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _DCI_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/DmiConfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/DmiConfig.h
> index 2fd5d1b171..e8ff6d91d6 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/DmiConfig.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/DmiConfig.h
> @@ -2,13 +2,7 @@
> DMI policy
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _DMI_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/EspiConfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/EspiConfig.h
> index c952bf9f31..c00e5a81be 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/EspiConfig.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/EspiConfig.h
> @@ -2,13 +2,7 @@
> Espi policy
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _ESPI_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/FlashProtectionCo
> nfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/FlashProtectionC
> onfig.h
> index b55aaa705a..77f43a80fc 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/FlashProtectionCo
> nfig.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/FlashProtectionC
> onfig.h
> @@ -2,13 +2,7 @@
> FlashProtection policy
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _FLASH_PROTECTION_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HdAudioConfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HdAudioConfig.h
> index a0ebbbd84d..6498d84646 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HdAudioConfig.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HdAudioConfig.h
> @@ -2,13 +2,7 @@
> HDAUDIO policy
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _HDAUDIO_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HpetConfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HpetConfig.h
> index 30928e5d08..7c2721a3cb 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HpetConfig.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HpetConfig.h
> @@ -2,13 +2,7 @@
> HPET policy
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _HPET_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HsioConfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HsioConfig.h
> index e4973fc25e..a463d40814 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HsioConfig.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HsioConfig.h
> @@ -2,13 +2,7 @@
> HSIO policy
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _HSIO_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HsioPcieConfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HsioPcieConfig.h
> index cf7bd6251a..c4043bee3e 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HsioPcieConfig.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HsioPcieConfig.h
> @@ -2,13 +2,7 @@
> HSIO pcie policy
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _HSIO_PCIE_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HsioSataConfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HsioSataConfig.h
> index 53c1a01a17..fb1c2fa279 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HsioSataConfig.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HsioSataConfig.h
> @@ -2,13 +2,7 @@
> Hsio Sata policy
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _HSIO_SATA_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/InterruptConfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/InterruptConfig.h
> index 3b8e247a31..6a032dbe0b 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/InterruptConfig.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/InterruptConfig.h
> @@ -2,13 +2,7 @@
> Interrupt policy
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _INTERRUPT_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/IoApicConfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/IoApicConfig.h
> index c96e3a3a04..603b876fb8 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/IoApicConfig.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/IoApicConfig.h
> @@ -2,13 +2,7 @@
> IoApic policy
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _IOAPIC_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/IshConfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/IshConfig.h
> index 6a4f6c9ee0..6ffdb0946f 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/IshConfig.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/IshConfig.h
> @@ -2,13 +2,7 @@
> ISH policy
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _ISH_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/LanConfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/LanConfig.h
> index 980f3ac709..873a131e61 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/LanConfig.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/LanConfig.h
> @@ -2,13 +2,7 @@
> Lan policy
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _LAN_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/LockDownConfig.
> h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/LockDownConfig.
> h
> index f083b3b50c..4f7526f3eb 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/LockDownConfig.
> h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/LockDownConfig.
> h
> @@ -2,13 +2,7 @@
> Lock down policy
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _LOCK_DOWN_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/LpcConfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/LpcConfig.h
> index be1613a5c2..85fb80c403 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/LpcConfig.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/LpcConfig.h
> @@ -2,13 +2,7 @@
> Lpc policy
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _LPC_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/P2sbConfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/P2sbConfig.h
> index 60b9828ebf..5a61e10299 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/P2sbConfig.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/P2sbConfig.h
> @@ -2,13 +2,7 @@
> P2sb policy
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _P2SB_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/PchGeneralConfig
> .h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/PchGeneralConfig
> .h
> index c946e9a116..9873061049 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/PchGeneralConfig
> .h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/PchGeneralConfig
> .h
> @@ -2,13 +2,7 @@
> PCH General policy
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_GENERAL_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/PcieRpConfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/PcieRpConfig.h
> index 873386afe7..d3d92378bd 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/PcieRpConfig.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/PcieRpConfig.h
> @@ -2,13 +2,7 @@
> Pcie root port policy
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_PCIE_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/PmConfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/PmConfig.h
> index f483987c97..fc899ab864 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/PmConfig.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/PmConfig.h
> @@ -2,13 +2,7 @@
> Power Management policy
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PM_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/Port61Config.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/Port61Config.h
> index d8b9cf6145..aa897d0e86 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/Port61Config.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/Port61Config.h
> @@ -2,13 +2,7 @@
> Port 61h policy
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PORT_61_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SataConfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SataConfig.h
> index 0dc76e0c23..368e470af8 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SataConfig.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SataConfig.h
> @@ -2,13 +2,7 @@
> Sata policy
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _SATA_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/ScsConfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/ScsConfig.h
> index 05a2f5dbfa..ba8ab17429 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/ScsConfig.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/ScsConfig.h
> @@ -2,13 +2,7 @@
> Scs policy
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _SCS_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SerialIoConfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SerialIoConfig.h
> index 5caa24310a..529c89f3bf 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SerialIoConfig.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SerialIoConfig.h
> @@ -2,13 +2,7 @@
> Serial IO policy
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _SERIAL_IO_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SerialIrqConfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SerialIrqConfig.h
> index b64579cd92..38ab7ca013 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SerialIrqConfig.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SerialIrqConfig.h
> @@ -2,13 +2,7 @@
> Serial IRQ policy
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _SERIAL_IRQ_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SmbusConfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SmbusConfig.h
> index 78ac72aa87..c2f5b07636 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SmbusConfig.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SmbusConfig.h
> @@ -2,13 +2,7 @@
> Smbus policy
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _SMBUS_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SpiConfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SpiConfig.h
> index 688fa314cb..e97f88cf71 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SpiConfig.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SpiConfig.h
> @@ -2,13 +2,7 @@
> Spi policy
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _SPI_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/ThermalConfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/ThermalConfig.h
> index 8963da6ee7..b64948ac05 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/ThermalConfig.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/ThermalConfig.h
> @@ -2,13 +2,7 @@
> Thermal policy
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _THERMAL_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/TraceHubConfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/TraceHubConfig.h
> index 5455c40514..a284dd3840 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/TraceHubConfig.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/TraceHubConfig.h
> @@ -2,13 +2,7 @@
> Trace Hub policy
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _TRACEHUB_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/UsbConfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/UsbConfig.h
> index c2cef0aa43..0936e8321a 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/UsbConfig.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/UsbConfig.h
> @@ -2,13 +2,7 @@
> USB policy
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _USB_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/WatchDogConfig.
> h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/WatchDogConfig.
> h
> index 610c1092fb..a01481af64 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/WatchDogConfig.
> h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/WatchDogConfig.
> h
> @@ -2,13 +2,7 @@
> WatchDog policy
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _WATCH_DOG_CONFIG_H_
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/GpioConfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/GpioConfig.h
> index 8b26020da2..9967241df3 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/GpioConfig.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/GpioConfig.h
> @@ -2,13 +2,7 @@
> Header file for GpioConfig structure used by GPIO library.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _GPIO_CONFIG_H_
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/GpioPinsSklH.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/GpioPinsSklH.h
> index 5230656791..c8629ab12e 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/GpioPinsSklH.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/GpioPinsSklH.h
> @@ -2,13 +2,7 @@
> GPIO pins for SKL-PCH-H,
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _GPIO_PINS_SKL_H_H_
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/GpioPinsSklLp.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/GpioPinsSklLp.h
> index 999b417011..73a982b240 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/GpioPinsSklLp.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/GpioPinsSklLp.h
> @@ -2,13 +2,7 @@
> GPIO pins for SKL-PCH-LP,
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _GPIO_PINS_SKL_LP_H_
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/GpioLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/GpioLib.h
> index 5362beeea3..30ac4abc8b 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/GpioLib.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/GpioLib.h
> @@ -7,13 +7,7 @@
> returned in this case will be 0xFF.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _GPIO_LIB_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/GpioNativeLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/GpioNativeLib.h
> index 5f2c57fd34..dab6708971 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/GpioNativeLib.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/GpioNativeLib.h
> @@ -3,13 +3,7 @@
> All function in this library is available for PEI, DXE, and SMM,
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _GPIO_NATIVE_LIB_H_
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/OcWdtLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/OcWdtLib.h
> index 9f5da64dff..b58c0d7acd 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/OcWdtLib.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/OcWdtLib.h
> @@ -2,13 +2,7 @@
> Header file for OC WDT Library.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _OC_WDT_LIB_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchCycleDecodingLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchCycleDecodingLib.
> h
> index 8247f8f3c8..1b24e94f74 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchCycleDecodingLib.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchCycleDecodingLib.
> h
> @@ -2,13 +2,7 @@
> Header file for PchCycleDecodingLib.
>
> Copyright (c) 2017 - 2019, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_CYCLE_DECODING_LIB_H_
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchEspiLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchEspiLib.h
> index 2096645375..479a4cc375 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchEspiLib.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchEspiLib.h
> @@ -3,13 +3,7 @@
> All function in this library is available for PEI, DXE, and SMM,
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchGbeLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchGbeLib.h
> index 5461286634..9fa03a98c7 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchGbeLib.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchGbeLib.h
> @@ -2,13 +2,7 @@
> Header file for PchGbeLib.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_GBE_LIB_H_
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchHsioLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchHsioLib.h
> index 65076800a9..9b775b3ce5 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchHsioLib.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchHsioLib.h
> @@ -2,13 +2,7 @@
> Header file for PchHsioLib.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_HSIO_LIB_H_
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchInfoLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchInfoLib.h
> index 5902b92f18..8b0c123048 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchInfoLib.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchInfoLib.h
> @@ -2,13 +2,7 @@
> Header file for PchInfoLib.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_INFO_LIB_H_
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchP2sbLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchP2sbLib.h
> index 8083ac4efd..6161016312 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchP2sbLib.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchP2sbLib.h
> @@ -2,13 +2,7 @@
> Header file for PchP2sbLib.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_P2SB_LIB_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchPcieRpLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchPcieRpLib.h
> index d5084772dd..1975465841 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchPcieRpLib.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchPcieRpLib.h
> @@ -2,13 +2,7 @@
> Header file for PchPcieRpLib.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_PCIERP_LIB_H_
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchPcrLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchPcrLib.h
> index 149168993f..968e59e412 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchPcrLib.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchPcrLib.h
> @@ -2,13 +2,7 @@
> Header file for PchPcrLib.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_PCR_LIB_H_
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchPmcLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchPmcLib.h
> index 61a955802a..ec98e07100 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchPmcLib.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchPmcLib.h
> @@ -2,13 +2,7 @@
> Header file for PchPmcLib.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_PMC_LIB_H_
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchPolicyLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchPolicyLib.h
> index f4e3659960..cd7622e00c 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchPolicyLib.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchPolicyLib.h
> @@ -2,13 +2,7 @@
> Prototype of the PeiPchPolicy library.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PEI_PCH_POLICY_LIB_H_
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchPsfLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchPsfLib.h
> index 4a2924f8f6..a2b4a9c2bc 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchPsfLib.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchPsfLib.h
> @@ -4,13 +4,7 @@
> It's not expected to be used in platform code.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_PSF_LIB_H_
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchResetLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchResetLib.h
> index 448cd21f50..6a2c57a202 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchResetLib.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchResetLib.h
> @@ -2,13 +2,7 @@
> Header file for PCH RESET Driver.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_RESET_LIB_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchSbiAccessLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchSbiAccessLib.h
> index 87d3318260..a11cc224e7 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchSbiAccessLib.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchSbiAccessLib.h
> @@ -2,13 +2,7 @@
> Header file for PchSbiAccessLib.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_SBI_ACCESS_LIB_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchSerialIoLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchSerialIoLib.h
> index 4ee5a9713e..6b2ba73061 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchSerialIoLib.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchSerialIoLib.h
> @@ -2,13 +2,7 @@
> Header file for PCH Serial IO Lib implementation.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_SERIAL_IO_LIB_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchSerialIoUartLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchSerialIoUartLib.h
> index 66c5945a7b..ac729c2bcf 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchSerialIoUartLib.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchSerialIoUartLib.h
> @@ -2,13 +2,7 @@
> Header file for PCH Serial IO UART Lib implementation.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_SERIAL_IO_UART_LIB_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchSmmControlLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchSmmControlLib.h
> index cdeeae5e6d..6cca4b7cb4 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchSmmControlLib.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchSmmControlLib.h
> @@ -2,13 +2,7 @@
> Header file for SMM Control PEI Library.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_SMM_CONTROL_LIB_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchWdtCommonLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchWdtCommonLib.h
> index f89e42a546..fde5d785c8 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchWdtCommonLib.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchWdtCommonLib.h
> @@ -2,13 +2,7 @@
> Library that contains common parts of WdtPei and WdtDxe. Not a standalone
> module.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_WDT_COMMON_LIB_H_
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/SecPchLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/SecPchLib.h
> index ba9586a7a2..fc7b42889f 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/SecPchLib.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/SecPchLib.h
> @@ -3,13 +3,7 @@
> All function in this library is available for SEC
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _SEC_PCH_LIB_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/SpiFlashCommonLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/SpiFlashCommonLib.h
> index 12dfaeb440..0c5e72258c 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/SpiFlashCommonLib.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/SpiFlashCommonLib.h
> @@ -3,13 +3,7 @@
> internal structure and functions used by SpiFlashCommonLib.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/SpiLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/SpiLib.h
> index 6af66f8869..c3a64eab90 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/SpiLib.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/SpiLib.h
> @@ -2,13 +2,7 @@
> Library to initialize SPI services for future SPI accesses.
>
> Copyright (c) 2019, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/TraceHubInitLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/TraceHubInitLib.h
> index 23cb544d67..85e4e32d23 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/TraceHubInitLib.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/TraceHubInitLib.h
> @@ -4,13 +4,7 @@
> But do not support UEFI RUNTIME environment call.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _TRACE_HUB_INIT_LIB_H_
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchAccess.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchAccess.h
> index 2c457e3a1e..399f618c70 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchAccess.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchAccess.h
> @@ -2,13 +2,7 @@
> Macros that simplify accessing PCH devices's PCI registers.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_ACCESS_H_
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchLimits.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchLimits.h
> index 905a4778ce..710ae04aee 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchLimits.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchLimits.h
> @@ -2,13 +2,7 @@
> Build time limits of PCH resources.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_LIMITS_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchPcieStorageDetectHob.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchPcieStorageDetectHob.h
> index 664f66f296..f28c3c2804 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchPcieStorageDetectHob.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchPcieStorageDetectHob.h
> @@ -3,13 +3,7 @@
> Definitions required to create PcieStorageInfoHob
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchPolicyCommon.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchPolicyCommon.h
> index 67b255fe97..807bf3c10b 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchPolicyCommon.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchPolicyCommon.h
> @@ -2,13 +2,7 @@
> PCH configuration based on PCH policy
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_POLICY_COMMON_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchPreMemPolicyCommon.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchPreMemPolicyCommon.h
> index 8bd4c9b960..1b492b9fe9 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchPreMemPolicyCommon.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchPreMemPolicyCommon.h
> @@ -2,13 +2,7 @@
> PCH configuration based on PCH policy
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_PREMEM_POLICY_COMMON_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchReservedResources.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchReservedResources.h
> index e5de75c0e3..d54d8736c4 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchReservedResources.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchReservedResources.h
> @@ -2,13 +2,7 @@
> PCH preserved MMIO resource definitions.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_PRESERVED_RESOURCES_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchResetPlatformSpecific.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchResetPlatformSpecific.h
> index c19677cccd..ff49f818ca 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchResetPlatformSpecific.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchResetPlatformSpecific.h
> @@ -2,13 +2,7 @@
> PCH Reset Platform Specific definitions.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_RESET_PLATFORM_SPECIFIC_H_
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Ppi/PchReset.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Ppi/PchReset.h
> index 951dac00dc..bb66f5dfde 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Ppi/PchReset.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Ppi/PchReset.h
> @@ -2,13 +2,7 @@
> PCH Reset PPI
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Ppi/Spi.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Ppi/Spi.h
> index cd98f3601c..e11f82edca 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Ppi/Spi.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Ppi/Spi.h
> @@ -3,13 +3,7 @@
> Intel(R) PCH SPI Host Controller Compatibility Interface.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_SPI_PPI_H_
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Ppi/Wdt.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Ppi/Wdt.h
> index b0bb6bccbd..a97be47abb 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Ppi/Wdt.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Ppi/Wdt.h
> @@ -2,13 +2,7 @@
> Watchdog Timer PPI
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PEI_WDT_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchAcpiSmiDispatch.
> h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchAcpiSmiDispatch.
> h
> index eb08a89f00..68f76fc411 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchAcpiSmiDispatch.
> h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchAcpiSmiDispatch.
> h
> @@ -2,13 +2,7 @@
> APIs of PCH ACPI SMI Dispatch Protocol.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_ACPI_SMI_DISPATCH_PROTOCOL_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchEmmcTuning.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchEmmcTuning.h
> index ad1db3833a..4423cc1c79 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchEmmcTuning.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchEmmcTuning.h
> @@ -2,13 +2,7 @@
> PCH eMMC HS400 Tuning Protocol
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_EMMC_TUNING_PROTOCOL_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchEspiSmiDispatch.
> h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchEspiSmiDispatch.
> h
> index 7d7d3a5339..f3e2e05eda 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchEspiSmiDispatch.
> h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchEspiSmiDispatch.
> h
> @@ -2,13 +2,7 @@
> SmmEspiDispatch Protocol
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_ESPI_SMI_DISPATCH_PROTOCOL_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchGpioUnlockSmiDi
> spatch.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchGpioUnlockSmiDi
> spatch.h
> index 392733117b..4df549ec31 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchGpioUnlockSmiDi
> spatch.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchGpioUnlockSmiDi
> spatch.h
> @@ -2,13 +2,7 @@
> APIs of PCH GPIO UNLOCK SMI Dispatch Protocol.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_GPIO_UNLOCK_SMI_DISPATCH_PROTOCOL_H_
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchInfo.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchInfo.h
> index ff81aebddf..312269e74b 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchInfo.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchInfo.h
> @@ -2,13 +2,7 @@
> This file defines the PCH Info Protocol.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_INFO_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchPcieSmiDispatch.
> h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchPcieSmiDispatch.
> h
> index b80597ae9b..cff66f4366 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchPcieSmiDispatch.
> h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchPcieSmiDispatch.
> h
> @@ -2,13 +2,7 @@
> APIs of PCH PCIE SMI Dispatch Protocol.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_PCIE_SMI_DISPATCH_PROTOCOL_H_
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchReset.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchReset.h
> index b39543b36e..b2911ade7e 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchReset.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchReset.h
> @@ -2,13 +2,7 @@
> PCH Reset Protocol
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_RESET_PROTOCOL_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchSmiDispatch.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchSmiDispatch.h
> index 4f0508b238..3e301cb66d 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchSmiDispatch.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchSmiDispatch.h
> @@ -2,13 +2,7 @@
> APIs of PCH SMI Dispatch Protocol.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_SMI_DISPATCH_PROTOCOL_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchSmmIoTrapContr
> ol.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchSmmIoTrapContr
> ol.h
> index 5d0a4d34cf..d94dc2c480 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchSmmIoTrapContr
> ol.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchSmmIoTrapContr
> ol.h
> @@ -2,13 +2,7 @@
> PCH SMM IO Trap Control Protocol
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_SMM_IO_TRAP_CONTROL_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchSmmPeriodicTim
> erControl.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchSmmPeriodicTim
> erControl.h
> index 95c680e75c..4e2c73e28d 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchSmmPeriodicTim
> erControl.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchSmmPeriodicTim
> erControl.h
> @@ -2,13 +2,7 @@
> PCH SMM Periodic Timer Control Protocol
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_SMM_PERIODIC_TIMER_CONTROL_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchTcoSmiDispatch.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchTcoSmiDispatch.h
> index 457cdb682c..60c627f778 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchTcoSmiDispatch.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchTcoSmiDispatch.h
> @@ -2,13 +2,7 @@
> APIs of PCH TCO SMI Dispatch Protocol.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_TCO_SMI_DISPATCH_PROTOCOL_H_
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/SerialGpio.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/SerialGpio.h
> index 4bc396132d..22663ce8d9 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/SerialGpio.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/SerialGpio.h
> @@ -3,13 +3,7 @@
> Intel(R) Serial Data over GPIO Pin functionality Protocol Interface.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_SERIAL_GPIO_PROTOCOL_H_
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/Spi.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/Spi.h
> index e4ce8fb472..8c66e5063f 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/Spi.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/Spi.h
> @@ -3,13 +3,7 @@
> Intel(R) PCH SPI Host Controller Compatibility Interface.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_SPI_PROTOCOL_H_
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/Wdt.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/Wdt.h
> index 4a65e016e6..171fe8aebc 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/Wdt.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/Wdt.h
> @@ -2,13 +2,7 @@
> Watchdog Timer protocol
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _DXE_WDT_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsCam.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsCam.h
> index c4be5c27e7..0e16b63d29 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsCam.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsCam.h
> @@ -22,13 +22,7 @@
> as "_PCH_" without [generation_name] inserted.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_REGS_CAM_H_
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsDci.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsDci.h
> index d38bd7f0c4..72b4d086e2 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsDci.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsDci.h
> @@ -22,13 +22,7 @@
> as "_PCH_" without [generation_name] inserted.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_REGS_DCI_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsDmi.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsDmi.h
> index 942aeda324..c94a384c79 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsDmi.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsDmi.h
> @@ -22,13 +22,7 @@
> as "_PCH_" without [generation_name] inserted.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_REGS_DMI_H_
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsFia.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsFia.h
> index c9e08ca854..537e83c25a 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsFia.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsFia.h
> @@ -22,13 +22,7 @@
> as "_PCH_" without [generation_name] inserted.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_REGS_FIA_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsGpio.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsGpio.h
> index a6b2c4a8e5..a8649a23a1 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsGpio.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsGpio.h
> @@ -22,13 +22,7 @@
> as "_PCH_" without [generation_name] inserted.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_REGS_GPIO_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsHda.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsHda.h
> index 1d5c0e9e76..c598c3b439 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsHda.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsHda.h
> @@ -22,13 +22,7 @@
> as "_PCH_" without [generation_name] inserted.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_REGS_HDA_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsHsio.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsHsio.h
> index faa938e5a5..635320056e 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsHsio.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsHsio.h
> @@ -2,13 +2,7 @@
> Register definition for HSIO
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_REGS_HSIO_H_
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsIsh.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsIsh.h
> index 687a153f30..4cf546b288 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsIsh.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsIsh.h
> @@ -22,13 +22,7 @@
> as "_PCH_" without [generation_name] inserted.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_REGS_ISH_H_
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsItss.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsItss.h
> index 21269155b5..45ba22490e 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsItss.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsItss.h
> @@ -22,13 +22,7 @@
> as "_PCH_" without [generation_name] inserted.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_REGS_ITSS_H_
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsLan.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsLan.h
> index bb4c2c15a9..974ca27c26 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsLan.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsLan.h
> @@ -22,13 +22,7 @@
> as "_PCH_" without [generation_name] inserted.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_REGS_LAN_H_
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsLpc.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsLpc.h
> index 7c6f639260..052680e9f0 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsLpc.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsLpc.h
> @@ -22,13 +22,7 @@
> as "_PCH_" without [generation_name] inserted.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_REGS_LPC_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsP2sb.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsP2sb.h
> index b2779ab0ce..7619bf27cd 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsP2sb.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsP2sb.h
> @@ -22,13 +22,7 @@
> as "_PCH_" without [generation_name] inserted.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_REGS_P2SB_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsPcie.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsPcie.h
> index 704f77c52f..0a1530743f 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsPcie.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsPcie.h
> @@ -22,13 +22,7 @@
> as "_PCH_" without [generation_name] inserted.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_REGS_PCIE_H_
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsPcr.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsPcr.h
> index eac209a149..49aa13b52b 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsPcr.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsPcr.h
> @@ -22,13 +22,7 @@
> as "_PCH_" without [generation_name] inserted.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_REGS_PCR_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsPmc.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsPmc.h
> index d4c048ffe3..91b4a5f9a6 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsPmc.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsPmc.h
> @@ -22,13 +22,7 @@
> as "_PCH_" without [generation_name] inserted.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_REGS_PMC_H_
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsPsf.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsPsf.h
> index c52f1e721d..ba5c5ce26b 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsPsf.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsPsf.h
> @@ -22,13 +22,7 @@
> as "_PCH_" without [generation_name] inserted.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_REGS_PSF_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsPsth.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsPsth.h
> index b312f7100e..0e599fef2b 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsPsth.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsPsth.h
> @@ -22,13 +22,7 @@
> as "_PCH_" without [generation_name] inserted.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_REGS_PSTH_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsSata.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsSata.h
> index 88d066ea28..5f62bb538d 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsSata.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsSata.h
> @@ -22,13 +22,7 @@
> as "_PCH_" without [generation_name] inserted.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_REGS_SATA_H_
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsScs.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsScs.h
> index b1872adbe6..7af90cfe0c 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsScs.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsScs.h
> @@ -22,13 +22,7 @@
> as "_PCH_" without [generation_name] inserted.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_REGS_SCS_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsSerialIo.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsSerialIo.h
> index 461b935fde..eab67649ee 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsSerialIo.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsSerialIo.h
> @@ -22,13 +22,7 @@
> as "_PCH_" without [generation_name] inserted.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_REGS_SERIAL_IO_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsSmbus.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsSmbus.h
> index 9682040879..d52133fa3a 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsSmbus.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsSmbus.h
> @@ -22,13 +22,7 @@
> as "_PCH_" without [generation_name] inserted.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_REGS_SMBUS_H_
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsSpi.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsSpi.h
> index f43c676797..6d7bf8f59a 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsSpi.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsSpi.h
> @@ -22,13 +22,7 @@
> as "_PCH_" without [generation_name] inserted.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_REGS_SPI_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsThermal.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsThermal.h
> index fe43d210ab..cdeaaab6a4 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsThermal.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsThermal.h
> @@ -22,13 +22,7 @@
> as "_PCH_" without [generation_name] inserted.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_REGS_THERMAL_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsTraceHub.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsTraceHub.h
> index 513b022f08..53526c8753 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsTraceHub.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsTraceHub.h
> @@ -22,13 +22,7 @@
> as "_PCH_" without [generation_name] inserted.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsUsb.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsUsb.h
> index 7dfe90815f..56a864cf4b 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsUsb.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsUsb.h
> @@ -22,13 +22,7 @@
> as "_PCH_" without [generation_name] inserted.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_REGS_USB_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/DxePchHdaNhlt.
> h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/DxePchHdaNhlt
> .h
> index 5e7674a412..366b9d6707 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/DxePchHdaNhlt.
> h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/DxePchHdaNhlt
> .h
> @@ -2,13 +2,7 @@
> Header file for DxePchHdaLib - NHLT structure definitions.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/GpioPrivateLib.
> h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/GpioPrivateLib.
> h
> index f555182bc4..395d009adf 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/GpioPrivateLib.
> h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/GpioPrivateLib.
> h
> @@ -3,13 +3,7 @@
> All function in this library is available for PEI, DXE, and SMM,
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _GPIO_PRIVATE_LIB_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/I2cMasterCom
> monLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/I2cMasterCom
> monLib.h
> index 8f0a1adf38..9c8335861d 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/I2cMasterCom
> monLib.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/I2cMasterCom
> monLib.h
> @@ -2,13 +2,7 @@
> Implement the I2C port control.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchHdaLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchHdaLib.h
> index f3f7c27340..e7d5fdc3dc 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchHdaLib.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchHdaLib.h
> @@ -2,13 +2,7 @@
> This library provides PCH HD Audio functions.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchInitCommon
> Lib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchInitCommon
> Lib.h
> index 8c016c624f..449b38f111 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchInitCommon
> Lib.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchInitCommon
> Lib.h
> @@ -2,13 +2,7 @@
> Header file for PCH Init Common Lib
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_INIT_COMMON_LIB_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchPciExpressH
> elpersLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchPciExpressH
> elpersLib.h
> index 49c89a2fcc..2c800ca8e0 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchPciExpressH
> elpersLib.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchPciExpressH
> elpersLib.h
> @@ -2,13 +2,7 @@
> Header file for PCH PCI Express helpers library
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_PCI_EXPRESS_HELPERS_LIB_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchPsfPrivateLi
> b.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchPsfPrivateLi
> b.h
> index ad390103ce..e72cc87a27 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchPsfPrivateLi
> b.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchPsfPrivateLi
> b.h
> @@ -2,13 +2,7 @@
> Header file for PchPsfPrivateLib.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_PSF_PRIVATE_LIB_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchSmbusCom
> monLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchSmbusCom
> monLib.h
> index 5c2a6c30e2..e6494a1a38 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchSmbusCom
> monLib.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchSmbusCom
> monLib.h
> @@ -2,13 +2,7 @@
> PCH Smbus Protocol
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_SMBUS_COMMON_LIB_H
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchSpiCommon
> Lib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchSpiCommon
> Lib.h
> index 8b6b6a6c97..d408289ea2 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchSpiCommon
> Lib.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchSpiCommon
> Lib.h
> @@ -2,13 +2,7 @@
> Header file for the PCH SPI Common Driver.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_SPI_COMMON_LIB_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PeiI2cMasterLib
> .h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PeiI2cMasterLib
> .h
> index da4cfc6d19..78c07f20c6 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PeiI2cMasterLib
> .h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PeiI2cMasterLib
> .h
> @@ -2,13 +2,7 @@
> PEI I2C Master module
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/RstPrivateLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/RstPrivateLib.h
> index 2301c9fc0f..28edfda991 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/RstPrivateLib.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/RstPrivateLib.h
> @@ -2,13 +2,7 @@
> Header file for Rst Library
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/PchConfigHob.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/PchConfigHob.h
> index fb372e92ac..9827beb085 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/PchConfigHob.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/PchConfigHob.h
> @@ -2,13 +2,7 @@
> The GUID definition for PchConfigHob
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_CONFIG_HOB_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/PchHdaEndpoints.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/PchHdaEndpoints.h
> index 97f7be6c11..4c3f1795c0 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/PchHdaEndpoints.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/PchHdaEndpoints.h
> @@ -2,13 +2,7 @@
> Header file for PchHdaLib Endpoint descriptors.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Protocol/PchNvs.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Protocol/PchNvs.h
> index ac288a56d0..b071061883 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Protocol/PchNvs.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Protocol/PchNvs.h
> @@ -2,13 +2,7 @@
> This file defines the PCH NVS Protocol.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_NVS_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Protocol/PchNvsArea.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Protocol/PchNvsArea.h
> index 66c119f577..c82498bde5 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Protocol/PchNvsArea.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Protocol/PchNvsArea.h
> @@ -1,13 +1,7 @@
> /**@file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Protocol/PcieIoTrap.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Protocol/PcieIoTrap.h
> index 26d13b7a7d..8e05dd2c0a 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Protocol/PcieIoTrap.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Protocol/PcieIoTrap.h
> @@ -2,13 +2,7 @@
> This file defines the PCH PCIE IoTrap Protocol.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_PCIE_IOTRAP_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseResetSystemLib/BaseReset
> SystemLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseResetSystemLib/BaseRese
> tSystemLib.c
> index f6f708172e..0fddff71a1 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseResetSystemLib/BaseReset
> SystemLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseResetSystemLib/BaseRese
> tSystemLib.c
> @@ -2,13 +2,7 @@
> System reset library services.
>
> Copyright (c) 2017 - 2019, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include <Uefi.h>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseResetSystemLib/BaseReset
> SystemLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseResetSystemLib/BaseRese
> tSystemLib.inf
> index 2af43b5091..4c46216b44 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseResetSystemLib/BaseReset
> SystemLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseResetSystemLib/BaseRese
> tSystemLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseSmbusLib/BaseSmbusLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseSmbusLib/BaseSmbusLib.c
> index 17e42dfd0b..5d09e18613 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseSmbusLib/BaseSmbusLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseSmbusLib/BaseSmbusLib.c
> @@ -2,13 +2,7 @@
> PCH SMBUS library implementation built upon I/O library.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseSmbusLib/BaseSmbusLib.i
> nf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseSmbusLib/BaseSmbusLib.i
> nf
> index a737f7105f..2894d137b9 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseSmbusLib/BaseSmbusLib.i
> nf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseSmbusLib/BaseSmbusLib.i
> nf
> @@ -6,13 +6,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeResetSystemLib/DxeResetS
> ystemLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeResetSystemLib/DxeResetS
> ystemLib.c
> index c591bdddef..51facacf08 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeResetSystemLib/DxeResetS
> ystemLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeResetSystemLib/DxeResetS
> ystemLib.c
> @@ -2,13 +2,7 @@
> System reset library services.
>
> Copyright (c) 2017 - 2019, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include <Base.h>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeResetSystemLib/DxeResetS
> ystemLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeResetSystemLib/DxeResetS
> ystemLib.inf
> index 1736c3189e..aa8877140a 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeResetSystemLib/DxeResetS
> ystemLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeResetSystemLib/DxeResetS
> ystemLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeRuntimeResetSystemLib/Dx
> eRuntimeResetSystemLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeRuntimeResetSystemLib/Dx
> eRuntimeResetSystemLib.c
> index 2bd8828836..9d09b3681b 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeRuntimeResetSystemLib/Dx
> eRuntimeResetSystemLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeRuntimeResetSystemLib/Dx
> eRuntimeResetSystemLib.c
> @@ -2,13 +2,7 @@
> System reset library services.
>
> Copyright (c) 2017 - 2019, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include <Base.h>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeRuntimeResetSystemLib/Dx
> eRuntimeResetSystemLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeRuntimeResetSystemLib/Dx
> eRuntimeResetSystemLib.inf
> index 801876dd93..6b27661603 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeRuntimeResetSystemLib/Dx
> eRuntimeResetSystemLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeRuntimeResetSystemLib/Dx
> eRuntimeResetSystemLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/GpioInit.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/GpioInit.c
> index 6e0c1c8b46..5d4d758e57 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/GpioInit.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/GpioInit.c
> @@ -2,13 +2,7 @@
> This file contains routines for GPIO initialization
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "GpioLibrary.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/GpioLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/GpioLib.c
> index bf76d40963..9679f657f3 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/GpioLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/GpioLib.c
> @@ -2,13 +2,7 @@
> This file contains routines for GPIO
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "GpioLibrary.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/GpioLibrar
> y.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/GpioLibrar
> y.h
> index 97a5287067..ed4f2f8023 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/GpioLibrar
> y.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/GpioLibrar
> y.h
> @@ -2,13 +2,7 @@
> Header file for GPIO Lib implementation.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _GPIO_LIBRARY_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/GpioNative
> Lib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/GpioNativ
> eLib.c
> index e57e3ecbfa..a4f6466ed4 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/GpioNative
> Lib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/GpioNativ
> eLib.c
> @@ -2,13 +2,7 @@
> This file contains routines for GPIO native and chipset specific usage
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "GpioLibrary.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/PchSklGpio
> Data.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/PchSklGpi
> oData.c
> index c36792139c..42f57df921 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/PchSklGpio
> Data.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/PchSklGpi
> oData.c
> @@ -2,13 +2,7 @@
> This file contains SKL specific GPIO information
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "GpioLibrary.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/PeiDxeSm
> mGpioLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/PeiDxeSm
> mGpioLib.inf
> index 747fa67199..1282118d55 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/PeiDxeSm
> mGpioLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/PeiDxeSm
> mGpioLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchCycleDecodingLi
> b/PchCycleDecodingLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchCycleDecodingL
> ib/PchCycleDecodingLib.c
> index 1f13b094fc..540e5ba116 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchCycleDecodingLi
> b/PchCycleDecodingLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchCycleDecodingL
> ib/PchCycleDecodingLib.c
> @@ -2,13 +2,7 @@
> PCH cycle deocding configuration and query library.
>
> Copyright (c) 2017 - 2019, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include <Base.h>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchCycleDecodingLi
> b/PeiDxeSmmPchCycleDecodingLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchCycleDecodingL
> ib/PeiDxeSmmPchCycleDecodingLib.inf
> index 446703d918..24d08f662f 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchCycleDecodingLi
> b/PeiDxeSmmPchCycleDecodingLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchCycleDecodingL
> ib/PeiDxeSmmPchCycleDecodingLib.inf
> @@ -6,13 +6,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchGbeLib/PchGbe
> Lib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchGbeLib/PchGbe
> Lib.c
> index 277923bdcc..d3bdfd2fc8 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchGbeLib/PchGbe
> Lib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchGbeLib/PchGbe
> Lib.c
> @@ -4,13 +4,7 @@
> But do not support UEFI RUNTIME environment call.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchGbeLib/PeiDxeS
> mmPchGbeLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchGbeLib/PeiDxeS
> mmPchGbeLib.inf
> index b05d82fce1..bfcb71ec20 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchGbeLib/PeiDxeS
> mmPchGbeLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchGbeLib/PeiDxeS
> mmPchGbeLib.inf
> @@ -6,13 +6,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchHsioLib/PchHsio
> Lib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchHsioLib/PchHsio
> Lib.c
> index d3e6094954..d7483ebd97 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchHsioLib/PchHsio
> Lib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchHsioLib/PchHsio
> Lib.c
> @@ -4,13 +4,7 @@
> But do not support UEFI RUNTIME environment call.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchHsioLib/PeiDxeS
> mmPchHsioLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchHsioLib/PeiDxeS
> mmPchHsioLib.inf
> index f233f3e673..11a32ad78e 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchHsioLib/PeiDxeS
> mmPchHsioLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchHsioLib/PeiDxeS
> mmPchHsioLib.inf
> @@ -6,13 +6,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchInfoLib/PchInfo
> Lib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchInfoLib/PchInfo
> Lib.c
> index 3f72e006c8..a1c20ba04f 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchInfoLib/PchInfo
> Lib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchInfoLib/PchInfo
> Lib.c
> @@ -5,13 +5,7 @@
> But do not support UEFI RUNTIME environment call.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include <Base.h>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchInfoLib/PchInfo
> StrLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchInfoLib/PchInfo
> StrLib.c
> index 6fb06eac2f..05b8587263 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchInfoLib/PchInfo
> StrLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchInfoLib/PchInfo
> StrLib.c
> @@ -5,13 +5,7 @@
> But do not support UEFI RUNTIME environment call.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include <Base.h>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchInfoLib/PeiDxeS
> mmPchInfoLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchInfoLib/PeiDxeS
> mmPchInfoLib.inf
> index 35566d8243..44d56ea838 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchInfoLib/PeiDxeS
> mmPchInfoLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchInfoLib/PeiDxeS
> mmPchInfoLib.inf
> @@ -6,13 +6,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchP2sbLib/PchP2s
> bLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchP2sbLib/PchP2s
> bLib.c
> index dba89d3edc..ca3a222979 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchP2sbLib/PchP2s
> bLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchP2sbLib/PchP2s
> bLib.c
> @@ -4,13 +4,7 @@
> But do not support UEFI RUNTIME environment call.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchP2sbLib/PeiDxe
> SmmPchP2sbLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchP2sbLib/PeiDxe
> SmmPchP2sbLib.inf
> index 115175f8a2..da3390c4ca 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchP2sbLib/PeiDxe
> SmmPchP2sbLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchP2sbLib/PeiDxe
> SmmPchP2sbLib.inf
> @@ -6,13 +6,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcieRpLib/PchP
> cieRpLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcieRpLib/PchP
> cieRpLib.c
> index 6b8a51d8d2..43caf3e9bd 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcieRpLib/PchP
> cieRpLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcieRpLib/PchP
> cieRpLib.c
> @@ -4,13 +4,7 @@
> But do not support UEFI RUNTIME environment call.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcieRpLib/PeiDx
> eSmmPchPcieRpLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcieRpLib/PeiDx
> eSmmPchPcieRpLib.inf
> index 79ddb969ae..6b22411162 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcieRpLib/PeiDx
> eSmmPchPcieRpLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcieRpLib/PeiDx
> eSmmPchPcieRpLib.inf
> @@ -6,13 +6,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcrLib/PchPcrLi
> b.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcrLib/PchPcrLi
> b.c
> index e2585c36e0..b07a903d44 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcrLib/PchPcrLi
> b.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcrLib/PchPcrLi
> b.c
> @@ -4,13 +4,7 @@
> But do not support UEFI RUNTIME environment call.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcrLib/PeiDxeS
> mmPchPcrLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcrLib/PeiDxeS
> mmPchPcrLib.inf
> index fdc523143f..2de45d5240 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcrLib/PeiDxeS
> mmPchPcrLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcrLib/PeiDxeS
> mmPchPcrLib.inf
> @@ -6,13 +6,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPmcLib/PchPmc
> Lib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPmcLib/PchPmc
> Lib.c
> index 1985d5d133..790af0a7a1 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPmcLib/PchPmc
> Lib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPmcLib/PchPmc
> Lib.c
> @@ -4,13 +4,7 @@
> But do not support UEFI RUNTIME environment call.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPmcLib/PeiDxeS
> mmPchPmcLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPmcLib/PeiDxeS
> mmPchPmcLib.inf
> index bd3a33ff70..8b46a59b67 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPmcLib/PeiDxeS
> mmPchPmcLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPmcLib/PeiDxeS
> mmPchPmcLib.inf
> @@ -6,13 +6,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPsfLib/PchPsfLi
> b.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPsfLib/PchPsfLi
> b.c
> index 08a28f7e6d..a6f484f47b 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPsfLib/PchPsfLi
> b.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPsfLib/PchPsfLi
> b.c
> @@ -2,13 +2,7 @@
> This file contains PSF routines
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include <Base.h>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPsfLib/PeiDxeS
> mmPchPsfLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPsfLib/PeiDxeS
> mmPchPsfLib.inf
> index 941f5a72dd..82db84c539 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPsfLib/PeiDxeS
> mmPchPsfLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPsfLib/PeiDxeS
> mmPchPsfLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchSbiAccessLib/Pc
> hSbiAccessLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchSbiAccessLib/Pc
> hSbiAccessLib.c
> index 9434b7f236..85a699689e 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchSbiAccessLib/Pc
> hSbiAccessLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchSbiAccessLib/Pc
> hSbiAccessLib.c
> @@ -2,13 +2,7 @@
> PCH SBI access library.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchSbiAccessLib/Pe
> iDxeSmmPchSbiAccessLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchSbiAccessLib/Pe
> iDxeSmmPchSbiAccessLib.inf
> index 38ca8dce0e..be8b2f55dc 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchSbiAccessLib/Pe
> iDxeSmmPchSbiAccessLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchSbiAccessLib/Pe
> iDxeSmmPchSbiAccessLib.inf
> @@ -6,13 +6,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchSerialIoLib/PeiD
> xeSmmPchSerialIoLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchSerialIoLib/PeiD
> xeSmmPchSerialIoLib.c
> index 7d24ed1269..03e2c60a5e 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchSerialIoLib/PeiD
> xeSmmPchSerialIoLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchSerialIoLib/PeiD
> xeSmmPchSerialIoLib.c
> @@ -4,13 +4,7 @@
> But do not support UEFI RUNTIME environment call.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchSerialIoLib/PeiD
> xeSmmPchSerialIoLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchSerialIoLib/PeiD
> xeSmmPchSerialIoLib.inf
> index 28ee07ee15..fc25c3001d 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchSerialIoLib/PeiD
> xeSmmPchSerialIoLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchSerialIoLib/PeiD
> xeSmmPchSerialIoLib.inf
> @@ -6,13 +6,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchWdtCommonLib
> /PeiDxeSmmPchWdtCommonLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchWdtCommonLi
> b/PeiDxeSmmPchWdtCommonLib.inf
> index 723ad14ced..95e4893d6c 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchWdtCommonLib
> /PeiDxeSmmPchWdtCommonLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchWdtCommonLi
> b/PeiDxeSmmPchWdtCommonLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchWdtCommonLib
> /WdtCommon.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchWdtCommonLi
> b/WdtCommon.c
> index 00a2fef78d..50d2dd638e 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchWdtCommonLib
> /WdtCommon.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchWdtCommonLi
> b/WdtCommon.c
> @@ -2,13 +2,7 @@
> Library that contains common parts of WdtPei and WdtDxe. Not a standalone
> module.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include <Uefi/UefiBaseType.h>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLib/PeiOcWdtLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLib/PeiOcWdtLib.c
> index 0996b02ea6..e8c8dab6e7 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLib/PeiOcWdtLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLib/PeiOcWdtLib.c
> @@ -2,13 +2,7 @@
> The PEI Library Implements OcWdt Support.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLib/PeiOcWdtLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLib/PeiOcWdtLib.inf
> index a2b8f71784..32a1df1b64 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLib/PeiOcWdtLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLib/PeiOcWdtLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLibNull/PeiOcWdtLib
> Null.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLibNull/PeiOcWdtLib
> Null.c
> index fdde6803c3..ccd6c73599 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLibNull/PeiOcWdtLib
> Null.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLibNull/PeiOcWdtLib
> Null.c
> @@ -2,13 +2,7 @@
> The Null PEI Library Implements OcWdt Support.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLibNull/PeiOcWdtLib
> Null.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLibNull/PeiOcWdtLib
> Null.inf
> index 93c951d49c..dbe58c6acd 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLibNull/PeiOcWdtLib
> Null.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLibNull/PeiOcWdtLib
> Null.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchPreMemPri
> ntPolicy.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchPreMemPri
> ntPolicy.c
> index 650d414247..b7fcb0944e 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchPreMemPri
> ntPolicy.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchPreMemPri
> ntPolicy.c
> @@ -2,13 +2,7 @@
> Print whole PCH_PREMEM_POLICY_PPI
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "PeiPchPolicyLibrary.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchPrintPolicy.
> c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchPrintPolicy.
> c
> index 13a8f9fbd6..72a78e5faf 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchPrintPolicy.
> c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchPrintPolicy.
> c
> @@ -2,13 +2,7 @@
> Print whole PCH_POLICY_PPI
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "PeiPchPolicyLibrary.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchSamplePoli
> cyLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchSamplePoli
> cyLib.c
> index 4e57b72d6e..62b621ce2f 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchSamplePoli
> cyLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchSamplePoli
> cyLib.c
> @@ -2,13 +2,7 @@
> This file is to load sample board policy.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "PeiPchPolicyLibrary.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchSamplePre
> MemPolicyLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchSamplePre
> MemPolicyLib.c
> index fcefd76e8e..6cf9d9069e 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchSamplePre
> MemPolicyLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchSamplePre
> MemPolicyLib.c
> @@ -2,13 +2,7 @@
> This file is to load sample board policy.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "PeiPchPolicyLibrary.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyLib
> .c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyLi
> b.c
> index f0f9f33f71..201c49b3a8 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyLib
> .c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyLi
> b.c
> @@ -2,13 +2,7 @@
> This file is PeiPchPolicy library.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "PeiPchPolicyLibrary.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyLib
> .inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyLi
> b.inf
> index d4d4ac1e54..39004319aa 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyLib
> .inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyLi
> b.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyLib
> rary.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyLi
> brary.h
> index 9be618d38a..f8d01614ac 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyLib
> rary.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyLi
> brary.h
> @@ -2,13 +2,7 @@
> Header file for the PeiPchPolicy library.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PEI_PCH_POLICY_LIBRARY_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPreMem
> PolicyLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPreMe
> mPolicyLib.c
> index 5480cf3d5c..b5c1a39399 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPreMem
> PolicyLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPreMe
> mPolicyLib.c
> @@ -2,13 +2,7 @@
> This file is PeiPchPreMemPolicy library.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "PeiPchPolicyLibrary.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchResetLib/PchReset.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchResetLib/PchReset.c
> index 1a30bf31f6..20e5d36892 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchResetLib/PchReset.c
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchResetLib/PchReset.c
> @@ -2,13 +2,7 @@
> PCH RESET PEIM DRIVER.
>
> Copyright (c) 2017 - 2019, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include <PiPei.h>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchResetLib/PeiPchResetLib
> .inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchResetLib/PeiPchResetLib
> .inf
> index b03a986313..b04f4006ef 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchResetLib/PeiPchResetLib
> .inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchResetLib/PeiPchResetLib
> .inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiResetSystemLib/PeiResetSys
> temLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiResetSystemLib/PeiResetSys
> temLib.c
> index 9429b0ecf4..6f12abf111 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiResetSystemLib/PeiResetSys
> temLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiResetSystemLib/PeiResetSys
> temLib.c
> @@ -2,13 +2,7 @@
> System reset library services.
>
> Copyright (c) 2017 - 2019, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include <Base.h>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiResetSystemLib/PeiResetSys
> temLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiResetSystemLib/PeiResetSys
> temLib.inf
> index a259bdf6ec..18a92a6f18 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiResetSystemLib/PeiResetSys
> temLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiResetSystemLib/PeiResetSys
> temLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiResetSystemLib/PeiResetSys
> temLibFsp.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiResetSystemLib/PeiResetSys
> temLibFsp.inf
> index 9abb7c2107..e7284e6668 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiResetSystemLib/PeiResetSys
> temLibFsp.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiResetSystemLib/PeiResetSys
> temLibFsp.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiSpiLib/PeiSpiLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiSpiLib/PeiSpiLib.c
> index ecd6878490..aadc367a9f 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiSpiLib/PeiSpiLib.c
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiSpiLib/PeiSpiLib.c
> @@ -2,13 +2,7 @@
> PCH SPI PEI Library implements the SPI Host Controller Interface.
>
> Copyright (c) 2019, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiSpiLib/PeiSpiLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiSpiLib/PeiSpiLib.inf
> index 9240b6ef06..31f4ffe43a 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiSpiLib/PeiSpiLib.inf
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiSpiLib/PeiSpiLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2019, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/Smm
> SpiFlashCommonLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/Smm
> SpiFlashCommonLib.inf
> index c7b3e864eb..d712b9e5f7 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/Smm
> SpiFlashCommonLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/Smm
> SpiFlashCommonLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/SpiFl
> ashCommon.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/SpiFl
> ashCommon.c
> index d95f51af41..7ee7ffab50 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/SpiFl
> ashCommon.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/SpiFl
> ashCommon.c
> @@ -3,13 +3,7 @@
> for module use.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/SpiFl
> ashCommonSmmLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/SpiFl
> ashCommonSmmLib.c
> index 8d2238dbf1..11133163d2 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/SpiFl
> ashCommonSmmLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/SpiFl
> ashCommonSmmLib.c
> @@ -2,13 +2,7 @@
> SMM Library instance of SPI Flash Common Library Class
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/BasePchSpiCommonLib/
> BasePchSpiCommonLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/BasePchSpiCommonLib/
> BasePchSpiCommonLib.inf
> index 128f7adcea..599b07d3d3 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/BasePchSpiCommonLib/
> BasePchSpiCommonLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/BasePchSpiCommonLib/
> BasePchSpiCommonLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/BasePchSpiCommonLib/
> SpiCommon.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/BasePchSpiCommonLib/
> SpiCommon.c
> index 0b708d4aad..58757a8cba 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/BasePchSpiCommonLib/
> SpiCommon.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/BasePchSpiCommonLib/
> SpiCommon.c
> @@ -2,13 +2,7 @@
> PCH SPI Common Driver implements the SPI Host Controller Compatibility
> Interface.
>
> Copyright (c) 2017 - 2019, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include <Uefi/UefiBaseType.h>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/DxePchH
> daLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/DxePchH
> daLib.inf
> index 52d7c8bbaf..04940c75c1 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/DxePchH
> daLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/DxePchH
> daLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/PchHdaE
> ndpoints.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/PchHdaE
> ndpoints.c
> index 11c6ec0269..31ea72bc55 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/PchHdaE
> ndpoints.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/PchHdaE
> ndpoints.c
> @@ -2,13 +2,7 @@
> This file contains HD Audio NHLT Endpoints definitions
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/PchHdaLi
> b.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/PchHdaLi
> b.c
> index e577cd9038..2e93507a8a 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/PchHdaLi
> b.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/PchHdaLi
> b.c
> @@ -2,13 +2,7 @@
> PCH HD Audio Library implementation.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/PchHdaN
> hltConfig.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/PchHdaN
> hltConfig.c
> index 46096a0ac3..6e56d357f5 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/PchHdaN
> hltConfig.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/PchHdaN
> hltConfig.c
> @@ -2,13 +2,7 @@
> This file contains HD Audio NHLT Configuration BLOBs
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeI2cMasterCommo
> nLib/I2cMasterCommonLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeI2cMasterComm
> onLib/I2cMasterCommonLib.c
> index 32814bf773..16a2c73a77 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeI2cMasterCommo
> nLib/I2cMasterCommonLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeI2cMasterComm
> onLib/I2cMasterCommonLib.c
> @@ -2,13 +2,7 @@
> Implement the I2C controller driver.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeI2cMasterCommo
> nLib/PeiDxeI2cMasterCommonLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeI2cMasterComm
> onLib/PeiDxeI2cMasterCommonLib.inf
> index a6af85a4a0..5218191d8a 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeI2cMasterCommo
> nLib/PeiDxeI2cMasterCommonLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeI2cMasterComm
> onLib/PeiDxeI2cMasterCommonLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivateL
> ib/GpioNativePrivateLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivate
> Lib/GpioNativePrivateLib.c
> index 89bf0a73ee..d47ae6fd55 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivateL
> ib/GpioNativePrivateLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivate
> Lib/GpioNativePrivateLib.c
> @@ -3,13 +3,7 @@
> used by Reference Code only.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include <Base.h>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivateL
> ib/GpioPrivateLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivate
> Lib/GpioPrivateLib.c
> index b386e071f7..bc660b0906 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivateL
> ib/GpioPrivateLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivate
> Lib/GpioPrivateLib.c
> @@ -2,13 +2,7 @@
> This file contains GPIO routines for RC usage
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include <Base.h>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivateL
> ib/PchSklGpioPrivateData.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivate
> Lib/PchSklGpioPrivateData.c
> index 3d8b128a1c..6cf855d692 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivateL
> ib/PchSklGpioPrivateData.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivate
> Lib/PchSklGpioPrivateData.c
> @@ -2,13 +2,7 @@
> This file contains SKL specific GPIO information
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include <Base.h>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivateL
> ib/PeiDxeSmmGpioPrivateLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivate
> Lib/PeiDxeSmmGpioPrivateLib.inf
> index d2542a1673..7986358ce1 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivateL
> ib/PeiDxeSmmGpioPrivateLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivate
> Lib/PeiDxeSmmGpioPrivateLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchInitCom
> monLib/PchInitCommon.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchInitCom
> monLib/PchInitCommon.c
> index a49bbc5c18..ed088bd642 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchInitCom
> monLib/PchInitCommon.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchInitCom
> monLib/PchInitCommon.c
> @@ -2,13 +2,7 @@
> Pch common library for PCH INIT PEI/DXE/SMM modules
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchInitCom
> monLib/PchRpfn.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchInitCom
> monLib/PchRpfn.c
> index 77dd285430..1cd4884bc9 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchInitCom
> monLib/PchRpfn.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchInitCom
> monLib/PchRpfn.c
> @@ -2,13 +2,7 @@
> This file contains functions that configures PCI Express Root Ports function
> swapping.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include <Uefi/UefiBaseType.h>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchInitCom
> monLib/PeiDxeSmmPchInitCommonLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchInitCom
> monLib/PeiDxeSmmPchInitCommonLib.inf
> index df4900d964..52ab228442 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchInitCom
> monLib/PeiDxeSmmPchInitCommonLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchInitCom
> monLib/PeiDxeSmmPchInitCommonLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPciExpre
> ssHelpersLib/PchPciExpressHelpersLibrary.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPciExpre
> ssHelpersLib/PchPciExpressHelpersLibrary.c
> index 815b800db7..04145d8373 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPciExpre
> ssHelpersLib/PchPciExpressHelpersLibrary.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPciExpre
> ssHelpersLib/PchPciExpressHelpersLibrary.c
> @@ -2,13 +2,7 @@
> This file contains routines that support PCI Express initialization
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "PchPciExpressHelpersLibrary.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPciExpre
> ssHelpersLib/PchPciExpressHelpersLibrary.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPciExpre
> ssHelpersLib/PchPciExpressHelpersLibrary.h
> index bd59b5346e..7fe8985946 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPciExpre
> ssHelpersLib/PchPciExpressHelpersLibrary.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPciExpre
> ssHelpersLib/PchPciExpressHelpersLibrary.h
> @@ -2,13 +2,7 @@
> Header file for PCH Pci Express helps library implementation.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_PCI_EXPRESS_HELPERS_LIBRARY_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPciExpre
> ssHelpersLib/PeiDxeSmmPchPciExpressHelpersLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPciExpre
> ssHelpersLib/PeiDxeSmmPchPciExpressHelpersLib.inf
> index b02f311f02..39dc89670a 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPciExpre
> ssHelpersLib/PeiDxeSmmPchPciExpressHelpersLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPciExpre
> ssHelpersLib/PeiDxeSmmPchPciExpressHelpersLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPsfPrivat
> eLib/PchPsfPrivateLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPsfPrivat
> eLib/PchPsfPrivateLib.c
> index ef579c825d..55124c0cb9 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPsfPrivat
> eLib/PchPsfPrivateLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPsfPrivat
> eLib/PchPsfPrivateLib.c
> @@ -2,13 +2,7 @@
> This file contains PSF routines for RC usage
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include <Base.h>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPsfPrivat
> eLib/PeiDxeSmmPchPsfPrivateLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPsfPrivat
> eLib/PeiDxeSmmPchPsfPrivateLib.inf
> index 6995171b10..0d7050500a 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPsfPrivat
> eLib/PeiDxeSmmPchPsfPrivateLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPsfPrivat
> eLib/PeiDxeSmmPchPsfPrivateLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchSmbusC
> ommonLib/PchSmbusExec.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchSmbusC
> ommonLib/PchSmbusExec.c
> index ad5c784bff..abdc06cd70 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchSmbusC
> ommonLib/PchSmbusExec.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchSmbusC
> ommonLib/PchSmbusExec.c
> @@ -2,13 +2,7 @@
> PCH Smbus Executive Code (common PEI/DXE/SMM code)
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include <Uefi/UefiBaseType.h>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchSmbusC
> ommonLib/PeiDxeSmmPchSmbusCommonLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchSmbusC
> ommonLib/PeiDxeSmmPchSmbusCommonLib.inf
> index 54a67614af..78324e1fef 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchSmbusC
> ommonLib/PeiDxeSmmPchSmbusCommonLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchSmbusC
> ommonLib/PeiDxeSmmPchSmbusCommonLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmRstPrivateLi
> b/PeiDxeSmmRstPrivateLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmRstPrivateLi
> b/PeiDxeSmmRstPrivateLib.c
> index 7436a76ec1..e97d48f777 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmRstPrivateLi
> b/PeiDxeSmmRstPrivateLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmRstPrivateLi
> b/PeiDxeSmmRstPrivateLib.c
> @@ -2,13 +2,7 @@
> Routines for Rst remapping
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmRstPrivateLi
> b/PeiDxeSmmRstPrivateLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmRstPrivateLi
> b/PeiDxeSmmRstPrivateLib.inf
> index 1bbcc7eda7..413d0c86f8 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmRstPrivateLi
> b/PeiDxeSmmRstPrivateLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmRstPrivateLi
> b/PeiDxeSmmRstPrivateLib.inf
> @@ -6,13 +6,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchAcpi.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchAcpi.c
> index 789b61170d..a0e3996664 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchAcpi.c
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchAcpi.c
> @@ -2,13 +2,7 @@
> This is the driver that initializes the Intel PCH.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "PchInit.h"
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchCio2Acpi.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchCio2Acpi.c
> index f0abea1323..0769655757 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchCio2Acpi.c
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchCio2Acpi.c
> @@ -2,13 +2,7 @@
> Initializes PCH CIO2 device ACPI data.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchHdaAcpi.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchHdaAcpi.c
> index 732dc8905d..f8839c47b5 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchHdaAcpi.c
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchHdaAcpi.c
> @@ -2,13 +2,7 @@
> Initializes the PCH HD Audio ACPI Tables.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInit.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInit.c
> index 0428479b50..40c814f460 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInit.c
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInit.c
> @@ -2,13 +2,7 @@
> This is the Common driver that initializes the Intel PCH.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "PchInit.h"
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInit.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInit.h
> index a05697d337..516606e604 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInit.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInit.h
> @@ -2,13 +2,7 @@
> Header file for PCH Initialization Driver.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_INITIALIZATION_DRIVER_H_
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxe.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxe.c
> index 1857b7f3c5..bd3efd8eda 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxe.c
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxe.c
> @@ -2,13 +2,7 @@
> This is the Uefi driver that initializes the Intel PCH.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "PchInit.h"
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxe.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxe.inf
> index 0242dcbe9a..49ede590e8 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxe.inf
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxe.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxeFsp.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxeFsp.inf
> index 18feffd894..68c1bca40c 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxeFsp.inf
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxeFsp.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitFsp.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitFsp.c
> index 9307b8fc4c..56052d8c9f 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitFsp.c
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitFsp.c
> @@ -2,13 +2,7 @@
> This is the FSP driver that initializes the Intel PCH.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "PchInit.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchRstPcieStorage.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchRstPcieStorage.c
> index 801abf2602..bcd8bb8232 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchRstPcieStorage.c
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchRstPcieStorage.c
> @@ -3,13 +3,7 @@
> In order to use this feature, Intel RST Driver is required
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "PchInit.h"
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchSata.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchSata.c
> index d1f2948de6..fabb536df0 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchSata.c
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchSata.c
> @@ -2,13 +2,7 @@
> Perform related functions for PCH Sata in DXE phase
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include <PchInit.h>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchScs.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchScs.c
> index 34227826b4..defe183965 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchScs.c
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchScs.c
> @@ -2,13 +2,7 @@
> Initializes PCH Storage and Communications Subsystem Controllers.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include <PchInit.h>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchSerialIo.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchSerialIo.c
> index 013c729ddf..93f07fa906 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchSerialIo.c
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchSerialIo.c
> @@ -2,13 +2,7 @@
> Initializes Serial IO Controllers.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include <PchInit.h>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchSerialIoDxe.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchSerialIoDxe.c
> index 3b951092b5..077012bd25 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchSerialIoDxe.c
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchSerialIoDxe.c
> @@ -2,13 +2,7 @@
> Initializes Serial IO Controllers.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include <PchInit.h>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchBiosWriteProtect.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchBiosWriteProtect.c
> index cfaf0d57bd..c1bc98bb6b 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchBiosWriteProtect.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchBiosWriteProtect.c
> @@ -2,13 +2,7 @@
> PCH BIOS Write Protect Driver.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "PchInitSmm.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchGpioSxIsolationSmm.
> c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchGpioSxIsolationSmm.
> c
> index 4c3dd6cf11..4cad3c6230 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchGpioSxIsolationSmm.
> c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchGpioSxIsolationSmm.
> c
> @@ -2,13 +2,7 @@
> PCH GPIO Sx Isolation Driver Entry
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "PchInitSmm.h"
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.c
> index c6e1809946..d2dba930ff 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.c
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.c
> @@ -2,13 +2,7 @@
> PCH Init Smm module for PCH specific SMI handlers.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "PchInitSmm.h"
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.h
> index 58ef567cc0..44f151c243 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.h
> @@ -2,13 +2,7 @@
> Header file for PCH Init SMM Handler
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.inf
> index 458eac090e..ea6692f6d9 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.inf
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchLanSxSmm.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchLanSxSmm.c
> index d05cb61bbc..8c2496a79e 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchLanSxSmm.c
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchLanSxSmm.c
> @@ -2,13 +2,7 @@
> PCH LAN Sx handler implementation.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchPcieSmm.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchPcieSmm.c
> index b4234f649c..aed33bba25 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchPcieSmm.c
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchPcieSmm.c
> @@ -2,13 +2,7 @@
> PCH Pcie SMM Driver Entry
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "PchInitSmm.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchPort61hSmm.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchPort61hSmm.c
> index 0717f38291..6267607a46 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchPort61hSmm.c
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchPort61hSmm.c
> @@ -2,13 +2,7 @@
> PCH Port 61h bit-4 toggling in SMM IO Trap
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchSpiAsync.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchSpiAsync.c
> index 463de1dba8..139a60631c 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchSpiAsync.c
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchSpiAsync.c
> @@ -2,13 +2,7 @@
> PCH SPI Async SMI handler.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "PchInitSmm.h"
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchXhciSxSmm.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchXhciSxSmm.c
> index f17b125d4f..72603e36e7 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchXhciSxSmm.c
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchXhciSxSmm.c
> @@ -2,13 +2,7 @@
> PCH xHCI Sx handler implementation.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/IoTrap.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/IoTrap.c
> index ffb2105719..ea794669ba 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/IoTrap.c
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/IoTrap.c
> @@ -2,13 +2,7 @@
> Main implementation source file for the Io Trap SMM driver
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "PchSmmHelpers.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/IoTrap.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/IoTrap.h
> index 99bb3527f7..13ad2f6f1b 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/IoTrap.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/IoTrap.h
> @@ -2,13 +2,7 @@
> Defines and prototypes for the IoTrap SMM driver
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _IO_TRAP_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmiDispatc
> h.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmiDispat
> ch.c
> index a0bd9aaaa1..5f8c9375ea 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmiDispatc
> h.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmiDispat
> ch.c
> @@ -2,13 +2,7 @@
> This function handle the register/unregister of PCH specific SMI events.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "PchSmmHelpers.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmiDispatc
> her.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmiDispat
> cher.inf
> index a593d631d3..46c4c72617 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmiDispatc
> her.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmiDispat
> cher.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmm.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmm.h
> index 3eebdc1daf..508832e76e 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmm.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmm.h
> @@ -2,13 +2,7 @@
> Prototypes and defines for the PCH SMM Dispatcher.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef PCH_SMM_H
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmCore.
> c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmCore.
> c
> index 77f0561ce4..0c494bffef 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmCore.
> c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmCore.
> c
> @@ -3,13 +3,7 @@
> and the abstraction of the PCH SMI sources.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "PchSmm.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmEspi.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmEspi.c
> index a4a7380737..a8a3a3dac6 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmEspi.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmEspi.c
> @@ -2,13 +2,7 @@
> eSPI SMI implementation
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmEspi.
> h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmEspi.
> h
> index da600495c0..af152414f5 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmEspi.
> h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmEspi.
> h
> @@ -2,13 +2,7 @@
> eSPI SMI Dispatch header
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmGpi.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmGpi.c
> index fd79538d3a..5690b91465 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmGpi.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmGpi.c
> @@ -2,13 +2,7 @@
> File to contain all the hardware specific stuff for the Smm Gpi dispatch
> protocol.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "PchSmmHelpers.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmHelpe
> rs.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmHelp
> ers.c
> index fea1ac9165..24bdf6a6e5 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmHelpe
> rs.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmHelp
> ers.c
> @@ -2,13 +2,7 @@
> Helper functions for PCH SMM dispatcher.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "PchSmmHelpers.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmHelpe
> rs.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmHelp
> ers.h
> index 44a8936790..dffd0e3944 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmHelpe
> rs.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmHelp
> ers.h
> @@ -2,13 +2,7 @@
> Helper functions for PCH SMM
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef PCH_SMM_HELPERS_H
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmPerio
> dicTimer.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmPerio
> dicTimer.c
> index 324eaeb7e8..29afe30817 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmPerio
> dicTimer.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmPerio
> dicTimer.c
> @@ -2,13 +2,7 @@
> File to contain all the hardware specific stuff for the Periodical Timer dispatch
> protocol.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "PchSmmHelpers.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmPowe
> rButton.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmPowe
> rButton.c
> index 404d2a31bc..82f0f6ffb2 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmPowe
> rButton.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmPowe
> rButton.c
> @@ -2,13 +2,7 @@
> File to contain all the hardware specific stuff for the Smm Power Button
> dispatch protocol.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include <PchSmmHelpers.h>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmSw.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmSw.c
> index c285c677f1..ccaac28794 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmSw.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmSw.c
> @@ -2,13 +2,7 @@
> File to contain all the hardware specific stuff for the Smm Sw dispatch
> protocol.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "PchSmmHelpers.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmSx.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmSx.c
> index 523cea27aa..6fbe87c75d 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmSx.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmSx.c
> @@ -2,13 +2,7 @@
> File to contain all the hardware specific stuff for the Smm Sx dispatch protocol.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "PchSmmHelpers.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmUsb.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmUsb.c
> index 71c11ed71d..f5ed3a1892 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmUsb.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmUsb.c
> @@ -2,13 +2,7 @@
> File to contain all the hardware specific stuff for the Smm USB dispatch
> protocol.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "PchSmmHelpers.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchxSmmHelp
> ers.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchxSmmHelp
> ers.c
> index d4f4603eea..4d2a926491 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchxSmmHelp
> ers.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchxSmmHelp
> ers.c
> @@ -3,13 +3,7 @@
> and the abstraction of the PCH SMI sources.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "PchSmmHelpers.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchxSmmHelp
> ers.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchxSmmHelp
> ers.h
> index 273bed32bc..08bf728da0 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchxSmmHelp
> ers.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchxSmmHelp
> ers.h
> @@ -3,13 +3,7 @@
> and the abstraction of the PCH SMI sources.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCHX_SMM_HELPERS_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/SmmControl/RuntimeDxe/SmmControl
> .inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/SmmControl/RuntimeDxe/SmmControl
> .inf
> index 2871b6c7c4..2695eaf9af 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/SmmControl/RuntimeDxe/SmmControl
> .inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/SmmControl/RuntimeDxe/SmmControl
> .inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/SmmControl/RuntimeDxe/SmmControl
> Driver.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/SmmControl/RuntimeDxe/SmmControl
> Driver.c
> index 96727dde8f..7abac4e110 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/SmmControl/RuntimeDxe/SmmControl
> Driver.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/SmmControl/RuntimeDxe/SmmControl
> Driver.c
> @@ -2,13 +2,7 @@
> This is the driver that publishes the SMM Control Protocol.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "SmmControlDriver.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/SmmControl/RuntimeDxe/SmmControl
> Driver.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/SmmControl/RuntimeDxe/SmmControl
> Driver.h
> index 110b93a3ca..fbb108f9d8 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/SmmControl/RuntimeDxe/SmmControl
> Driver.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/SmmControl/RuntimeDxe/SmmControl
> Driver.h
> @@ -2,13 +2,7 @@
> Header file for SMM Control Driver.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _SMM_CONTROL_DRIVER_H_
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Spi/Smm/PchSpi.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Spi/Smm/PchSpi.c
> index 5cc808aa9d..1d84d06134 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Spi/Smm/PchSpi.c
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Spi/Smm/PchSpi.c
> @@ -2,13 +2,7 @@
> PCH SPI SMM Driver implements the SPI Host Controller Compatibility
> Interface.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "PchSpi.h"
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Spi/Smm/PchSpi.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Spi/Smm/PchSpi.h
> index e3b6d7fd90..43e158b604 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Spi/Smm/PchSpi.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Spi/Smm/PchSpi.h
> @@ -2,13 +2,7 @@
> Header file for the PCH SPI SMM Driver.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_SPI_H_
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Spi/Smm/PchSpiSmm.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Spi/Smm/PchSpiSmm.inf
> index 52f83a9953..964489064a 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Spi/Smm/PchSpiSmm.inf
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Spi/Smm/PchSpiSmm.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/Include/Library/SecPlatformLi
> b.h
> b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/Include/Library/SecPlatformLi
> b.h
> index f9bbc931aa..bf4f75effb 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/Include/Library/SecPlatformLi
> b.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/Include/Library/SecPlatformLi
> b.h
> @@ -2,13 +2,7 @@
> Prototype of SEC Platform hook library.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkModulePkg/In
> clude/Guid/DataHubStatusCodeRecord.h
> b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkModulePkg/In
> clude/Guid/DataHubStatusCodeRecord.h
> index d18a2eda21..7611700179 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkModulePkg/In
> clude/Guid/DataHubStatusCodeRecord.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkModulePkg/In
> clude/Guid/DataHubStatusCodeRecord.h
> @@ -2,13 +2,7 @@
> GUID used to identify Data Hub records logged by Status Code Protocol.
>
> Copyright (c) 2006 - 2010, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include/G
> uid/SmramMemoryReserve.h
> b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include/
> Guid/SmramMemoryReserve.h
> index 04589cf040..9918c768ba 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include/G
> uid/SmramMemoryReserve.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include/
> Guid/SmramMemoryReserve.h
> @@ -9,13 +9,7 @@
> This GUIDed HOB can be used to convey the existence of the T-SEG
> reservation and H-SEG usage
>
> Copyright (c) 2007 - 2010, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> @par Revision Reference:
> GUIDs defined in SmmCis spec version 0.9.
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include/P
> rotocol/DataHub.h
> b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include/P
> rotocol/DataHub.h
> index ce73e3e8a6..4890ef7895 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include/P
> rotocol/DataHub.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include/P
> rotocol/DataHub.h
> @@ -4,13 +4,7 @@
> has been logged. This protocol may only be called <= TPL_NOTIFY.
>
> Copyright (c) 2007 - 2010, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> @par Revision Reference:
> The Data Hub Protocol is defined in Framework for EFI Data Hub Specification
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include/P
> rotocol/Legacy8259.h
> b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include/P
> rotocol/Legacy8259.h
> index c12936f2d2..6a2e4669db 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include/P
> rotocol/Legacy8259.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include/P
> rotocol/Legacy8259.h
> @@ -3,13 +3,7 @@
> PCI IRQ routing needed to program the PCI Interrupt Line register.
>
> Copyright (c) 2007 - 2010, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> @par Revision Reference:
> This protocol is defined in Framework for EFI Compatibility Support Module
> spec
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include/P
> rotocol/LegacyBios.h
> b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include/P
> rotocol/LegacyBios.h
> index a5f8f8abf7..e60afb6dcd 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include/P
> rotocol/LegacyBios.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include/P
> rotocol/LegacyBios.h
> @@ -10,13 +10,7 @@
> environment. Reverse thunk is the code that does the opposite.
>
> Copyright (c) 2007 - 2010, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> @par Revision Reference:
> This protocol is defined in Framework for EFI Compatibility Support Module
> spec
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include/P
> rotocol/LegacyInterrupt.h
> b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include/P
> rotocol/LegacyInterrupt.h
> index f06836a97c..f4944d4c79 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include/P
> rotocol/LegacyInterrupt.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include/P
> rotocol/LegacyInterrupt.h
> @@ -2,13 +2,7 @@
> This protocol abstracts the PIRQ programming from the generic EFI
> Compatibility Support Modules (CSMs).
>
> Copyright (c) 2007 - 2010, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> @par Revision Reference:
> This protocol is defined in Framework for the EFI Compatibility Support
> Module specification.
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Guid
> /AcpiS3Context.h
> b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Guid
> /AcpiS3Context.h
> index 8f78e284f6..c5a995b8e8 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Guid
> /AcpiS3Context.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Guid
> /AcpiS3Context.h
> @@ -3,14 +3,7 @@
>
> Copyright (c) 2011 - 2012, 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 distribution. The
> -full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Guid
> /ConsoleOutDevice.h
> b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Guid
> /ConsoleOutDevice.h
> index 7ca3f424e5..0a9aef19c6 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Guid
> /ConsoleOutDevice.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Guid
> /ConsoleOutDevice.h
> @@ -2,13 +2,7 @@
> This GUID can be installed to the device handle to specify that the device is the
> console-out device.
>
> Copyright (c) 2006 - 2010, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Guid
> /MemoryTypeInformation.h
> b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Guid
> /MemoryTypeInformation.h
> index e3e2ec82fd..3b05c9a79e 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Guid
> /MemoryTypeInformation.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Guid
> /MemoryTypeInformation.h
> @@ -8,13 +8,7 @@
> be used to store the information for each memory type in Variable or HOB.
>
> Copyright (c) 2006 - 2010, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Libra
> ry/ResetSystemLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Libra
> ry/ResetSystemLib.h
> index 6cab22a80c..75d3e15ed7 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Libra
> ry/ResetSystemLib.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Libra
> ry/ResetSystemLib.h
> @@ -3,13 +3,7 @@
> methods that reset the whole system.
>
> Copyright (c) 2005 - 2010, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Ppi/
> SmmAccess.h
> b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Ppi/
> SmmAccess.h
> index 8255a4a1d1..83a8edb449 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Ppi/
> SmmAccess.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Ppi/
> SmmAccess.h
> @@ -13,14 +13,7 @@
>
> Copyright (c) 2010, 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 distribution. The
> -full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Ppi/
> SmmControl.h
> b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Ppi/
> SmmControl.h
> index fef5a3dca3..5bf1084a7a 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Ppi/
> SmmControl.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Ppi/
> SmmControl.h
> @@ -11,14 +11,7 @@
>
> Copyright (c) 2010, 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 distribution. The
> - full text of the license may be found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Prot
> ocol/SmmVariable.h
> b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Prot
> ocol/SmmVariable.h
> index 7e72bee166..c2dbdb3651 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Prot
> ocol/SmmVariable.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Prot
> ocol/SmmVariable.h
> @@ -3,13 +3,7 @@
> and intended for use as a means to store data in the EFI SMM environment.
>
> Copyright (c) 2010, 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 distribution. The full text of the license may be found
> at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/Pch/AcpiTables/Dsdt/PchSmb.
> asl
> b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/Pch/AcpiTables/Dsdt/PchSmb.
> asl
> index 25c4960585..9f23b3bb3c 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/Pch/AcpiTables/Dsdt/PchSmb.
> asl
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/Pch/AcpiTables/Dsdt/PchSmb.
> asl
> @@ -6,13 +6,7 @@
> driver with SMBUS operation region support implemented for ACPI usage.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/SiPkg.dec
> b/Silicon/Intel/KabylakeSiliconPkg/SiPkg.dec
> index 078d10c520..a613079dd4 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/SiPkg.dec
> +++ b/Silicon/Intel/KabylakeSiliconPkg/SiPkg.dec
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017 - 2019, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/SiPkgBuildOption.dsc
> b/Silicon/Intel/KabylakeSiliconPkg/SiPkgBuildOption.dsc
> index f313e4c352..20132653bd 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/SiPkgBuildOption.dsc
> +++ b/Silicon/Intel/KabylakeSiliconPkg/SiPkgBuildOption.dsc
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/SiPkgCommonLib.dsc
> b/Silicon/Intel/KabylakeSiliconPkg/SiPkgCommonLib.dsc
> index eb7d43191f..920b02e410 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/SiPkgCommonLib.dsc
> +++ b/Silicon/Intel/KabylakeSiliconPkg/SiPkgCommonLib.dsc
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
> #
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/SiPkgDxe.dsc
> b/Silicon/Intel/KabylakeSiliconPkg/SiPkgDxe.dsc
> index 4fe0f8d18c..c39bd56c0e 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/SiPkgDxe.dsc
> +++ b/Silicon/Intel/KabylakeSiliconPkg/SiPkgDxe.dsc
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/SiPkgDxeLib.dsc
> b/Silicon/Intel/KabylakeSiliconPkg/SiPkgDxeLib.dsc
> index 9697da6c30..8c194d8e7c 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/SiPkgDxeLib.dsc
> +++ b/Silicon/Intel/KabylakeSiliconPkg/SiPkgDxeLib.dsc
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/SiPkgPei.dsc
> b/Silicon/Intel/KabylakeSiliconPkg/SiPkgPei.dsc
> index a2bc1cd49f..8bd16c3845 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/SiPkgPei.dsc
> +++ b/Silicon/Intel/KabylakeSiliconPkg/SiPkgPei.dsc
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/SiPkgPeiLib.dsc
> b/Silicon/Intel/KabylakeSiliconPkg/SiPkgPeiLib.dsc
> index bb95ce3888..86e34ff359 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/SiPkgPeiLib.dsc
> +++ b/Silicon/Intel/KabylakeSiliconPkg/SiPkgPeiLib.dsc
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017 - 2019, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/Dmar/Dmar.aslc
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/Dmar/Dmar.aslc
> index bf7b56e23e..cd3192639b 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/Dmar/Dmar.aslc
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/Dmar/Dmar.aslc
> @@ -2,13 +2,7 @@
> This file describes the contents of the ACPI DMA address Remapping
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "Dmar.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/Dmar/Dmar.h
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/Dmar/Dmar.h
> index aaa027806b..32aba45fc8 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/Dmar/Dmar.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/Dmar/Dmar.h
> @@ -3,13 +3,7 @@
> Some additional ACPI values are defined in Acpi1_0.h and Acpi2_0.h.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _SA_DMAR_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/HostBus.asl
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/HostBus.asl
> index ea14d5d479..597a10dc08 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/HostBus.asl
> +++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/HostBus.asl
> @@ -6,13 +6,7 @@
> @note This ASL file needs to be included as part of platform ACPI DSDT table.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaAcpiTables.inf
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaAcpiTables.inf
> index ff39573378..1488d3ba61 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaAcpiTables.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaAcpiTables.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> ################################################################
> ################
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/Igfx.asl
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/Igfx.asl
> index c853700c40..2770e91752 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/Igfx.asl
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/Igfx.asl
> @@ -7,13 +7,7 @@
> present in the system, etc.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxComm
> on.asl
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxComm
> on.asl
> index 4d28ad0068..5f46e49ff6 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxComm
> on.asl
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxComm
> on.asl
> @@ -4,13 +4,7 @@
> i.e. hotkeys and other system interrupts.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> //
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxDsm.as
> l
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxDsm.as
> l
> index 974f7b706d..a045242872 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxDsm.as
> l
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxDsm.as
> l
> @@ -4,13 +4,7 @@
> the Integrated Graphics Device (IGD) OpRegion/DSM mechanism
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxOpGbd
> a.asl
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxOpGbd
> a.asl
> index cd86e25fca..4705df772d 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxOpGbd
> a.asl
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxOpGbd
> a.asl
> @@ -4,13 +4,7 @@
> the Integrated Graphics Device (IGD) OpRegion/Software SCI mechanism
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> Method (GBDA, 0, Serialized)
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxOpRn.a
> sl
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxOpRn.
> asl
> index 4e3b6c5522..4f85e17a0e 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxOpRn.a
> sl
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxOpRn.
> asl
> @@ -6,13 +6,7 @@
> as described in the IGD OpRegion specification.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> //
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxOpSbc
> b.asl
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxOpSbc
> b.asl
> index 1f688e3b4a..e6a6f67621 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxOpSbc
> b.asl
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxOpSbc
> b.asl
> @@ -3,13 +3,7 @@
> OpRegion/Software SCI mechanism.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/Sa.asl
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/Sa.asl
> index 7bc2d80667..8b5ea28035 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/Sa.asl
> +++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/Sa.asl
> @@ -5,13 +5,7 @@
> System Agent PCI Express* ports (PEG), iGfx and other devices.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/SaNvs.asl
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/SaNvs.asl
> index 311810020f..179b6b95b8 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/SaNvs.asl
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/SaNvs.asl
> @@ -1,13 +1,7 @@
> /**@file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/SaSsdt.asl
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/SaSsdt.asl
> index b19a3cfa7b..df187f593e 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/SaSsdt.asl
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/SaSsdt.asl
> @@ -4,13 +4,7 @@
> and BIOS.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/SaSsdt.inf
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/SaSsdt.inf
> index 43d7819263..e5f234ec2a 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/SaSsdt.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/SaSsdt.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> ################################################################
> ################
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/Graphics
> DxeConfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/Graphic
> sDxeConfig.h
> index 8f746dcc95..81549871b7 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/Graphics
> DxeConfig.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/Graphic
> sDxeConfig.h
> @@ -2,13 +2,7 @@
> Graphics DXE Policy definitions
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _GRAPHICS_DXE_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/Graphics
> PeiConfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/Graphic
> sPeiConfig.h
> index ee294650bf..4063f800e8 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/Graphics
> PeiConfig.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/Graphic
> sPeiConfig.h
> @@ -2,13 +2,7 @@
> Policy definition for Internal Graphics Config Block (PostMem)
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _GRAPHICS_PEI_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/Memory
> Config.h
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/Memory
> Config.h
> index 8f77fa720b..d64d3d3d0a 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/Memory
> Config.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/Memory
> Config.h
> @@ -2,13 +2,7 @@
> Policy definition of Memory Config Block
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _MEMORY_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/MiscDxe
> Config.h
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/MiscDxe
> Config.h
> index 18a5371c4b..08229cd33c 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/MiscDxe
> Config.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/MiscDxe
> Config.h
> @@ -2,13 +2,7 @@
> MISC DXE policy definitions
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _MISC_DXE_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/SaMiscP
> eiPreMemConfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/SaMiscP
> eiPreMemConfig.h
> index 0bf1934207..4aa02e3142 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/SaMiscP
> eiPreMemConfig.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/SaMiscP
> eiPreMemConfig.h
> @@ -2,13 +2,7 @@
> Policy details for miscellaneous configuration in System Agent
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _SA_MISC_PEI_PREMEM_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/VtdConfi
> g.h
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/VtdConf
> ig.h
> index 086d70849a..8430563788 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/VtdConfi
> g.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/VtdConf
> ig.h
> @@ -2,13 +2,7 @@
> VT-d policy definitions.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _VTD_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/DmaRemappingTable
> .h
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/DmaRemappingTable
> .h
> index 0c49f98f2c..08edcee410 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/DmaRemappingTable
> .h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/DmaRemappingTable
> .h
> @@ -2,13 +2,7 @@
> This code defines ACPI DMA Remapping table related definitions.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _DMA_REMAPPING_TABLE_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Library/DxeSaPolicyLi
> b.h
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Library/DxeSaPolicyLi
> b.h
> index 12274d797d..61457dfb59 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Library/DxeSaPolicyLi
> b.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Library/DxeSaPolicyLi
> b.h
> @@ -2,13 +2,7 @@
> Prototype of the DxeSaPolicyLib library.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _DXE_SA_POLICY_LIB_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Library/PeiSaPolicyLi
> b.h
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Library/PeiSaPolicyLi
> b.h
> index 6348fd003e..28e648f4a0 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Library/PeiSaPolicyLi
> b.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Library/PeiSaPolicyLi
> b.h
> @@ -2,13 +2,7 @@
> Prototype of the PeiSaPolicy library.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PEI_SA_POLICY_LIB_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Library/SaPlatformLi
> b.h
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Library/SaPlatformLi
> b.h
> index f3762e91a5..cf62e1a9e2 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Library/SaPlatformLi
> b.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Library/SaPlatformLi
> b.h
> @@ -2,13 +2,7 @@
> Header file for SaPlatformLib.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/MemInfoHob.h
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/MemInfoHob.h
> index dbf93ac265..ae51195736 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/MemInfoHob.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/MemInfoHob.h
> @@ -4,13 +4,7 @@
> data hobs.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _MEM_INFO_HOB_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/GopPolicy.h
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/GopPolicy.h
> index e7e72e5e53..9a7f02353c 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/GopPolicy.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/GopPolicy.h
> @@ -2,13 +2,7 @@
> Interface definition for GopPolicy Protocol.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _GOP_POLICY_PROTOCOL_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/IgdOpRegio
> n.h
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/IgdOpRegio
> n.h
> index b39ccc31d4..1410a8a309 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/IgdOpRegio
> n.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/IgdOpRegio
> n.h
> @@ -3,13 +3,7 @@
> an interface between system BIOS, ASL code, and Graphics drivers.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> @par Specification Reference:
> - IGD OpRegion/Software SCI SPEC
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/MemInfo.h
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/MemInfo.h
> index ceadd739d6..7d5dd03f55 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/MemInfo.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/MemInfo.h
> @@ -4,13 +4,7 @@
> of each dimm and rank.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _MEM_INFO_PROTOCOL_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/SaGlobalNv
> sArea.h
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/SaGlobalNv
> sArea.h
> index 5daf183c1a..08ab89898b 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/SaGlobalNv
> sArea.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/SaGlobalNv
> sArea.h
> @@ -4,13 +4,7 @@
> used as a communications buffer between SMM/DXE/PEI code and ASL code.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _SYSTEM_AGENT_GLOBAL_NVS_AREA_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/SaNvs.h
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/SaNvs.h
> index 8f6ec57304..01cdf6d56d 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/SaNvs.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/SaNvs.h
> @@ -1,13 +1,7 @@
> /**@file
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/SaPolicy.h
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/SaPolicy.h
> index 577eaa8ffc..40a0ab884d 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/SaPolicy.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/SaPolicy.h
> @@ -2,13 +2,7 @@
> Interface definition details between System Agent and platform drivers during
> DXE phase.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _SA_POLICY_H_
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/SaAccess.h
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/SaAccess.h
> index 5d343ba57a..45caa7fe90 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/SaAccess.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/SaAccess.h
> @@ -2,13 +2,7 @@
> Macros to simplify and abstract the interface to PCI configuration.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _SAACCESS_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/SaPolicyCommon.h
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/SaPolicyCommon.h
> index bfe6011763..dccd4c9b3b 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/SaPolicyCommon.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/SaPolicyCommon.h
> @@ -2,13 +2,7 @@
> Main System Agent Policy structure definition which will contain several config
> blocks during runtime.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _SA_POLICY_COMMON_H_
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/SaRegs.h
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/SaRegs.h
> index 5f92981f4b..2b518853bd 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/SaRegs.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/SaRegs.h
> @@ -16,13 +16,7 @@
> as "_SA_" without [generation_name] inserted.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _SA_REGS_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/IncludePrivate/SaConfigHob.
> h
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/IncludePrivate/SaConfigHob.
> h
> index 02ec08fc96..16f31bbdfd 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/IncludePrivate/SaConfigHob.
> h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/IncludePrivate/SaConfigHob.
> h
> @@ -2,13 +2,7 @@
> The GUID definition for SaConfigHob
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _SA_CONFIG_HOB_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/DxeSa
> PolicyLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/DxeSa
> PolicyLib.c
> index 4909ed8f62..67fe214d0e 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/DxeSa
> PolicyLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/DxeSa
> PolicyLib.c
> @@ -2,13 +2,7 @@
> This file provide services for DXE phase policy default initialization
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/DxeSa
> PolicyLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/DxeSa
> PolicyLib.inf
> index f75ecb1388..9eb389b14f 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/DxeSa
> PolicyLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/DxeSa
> PolicyLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/DxeSa
> PolicyLibrary.h
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/DxeSa
> PolicyLibrary.h
> index f754072411..ec1b7d10e8 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/DxeSa
> PolicyLibrary.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/DxeSa
> PolicyLibrary.h
> @@ -2,13 +2,7 @@
> Header file for the DxeSaPolicy library.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _DXE_SA_POLICY_LIBRARY_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiDxeSmmSaPlatfor
> mLib/PeiDxeSmmSaPlatformLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiDxeSmmSaPlatfor
> mLib/PeiDxeSmmSaPlatformLib.inf
> index 860da17031..9fe71e5bac 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiDxeSmmSaPlatfor
> mLib/PeiDxeSmmSaPlatformLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiDxeSmmSaPlatfor
> mLib/PeiDxeSmmSaPlatformLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiDxeSmmSaPlatfor
> mLib/SaPlatformLibrary.c
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiDxeSmmSaPlatfor
> mLib/SaPlatformLibrary.c
> index df662b0222..4fd3ffa64b 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiDxeSmmSaPlatfor
> mLib/SaPlatformLibrary.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiDxeSmmSaPlatfor
> mLib/SaPlatformLibrary.c
> @@ -2,13 +2,7 @@
> SA Platform Lib implementation.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "SaPlatformLibrary.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiDxeSmmSaPlatfor
> mLib/SaPlatformLibrary.h
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiDxeSmmSaPlatfor
> mLib/SaPlatformLibrary.h
> index 632b801ad2..1e7b0d051a 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiDxeSmmSaPlatfor
> mLib/SaPlatformLibrary.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiDxeSmmSaPlatfor
> mLib/SaPlatformLibrary.h
> @@ -2,13 +2,7 @@
> Header file for SA Platform Lib implementation.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/Ia32/
> MrcOemPlatform.S
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/Ia32/
> MrcOemPlatform.S
> index d8fe66154a..74e5589d0b 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/Ia32/
> MrcOemPlatform.S
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/Ia32/
> MrcOemPlatform.S
> @@ -1,13 +1,7 @@
> ## @file
> #
> # Copyright (c) 2017, 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 that accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php.
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/Ia32/
> MrcOemPlatform.asm
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/Ia32/
> MrcOemPlatform.asm
> index bef8aafe1a..3899ef119e 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/Ia32/
> MrcOemPlatform.asm
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/Ia32/
> MrcOemPlatform.asm
> @@ -2,13 +2,7 @@
> ; This file provides assembly 64-bit atomic reads/writes required for memory
> initialization.
> ;
> ; Copyright (c) 2017, 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 that accompanies this distribution.
> -; The full text of the license may be found at
> -; http://opensource.org/licenses/bsd-license.php.
> -;
> -; THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -; WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +; SPDX-License-Identifier: BSD-2-Clause-Patent
> ;
> ;;
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/Ia32/
> MrcOemPlatform.nasm
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/Ia32/
> MrcOemPlatform.nasm
> index 5bc17065bd..03c1380f89 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/Ia32/
> MrcOemPlatform.nasm
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/Ia32/
> MrcOemPlatform.nasm
> @@ -2,13 +2,7 @@
> ; This file provides assembly 64-bit atomic reads/writes required for memory
> initialization.
> ;
> ; Copyright (c) 2017, 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 that accompanies this distribution.
> -; The full text of the license may be found at
> -; http://opensource.org/licenses/bsd-license.php.
> -;
> -; THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -; WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +; SPDX-License-Identifier: BSD-2-Clause-Patent
> ;
> ;;
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/MrcOe
> mPlatform.c
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/MrcOe
> mPlatform.c
> index e4d6f1b35c..f62651796a 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/MrcOe
> mPlatform.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/MrcOe
> mPlatform.c
> @@ -2,13 +2,7 @@
> This file is SampleCode for Intel SA PEI Policy initialization.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/MrcOe
> mPlatform.h
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/MrcOe
> mPlatform.h
> index f561138b04..53440d5d80 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/MrcOe
> mPlatform.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/MrcOe
> mPlatform.h
> @@ -4,13 +4,7 @@
> This file is SampleCode for Intel SA PEI Policy initialization.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSaP
> olicyLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSaP
> olicyLib.c
> index ddc83ba4b2..eb18d993e7 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSaP
> olicyLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSaP
> olicyLib.c
> @@ -2,13 +2,7 @@
> This file provides services for PEI policy default initialization
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "PeiSaPolicyLibrary.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSaP
> olicyLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSaP
> olicyLib.inf
> index 0afd31b584..8fae4cee61 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSaP
> olicyLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSaP
> olicyLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSaP
> olicyLibSample.c
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSaP
> olicyLibSample.c
> index a65349b29c..63e93094e1 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSaP
> olicyLibSample.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSaP
> olicyLibSample.c
> @@ -2,13 +2,7 @@
> This file provides services for Sample PEI policy default initialization.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include <SaPolicyCommon.h>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSaP
> olicyLibrary.h
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSaP
> olicyLibrary.h
> index e7fe3d2fcf..a44f7343dd 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSaP
> olicyLibrary.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSaP
> olicyLibrary.h
> @@ -2,13 +2,7 @@
> Header file for the PeiSaPolicy library.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PEI_SA_POLICY_LIBRARY_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/SaPrint
> Policy.c
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/SaPrin
> tPolicy.c
> index 0a6ddb8a8f..8b3a81a1c4 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/SaPrint
> Policy.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/SaPrin
> tPolicy.c
> @@ -2,13 +2,7 @@
> This file provides service for PEI phase policy printing
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "PeiSaPolicyLibrary.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcCom
> monTypes.h
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcCo
> mmonTypes.h
> index 792b2ca58d..3b612e3177 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcCom
> monTypes.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcCo
> mmonTypes.h
> @@ -2,13 +2,7 @@
> This file contains the definitions common to the MRC API and other APIs.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _MrcCommonTypes_h_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcInte
> rface.h
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcInte
> rface.h
> index 87ad005f03..8e6aa32ed8 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcInte
> rface.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcInte
> rface.h
> @@ -2,13 +2,7 @@
> This file includes all the data structures that the MRC considers "global data".
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _MrcInterface_h_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcRmt
> Data.h
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcRmt
> Data.h
> index 51d40ff376..73cdb214f7 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcRmt
> Data.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcRmt
> Data.h
> @@ -3,13 +3,7 @@
> Compatible BIOS data (BDAT) table.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _MrcRmtData_h_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcSpd
> Data.h
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcSpd
> Data.h
> index cbfeb1cd0a..304db700c0 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcSpd
> Data.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcSpd
> Data.h
> @@ -2,13 +2,7 @@
> SPD data format header file.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcTyp
> es.h
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcTyp
> es.h
> index 5bb771089d..241e5adcb7 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcTyp
> es.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcTyp
> es.h
> @@ -3,13 +3,7 @@
> Include the the general MRC types
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _MRC_TYPES_H
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/GraphicsInit.c
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/GraphicsInit.c
> index 1d438e3c85..045f82a31d 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/GraphicsInit.c
> +++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/GraphicsInit.c
> @@ -2,13 +2,7 @@
> DXE driver for Initializing SystemAgent Graphics ACPI table initialization.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "GraphicsInit.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/GraphicsInit.h
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/GraphicsInit.h
> index b76f775b24..00e8c08b53 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/GraphicsInit.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/GraphicsInit.h
> @@ -2,13 +2,7 @@
> Header file for initialization of GT PowerManagement
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _GRAPHICS_INIT_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/IgdOpRegion.c
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/IgdOpRegion.c
> index 8e7ef7bc29..b7e6cc44b1 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/IgdOpRegion.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/IgdOpRegion.c
> @@ -4,13 +4,7 @@
> The code in this file will load the driver and initialize the interface
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> @par Specification Reference:
> - OpRegion / Software SCI SPEC
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/IgdOpRegion.h
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/IgdOpRegion.h
> index 40616c4b82..1b960e4b11 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/IgdOpRegion.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/IgdOpRegion.h
> @@ -3,13 +3,7 @@
> Software SCI interface between system BIOS, ASL code, and Graphics drivers.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> @par Specification Reference:
> - OpRegion / Software SCI SPEC
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaAcpi.c
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaAcpi.c
> index 40aa155ead..09e23c250d 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaAcpi.c
> +++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaAcpi.c
> @@ -2,13 +2,7 @@
> This is the driver that initializes the Intel System Agent.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "SaInitDxe.h"
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaInit.h
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaInit.h
> index 7e9efc40bc..69cd9407eb 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaInit.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaInit.h
> @@ -2,13 +2,7 @@
> Header file for SA Common Initialization Driver.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _SA_INITIALIZATION_DRIVER_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaInitDxe.c
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaInitDxe.c
> index 0948a91a72..8ea4f3eb84 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaInitDxe.c
> +++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaInitDxe.c
> @@ -2,13 +2,7 @@
> This is the driver that initializes the Intel System Agent.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "SaInitDxe.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaInitDxe.h
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaInitDxe.h
> index 9381941b87..b77962fa2e 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaInitDxe.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaInitDxe.h
> @@ -2,13 +2,7 @@
> Header file for SA Initialization Driver.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _SA_INITIALIZATION_DXE_DRIVER_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaInitDxe.inf
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaInitDxe.inf
> index 6b01b494cd..cc05f336b3 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaInitDxe.inf
> +++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaInitDxe.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/VTd.c
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/VTd.c
> index ded44b661f..0adabd18bc 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/VTd.c
> +++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/VTd.c
> @@ -2,13 +2,7 @@
> This code provides a initialization of intel VT-d (Virtualization Technology for
> Directed I/O).
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "SaInitDxe.h"
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/VTd.h
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/VTd.h
> index fc84a7c41e..c74c5447ff 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/VTd.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/VTd.h
> @@ -2,13 +2,7 @@
> This code provides a initialization of intel VT-d (Virtualization Technology for
> Directed I/O).
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _VT_D_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccess.
> inf
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccess.
> inf
> index 150716529c..93ab408206 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccess.
> inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccess.
> inf
> @@ -5,13 +5,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccess
> Driver.c
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccess
> Driver.c
> index 3e8fd96484..f03dbe3d27 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccess
> Driver.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccess
> Driver.c
> @@ -3,13 +3,7 @@
> instance for System Agent.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "SmmAccessDriver.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccess
> Driver.h
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccess
> Driver.h
> index 69e9e89b24..dbc1894af5 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccess
> Driver.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccess
> Driver.h
> @@ -2,13 +2,7 @@
> Header file for SMM Access Driver.
>
> Copyright (c) 2017, 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 that accompanies this distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _SMM_ACCESS_DRIVER_H_
> --
> 2.21.0.windows.1
>
>
>
^ permalink raw reply [flat|nested] 63+ messages in thread* Re: [[edk2-platforms][PATCH V2] 23/30] Silicon/Intel/KabylakeSiliconPkg: Replace BSD License with BSD+Patent License
2019-05-15 23:10 ` [[edk2-platforms][PATCH V2] 23/30] Silicon/Intel/KabylakeSiliconPkg: " Michael D Kinney
2019-05-16 0:39 ` [edk2-devel] " Chiu, Chasel
@ 2019-05-17 6:54 ` Kubacki, Michael A
1 sibling, 0 replies; 63+ messages in thread
From: Kubacki, Michael A @ 2019-05-17 6:54 UTC (permalink / raw)
To: Kinney, Michael D, devel@edk2.groups.io; +Cc: Chiu, Chasel
Reviewed-by: Michael Kubacki <michael.a.kubacki@intel.com>
> -----Original Message-----
> From: Kinney, Michael D
> Sent: Wednesday, May 15, 2019 4:10 PM
> To: devel@edk2.groups.io
> Cc: Chiu, Chasel <chasel.chiu@intel.com>; Kubacki, Michael A
> <michael.a.kubacki@intel.com>
> Subject: [[edk2-platforms][PATCH V2] 23/30]
> Silicon/Intel/KabylakeSiliconPkg: Replace BSD License with BSD+Patent
> License
>
> https://bugzilla.tianocore.org/show_bug.cgi?id=1373
>
> Replace BSD 2-Clause License with BSD+Patent License. This change is
> based on the following emails:
>
> https://lists.01.org/pipermail/edk2-devel/2019-February/036260.html
> https://lists.01.org/pipermail/edk2-devel/2018-October/030385.html
>
> RFCs with detailed process for the license change:
>
> V3: https://lists.01.org/pipermail/edk2-devel/2019-March/038116.html
> V2: https://lists.01.org/pipermail/edk2-devel/2019-March/037669.html
> V1: https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html
>
> Cc: Chasel Chiu <chasel.chiu@intel.com>
> Cc: Michael Kubacki <michael.a.kubacki@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
> ---
> .../Cpu/Include/ConfigBlock/CpuConfig.h | 8 +-------
> .../Cpu/Include/ConfigBlock/CpuConfigFspData.h | 8 +-------
> .../Cpu/Include/ConfigBlock/CpuConfigLibPreMemConfig.h | 8 +-------
> .../Cpu/Include/ConfigBlock/CpuOverclockingConfig.h | 8 +-------
> .../Cpu/Include/ConfigBlock/CpuPidTestConfig.h | 8 +-------
> .../Cpu/Include/ConfigBlock/CpuPowerMgmtBasicConfig.h | 8 +-------
> .../Cpu/Include/ConfigBlock/CpuPowerMgmtCustomConfig.h | 8 +-------
> .../Cpu/Include/ConfigBlock/CpuPowerMgmtPsysConfig.h | 8 +-------
> .../Cpu/Include/ConfigBlock/CpuPowerMgmtTestConfig.h | 8 +-------
> .../Cpu/Include/ConfigBlock/CpuPowerMgmtVrConfig.h | 8 +-------
> .../Cpu/Include/ConfigBlock/CpuTestConfig.h | 8 +-------
> Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuAccess.h | 8 +-------
> .../Intel/KabylakeSiliconPkg/Cpu/Include/CpuDataStruct.h | 8 +-------
> .../KabylakeSiliconPkg/Cpu/Include/CpuPolicyCommon.h | 8 +-------
> .../Intel/KabylakeSiliconPkg/Cpu/Include/CpuPowerMgmt.h | 8 +-------
> Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuRegs.h | 8 +-------
> .../Cpu/Include/Library/CpuMailboxLib.h | 8 +-------
> .../Cpu/Include/Library/CpuPlatformLib.h | 8 +-------
> .../Cpu/Include/Library/CpuPolicyLib.h | 8 +-------
> .../Cpu/Include/Library/CpuPolicyLibPreMem.h | 8 +-------
> .../Cpu/Include/Protocol/CpuGlobalNvsArea.h | 8 +-------
> .../KabylakeSiliconPkg/Cpu/Include/Protocol/CpuInfo.h | 8 +-------
> .../Cpu/IncludePrivate/CpuInitDataHob.h | 8 +-------
> .../Cpu/IncludePrivate/CpuPrivateData.h | 8 +-------
> .../Cpu/IncludePrivate/Library/CpuCommonLib.h | 8 +-------
> .../Cpu/IncludePrivate/PowerMgmtNvsStruct.h | 8 +-------
> .../BaseCpuMailboxLibNull/BaseCpuMailboxLibNull.c | 8 +-------
> .../BaseCpuMailboxLibNull/BaseCpuMailboxLibNull.inf | 8 +-------
> .../Cpu/Library/PeiCpuPolicyLib/CpuPrintPolicy.c | 8 +-------
> .../Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicyLib.c | 8 +-------
> .../Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicyLib.inf | 8 +-------
> .../Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicyLibrary.h | 8 +-------
> .../Cpu/Library/PeiCpuPolicyLibPreMem/CpuPrintPolicy.c | 8 +-------
> .../Cpu/Library/PeiCpuPolicyLibPreMem/PeiCpuPolicyLib.c | 8 +-------
> .../PeiCpuPolicyLibPreMem/PeiCpuPolicyLibPreMem.inf | 8 +-------
> .../Library/PeiCpuPolicyLibPreMem/PeiCpuPolicyLibrary.h | 8 +-------
> .../Library/PeiDxeSmmCpuPlatformLib/CpuPlatformLibrary.c | 8 +-------
> .../Library/PeiDxeSmmCpuPlatformLib/CpuPlatformLibrary.h | 8 +-------
> .../PeiDxeSmmCpuPlatformLib/PeiDxeSmmCpuPlatformLib.inf | 8 +-------
> .../LibraryPrivate/PeiDxeSmmCpuCommonLib/CpuCommonLib.c | 8 +-------
> .../PeiDxeSmmCpuCommonLib/PeiDxeSmmCpuCommonLib.inf | 8 +-------
> .../Hsti/Dxe/BootFirmwareMediaProtection.c | 8 +-------
> .../KabylakeSiliconPkg/Hsti/Dxe/DebugModeDisabled.c | 8 +-------
> .../Hsti/Dxe/HardwareRootedBootIntegrity.c | 8 +-------
> .../Intel/KabylakeSiliconPkg/Hsti/Dxe/HstiSiliconDxe.c | 8 +-------
> .../Intel/KabylakeSiliconPkg/Hsti/Dxe/HstiSiliconDxe.h | 8 +-------
> .../Intel/KabylakeSiliconPkg/Hsti/Dxe/HstiSiliconDxe.inf | 8 +-------
> .../Hsti/Dxe/IntegratedDeviceDmaProtection.c | 8 +-------
> .../Hsti/Dxe/MeasuredBootEnforcement.c | 8 +-------
> .../Intel/KabylakeSiliconPkg/Hsti/Dxe/MpServiceHelp.c | 8 +-------
> .../KabylakeSiliconPkg/Hsti/Dxe/SecureCpuConfiguration.c | 8 +-------
> .../Hsti/Dxe/SecureIntegratedGraphicsConfiguration.c | 8 +-------
> .../Hsti/Dxe/SecureMemoryMapConfiguration.c | 8 +-------
> .../KabylakeSiliconPkg/Hsti/Dxe/SecurePCHConfiguration.c | 8 +-------
> .../Hsti/Dxe/SecureSystemAgentConfiguration.c | 8 +-------
> .../KabylakeSiliconPkg/Hsti/Dxe/SignedFirmwareUpdate.c | 8 +-------
> Silicon/Intel/KabylakeSiliconPkg/Include/ConfigBlock.h | 8 +-------
> .../Intel/KabylakeSiliconPkg/Include/HstiFeatureBit.h | 8 +-------
> .../KabylakeSiliconPkg/Include/Library/AslUpdateLib.h | 8 +-------
> .../KabylakeSiliconPkg/Include/Library/ConfigBlockLib.h | 8 +-------
> .../Intel/KabylakeSiliconPkg/Include/Library/MmPciLib.h | 8 +-------
> .../Include/Library/PeiSiPolicyUpdateLib.h | 8 +-------
> .../Include/Library/SiConfigBlockLib.h | 8 +-------
> .../KabylakeSiliconPkg/Include/Library/SiPolicyLib.h | 8 +-------
> .../KabylakeSiliconPkg/Include/Library/SiliconInitLib.h | 8 +-------
> Silicon/Intel/KabylakeSiliconPkg/Include/PcieRegs.h | 8 +-------
> Silicon/Intel/KabylakeSiliconPkg/Include/Ppi/SiInitPpi.h | 8 +-------
> Silicon/Intel/KabylakeSiliconPkg/Include/Ppi/SiPolicy.h | 8 +-------
> .../Include/Protocol/SiPolicyProtocol.h | 8 +-------
> .../Intel/KabylakeSiliconPkg/Include/SiPolicyStruct.h | 8 +-------
> .../IncludePrivate/Library/PcieInitLib.h | 8 +-------
> .../KabylakeSiliconPkg/IncludePrivate/SiConfigHob.h | 8 +-------
> .../Intel/KabylakeSiliconPkg/KabylakeSiliconBuild.bat | 8 +-------
> Silicon/Intel/KabylakeSiliconPkg/KabylakeSiliconPkg.dsc | 8 +-------
> .../Intel/KabylakeSiliconPkg/KabylakeSiliconPrivate.dec | 8 +-------
> .../Library/BaseConfigBlockLib/BaseConfigBlockLib.c | 8 +-------
> .../Library/BaseConfigBlockLib/BaseConfigBlockLib.inf | 8 +-------
> .../Library/BaseSiConfigBlockLib/BaseSiConfigBlockLib.c | 8 +-------
> .../BaseSiConfigBlockLib/BaseSiConfigBlockLib.inf | 8 +-------
> .../Library/DxeAslUpdateLib/DxeAslUpdateLib.c | 8 +-------
> .../Library/DxeAslUpdateLib/DxeAslUpdateLib.inf | 8 +-------
> .../Library/DxeAslUpdateLibNull/DxeAslUpdateLibNull.c | 8 +-------
> .../Library/DxeAslUpdateLibNull/DxeAslUpdateLibNull.inf | 8 +-------
> .../Library/DxeSiliconPolicyInitLib/DxePolicyInit.c | 8 +-------
> .../Library/DxeSiliconPolicyInitLib/DxeSaPolicyInit.h | 8 +-------
> .../DxeSiliconPolicyInitLib/DxeSiliconPolicyInitLib.inf | 8 +-------
> .../Library/PeiDxeSmmMmPciLib/PeiDxeSmmMmPciLib.c | 8 +-------
> .../Library/PeiDxeSmmMmPciLib/PeiDxeSmmMmPciLib.inf | 8 +-------
> .../Library/PeiSiPolicyLib/PeiSiPolicyLib.c | 8 +-------
> .../Library/PeiSiPolicyLib/PeiSiPolicyLib.inf | 8 +-------
> .../Library/PeiSiPolicyLib/PeiSiPolicyLibPreMem.c | 8 +-------
> .../Library/PeiSiPolicyLib/PeiSiPolicyLibrary.h | 8 +-------
> .../Library/PeiSiPolicyLib/SiPrintPolicy.c | 8 +-------
> .../Library/PeiSiliconPolicyInitLib/PeiPolicyInit.c | 8 +-------
> .../Library/PeiSiliconPolicyInitLib/PeiPolicyInit.h | 8 +-------
> .../PeiSiliconPolicyInitLib/PeiPolicyInitPreMem.c | 8 +-------
> .../Library/PeiSiliconPolicyInitLib/PeiSiPolicyInit.h | 8 +-------
> .../PeiSiliconPolicyInitLib/PeiSiliconPolicyInitLib.inf | 8 +-------
> .../PeiPostMemSiliconPolicyInitLibDependency.inf | 8 +-------
> .../PeiPreMemSiliconPolicyInitLibDependency.inf | 8 +-------
> .../PeiSiliconPolicyInitLibDependency.c | 8 +-------
> .../PeiSiliconPolicyInitLibFsp/PeiFspCpuPolicyInitLib.c | 8 +-------
> .../PeiSiliconPolicyInitLibFsp/PeiFspMePolicyInitLib.c | 8 +-------
> .../PeiSiliconPolicyInitLibFsp/PeiFspMiscUpdInitLib.c | 8 +-------
> .../PeiSiliconPolicyInitLibFsp/PeiFspPchPolicyInitLib.c | 8 +-------
> .../PeiSiliconPolicyInitLibFsp/PeiFspPolicyInitLib.c | 8 +-------
> .../PeiSiliconPolicyInitLibFsp/PeiFspPolicyInitLib.h | 8 +-------
> .../PeiSiliconPolicyInitLibFsp/PeiFspSaPolicyInitLib.c | 8 +-------
> .../PeiSiliconPolicyInitLibFsp/PeiFspSiPolicyInitLib.c | 8 +-------
> .../Library/PeiSiliconPolicyInitLibFsp/PeiPolicyInit.c | 8 +-------
> .../Library/PeiSiliconPolicyInitLibFsp/PeiPolicyInit.h | 8 +-------
> .../PeiSiliconPolicyInitLibFsp/PeiPolicyInitLib.h | 8 +-------
> .../PeiSiliconPolicyInitLibFsp/PeiPolicyInitPreMem.c | 8 +-------
> .../Library/PeiSiliconPolicyInitLibFsp/PeiSiPolicyInit.h | 8 +-------
> .../PeiSiliconPolicyInitLibFsp.inf | 8 +-------
> .../Library/SiliconInitLib/SiliconInit.c | 8 +-------
> .../Library/SiliconInitLib/SiliconInitLib.inf | 8 +-------
> .../Library/SiliconInitLib/SiliconInitPreMem.c | 8 +-------
> .../Me/Include/ConfigBlock/MePeiConfig.h | 8 +-------
> .../Me/Include/Library/PeiMePolicyLib.h | 8 +-------
> Silicon/Intel/KabylakeSiliconPkg/Me/Include/MeChipset.h | 8 +-------
> .../Intel/KabylakeSiliconPkg/Me/Include/MePolicyCommon.h | 8 +-------
> .../Me/Library/PeiMePolicyLib/PeiMePolicyLib.c | 8 +-------
> .../Me/Library/PeiMePolicyLib/PeiMePolicyLib.inf | 8 +-------
> .../Me/Library/PeiMePolicyLib/PeiMePolicyLibrary.h | 8 +-------
> .../Pch/AcpiTables/Dsdt/GpioAcpiDefines.h | 8 +-------
> .../KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/GpioLib.asl | 8 +-------
> .../Pch/AcpiTables/Dsdt/GpioLibObjects.asl | 8 +-------
> .../KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/IrqLink.asl | 8 +-------
> .../Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/Pch.asl | 8 +-------
> .../Pch/AcpiTables/Dsdt/PchAcpiTables.inf | 8 +-------
> .../KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchHda.asl | 8 +-------
> .../KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchHeci.asl | 8 +-------
> .../KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchIsh.asl | 8 +-------
> .../KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchNvs.asl | 8 +-------
> .../KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchPcie.asl | 8 +-------
> .../Pch/AcpiTables/Dsdt/PchRstPcieStorage.asl | 8 +-------
> .../KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchSata.asl | 8 +-------
> .../KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchScs.asl | 8 +-------
> .../Pch/AcpiTables/Dsdt/PchSerialIo.asl | 8 +-------
> .../KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchXdci.asl | 8 +-------
> .../KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchXhci.asl | 8 +-------
> .../Pch/AcpiTables/Dsdt/TraceHubDebug.asl | 8 +-------
> .../KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/usbsbd.asl | 8 +-------
> .../Pch/Include/ConfigBlock/Cio2Config.h | 8 +-------
> .../Pch/Include/ConfigBlock/DciConfig.h | 8 +-------
> .../Pch/Include/ConfigBlock/DmiConfig.h | 8 +-------
> .../Pch/Include/ConfigBlock/EspiConfig.h | 8 +-------
> .../Pch/Include/ConfigBlock/FlashProtectionConfig.h | 8 +-------
> .../Pch/Include/ConfigBlock/HdAudioConfig.h | 8 +-------
> .../Pch/Include/ConfigBlock/HpetConfig.h | 8 +-------
> .../Pch/Include/ConfigBlock/HsioConfig.h | 8 +-------
> .../Pch/Include/ConfigBlock/HsioPcieConfig.h | 8 +-------
> .../Pch/Include/ConfigBlock/HsioSataConfig.h | 8 +-------
> .../Pch/Include/ConfigBlock/InterruptConfig.h | 8 +-------
> .../Pch/Include/ConfigBlock/IoApicConfig.h | 8 +-------
> .../Pch/Include/ConfigBlock/IshConfig.h | 8 +-------
> .../Pch/Include/ConfigBlock/LanConfig.h | 8 +-------
> .../Pch/Include/ConfigBlock/LockDownConfig.h | 8 +-------
> .../Pch/Include/ConfigBlock/LpcConfig.h | 8 +-------
> .../Pch/Include/ConfigBlock/P2sbConfig.h | 8 +-------
> .../Pch/Include/ConfigBlock/PchGeneralConfig.h | 8 +-------
> .../Pch/Include/ConfigBlock/PcieRpConfig.h | 8 +-------
> .../Pch/Include/ConfigBlock/PmConfig.h | 8 +-------
> .../Pch/Include/ConfigBlock/Port61Config.h | 8 +-------
> .../Pch/Include/ConfigBlock/SataConfig.h | 8 +-------
> .../Pch/Include/ConfigBlock/ScsConfig.h | 8 +-------
> .../Pch/Include/ConfigBlock/SerialIoConfig.h | 8 +-------
> .../Pch/Include/ConfigBlock/SerialIrqConfig.h | 8 +-------
> .../Pch/Include/ConfigBlock/SmbusConfig.h | 8 +-------
> .../Pch/Include/ConfigBlock/SpiConfig.h | 8 +-------
> .../Pch/Include/ConfigBlock/ThermalConfig.h | 8 +-------
> .../Pch/Include/ConfigBlock/TraceHubConfig.h | 8 +-------
> .../Pch/Include/ConfigBlock/UsbConfig.h | 8 +-------
> .../Pch/Include/ConfigBlock/WatchDogConfig.h | 8 +-------
> .../Intel/KabylakeSiliconPkg/Pch/Include/GpioConfig.h | 8 +-------
> .../Intel/KabylakeSiliconPkg/Pch/Include/GpioPinsSklH.h | 8 +-------
> .../Intel/KabylakeSiliconPkg/Pch/Include/GpioPinsSklLp.h | 8 +-------
> .../KabylakeSiliconPkg/Pch/Include/Library/GpioLib.h | 8 +-------
> .../Pch/Include/Library/GpioNativeLib.h | 8 +-------
> .../KabylakeSiliconPkg/Pch/Include/Library/OcWdtLib.h | 8 +-------
> .../Pch/Include/Library/PchCycleDecodingLib.h | 8 +-------
> .../KabylakeSiliconPkg/Pch/Include/Library/PchEspiLib.h | 8 +-------
> .../KabylakeSiliconPkg/Pch/Include/Library/PchGbeLib.h | 8 +-------
> .../KabylakeSiliconPkg/Pch/Include/Library/PchHsioLib.h | 8 +-------
> .../KabylakeSiliconPkg/Pch/Include/Library/PchInfoLib.h | 8 +-------
> .../KabylakeSiliconPkg/Pch/Include/Library/PchP2sbLib.h | 8 +-------
> .../Pch/Include/Library/PchPcieRpLib.h | 8 +-------
> .../KabylakeSiliconPkg/Pch/Include/Library/PchPcrLib.h | 8 +-------
> .../KabylakeSiliconPkg/Pch/Include/Library/PchPmcLib.h | 8 +-------
> .../Pch/Include/Library/PchPolicyLib.h | 8 +-------
> .../KabylakeSiliconPkg/Pch/Include/Library/PchPsfLib.h | 8 +-------
> .../KabylakeSiliconPkg/Pch/Include/Library/PchResetLib.h | 8 +-------
> .../Pch/Include/Library/PchSbiAccessLib.h | 8 +-------
> .../Pch/Include/Library/PchSerialIoLib.h | 8 +-------
> .../Pch/Include/Library/PchSerialIoUartLib.h | 8 +-------
> .../Pch/Include/Library/PchSmmControlLib.h | 8 +-------
> .../Pch/Include/Library/PchWdtCommonLib.h | 8 +-------
> .../KabylakeSiliconPkg/Pch/Include/Library/SecPchLib.h | 8 +-------
> .../Pch/Include/Library/SpiFlashCommonLib.h | 8 +-------
> .../KabylakeSiliconPkg/Pch/Include/Library/SpiLib.h | 8 +-------
> .../Pch/Include/Library/TraceHubInitLib.h | 8 +-------
> Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchAccess.h | 8 +-------
> Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchLimits.h | 8 +-------
> .../Pch/Include/PchPcieStorageDetectHob.h | 8 +-------
> .../KabylakeSiliconPkg/Pch/Include/PchPolicyCommon.h | 8 +-------
> .../Pch/Include/PchPreMemPolicyCommon.h | 8 +-------
> .../Pch/Include/PchReservedResources.h | 8 +-------
> .../Pch/Include/PchResetPlatformSpecific.h | 8 +-------
> .../Intel/KabylakeSiliconPkg/Pch/Include/Ppi/PchReset.h | 8 +-------
> Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Ppi/Spi.h | 8 +-------
> Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Ppi/Wdt.h | 8 +-------
> .../Pch/Include/Protocol/PchAcpiSmiDispatch.h | 8 +-------
> .../Pch/Include/Protocol/PchEmmcTuning.h | 8 +-------
> .../Pch/Include/Protocol/PchEspiSmiDispatch.h | 8 +-------
> .../Pch/Include/Protocol/PchGpioUnlockSmiDispatch.h | 8 +-------
> .../KabylakeSiliconPkg/Pch/Include/Protocol/PchInfo.h | 8 +-------
> .../Pch/Include/Protocol/PchPcieSmiDispatch.h | 8 +-------
> .../KabylakeSiliconPkg/Pch/Include/Protocol/PchReset.h | 8 +-------
> .../Pch/Include/Protocol/PchSmiDispatch.h | 8 +-------
> .../Pch/Include/Protocol/PchSmmIoTrapControl.h | 8 +-------
> .../Pch/Include/Protocol/PchSmmPeriodicTimerControl.h | 8 +-------
> .../Pch/Include/Protocol/PchTcoSmiDispatch.h | 8 +-------
> .../KabylakeSiliconPkg/Pch/Include/Protocol/SerialGpio.h | 8 +-------
> .../Intel/KabylakeSiliconPkg/Pch/Include/Protocol/Spi.h | 8 +-------
> .../Intel/KabylakeSiliconPkg/Pch/Include/Protocol/Wdt.h | 8 +-------
> .../KabylakeSiliconPkg/Pch/Include/Register/PchRegsCam.h | 8 +-------
> .../KabylakeSiliconPkg/Pch/Include/Register/PchRegsDci.h | 8 +-------
> .../KabylakeSiliconPkg/Pch/Include/Register/PchRegsDmi.h | 8 +-------
> .../KabylakeSiliconPkg/Pch/Include/Register/PchRegsFia.h | 8 +-------
> .../Pch/Include/Register/PchRegsGpio.h | 8 +-------
> .../KabylakeSiliconPkg/Pch/Include/Register/PchRegsHda.h | 8 +-------
> .../Pch/Include/Register/PchRegsHsio.h | 8 +-------
> .../KabylakeSiliconPkg/Pch/Include/Register/PchRegsIsh.h | 8 +-------
> .../Pch/Include/Register/PchRegsItss.h | 8 +-------
> .../KabylakeSiliconPkg/Pch/Include/Register/PchRegsLan.h | 8 +-------
> .../KabylakeSiliconPkg/Pch/Include/Register/PchRegsLpc.h | 8 +-------
> .../Pch/Include/Register/PchRegsP2sb.h | 8 +-------
> .../Pch/Include/Register/PchRegsPcie.h | 8 +-------
> .../KabylakeSiliconPkg/Pch/Include/Register/PchRegsPcr.h | 8 +-------
> .../KabylakeSiliconPkg/Pch/Include/Register/PchRegsPmc.h | 8 +-------
> .../KabylakeSiliconPkg/Pch/Include/Register/PchRegsPsf.h | 8 +-------
> .../Pch/Include/Register/PchRegsPsth.h | 8 +-------
> .../Pch/Include/Register/PchRegsSata.h | 8 +-------
> .../KabylakeSiliconPkg/Pch/Include/Register/PchRegsScs.h | 8 +-------
> .../Pch/Include/Register/PchRegsSerialIo.h | 8 +-------
> .../Pch/Include/Register/PchRegsSmbus.h | 8 +-------
> .../KabylakeSiliconPkg/Pch/Include/Register/PchRegsSpi.h | 8 +-------
> .../Pch/Include/Register/PchRegsThermal.h | 8 +-------
> .../Pch/Include/Register/PchRegsTraceHub.h | 8 +-------
> .../KabylakeSiliconPkg/Pch/Include/Register/PchRegsUsb.h | 8 +-------
> .../Pch/IncludePrivate/Library/DxePchHdaNhlt.h | 8 +-------
> .../Pch/IncludePrivate/Library/GpioPrivateLib.h | 8 +-------
> .../Pch/IncludePrivate/Library/I2cMasterCommonLib.h | 8 +-------
> .../Pch/IncludePrivate/Library/PchHdaLib.h | 8 +-------
> .../Pch/IncludePrivate/Library/PchInitCommonLib.h | 8 +-------
> .../Pch/IncludePrivate/Library/PchPciExpressHelpersLib.h | 8 +-------
> .../Pch/IncludePrivate/Library/PchPsfPrivateLib.h | 8 +-------
> .../Pch/IncludePrivate/Library/PchSmbusCommonLib.h | 8 +-------
> .../Pch/IncludePrivate/Library/PchSpiCommonLib.h | 8 +-------
> .../Pch/IncludePrivate/Library/PeiI2cMasterLib.h | 8 +-------
> .../Pch/IncludePrivate/Library/RstPrivateLib.h | 8 +-------
> .../KabylakeSiliconPkg/Pch/IncludePrivate/PchConfigHob.h | 8 +-------
> .../Pch/IncludePrivate/PchHdaEndpoints.h | 8 +-------
> .../Pch/IncludePrivate/Protocol/PchNvs.h | 8 +-------
> .../Pch/IncludePrivate/Protocol/PchNvsArea.h | 8 +-------
> .../Pch/IncludePrivate/Protocol/PcieIoTrap.h | 8 +-------
> .../Pch/Library/BaseResetSystemLib/BaseResetSystemLib.c | 8 +-------
> .../Library/BaseResetSystemLib/BaseResetSystemLib.inf | 8 +-------
> .../Pch/Library/BaseSmbusLib/BaseSmbusLib.c | 8 +-------
> .../Pch/Library/BaseSmbusLib/BaseSmbusLib.inf | 8 +-------
> .../Pch/Library/DxeResetSystemLib/DxeResetSystemLib.c | 8 +-------
> .../Pch/Library/DxeResetSystemLib/DxeResetSystemLib.inf | 8 +-------
> .../DxeRuntimeResetSystemLib/DxeRuntimeResetSystemLib.c | 8 +-------
> .../DxeRuntimeResetSystemLib.inf | 8 +-------
> .../Pch/Library/PeiDxeSmmGpioLib/GpioInit.c | 8 +-------
> .../Pch/Library/PeiDxeSmmGpioLib/GpioLib.c | 8 +-------
> .../Pch/Library/PeiDxeSmmGpioLib/GpioLibrary.h | 8 +-------
> .../Pch/Library/PeiDxeSmmGpioLib/GpioNativeLib.c | 8 +-------
> .../Pch/Library/PeiDxeSmmGpioLib/PchSklGpioData.c | 8 +-------
> .../Pch/Library/PeiDxeSmmGpioLib/PeiDxeSmmGpioLib.inf | 8 +-------
> .../PeiDxeSmmPchCycleDecodingLib/PchCycleDecodingLib.c | 8 +-------
> .../PeiDxeSmmPchCycleDecodingLib.inf | 8 +-------
> .../Pch/Library/PeiDxeSmmPchGbeLib/PchGbeLib.c | 8 +-------
> .../Library/PeiDxeSmmPchGbeLib/PeiDxeSmmPchGbeLib.inf | 8 +-------
> .../Pch/Library/PeiDxeSmmPchHsioLib/PchHsioLib.c | 8 +-------
> .../Library/PeiDxeSmmPchHsioLib/PeiDxeSmmPchHsioLib.inf | 8 +-------
> .../Pch/Library/PeiDxeSmmPchInfoLib/PchInfoLib.c | 8 +-------
> .../Pch/Library/PeiDxeSmmPchInfoLib/PchInfoStrLib.c | 8 +-------
> .../Library/PeiDxeSmmPchInfoLib/PeiDxeSmmPchInfoLib.inf | 8 +-------
> .../Pch/Library/PeiDxeSmmPchP2sbLib/PchP2sbLib.c | 8 +-------
> .../Library/PeiDxeSmmPchP2sbLib/PeiDxeSmmPchP2sbLib.inf | 8 +-------
> .../Pch/Library/PeiDxeSmmPchPcieRpLib/PchPcieRpLib.c | 8 +-------
> .../PeiDxeSmmPchPcieRpLib/PeiDxeSmmPchPcieRpLib.inf | 8 +-------
> .../Pch/Library/PeiDxeSmmPchPcrLib/PchPcrLib.c | 8 +-------
> .../Library/PeiDxeSmmPchPcrLib/PeiDxeSmmPchPcrLib.inf | 8 +-------
> .../Pch/Library/PeiDxeSmmPchPmcLib/PchPmcLib.c | 8 +-------
> .../Library/PeiDxeSmmPchPmcLib/PeiDxeSmmPchPmcLib.inf | 8 +-------
> .../Pch/Library/PeiDxeSmmPchPsfLib/PchPsfLib.c | 8 +-------
> .../Library/PeiDxeSmmPchPsfLib/PeiDxeSmmPchPsfLib.inf | 8 +-------
> .../Library/PeiDxeSmmPchSbiAccessLib/PchSbiAccessLib.c | 8 +-------
> .../PeiDxeSmmPchSbiAccessLib.inf | 8 +-------
> .../PeiDxeSmmPchSerialIoLib/PeiDxeSmmPchSerialIoLib.c | 8 +-------
> .../PeiDxeSmmPchSerialIoLib/PeiDxeSmmPchSerialIoLib.inf | 8 +-------
> .../PeiDxeSmmPchWdtCommonLib.inf | 8 +-------
> .../Pch/Library/PeiDxeSmmPchWdtCommonLib/WdtCommon.c | 8 +-------
> .../Pch/Library/PeiOcWdtLib/PeiOcWdtLib.c | 8 +-------
> .../Pch/Library/PeiOcWdtLib/PeiOcWdtLib.inf | 8 +-------
> .../Pch/Library/PeiOcWdtLibNull/PeiOcWdtLibNull.c | 8 +-------
> .../Pch/Library/PeiOcWdtLibNull/PeiOcWdtLibNull.inf | 8 +-------
> .../Pch/Library/PeiPchPolicyLib/PchPreMemPrintPolicy.c | 8 +-------
> .../Pch/Library/PeiPchPolicyLib/PchPrintPolicy.c | 8 +-------
> .../Pch/Library/PeiPchPolicyLib/PchSamplePolicyLib.c | 8 +-------
> .../Library/PeiPchPolicyLib/PchSamplePreMemPolicyLib.c | 8 +-------
> .../Pch/Library/PeiPchPolicyLib/PeiPchPolicyLib.c | 8 +-------
> .../Pch/Library/PeiPchPolicyLib/PeiPchPolicyLib.inf | 8 +-------
> .../Pch/Library/PeiPchPolicyLib/PeiPchPolicyLibrary.h | 8 +-------
> .../Pch/Library/PeiPchPolicyLib/PeiPchPreMemPolicyLib.c | 8 +-------
> .../Pch/Library/PeiPchResetLib/PchReset.c | 8 +-------
> .../Pch/Library/PeiPchResetLib/PeiPchResetLib.inf | 8 +-------
> .../Pch/Library/PeiResetSystemLib/PeiResetSystemLib.c | 8 +-------
> .../Pch/Library/PeiResetSystemLib/PeiResetSystemLib.inf | 8 +-------
> .../Library/PeiResetSystemLib/PeiResetSystemLibFsp.inf | 8 +-------
> .../KabylakeSiliconPkg/Pch/Library/PeiSpiLib/PeiSpiLib.c | 8 +-------
> .../Pch/Library/PeiSpiLib/PeiSpiLib.inf | 8 +-------
> .../SmmSpiFlashCommonLib/SmmSpiFlashCommonLib.inf | 8 +-------
> .../Pch/Library/SmmSpiFlashCommonLib/SpiFlashCommon.c | 8 +-------
> .../Library/SmmSpiFlashCommonLib/SpiFlashCommonSmmLib.c | 8 +-------
> .../BasePchSpiCommonLib/BasePchSpiCommonLib.inf | 8 +-------
> .../Pch/LibraryPrivate/BasePchSpiCommonLib/SpiCommon.c | 8 +-------
> .../Pch/LibraryPrivate/DxePchHdaLib/DxePchHdaLib.inf | 8 +-------
> .../Pch/LibraryPrivate/DxePchHdaLib/PchHdaEndpoints.c | 8 +-------
> .../Pch/LibraryPrivate/DxePchHdaLib/PchHdaLib.c | 8 +-------
> .../Pch/LibraryPrivate/DxePchHdaLib/PchHdaNhltConfig.c | 8 +-------
> .../PeiDxeI2cMasterCommonLib/I2cMasterCommonLib.c | 8 +-------
> .../PeiDxeI2cMasterCommonLib.inf | 8 +-------
> .../PeiDxeSmmGpioPrivateLib/GpioNativePrivateLib.c | 8 +-------
> .../PeiDxeSmmGpioPrivateLib/GpioPrivateLib.c | 8 +-------
> .../PeiDxeSmmGpioPrivateLib/PchSklGpioPrivateData.c | 8 +-------
> .../PeiDxeSmmGpioPrivateLib/PeiDxeSmmGpioPrivateLib.inf | 8 +-------
> .../PeiDxeSmmPchInitCommonLib/PchInitCommon.c | 8 +-------
> .../LibraryPrivate/PeiDxeSmmPchInitCommonLib/PchRpfn.c | 8 +-------
> .../PeiDxeSmmPchInitCommonLib.inf | 8 +-------
> .../PchPciExpressHelpersLibrary.c | 8 +-------
> .../PchPciExpressHelpersLibrary.h | 8 +-------
> .../PeiDxeSmmPchPciExpressHelpersLib.inf | 8 +-------
> .../PeiDxeSmmPchPsfPrivateLib/PchPsfPrivateLib.c | 8 +-------
> .../PeiDxeSmmPchPsfPrivateLib.inf | 8 +-------
> .../PeiDxeSmmPchSmbusCommonLib/PchSmbusExec.c | 8 +-------
> .../PeiDxeSmmPchSmbusCommonLib.inf | 8 +-------
> .../PeiDxeSmmRstPrivateLib/PeiDxeSmmRstPrivateLib.c | 8 +-------
> .../PeiDxeSmmRstPrivateLib/PeiDxeSmmRstPrivateLib.inf | 8 +-------
> .../Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchAcpi.c | 8 +-------
> .../KabylakeSiliconPkg/Pch/PchInit/Dxe/PchCio2Acpi.c | 8 +-------
> .../KabylakeSiliconPkg/Pch/PchInit/Dxe/PchHdaAcpi.c | 8 +-------
> .../Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInit.c | 8 +-------
> .../Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInit.h | 8 +-------
> .../KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxe.c | 8 +-------
> .../KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxe.inf | 8 +-------
> .../KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxeFsp.inf | 8 +-------
> .../KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitFsp.c | 8 +-------
> .../Pch/PchInit/Dxe/PchRstPcieStorage.c | 8 +-------
> .../Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchSata.c | 8 +-------
> .../Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchScs.c | 8 +-------
> .../KabylakeSiliconPkg/Pch/PchInit/Dxe/PchSerialIo.c | 8 +-------
> .../KabylakeSiliconPkg/Pch/PchInit/Dxe/PchSerialIoDxe.c | 8 +-------
> .../Pch/PchInit/Smm/PchBiosWriteProtect.c | 8 +-------
> .../Pch/PchInit/Smm/PchGpioSxIsolationSmm.c | 8 +-------
> .../KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.c | 8 +-------
> .../KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.h | 8 +-------
> .../KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.inf | 8 +-------
> .../KabylakeSiliconPkg/Pch/PchInit/Smm/PchLanSxSmm.c | 8 +-------
> .../KabylakeSiliconPkg/Pch/PchInit/Smm/PchPcieSmm.c | 8 +-------
> .../KabylakeSiliconPkg/Pch/PchInit/Smm/PchPort61hSmm.c | 8 +-------
> .../KabylakeSiliconPkg/Pch/PchInit/Smm/PchSpiAsync.c | 8 +-------
> .../KabylakeSiliconPkg/Pch/PchInit/Smm/PchXhciSxSmm.c | 8 +-------
> .../KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/IoTrap.c | 8 +-------
> .../KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/IoTrap.h | 8 +-------
> .../Pch/PchSmiDispatcher/Smm/PchSmiDispatch.c | 8 +-------
> .../Pch/PchSmiDispatcher/Smm/PchSmiDispatcher.inf | 8 +-------
> .../KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmm.h | 8 +-------
> .../Pch/PchSmiDispatcher/Smm/PchSmmCore.c | 8 +-------
> .../Pch/PchSmiDispatcher/Smm/PchSmmEspi.c | 8 +-------
> .../Pch/PchSmiDispatcher/Smm/PchSmmEspi.h | 8 +-------
> .../Pch/PchSmiDispatcher/Smm/PchSmmGpi.c | 8 +-------
> .../Pch/PchSmiDispatcher/Smm/PchSmmHelpers.c | 8 +-------
> .../Pch/PchSmiDispatcher/Smm/PchSmmHelpers.h | 8 +-------
> .../Pch/PchSmiDispatcher/Smm/PchSmmPeriodicTimer.c | 8 +-------
> .../Pch/PchSmiDispatcher/Smm/PchSmmPowerButton.c | 8 +-------
> .../Pch/PchSmiDispatcher/Smm/PchSmmSw.c | 8 +-------
> .../Pch/PchSmiDispatcher/Smm/PchSmmSx.c | 8 +-------
> .../Pch/PchSmiDispatcher/Smm/PchSmmUsb.c | 8 +-------
> .../Pch/PchSmiDispatcher/Smm/PchxSmmHelpers.c | 8 +-------
> .../Pch/PchSmiDispatcher/Smm/PchxSmmHelpers.h | 8 +-------
> .../Pch/SmmControl/RuntimeDxe/SmmControl.inf | 8 +-------
> .../Pch/SmmControl/RuntimeDxe/SmmControlDriver.c | 8 +-------
> .../Pch/SmmControl/RuntimeDxe/SmmControlDriver.h | 8 +-------
> Silicon/Intel/KabylakeSiliconPkg/Pch/Spi/Smm/PchSpi.c | 8 +-------
> Silicon/Intel/KabylakeSiliconPkg/Pch/Spi/Smm/PchSpi.h | 8 +-------
> .../Intel/KabylakeSiliconPkg/Pch/Spi/Smm/PchSpiSmm.inf | 8 +-------
> .../SampleCode/Include/Library/SecPlatformLib.h | 8 +-------
> .../Include/Guid/DataHubStatusCodeRecord.h | 8 +-------
> .../IntelFrameworkPkg/Include/Guid/SmramMemoryReserve.h | 8 +-------
> .../IntelFrameworkPkg/Include/Protocol/DataHub.h | 8 +-------
> .../IntelFrameworkPkg/Include/Protocol/Legacy8259.h | 8 +-------
> .../IntelFrameworkPkg/Include/Protocol/LegacyBios.h | 8 +-------
> .../IntelFrameworkPkg/Include/Protocol/LegacyInterrupt.h | 8 +-------
> .../SampleCode/MdeModulePkg/Include/Guid/AcpiS3Context.h | 9 +--------
> .../MdeModulePkg/Include/Guid/ConsoleOutDevice.h | 8 +-------
> .../MdeModulePkg/Include/Guid/MemoryTypeInformation.h | 8 +-------
> .../MdeModulePkg/Include/Library/ResetSystemLib.h | 8 +-------
> .../SampleCode/MdeModulePkg/Include/Ppi/SmmAccess.h | 9 +--------
> .../SampleCode/MdeModulePkg/Include/Ppi/SmmControl.h | 9 +--------
> .../MdeModulePkg/Include/Protocol/SmmVariable.h | 8 +-------
> .../SampleCode/Pch/AcpiTables/Dsdt/PchSmb.asl | 8 +-------
> Silicon/Intel/KabylakeSiliconPkg/SiPkg.dec | 8 +-------
> Silicon/Intel/KabylakeSiliconPkg/SiPkgBuildOption.dsc | 8 +-------
> Silicon/Intel/KabylakeSiliconPkg/SiPkgCommonLib.dsc | 8 +-------
> Silicon/Intel/KabylakeSiliconPkg/SiPkgDxe.dsc | 8 +-------
> Silicon/Intel/KabylakeSiliconPkg/SiPkgDxeLib.dsc | 8 +-------
> Silicon/Intel/KabylakeSiliconPkg/SiPkgPei.dsc | 8 +-------
> Silicon/Intel/KabylakeSiliconPkg/SiPkgPeiLib.dsc | 8 +-------
> .../SystemAgent/AcpiTables/Dmar/Dmar.aslc | 8 +-------
> .../SystemAgent/AcpiTables/Dmar/Dmar.h | 8 +-------
> .../SystemAgent/AcpiTables/HostBus.asl | 8 +-------
> .../SystemAgent/AcpiTables/SaAcpiTables.inf | 8 +-------
> .../SystemAgent/AcpiTables/SaSsdt/Igfx.asl | 8 +-------
> .../SystemAgent/AcpiTables/SaSsdt/IgfxCommon.asl | 8 +-------
> .../SystemAgent/AcpiTables/SaSsdt/IgfxDsm.asl | 8 +-------
> .../SystemAgent/AcpiTables/SaSsdt/IgfxOpGbda.asl | 8 +-------
> .../SystemAgent/AcpiTables/SaSsdt/IgfxOpRn.asl | 8 +-------
> .../SystemAgent/AcpiTables/SaSsdt/IgfxOpSbcb.asl | 8 +-------
> .../SystemAgent/AcpiTables/SaSsdt/Sa.asl | 8 +-------
> .../SystemAgent/AcpiTables/SaSsdt/SaNvs.asl | 8 +-------
> .../SystemAgent/AcpiTables/SaSsdt/SaSsdt.asl | 8 +-------
> .../SystemAgent/AcpiTables/SaSsdt/SaSsdt.inf | 8 +-------
> .../SystemAgent/Include/ConfigBlock/GraphicsDxeConfig.h | 8 +-------
> .../SystemAgent/Include/ConfigBlock/GraphicsPeiConfig.h | 8 +-------
> .../SystemAgent/Include/ConfigBlock/MemoryConfig.h | 8 +-------
> .../SystemAgent/Include/ConfigBlock/MiscDxeConfig.h | 8 +-------
> .../Include/ConfigBlock/SaMiscPeiPreMemConfig.h | 8 +-------
> .../SystemAgent/Include/ConfigBlock/VtdConfig.h | 8 +-------
> .../SystemAgent/Include/DmaRemappingTable.h | 8 +-------
> .../SystemAgent/Include/Library/DxeSaPolicyLib.h | 8 +-------
> .../SystemAgent/Include/Library/PeiSaPolicyLib.h | 8 +-------
> .../SystemAgent/Include/Library/SaPlatformLib.h | 8 +-------
> .../KabylakeSiliconPkg/SystemAgent/Include/MemInfoHob.h | 8 +-------
> .../SystemAgent/Include/Protocol/GopPolicy.h | 8 +-------
> .../SystemAgent/Include/Protocol/IgdOpRegion.h | 8 +-------
> .../SystemAgent/Include/Protocol/MemInfo.h | 8 +-------
> .../SystemAgent/Include/Protocol/SaGlobalNvsArea.h | 8 +-------
> .../SystemAgent/Include/Protocol/SaNvs.h | 8 +-------
> .../SystemAgent/Include/Protocol/SaPolicy.h | 8 +-------
> .../KabylakeSiliconPkg/SystemAgent/Include/SaAccess.h | 8 +-------
> .../SystemAgent/Include/SaPolicyCommon.h | 8 +-------
> .../KabylakeSiliconPkg/SystemAgent/Include/SaRegs.h | 8 +-------
> .../SystemAgent/IncludePrivate/SaConfigHob.h | 8 +-------
> .../SystemAgent/Library/DxeSaPolicyLib/DxeSaPolicyLib.c | 8 +-------
> .../Library/DxeSaPolicyLib/DxeSaPolicyLib.inf | 8 +-------
> .../Library/DxeSaPolicyLib/DxeSaPolicyLibrary.h | 8 +-------
> .../PeiDxeSmmSaPlatformLib/PeiDxeSmmSaPlatformLib.inf | 8 +-------
> .../Library/PeiDxeSmmSaPlatformLib/SaPlatformLibrary.c | 8 +-------
> .../Library/PeiDxeSmmSaPlatformLib/SaPlatformLibrary.h | 8 +-------
> .../Library/PeiSaPolicyLib/Ia32/MrcOemPlatform.S | 8 +-------
> .../Library/PeiSaPolicyLib/Ia32/MrcOemPlatform.asm | 8 +-------
> .../Library/PeiSaPolicyLib/Ia32/MrcOemPlatform.nasm | 8 +-------
> .../SystemAgent/Library/PeiSaPolicyLib/MrcOemPlatform.c | 8 +-------
> .../SystemAgent/Library/PeiSaPolicyLib/MrcOemPlatform.h | 8 +-------
> .../SystemAgent/Library/PeiSaPolicyLib/PeiSaPolicyLib.c | 8 +-------
> .../Library/PeiSaPolicyLib/PeiSaPolicyLib.inf | 8 +-------
> .../Library/PeiSaPolicyLib/PeiSaPolicyLibSample.c | 8 +-------
> .../Library/PeiSaPolicyLib/PeiSaPolicyLibrary.h | 8 +-------
> .../SystemAgent/Library/PeiSaPolicyLib/SaPrintPolicy.c | 8 +-------
> .../SystemAgent/MemoryInit/Include/MrcCommonTypes.h | 8 +-------
> .../SystemAgent/MemoryInit/Include/MrcInterface.h | 8 +-------
> .../SystemAgent/MemoryInit/Include/MrcRmtData.h | 8 +-------
> .../SystemAgent/MemoryInit/Include/MrcSpdData.h | 8 +-------
> .../SystemAgent/MemoryInit/Include/MrcTypes.h | 8 +-------
> .../SystemAgent/SaInit/Dxe/GraphicsInit.c | 8 +-------
> .../SystemAgent/SaInit/Dxe/GraphicsInit.h | 8 +-------
> .../SystemAgent/SaInit/Dxe/IgdOpRegion.c | 8 +-------
> .../SystemAgent/SaInit/Dxe/IgdOpRegion.h | 8 +-------
> .../KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaAcpi.c | 8 +-------
> .../KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaInit.h | 8 +-------
> .../SystemAgent/SaInit/Dxe/SaInitDxe.c | 8 +-------
> .../SystemAgent/SaInit/Dxe/SaInitDxe.h | 8 +-------
> .../SystemAgent/SaInit/Dxe/SaInitDxe.inf | 8 +-------
> .../KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/VTd.c | 8 +-------
> .../KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/VTd.h | 8 +-------
> .../SystemAgent/SmmAccess/Dxe/SmmAccess.inf | 8 +-------
> .../SystemAgent/SmmAccess/Dxe/SmmAccessDriver.c | 8 +-------
> .../SystemAgent/SmmAccess/Dxe/SmmAccessDriver.h | 8 +-------
> 492 files changed, 492 insertions(+), 3447 deletions(-)
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuConfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuConfig.h
> index 863a4fcdf8..6de5efbede 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuConfig.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuConfig.h
> @@ -2,13 +2,7 @@
> CPU Config Block.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _CPU_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuConfigFspD
> ata.h
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuConfigFspD
> ata.h
> index 8f333cffeb..53e6d45fe5 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuConfigFspD
> ata.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuConfigFspD
> ata.h
> @@ -2,13 +2,7 @@
> FSP CPU Data Config Block.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _CPU_CONFIG_FSP_DATA_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuConfigLibPr
> eMemConfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuConfigLibPr
> eMemConfig.h
> index 19e41287ce..4823b1d713 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuConfigLibPr
> eMemConfig.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuConfigLibPr
> eMemConfig.h
> @@ -2,13 +2,7 @@
> CPU PreMemory Config Block.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _CPU_CONFIG_LIB_PREMEM_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuOverclockin
> gConfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuOverclockin
> gConfig.h
> index 735e79c491..7a6d89ebda 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuOverclockin
> gConfig.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuOverclockin
> gConfig.h
> @@ -2,13 +2,7 @@
> CPU Overclocking Config Block.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _CPU_OVERCLOCKING_PREMEM_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPidTestConf
> ig.h
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPidTestConf
> ig.h
> index d8b5a2ed98..c55f9a0cc3 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPidTestConf
> ig.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPidTestConf
> ig.h
> @@ -2,13 +2,7 @@
> CPU PID Config Block.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _CPU_PID_TEST_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgm
> tBasicConfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgm
> tBasicConfig.h
> index 68dc9195ae..6fe9126377 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgm
> tBasicConfig.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgm
> tBasicConfig.h
> @@ -2,13 +2,7 @@
> CPU Power Management Basic Config Block.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _CPU_POWER_MGMT_BASIC_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgm
> tCustomConfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgm
> tCustomConfig.h
> index edb8182db5..026a1aff5f 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgm
> tCustomConfig.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgm
> tCustomConfig.h
> @@ -2,13 +2,7 @@
> CPU Power Managment Custom Config Block.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _CPU_POWER_MGMT_CUSTOM_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgm
> tPsysConfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgm
> tPsysConfig.h
> index 05b1efd5b6..75b49dbe7a 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgm
> tPsysConfig.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgm
> tPsysConfig.h
> @@ -2,13 +2,7 @@
> CPU Power Management Psys(Platform) Config Block.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _CPU_POWER_MGMT_PSYS_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgm
> tTestConfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgm
> tTestConfig.h
> index bf6e829fa3..ab0c194e76 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgm
> tTestConfig.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgm
> tTestConfig.h
> @@ -2,13 +2,7 @@
> CPU Power Management Test Config Block.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _CPU_POWER_MGMT_TEST_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgm
> tVrConfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgm
> tVrConfig.h
> index ad4ed76250..802f585819 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgm
> tVrConfig.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgm
> tVrConfig.h
> @@ -2,13 +2,7 @@
> CPU Power Management VR Config Block.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _CPU_POWER_MGMT_VR_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuTestConfig.
> h
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuTestConfig.
> h
> index 2b1fa5b3a5..2cdf834a89 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuTestConfig.
> h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuTestConfig.
> h
> @@ -2,13 +2,7 @@
> CPU Test Config Block.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _CPU_TEST_CONFIG_H_
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuAccess.h
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuAccess.h
> index dc62fea6eb..62a0323cb0 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuAccess.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuAccess.h
> @@ -2,13 +2,7 @@
> Macros to simplify and abstract the interface to CPU configuration.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _CPUACCESS_H_
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuDataStruct.h
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuDataStruct.h
> index e7caafa416..2dc7be45d2 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuDataStruct.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuDataStruct.h
> @@ -2,13 +2,7 @@
> This file declares various data structures used in CPU reference code.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuPolicyCommon.h
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuPolicyCommon.h
> index a8ee41ec99..775fc6ce65 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuPolicyCommon.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuPolicyCommon.h
> @@ -2,13 +2,7 @@
> CPU Policy structure definition which will contain several config blocks
> during runtime.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _CPU_POLICY_COMMON_H_
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuPowerMgmt.h
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuPowerMgmt.h
> index 612b166010..4a14004fdf 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuPowerMgmt.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuPowerMgmt.h
> @@ -2,13 +2,7 @@
> This file contains define definitions specific to processor
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuRegs.h
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuRegs.h
> index 21b6dd6f4b..3b92fd677f 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuRegs.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuRegs.h
> @@ -10,13 +10,7 @@
> - Definitions beginning with "N_" are the bit position
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _CPU_REGS_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Library/CpuMailboxLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Library/CpuMailboxLib.h
> index 0c2df2ff80..4d36a90ad1 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Library/CpuMailboxLib.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Library/CpuMailboxLib.h
> @@ -2,13 +2,7 @@
> Header file for Cpu Mailbox Lib.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Library/CpuPlatformLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Library/CpuPlatformLib.h
> index d1ccc5e7fb..462b083e6a 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Library/CpuPlatformLib.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Library/CpuPlatformLib.h
> @@ -2,13 +2,7 @@
> Header file for CpuPlatform Lib.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Library/CpuPolicyLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Library/CpuPolicyLib.h
> index f05c5743d7..4ed5719491 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Library/CpuPolicyLib.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Library/CpuPolicyLib.h
> @@ -2,13 +2,7 @@
> Prototype of the CpuPolicy library.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _CPU_POLICY_LIB_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Library/CpuPolicyLibPreMem
> .h
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Library/CpuPolicyLibPreMem
> .h
> index 905937ec88..9e7518f91c 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Library/CpuPolicyLibPreMem
> .h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Library/CpuPolicyLibPreMem
> .h
> @@ -2,13 +2,7 @@
> Prototype of the CpuPolicy library.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _CPU_PREMEM_POLICY_LIB_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Protocol/CpuGlobalNvsArea.
> h
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Protocol/CpuGlobalNvsArea.
> h
> index 6e807a3504..59c0f812c5 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Protocol/CpuGlobalNvsArea.
> h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Protocol/CpuGlobalNvsArea.
> h
> @@ -6,13 +6,7 @@
> @note Data structures defined in this protocol are not naturally aligned.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _CPU_GLOBAL_NVS_AREA_H_
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Protocol/CpuInfo.h
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Protocol/CpuInfo.h
> index d59994471d..f0095908f3 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Protocol/CpuInfo.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Protocol/CpuInfo.h
> @@ -2,13 +2,7 @@
> Protocol used to report CPU information
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _CPU_INFO_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/IncludePrivate/CpuInitDataHob.h
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/IncludePrivate/CpuInitDataHob.h
> index cdc6c463b6..58c968df89 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/IncludePrivate/CpuInitDataHob.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/IncludePrivate/CpuInitDataHob.h
> @@ -2,13 +2,7 @@
> Struct and GUID definitions for CpuInitDataHob.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _CPU_INIT_DATA_HOB_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/IncludePrivate/CpuPrivateData.h
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/IncludePrivate/CpuPrivateData.h
> index 13ca1f2a01..4cc60651c3 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/IncludePrivate/CpuPrivateData.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/IncludePrivate/CpuPrivateData.h
> @@ -2,13 +2,7 @@
> Struct definition for CpuPrivateData.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _CPU_PRIVATE_DATA_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/IncludePrivate/Library/CpuCommonL
> ib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/IncludePrivate/Library/CpuCommonL
> ib.h
> index 8099236d88..759fa84175 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/IncludePrivate/Library/CpuCommonL
> ib.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/IncludePrivate/Library/CpuCommonL
> ib.h
> @@ -2,13 +2,7 @@
> Header file for Cpu Common Lib implementation.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/IncludePrivate/PowerMgmtNvsStruct
> .h
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/IncludePrivate/PowerMgmtNvsStruct
> .h
> index e7f7c19279..bd3fddb86f 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/IncludePrivate/PowerMgmtNvsStruct
> .h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/IncludePrivate/PowerMgmtNvsStruct
> .h
> @@ -2,13 +2,7 @@
> This file contains CPU Gnvs Struct specific to processor
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _POWER_MGMT_NVS_STRUCT_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/BaseCpuMailboxLibNull/Base
> CpuMailboxLibNull.c
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/BaseCpuMailboxLibNull/Base
> CpuMailboxLibNull.c
> index ed964d00c3..bc2e93a1ac 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/BaseCpuMailboxLibNull/Base
> CpuMailboxLibNull.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/BaseCpuMailboxLibNull/Base
> CpuMailboxLibNull.c
> @@ -2,13 +2,7 @@
> Mailbox Library.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include <Uefi.h>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/BaseCpuMailboxLibNull/Base
> CpuMailboxLibNull.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/BaseCpuMailboxLibNull/Base
> CpuMailboxLibNull.inf
> index 0426e05802..0799aa891b 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/BaseCpuMailboxLibNull/Base
> CpuMailboxLibNull.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/BaseCpuMailboxLibNull/Base
> CpuMailboxLibNull.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/CpuPrintPoli
> cy.c
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/CpuPrintPoli
> cy.c
> index f871c21e6a..f13ca92661 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/CpuPrintPoli
> cy.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/CpuPrintPoli
> cy.c
> @@ -2,13 +2,7 @@
> This file is PeiCpuPolicy library.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "PeiCpuPolicyLibrary.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicy
> Lib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicy
> Lib.c
> index 49331f1471..cb7f379e0f 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicy
> Lib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicy
> Lib.c
> @@ -2,13 +2,7 @@
> This file is PeiCpuPolicy library.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "PeiCpuPolicyLibrary.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicy
> Lib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicy
> Lib.inf
> index 24e9819e34..e0f4ee03ee 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicy
> Lib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicy
> Lib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicy
> Library.h
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicy
> Library.h
> index 81301b475e..d2a475591d 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicy
> Library.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicy
> Library.h
> @@ -2,13 +2,7 @@
> Header file for the PeiCpuPolicyLib library.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PEI_CPU_POLICY_LIBRARY_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/Cpu
> PrintPolicy.c
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/Cpu
> PrintPolicy.c
> index 1807604405..d7ffd0b600 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/Cpu
> PrintPolicy.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/Cpu
> PrintPolicy.c
> @@ -2,13 +2,7 @@
> This file is PeiCpuPolicy library.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "PeiCpuPolicyLibrary.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/PeiC
> puPolicyLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/PeiC
> puPolicyLib.c
> index 7d27c0b6dc..35041322a7 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/PeiC
> puPolicyLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/PeiC
> puPolicyLib.c
> @@ -2,13 +2,7 @@
> This file is PeiCpuPolicy library.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "PeiCpuPolicyLibrary.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/PeiC
> puPolicyLibPreMem.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/PeiC
> puPolicyLibPreMem.inf
> index df6e20baef..a18ea79147 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/PeiC
> puPolicyLibPreMem.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/PeiC
> puPolicyLibPreMem.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/PeiC
> puPolicyLibrary.h
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/PeiC
> puPolicyLibrary.h
> index 8c039b4591..553b7a8ca9 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/PeiC
> puPolicyLibrary.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/PeiC
> puPolicyLibrary.h
> @@ -2,13 +2,7 @@
> Header file for the PeiCpuPolicyLib library.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PEI_CPU_POLICY_LIBRARY_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiDxeSmmCpuPlatformLib/C
> puPlatformLibrary.c
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiDxeSmmCpuPlatformLib/C
> puPlatformLibrary.c
> index 830803a909..0cf2cc8a1f 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiDxeSmmCpuPlatformLib/C
> puPlatformLibrary.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiDxeSmmCpuPlatformLib/C
> puPlatformLibrary.c
> @@ -2,13 +2,7 @@
> CPU Platform Lib implementation.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiDxeSmmCpuPlatformLib/C
> puPlatformLibrary.h
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiDxeSmmCpuPlatformLib/C
> puPlatformLibrary.h
> index d5b8ed9ae4..3fcdbcb402 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiDxeSmmCpuPlatformLib/C
> puPlatformLibrary.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiDxeSmmCpuPlatformLib/C
> puPlatformLibrary.h
> @@ -2,13 +2,7 @@
> Header file for Cpu Platform Lib implementation.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiDxeSmmCpuPlatformLib/P
> eiDxeSmmCpuPlatformLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiDxeSmmCpuPlatformLib/P
> eiDxeSmmCpuPlatformLib.inf
> index 2a123ae708..21d441a577 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiDxeSmmCpuPlatformLib/P
> eiDxeSmmCpuPlatformLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiDxeSmmCpuPlatformLib/P
> eiDxeSmmCpuPlatformLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/LibraryPrivate/PeiDxeSmmCpuComm
> onLib/CpuCommonLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/LibraryPrivate/PeiDxeSmmCpuComm
> onLib/CpuCommonLib.c
> index 100bd1464c..4fa713612b 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/LibraryPrivate/PeiDxeSmmCpuComm
> onLib/CpuCommonLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/LibraryPrivate/PeiDxeSmmCpuComm
> onLib/CpuCommonLib.c
> @@ -2,13 +2,7 @@
> CPU Common Lib implementation.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/LibraryPrivate/PeiDxeSmmCpuComm
> onLib/PeiDxeSmmCpuCommonLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/LibraryPrivate/PeiDxeSmmCpuComm
> onLib/PeiDxeSmmCpuCommonLib.inf
> index 70d33ce354..e5c546d67a 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/LibraryPrivate/PeiDxeSmmCpuComm
> onLib/PeiDxeSmmCpuCommonLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/LibraryPrivate/PeiDxeSmmCpuComm
> onLib/PeiDxeSmmCpuCommonLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/BootFirmwareMediaProtection.
> c
> b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/BootFirmwareMediaProtection.
> c
> index bf272036c4..a255e7e514 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/BootFirmwareMediaProtection.
> c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/BootFirmwareMediaProtection.
> c
> @@ -2,13 +2,7 @@
> This file contains the tests for the BootFirmwareMediaProtection BIT
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/DebugModeDisabled.c
> b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/DebugModeDisabled.c
> index e96535cf03..0a9d381a53 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/DebugModeDisabled.c
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/DebugModeDisabled.c
> @@ -2,13 +2,7 @@
> This file contains the tests for the DebugModeDisabled Bit
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/HardwareRootedBootIntegrity.c
> b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/HardwareRootedBootIntegrity.c
> index beca056028..d159039b35 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/HardwareRootedBootIntegrity.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/HardwareRootedBootIntegrity.c
> @@ -2,13 +2,7 @@
> This file contains the tests for the HardwareRootedBootIntegrity bit
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/HstiSiliconDxe.c
> b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/HstiSiliconDxe.c
> index e9a26cac80..3b40893266 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/HstiSiliconDxe.c
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/HstiSiliconDxe.c
> @@ -2,13 +2,7 @@
> This file contains DXE driver for testing and publishing HSTI
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/HstiSiliconDxe.h
> b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/HstiSiliconDxe.h
> index b2b48a2152..08094dbbc1 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/HstiSiliconDxe.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/HstiSiliconDxe.h
> @@ -2,13 +2,7 @@
> This file contains the required header files for the HSTI Silicon DXE driver
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/HstiSiliconDxe.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/HstiSiliconDxe.inf
> index 854343da38..52e3b6ceba 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/HstiSiliconDxe.inf
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/HstiSiliconDxe.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/IntegratedDeviceDmaProtection
> .c
> b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/IntegratedDeviceDmaProtection
> .c
> index d45cc586ba..184ec609ba 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/IntegratedDeviceDmaProtection
> .c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/IntegratedDeviceDmaProtection
> .c
> @@ -2,13 +2,7 @@
> This file contains the tests for the IntegratedDeviceDMAProtection bit
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/MeasuredBootEnforcement.c
> b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/MeasuredBootEnforcement.c
> index 6d88a64060..c05e6d6ec6 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/MeasuredBootEnforcement.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/MeasuredBootEnforcement.c
> @@ -2,13 +2,7 @@
> This file contains the tests for the MeasuredBootEnforcement BIT
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/MpServiceHelp.c
> b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/MpServiceHelp.c
> index f1e7a8d946..bac52664b5 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/MpServiceHelp.c
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/MpServiceHelp.c
> @@ -2,13 +2,7 @@
> This file contains the mpservices helper functions
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureCpuConfiguration.c
> b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureCpuConfiguration.c
> index 8abb3caf1f..68fda2d634 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureCpuConfiguration.c
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureCpuConfiguration.c
> @@ -2,13 +2,7 @@
> This file contains the tests for the SecureCPUConfiguration bit
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureIntegratedGraphicsConfig
> uration.c
> b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureIntegratedGraphicsConfig
> uration.c
> index c70ac41cf6..e53d45ee12 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureIntegratedGraphicsConfig
> uration.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureIntegratedGraphicsConfig
> uration.c
> @@ -2,13 +2,7 @@
> This file contains the tests for the SecureIntegratedGraphics bit
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "HstiSiliconDxe.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureMemoryMapConfiguratio
> n.c
> b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureMemoryMapConfiguratio
> n.c
> index 00dd3092a1..a3c9bbebea 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureMemoryMapConfiguratio
> n.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureMemoryMapConfiguratio
> n.c
> @@ -2,13 +2,7 @@
> This file contains the tests for the SecureMemoryMapConfiguration bit
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecurePCHConfiguration.c
> b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecurePCHConfiguration.c
> index 7274c5556a..2d73c26eb2 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecurePCHConfiguration.c
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecurePCHConfiguration.c
> @@ -2,13 +2,7 @@
> This file contains the tests for the SecuePCHConfiguration bit
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "HstiSiliconDxe.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureSystemAgentConfiguratio
> n.c
> b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureSystemAgentConfiguratio
> n.c
> index 2f498cd532..d08a85b87e 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureSystemAgentConfiguratio
> n.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureSystemAgentConfiguratio
> n.c
> @@ -2,13 +2,7 @@
> This file contains the tests for the SecureSystemAgentConfiguration bit
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SignedFirmwareUpdate.c
> b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SignedFirmwareUpdate.c
> index 79dabc690e..aab48e02e6 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SignedFirmwareUpdate.c
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SignedFirmwareUpdate.c
> @@ -2,13 +2,7 @@
> This file contains the tests for the SignedFirmwareUpdate bit
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Include/ConfigBlock.h
> b/Silicon/Intel/KabylakeSiliconPkg/Include/ConfigBlock.h
> index 246582e9ee..dd91a55e79 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Include/ConfigBlock.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Include/ConfigBlock.h
> @@ -2,13 +2,7 @@
> Header file for Config Block Lib implementation
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Include/HstiFeatureBit.h
> b/Silicon/Intel/KabylakeSiliconPkg/Include/HstiFeatureBit.h
> index cdbe75ae18..12baf4e378 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Include/HstiFeatureBit.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Include/HstiFeatureBit.h
> @@ -3,13 +3,7 @@
> including error string definitions
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Include/Library/AslUpdateLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Include/Library/AslUpdateLib.h
> index dc76e33557..d58b6d6458 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Include/Library/AslUpdateLib.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Include/Library/AslUpdateLib.h
> @@ -6,13 +6,7 @@
> restrictions, etc).
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Include/Library/ConfigBlockLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Include/Library/ConfigBlockLib.h
> index cc437b93bf..04c8ec5cca 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Include/Library/ConfigBlockLib.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Include/Library/ConfigBlockLib.h
> @@ -2,13 +2,7 @@
> Header file for Config Block Lib implementation
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Include/Library/MmPciLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Include/Library/MmPciLib.h
> index b4f8b41e1b..9049675679 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Include/Library/MmPciLib.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Include/Library/MmPciLib.h
> @@ -2,13 +2,7 @@
> Get Pci Express address library implementation.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Include/Library/PeiSiPolicyUpdateLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Include/Library/PeiSiPolicyUpdateLib.h
> index 184b04f5de..7c9517bdb1 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Include/Library/PeiSiPolicyUpdateLib.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Include/Library/PeiSiPolicyUpdateLib.h
> @@ -2,13 +2,7 @@
> Header file for PEI SiPolicyUpdate Library.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Include/Library/SiConfigBlockLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Include/Library/SiConfigBlockLib.h
> index 56527478b4..1534eb59d0 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Include/Library/SiConfigBlockLib.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Include/Library/SiConfigBlockLib.h
> @@ -2,13 +2,7 @@
> Prototype of the SiConfigBlockLib library.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Include/Library/SiPolicyLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Include/Library/SiPolicyLib.h
> index 98d3ad25e0..7bd26863b5 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Include/Library/SiPolicyLib.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Include/Library/SiPolicyLib.h
> @@ -2,13 +2,7 @@
> Prototype of the SiPolicyLib library.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Include/Library/SiliconInitLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Include/Library/SiliconInitLib.h
> index d10e7cf0b8..0028c9d911 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Include/Library/SiliconInitLib.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Include/Library/SiliconInitLib.h
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Include/PcieRegs.h
> b/Silicon/Intel/KabylakeSiliconPkg/Include/PcieRegs.h
> index 3a3b22fd83..d91a450023 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Include/PcieRegs.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Include/PcieRegs.h
> @@ -11,13 +11,7 @@
> Definitions beginning with "N_" are the bit position
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Include/Ppi/SiInitPpi.h
> b/Silicon/Intel/KabylakeSiliconPkg/Include/Ppi/SiInitPpi.h
> index 6d2b857ac6..b8643b3ede 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Include/Ppi/SiInitPpi.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Include/Ppi/SiInitPpi.h
> @@ -3,13 +3,7 @@
> init
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Include/Ppi/SiPolicy.h
> b/Silicon/Intel/KabylakeSiliconPkg/Include/Ppi/SiPolicy.h
> index 044dadc022..3088eb89e6 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Include/Ppi/SiPolicy.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Include/Ppi/SiPolicy.h
> @@ -5,13 +5,7 @@
> over to silicon DXE modules.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Include/Protocol/SiPolicyProtocol.h
> b/Silicon/Intel/KabylakeSiliconPkg/Include/Protocol/SiPolicyProtocol.h
> index 91fcad80a0..ff3b92ba1b 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Include/Protocol/SiPolicyProtocol.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Include/Protocol/SiPolicyProtocol.h
> @@ -2,13 +2,7 @@
> Protocol used for specifying platform related Silicon information and policy
> setting.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Include/SiPolicyStruct.h
> b/Silicon/Intel/KabylakeSiliconPkg/Include/SiPolicyStruct.h
> index f1facc4300..375844e506 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Include/SiPolicyStruct.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Include/SiPolicyStruct.h
> @@ -2,13 +2,7 @@
> Intel reference code configuration policies.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/IncludePrivate/Library/PcieInitLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/IncludePrivate/Library/PcieInitLib.h
> index f8c3c3b43d..f800b78809 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/IncludePrivate/Library/PcieInitLib.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/IncludePrivate/Library/PcieInitLib.h
> @@ -2,13 +2,7 @@
> PCIe Initialization Library header file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/IncludePrivate/SiConfigHob.h
> b/Silicon/Intel/KabylakeSiliconPkg/IncludePrivate/SiConfigHob.h
> index 676e5e433b..dbbcfa997c 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/IncludePrivate/SiConfigHob.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/IncludePrivate/SiConfigHob.h
> @@ -3,13 +3,7 @@
> related Intel silicon information and config setting.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/KabylakeSiliconBuild.bat
> b/Silicon/Intel/KabylakeSiliconPkg/KabylakeSiliconBuild.bat
> index 98d94cf310..c384ca0a1f 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/KabylakeSiliconBuild.bat
> +++ b/Silicon/Intel/KabylakeSiliconPkg/KabylakeSiliconBuild.bat
> @@ -1,13 +1,7 @@
> @REM @file
> @REM
> @REM Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -@REM This program and the accompanying materials
> -@REM are licensed and made available under the terms and conditions of
> the BSD License
> -@REM which accompanies this distribution. The full text of the license may
> be found at
> -@REM http://opensource.org/licenses/bsd-license.php
> -@REM
> -@REM THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS
> IS" BASIS,
> -@REM WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND,
> EITHER EXPRESS OR IMPLIED.
> +@REM SPDX-License-Identifier: BSD-2-Clause-Patent
> @REM
>
> @call edksetup.bat
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/KabylakeSiliconPkg.dsc
> b/Silicon/Intel/KabylakeSiliconPkg/KabylakeSiliconPkg.dsc
> index cbb2a8bec4..5b114ae99e 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/KabylakeSiliconPkg.dsc
> +++ b/Silicon/Intel/KabylakeSiliconPkg/KabylakeSiliconPkg.dsc
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017 - 2019, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/KabylakeSiliconPrivate.dec
> b/Silicon/Intel/KabylakeSiliconPkg/KabylakeSiliconPrivate.dec
> index 163bd429f8..0c013af8b6 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/KabylakeSiliconPrivate.dec
> +++ b/Silicon/Intel/KabylakeSiliconPkg/KabylakeSiliconPrivate.dec
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/BaseConfigBlockLib/BaseConfigBl
> ockLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Library/BaseConfigBlockLib/BaseConfigBl
> ockLib.c
> index a411547ccb..b9bd6f3a48 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/BaseConfigBlockLib/BaseConfigBl
> ockLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/BaseConfigBlockLib/BaseConfigBl
> ockLib.c
> @@ -2,13 +2,7 @@
> Library functions for Config Block management.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include <ConfigBlock.h>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/BaseConfigBlockLib/BaseConfigBl
> ockLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Library/BaseConfigBlockLib/BaseConfigBl
> ockLib.inf
> index f544c75a6c..646c5b189c 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/BaseConfigBlockLib/BaseConfigBl
> ockLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/BaseConfigBlockLib/BaseConfigBl
> ockLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/BaseSiConfigBlockLib/BaseSiConfi
> gBlockLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Library/BaseSiConfigBlockLib/BaseSiConfi
> gBlockLib.c
> index 98ff9e3410..8596933549 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/BaseSiConfigBlockLib/BaseSiConfi
> gBlockLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/BaseSiConfigBlockLib/BaseSiConfi
> gBlockLib.c
> @@ -3,13 +3,7 @@
> to config block header.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include <ConfigBlock.h>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/BaseSiConfigBlockLib/BaseSiConfi
> gBlockLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Library/BaseSiConfigBlockLib/BaseSiConfi
> gBlockLib.inf
> index 5961b1a6b2..c9a70c10c8 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/BaseSiConfigBlockLib/BaseSiConfi
> gBlockLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/BaseSiConfigBlockLib/BaseSiConfi
> gBlockLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLib/DxeAslUpdateLi
> b.c
> b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLib/DxeAslUpdateLi
> b.c
> index ea85be4a11..e6ab43db6d 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLib/DxeAslUpdateLi
> b.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLib/DxeAslUpdateLi
> b.c
> @@ -7,13 +7,7 @@
> This library uses the ACPI Support protocol.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include <Base.h>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLib/DxeAslUpdateLi
> b.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLib/DxeAslUpdateLi
> b.inf
> index 0b24bbe71e..7a100128f3 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLib/DxeAslUpdateLi
> b.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLib/DxeAslUpdateLi
> b.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLibNull/DxeAslUpda
> teLibNull.c
> b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLibNull/DxeAslUpda
> teLibNull.c
> index 834315d236..490a09ddb5 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLibNull/DxeAslUpda
> teLibNull.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLibNull/DxeAslUpda
> teLibNull.c
> @@ -7,13 +7,7 @@
> This library uses the ACPI Support protocol.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include <Base.h>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLibNull/DxeAslUpda
> teLibNull.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLibNull/DxeAslUpda
> teLibNull.inf
> index 3805dbf1dd..a3c8aef60a 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLibNull/DxeAslUpda
> teLibNull.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLibNull/DxeAslUpda
> teLibNull.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeSiliconPolicyInitLib/DxePolicyI
> nit.c
> b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeSiliconPolicyInitLib/DxePolicyI
> nit.c
> index ac870bee84..694c896879 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeSiliconPolicyInitLib/DxePolicyI
> nit.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeSiliconPolicyInitLib/DxePolicyI
> nit.c
> @@ -2,13 +2,7 @@
> This file is SampleCode for Intel PEI Platform Policy initialization.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeSiliconPolicyInitLib/DxeSaPolic
> yInit.h
> b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeSiliconPolicyInitLib/DxeSaPolic
> yInit.h
> index ebc5023f7b..855a89fc23 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeSiliconPolicyInitLib/DxeSaPolic
> yInit.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeSiliconPolicyInitLib/DxeSaPolic
> yInit.h
> @@ -2,13 +2,7 @@
> Header file for the SaPolicyInitDxe Driver.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _SA_POLICY_INIT_DXE_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeSiliconPolicyInitLib/DxeSilicon
> PolicyInitLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeSiliconPolicyInitLib/DxeSilicon
> PolicyInitLib.inf
> index fbce84e78f..1997f43ab4 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeSiliconPolicyInitLib/DxeSilicon
> PolicyInitLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeSiliconPolicyInitLib/DxeSilicon
> PolicyInitLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiDxeSmmMmPciLib/PeiDxeSmm
> MmPciLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiDxeSmmMmPciLib/PeiDxeSmm
> MmPciLib.c
> index 3688872019..51a06528e0 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiDxeSmmMmPciLib/PeiDxeSmm
> MmPciLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiDxeSmmMmPciLib/PeiDxeSmm
> MmPciLib.c
> @@ -2,13 +2,7 @@
> This file contains routines that get PCI Express Address
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include <Library/BaseLib.h>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiDxeSmmMmPciLib/PeiDxeSmm
> MmPciLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiDxeSmmMmPciLib/PeiDxeSmm
> MmPciLib.inf
> index 24cae56d04..8ae40a0c9e 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiDxeSmmMmPciLib/PeiDxeSmm
> MmPciLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiDxeSmmMmPciLib/PeiDxeSmm
> MmPciLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLib.c
> index b7db139ded..813b868fcf 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLib.c
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLib.c
> @@ -3,13 +3,7 @@
> Policy and installs RC Policy PPI.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLib.inf
> index 134f60be5e..1d992cfbbd 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLibPreMe
> m.c
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLibPreMe
> m.c
> index 3f80b990e9..e0d83cb467 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLibPreMe
> m.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLibPreMe
> m.c
> @@ -3,13 +3,7 @@
> Policy and installs RC Policy PPI.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLibrary.h
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLibrary.h
> index 4c6ba6309d..f090e58868 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLibrary.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLibrary.h
> @@ -2,13 +2,7 @@
> Header file for the PeiSiPolicyLib library.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/SiPrintPolicy.c
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/SiPrintPolicy.c
> index 16cfb52565..623f30de45 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/SiPrintPolicy.c
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/SiPrintPolicy.c
> @@ -2,13 +2,7 @@
> This file is PeiSiPolicyLib library for printing Policy settings.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiPolicyIni
> t.c
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiPolicyIni
> t.c
> index c3a96e5ad2..0de415ad19 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiPolicyIni
> t.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiPolicyIni
> t.c
> @@ -2,13 +2,7 @@
> This file is SampleCode for Intel PEI Platform Policy initialization.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiPolicyIni
> t.h
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiPolicyIni
> t.h
> index e85724411a..c38294cfbe 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiPolicyIni
> t.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiPolicyIni
> t.h
> @@ -2,13 +2,7 @@
> Header file for the PolicyInitPei PEIM.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiPolicyIni
> tPreMem.c
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiPolicyIni
> tPreMem.c
> index c402dee3a4..fd76b4fac3 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiPolicyIni
> tPreMem.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiPolicyIni
> tPreMem.c
> @@ -2,13 +2,7 @@
> This file is SampleCode for Intel PEI Platform Policy initialization.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiSiPolicyI
> nit.h
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiSiPolicyI
> nit.h
> index 4f4a80b9ae..47ede26b05 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiSiPolicyI
> nit.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiSiPolicyI
> nit.h
> @@ -2,13 +2,7 @@
> Header file for the PeiSiPolicyInit
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiSiliconP
> olicyInitLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiSiliconP
> olicyInitLib.inf
> index ac37f17eae..7982a5d87f 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiSiliconP
> olicyInitLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiSiliconP
> olicyInitLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibDependency
> /PeiPostMemSiliconPolicyInitLibDependency.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibDependency
> /PeiPostMemSiliconPolicyInitLibDependency.inf
> index 243a70f30d..2bca431712 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibDependency
> /PeiPostMemSiliconPolicyInitLibDependency.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibDependency
> /PeiPostMemSiliconPolicyInitLibDependency.inf
> @@ -5,13 +5,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibDependency
> /PeiPreMemSiliconPolicyInitLibDependency.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibDependency
> /PeiPreMemSiliconPolicyInitLibDependency.inf
> index fd54b0bf7d..45a30da9ac 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibDependency
> /PeiPreMemSiliconPolicyInitLibDependency.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibDependency
> /PeiPreMemSiliconPolicyInitLibDependency.inf
> @@ -5,13 +5,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibDependency
> /PeiSiliconPolicyInitLibDependency.c
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibDependency
> /PeiSiliconPolicyInitLibDependency.c
> index 1db1582ff2..4c3be83c21 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibDependency
> /PeiSiliconPolicyInitLibDependency.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibDependency
> /PeiSiliconPolicyInitLibDependency.c
> @@ -1,13 +1,7 @@
> /** @file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspC
> puPolicyInitLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspC
> puPolicyInitLib.c
> index 282f774831..72a797a0ea 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspC
> puPolicyInitLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspC
> puPolicyInitLib.c
> @@ -2,13 +2,7 @@
> Implementation of Fsp PCH Policy Initialization.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspM
> ePolicyInitLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspM
> ePolicyInitLib.c
> index d97bf8be57..e72a06f5d3 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspM
> ePolicyInitLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspM
> ePolicyInitLib.c
> @@ -2,13 +2,7 @@
> Implementation of Fsp Me Policy Initialization.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspM
> iscUpdInitLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspM
> iscUpdInitLib.c
> index b9329e4c8a..6d1a982bfb 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspM
> iscUpdInitLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspM
> iscUpdInitLib.c
> @@ -2,13 +2,7 @@
> Implementation of Fsp Misc UPD Initialization.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspPc
> hPolicyInitLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspPc
> hPolicyInitLib.c
> index 3f7e297c0b..46c143553c 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspPc
> hPolicyInitLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspPc
> hPolicyInitLib.c
> @@ -2,13 +2,7 @@
> Implementation of Fsp PCH Policy Initialization.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspP
> olicyInitLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspP
> olicyInitLib.c
> index 4e82a0cc31..1136996684 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspP
> olicyInitLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspP
> olicyInitLib.c
> @@ -2,13 +2,7 @@
> Instance of Fsp Policy Initialization Library.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspP
> olicyInitLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspP
> olicyInitLib.h
> index a17b642a1d..52f20777ec 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspP
> olicyInitLib.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspP
> olicyInitLib.h
> @@ -2,13 +2,7 @@
> Internal header file for Fsp Policy Initialization Library.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspSa
> PolicyInitLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspSa
> PolicyInitLib.c
> index 3d218f8ba9..51b72c360a 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspSa
> PolicyInitLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspSa
> PolicyInitLib.c
> @@ -2,13 +2,7 @@
> Implementation of Fsp SA Policy Initialization.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspSi
> PolicyInitLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspSi
> PolicyInitLib.c
> index 49601b1496..bffabe61d0 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspSi
> PolicyInitLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspSi
> PolicyInitLib.c
> @@ -2,13 +2,7 @@
> Implementation of Fsp SI Policy Initialization.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiPolic
> yInit.c
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiPolic
> yInit.c
> index abed092c46..06210927d4 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiPolic
> yInit.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiPolic
> yInit.c
> @@ -2,13 +2,7 @@
> This file is SampleCode for Intel PEI Platform Policy initialization.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiPolic
> yInit.h
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiPolic
> yInit.h
> index e85724411a..c38294cfbe 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiPolic
> yInit.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiPolic
> yInit.h
> @@ -2,13 +2,7 @@
> Header file for the PolicyInitPei PEIM.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiPolic
> yInitLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiPolic
> yInitLib.h
> index b5a7f4eef3..ae289f884e 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiPolic
> yInitLib.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiPolic
> yInitLib.h
> @@ -2,13 +2,7 @@
> Header file for the PolicyInitPei Library.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiPolic
> yInitPreMem.c
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiPolic
> yInitPreMem.c
> index 35baba3183..ed391db583 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiPolic
> yInitPreMem.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiPolic
> yInitPreMem.c
> @@ -2,13 +2,7 @@
> This file is SampleCode for Intel PEI Platform Policy initialization.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiSiPoli
> cyInit.h
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiSiPoli
> cyInit.h
> index 4f4a80b9ae..47ede26b05 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiSiPoli
> cyInit.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiSiPoli
> cyInit.h
> @@ -2,13 +2,7 @@
> Header file for the PeiSiPolicyInit
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiSilico
> nPolicyInitLibFsp.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiSilico
> nPolicyInitLibFsp.inf
> index 7f0d7a5dec..9ffb84fa1e 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiSilico
> nPolicyInitLibFsp.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiSilico
> nPolicyInitLibFsp.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/SiliconInitLib/SiliconInit.c
> b/Silicon/Intel/KabylakeSiliconPkg/Library/SiliconInitLib/SiliconInit.c
> index 47ca04b98c..d09bec0489 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Library/SiliconInitLib/SiliconInit.c
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Library/SiliconInitLib/SiliconInit.c
> @@ -2,13 +2,7 @@
> Source code file for Platform Init PEI module
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/SiliconInitLib/SiliconInitLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Library/SiliconInitLib/SiliconInitLib.inf
> index f26eea6be6..9007f299bb 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Library/SiliconInitLib/SiliconInitLib.inf
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Library/SiliconInitLib/SiliconInitLib.inf
> @@ -2,13 +2,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/SiliconInitLib/SiliconInitPreMem.c
> b/Silicon/Intel/KabylakeSiliconPkg/Library/SiliconInitLib/SiliconInitPreMem.c
> index bb21872e1e..65a67a6795 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/SiliconInitLib/SiliconInitPreMem.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/SiliconInitLib/SiliconInitPreMem.c
> @@ -2,13 +2,7 @@
> Source code file for Platform Init Pre-Memory PEI module
>
> Copyright (c) 2017 - 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Me/Include/ConfigBlock/MePeiConfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/Me/Include/ConfigBlock/MePeiConfig.h
> index 2ec0d556b1..1d082d5854 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Me/Include/ConfigBlock/MePeiConfig.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Me/Include/ConfigBlock/MePeiConfig.h
> @@ -2,13 +2,7 @@
> ME config block for PEI phase
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _ME_PEI_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Me/Include/Library/PeiMePolicyLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Me/Include/Library/PeiMePolicyLib.h
> index 20afe4c46e..bca35e19d3 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Me/Include/Library/PeiMePolicyLib.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Me/Include/Library/PeiMePolicyLib.h
> @@ -2,13 +2,7 @@
> Prototype of the MePolicyLibPei library.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PEI_ME_POLICY_LIB_H_
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Me/Include/MeChipset.h
> b/Silicon/Intel/KabylakeSiliconPkg/Me/Include/MeChipset.h
> index 11ee04ad12..2ea9da8c2c 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Me/Include/MeChipset.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Me/Include/MeChipset.h
> @@ -22,13 +22,7 @@
> as "_ME_" without [generation_name] inserted.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _ME_CHIPSET_H_
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Me/Include/MePolicyCommon.h
> b/Silicon/Intel/KabylakeSiliconPkg/Me/Include/MePolicyCommon.h
> index 0243982c80..04d787a0f5 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Me/Include/MePolicyCommon.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Me/Include/MePolicyCommon.h
> @@ -2,13 +2,7 @@
> Definition for ME common policy
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _ME_POLICY_COMMON_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLi
> b.c
> b/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLi
> b.c
> index 94a84a0478..31c7d59d1d 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLi
> b.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLi
> b.c
> @@ -2,13 +2,7 @@
> This file is PeiMePolicy library.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "PeiMePolicyLibrary.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLi
> b.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLi
> b.inf
> index 3c6e325772..ea247181a4 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLi
> b.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLi
> b.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLi
> brary.h
> b/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLi
> brary.h
> index 85e8e2b154..a908bb6c24 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLi
> brary.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLi
> brary.h
> @@ -2,13 +2,7 @@
> Header file for the PeiMePolicy library.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PEI_ME_POLICY_LIBRARY_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/GpioAcpiDefines.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/GpioAcpiDefines.h
> index 9cde7e862d..32507d4d11 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/GpioAcpiDefines.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/GpioAcpiDefines.h
> @@ -1,13 +1,7 @@
> /**@file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/GpioLib.asl
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/GpioLib.asl
> index b9809bd2ab..db97d4b20d 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/GpioLib.asl
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/GpioLib.asl
> @@ -1,13 +1,7 @@
> /**@file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> include("GpioLibObjects.asl")
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/GpioLibObjects.asl
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/GpioLibObjects.asl
> index 1468aedba4..ba1bf8cb93 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/GpioLibObjects.asl
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/GpioLibObjects.asl
> @@ -1,13 +1,7 @@
> /**@file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/IrqLink.asl
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/IrqLink.asl
> index 51d88f1e5a..dfb09b95b0 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/IrqLink.asl
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/IrqLink.asl
> @@ -2,13 +2,7 @@
> ACPI DSDT table
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/Pch.asl
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/Pch.asl
> index 34f3f6877f..b655572a96 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/Pch.asl
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/Pch.asl
> @@ -1,13 +1,7 @@
> /**@file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchAcpiTables.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchAcpiTables.inf
> index ec99fb847a..14d5b28c33 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchAcpiTables.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchAcpiTables.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchHda.asl
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchHda.asl
> index 151ee1fdd8..86a2523eed 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchHda.asl
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchHda.asl
> @@ -1,13 +1,7 @@
> /**@file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchHeci.asl
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchHeci.asl
> index c79ee8d6cd..10f6c687b4 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchHeci.asl
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchHeci.asl
> @@ -2,13 +2,7 @@
> ACPI DSDT table for MEI1
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchIsh.asl
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchIsh.asl
> index 42f12ff266..b792109478 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchIsh.asl
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchIsh.asl
> @@ -2,13 +2,7 @@
> ACPI DSDT table for ISH
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchNvs.asl
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchNvs.asl
> index 7c4a0cc23c..db3ca89608 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchNvs.asl
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchNvs.asl
> @@ -1,13 +1,7 @@
> /**@file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchPcie.asl
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchPcie.asl
> index 8628735184..edffaf28d0 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchPcie.asl
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchPcie.asl
> @@ -1,13 +1,7 @@
> /**@file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchRstPcieStorage.a
> sl
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchRstPcieStorage.a
> sl
> index 701cf6891a..a9d3756a74 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchRstPcieStorage.a
> sl
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchRstPcieStorage.a
> sl
> @@ -1,13 +1,7 @@
> /**@file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchSata.asl
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchSata.asl
> index d7f51f2b9b..17d32ade9d 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchSata.asl
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchSata.asl
> @@ -1,13 +1,7 @@
> /**@file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchScs.asl
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchScs.asl
> index 808c73e06c..2707ad3a0b 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchScs.asl
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchScs.asl
> @@ -2,13 +2,7 @@
> ACPI DSDT table for SCS Controllers
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchSerialIo.asl
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchSerialIo.asl
> index f33ee887e7..deaf57400f 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchSerialIo.asl
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchSerialIo.asl
> @@ -1,13 +1,7 @@
> /**@file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchXdci.asl
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchXdci.asl
> index 54c1242178..432669a692 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchXdci.asl
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchXdci.asl
> @@ -1,13 +1,7 @@
> /**@file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchXhci.asl
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchXhci.asl
> index 873246f662..d261973583 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchXhci.asl
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchXhci.asl
> @@ -1,13 +1,7 @@
> /**@file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/TraceHubDebug.asl
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/TraceHubDebug.asl
> index a8e4f0b34c..35a2232bc4 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/TraceHubDebug.asl
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/TraceHubDebug.asl
> @@ -2,13 +2,7 @@
> Trace Hub debug library for ASL code.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/usbsbd.asl
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/usbsbd.asl
> index 5036b4b771..acb948f699 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/usbsbd.asl
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/usbsbd.asl
> @@ -1,13 +1,7 @@
> /**@file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/Cio2Config.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/Cio2Config.h
> index 187d4cd506..a3e15daede 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/Cio2Config.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/Cio2Config.h
> @@ -2,13 +2,7 @@
> CIO2 policy
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _CIO2_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/DciConfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/DciConfig.h
> index aba0677abc..37cb469db6 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/DciConfig.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/DciConfig.h
> @@ -2,13 +2,7 @@
> Dci policy
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _DCI_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/DmiConfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/DmiConfig.h
> index 2fd5d1b171..e8ff6d91d6 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/DmiConfig.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/DmiConfig.h
> @@ -2,13 +2,7 @@
> DMI policy
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _DMI_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/EspiConfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/EspiConfig.h
> index c952bf9f31..c00e5a81be 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/EspiConfig.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/EspiConfig.h
> @@ -2,13 +2,7 @@
> Espi policy
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _ESPI_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/FlashProtection
> Config.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/FlashProtection
> Config.h
> index b55aaa705a..77f43a80fc 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/FlashProtection
> Config.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/FlashProtection
> Config.h
> @@ -2,13 +2,7 @@
> FlashProtection policy
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _FLASH_PROTECTION_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HdAudioConfig.
> h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HdAudioConfig.
> h
> index a0ebbbd84d..6498d84646 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HdAudioConfig.
> h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HdAudioConfig.
> h
> @@ -2,13 +2,7 @@
> HDAUDIO policy
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _HDAUDIO_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HpetConfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HpetConfig.h
> index 30928e5d08..7c2721a3cb 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HpetConfig.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HpetConfig.h
> @@ -2,13 +2,7 @@
> HPET policy
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _HPET_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HsioConfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HsioConfig.h
> index e4973fc25e..a463d40814 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HsioConfig.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HsioConfig.h
> @@ -2,13 +2,7 @@
> HSIO policy
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _HSIO_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HsioPcieConfig.
> h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HsioPcieConfig.
> h
> index cf7bd6251a..c4043bee3e 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HsioPcieConfig.
> h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HsioPcieConfig.
> h
> @@ -2,13 +2,7 @@
> HSIO pcie policy
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _HSIO_PCIE_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HsioSataConfig.
> h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HsioSataConfig.
> h
> index 53c1a01a17..fb1c2fa279 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HsioSataConfig.
> h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HsioSataConfig.
> h
> @@ -2,13 +2,7 @@
> Hsio Sata policy
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _HSIO_SATA_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/InterruptConfig.
> h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/InterruptConfig.
> h
> index 3b8e247a31..6a032dbe0b 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/InterruptConfig.
> h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/InterruptConfig.
> h
> @@ -2,13 +2,7 @@
> Interrupt policy
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _INTERRUPT_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/IoApicConfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/IoApicConfig.h
> index c96e3a3a04..603b876fb8 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/IoApicConfig.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/IoApicConfig.h
> @@ -2,13 +2,7 @@
> IoApic policy
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _IOAPIC_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/IshConfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/IshConfig.h
> index 6a4f6c9ee0..6ffdb0946f 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/IshConfig.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/IshConfig.h
> @@ -2,13 +2,7 @@
> ISH policy
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _ISH_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/LanConfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/LanConfig.h
> index 980f3ac709..873a131e61 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/LanConfig.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/LanConfig.h
> @@ -2,13 +2,7 @@
> Lan policy
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _LAN_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/LockDownConfi
> g.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/LockDownConfi
> g.h
> index f083b3b50c..4f7526f3eb 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/LockDownConfi
> g.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/LockDownConfi
> g.h
> @@ -2,13 +2,7 @@
> Lock down policy
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _LOCK_DOWN_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/LpcConfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/LpcConfig.h
> index be1613a5c2..85fb80c403 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/LpcConfig.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/LpcConfig.h
> @@ -2,13 +2,7 @@
> Lpc policy
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _LPC_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/P2sbConfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/P2sbConfig.h
> index 60b9828ebf..5a61e10299 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/P2sbConfig.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/P2sbConfig.h
> @@ -2,13 +2,7 @@
> P2sb policy
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _P2SB_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/PchGeneralConf
> ig.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/PchGeneralConf
> ig.h
> index c946e9a116..9873061049 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/PchGeneralConf
> ig.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/PchGeneralConf
> ig.h
> @@ -2,13 +2,7 @@
> PCH General policy
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_GENERAL_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/PcieRpConfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/PcieRpConfig.h
> index 873386afe7..d3d92378bd 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/PcieRpConfig.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/PcieRpConfig.h
> @@ -2,13 +2,7 @@
> Pcie root port policy
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_PCIE_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/PmConfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/PmConfig.h
> index f483987c97..fc899ab864 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/PmConfig.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/PmConfig.h
> @@ -2,13 +2,7 @@
> Power Management policy
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PM_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/Port61Config.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/Port61Config.h
> index d8b9cf6145..aa897d0e86 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/Port61Config.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/Port61Config.h
> @@ -2,13 +2,7 @@
> Port 61h policy
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PORT_61_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SataConfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SataConfig.h
> index 0dc76e0c23..368e470af8 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SataConfig.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SataConfig.h
> @@ -2,13 +2,7 @@
> Sata policy
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _SATA_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/ScsConfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/ScsConfig.h
> index 05a2f5dbfa..ba8ab17429 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/ScsConfig.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/ScsConfig.h
> @@ -2,13 +2,7 @@
> Scs policy
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _SCS_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SerialIoConfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SerialIoConfig.h
> index 5caa24310a..529c89f3bf 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SerialIoConfig.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SerialIoConfig.h
> @@ -2,13 +2,7 @@
> Serial IO policy
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _SERIAL_IO_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SerialIrqConfig.
> h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SerialIrqConfig.
> h
> index b64579cd92..38ab7ca013 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SerialIrqConfig.
> h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SerialIrqConfig.
> h
> @@ -2,13 +2,7 @@
> Serial IRQ policy
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _SERIAL_IRQ_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SmbusConfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SmbusConfig.h
> index 78ac72aa87..c2f5b07636 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SmbusConfig.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SmbusConfig.h
> @@ -2,13 +2,7 @@
> Smbus policy
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _SMBUS_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SpiConfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SpiConfig.h
> index 688fa314cb..e97f88cf71 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SpiConfig.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SpiConfig.h
> @@ -2,13 +2,7 @@
> Spi policy
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _SPI_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/ThermalConfig.
> h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/ThermalConfig.
> h
> index 8963da6ee7..b64948ac05 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/ThermalConfig.
> h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/ThermalConfig.
> h
> @@ -2,13 +2,7 @@
> Thermal policy
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _THERMAL_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/TraceHubConfig
> .h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/TraceHubConfig
> .h
> index 5455c40514..a284dd3840 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/TraceHubConfig
> .h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/TraceHubConfig
> .h
> @@ -2,13 +2,7 @@
> Trace Hub policy
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _TRACEHUB_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/UsbConfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/UsbConfig.h
> index c2cef0aa43..0936e8321a 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/UsbConfig.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/UsbConfig.h
> @@ -2,13 +2,7 @@
> USB policy
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _USB_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/WatchDogConfi
> g.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/WatchDogConfi
> g.h
> index 610c1092fb..a01481af64 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/WatchDogConfi
> g.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/WatchDogConfi
> g.h
> @@ -2,13 +2,7 @@
> WatchDog policy
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _WATCH_DOG_CONFIG_H_
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/GpioConfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/GpioConfig.h
> index 8b26020da2..9967241df3 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/GpioConfig.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/GpioConfig.h
> @@ -2,13 +2,7 @@
> Header file for GpioConfig structure used by GPIO library.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _GPIO_CONFIG_H_
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/GpioPinsSklH.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/GpioPinsSklH.h
> index 5230656791..c8629ab12e 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/GpioPinsSklH.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/GpioPinsSklH.h
> @@ -2,13 +2,7 @@
> GPIO pins for SKL-PCH-H,
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _GPIO_PINS_SKL_H_H_
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/GpioPinsSklLp.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/GpioPinsSklLp.h
> index 999b417011..73a982b240 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/GpioPinsSklLp.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/GpioPinsSklLp.h
> @@ -2,13 +2,7 @@
> GPIO pins for SKL-PCH-LP,
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _GPIO_PINS_SKL_LP_H_
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/GpioLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/GpioLib.h
> index 5362beeea3..30ac4abc8b 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/GpioLib.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/GpioLib.h
> @@ -7,13 +7,7 @@
> returned in this case will be 0xFF.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _GPIO_LIB_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/GpioNativeLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/GpioNativeLib.h
> index 5f2c57fd34..dab6708971 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/GpioNativeLib.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/GpioNativeLib.h
> @@ -3,13 +3,7 @@
> All function in this library is available for PEI, DXE, and SMM,
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _GPIO_NATIVE_LIB_H_
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/OcWdtLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/OcWdtLib.h
> index 9f5da64dff..b58c0d7acd 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/OcWdtLib.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/OcWdtLib.h
> @@ -2,13 +2,7 @@
> Header file for OC WDT Library.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _OC_WDT_LIB_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchCycleDecodingLib
> .h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchCycleDecodingLib
> .h
> index 8247f8f3c8..1b24e94f74 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchCycleDecodingLib
> .h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchCycleDecodingLib
> .h
> @@ -2,13 +2,7 @@
> Header file for PchCycleDecodingLib.
>
> Copyright (c) 2017 - 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_CYCLE_DECODING_LIB_H_
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchEspiLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchEspiLib.h
> index 2096645375..479a4cc375 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchEspiLib.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchEspiLib.h
> @@ -3,13 +3,7 @@
> All function in this library is available for PEI, DXE, and SMM,
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchGbeLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchGbeLib.h
> index 5461286634..9fa03a98c7 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchGbeLib.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchGbeLib.h
> @@ -2,13 +2,7 @@
> Header file for PchGbeLib.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_GBE_LIB_H_
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchHsioLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchHsioLib.h
> index 65076800a9..9b775b3ce5 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchHsioLib.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchHsioLib.h
> @@ -2,13 +2,7 @@
> Header file for PchHsioLib.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_HSIO_LIB_H_
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchInfoLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchInfoLib.h
> index 5902b92f18..8b0c123048 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchInfoLib.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchInfoLib.h
> @@ -2,13 +2,7 @@
> Header file for PchInfoLib.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_INFO_LIB_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchP2sbLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchP2sbLib.h
> index 8083ac4efd..6161016312 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchP2sbLib.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchP2sbLib.h
> @@ -2,13 +2,7 @@
> Header file for PchP2sbLib.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_P2SB_LIB_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchPcieRpLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchPcieRpLib.h
> index d5084772dd..1975465841 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchPcieRpLib.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchPcieRpLib.h
> @@ -2,13 +2,7 @@
> Header file for PchPcieRpLib.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_PCIERP_LIB_H_
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchPcrLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchPcrLib.h
> index 149168993f..968e59e412 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchPcrLib.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchPcrLib.h
> @@ -2,13 +2,7 @@
> Header file for PchPcrLib.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_PCR_LIB_H_
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchPmcLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchPmcLib.h
> index 61a955802a..ec98e07100 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchPmcLib.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchPmcLib.h
> @@ -2,13 +2,7 @@
> Header file for PchPmcLib.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_PMC_LIB_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchPolicyLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchPolicyLib.h
> index f4e3659960..cd7622e00c 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchPolicyLib.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchPolicyLib.h
> @@ -2,13 +2,7 @@
> Prototype of the PeiPchPolicy library.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PEI_PCH_POLICY_LIB_H_
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchPsfLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchPsfLib.h
> index 4a2924f8f6..a2b4a9c2bc 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchPsfLib.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchPsfLib.h
> @@ -4,13 +4,7 @@
> It's not expected to be used in platform code.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_PSF_LIB_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchResetLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchResetLib.h
> index 448cd21f50..6a2c57a202 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchResetLib.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchResetLib.h
> @@ -2,13 +2,7 @@
> Header file for PCH RESET Driver.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_RESET_LIB_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchSbiAccessLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchSbiAccessLib.h
> index 87d3318260..a11cc224e7 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchSbiAccessLib.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchSbiAccessLib.h
> @@ -2,13 +2,7 @@
> Header file for PchSbiAccessLib.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_SBI_ACCESS_LIB_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchSerialIoLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchSerialIoLib.h
> index 4ee5a9713e..6b2ba73061 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchSerialIoLib.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchSerialIoLib.h
> @@ -2,13 +2,7 @@
> Header file for PCH Serial IO Lib implementation.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_SERIAL_IO_LIB_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchSerialIoUartLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchSerialIoUartLib.h
> index 66c5945a7b..ac729c2bcf 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchSerialIoUartLib.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchSerialIoUartLib.h
> @@ -2,13 +2,7 @@
> Header file for PCH Serial IO UART Lib implementation.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_SERIAL_IO_UART_LIB_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchSmmControlLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchSmmControlLib.h
> index cdeeae5e6d..6cca4b7cb4 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchSmmControlLib.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchSmmControlLib.h
> @@ -2,13 +2,7 @@
> Header file for SMM Control PEI Library.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_SMM_CONTROL_LIB_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchWdtCommonLib.
> h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchWdtCommonLib.
> h
> index f89e42a546..fde5d785c8 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchWdtCommonLib.
> h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchWdtCommonLib.
> h
> @@ -2,13 +2,7 @@
> Library that contains common parts of WdtPei and WdtDxe. Not a
> standalone module.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_WDT_COMMON_LIB_H_
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/SecPchLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/SecPchLib.h
> index ba9586a7a2..fc7b42889f 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/SecPchLib.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/SecPchLib.h
> @@ -3,13 +3,7 @@
> All function in this library is available for SEC
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _SEC_PCH_LIB_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/SpiFlashCommonLib.
> h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/SpiFlashCommonLib.
> h
> index 12dfaeb440..0c5e72258c 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/SpiFlashCommonLib.
> h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/SpiFlashCommonLib.
> h
> @@ -3,13 +3,7 @@
> internal structure and functions used by SpiFlashCommonLib.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/SpiLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/SpiLib.h
> index 6af66f8869..c3a64eab90 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/SpiLib.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/SpiLib.h
> @@ -2,13 +2,7 @@
> Library to initialize SPI services for future SPI accesses.
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/TraceHubInitLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/TraceHubInitLib.h
> index 23cb544d67..85e4e32d23 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/TraceHubInitLib.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/TraceHubInitLib.h
> @@ -4,13 +4,7 @@
> But do not support UEFI RUNTIME environment call.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _TRACE_HUB_INIT_LIB_H_
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchAccess.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchAccess.h
> index 2c457e3a1e..399f618c70 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchAccess.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchAccess.h
> @@ -2,13 +2,7 @@
> Macros that simplify accessing PCH devices's PCI registers.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_ACCESS_H_
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchLimits.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchLimits.h
> index 905a4778ce..710ae04aee 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchLimits.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchLimits.h
> @@ -2,13 +2,7 @@
> Build time limits of PCH resources.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_LIMITS_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchPcieStorageDetectHob.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchPcieStorageDetectHob.h
> index 664f66f296..f28c3c2804 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchPcieStorageDetectHob.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchPcieStorageDetectHob.h
> @@ -3,13 +3,7 @@
> Definitions required to create PcieStorageInfoHob
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchPolicyCommon.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchPolicyCommon.h
> index 67b255fe97..807bf3c10b 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchPolicyCommon.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchPolicyCommon.h
> @@ -2,13 +2,7 @@
> PCH configuration based on PCH policy
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_POLICY_COMMON_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchPreMemPolicyCommon.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchPreMemPolicyCommon.h
> index 8bd4c9b960..1b492b9fe9 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchPreMemPolicyCommon.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchPreMemPolicyCommon.h
> @@ -2,13 +2,7 @@
> PCH configuration based on PCH policy
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_PREMEM_POLICY_COMMON_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchReservedResources.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchReservedResources.h
> index e5de75c0e3..d54d8736c4 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchReservedResources.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchReservedResources.h
> @@ -2,13 +2,7 @@
> PCH preserved MMIO resource definitions.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_PRESERVED_RESOURCES_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchResetPlatformSpecific.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchResetPlatformSpecific.h
> index c19677cccd..ff49f818ca 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchResetPlatformSpecific.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchResetPlatformSpecific.h
> @@ -2,13 +2,7 @@
> PCH Reset Platform Specific definitions.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_RESET_PLATFORM_SPECIFIC_H_
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Ppi/PchReset.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Ppi/PchReset.h
> index 951dac00dc..bb66f5dfde 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Ppi/PchReset.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Ppi/PchReset.h
> @@ -2,13 +2,7 @@
> PCH Reset PPI
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Ppi/Spi.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Ppi/Spi.h
> index cd98f3601c..e11f82edca 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Ppi/Spi.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Ppi/Spi.h
> @@ -3,13 +3,7 @@
> Intel(R) PCH SPI Host Controller Compatibility Interface.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_SPI_PPI_H_
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Ppi/Wdt.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Ppi/Wdt.h
> index b0bb6bccbd..a97be47abb 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Ppi/Wdt.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Ppi/Wdt.h
> @@ -2,13 +2,7 @@
> Watchdog Timer PPI
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PEI_WDT_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchAcpiSmiDispatc
> h.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchAcpiSmiDispatc
> h.h
> index eb08a89f00..68f76fc411 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchAcpiSmiDispatc
> h.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchAcpiSmiDispatc
> h.h
> @@ -2,13 +2,7 @@
> APIs of PCH ACPI SMI Dispatch Protocol.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_ACPI_SMI_DISPATCH_PROTOCOL_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchEmmcTuning.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchEmmcTuning.h
> index ad1db3833a..4423cc1c79 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchEmmcTuning.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchEmmcTuning.h
> @@ -2,13 +2,7 @@
> PCH eMMC HS400 Tuning Protocol
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_EMMC_TUNING_PROTOCOL_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchEspiSmiDispatch
> .h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchEspiSmiDispatch
> .h
> index 7d7d3a5339..f3e2e05eda 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchEspiSmiDispatch
> .h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchEspiSmiDispatch
> .h
> @@ -2,13 +2,7 @@
> SmmEspiDispatch Protocol
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_ESPI_SMI_DISPATCH_PROTOCOL_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchGpioUnlockSmi
> Dispatch.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchGpioUnlockSmi
> Dispatch.h
> index 392733117b..4df549ec31 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchGpioUnlockSmi
> Dispatch.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchGpioUnlockSmi
> Dispatch.h
> @@ -2,13 +2,7 @@
> APIs of PCH GPIO UNLOCK SMI Dispatch Protocol.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_GPIO_UNLOCK_SMI_DISPATCH_PROTOCOL_H_
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchInfo.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchInfo.h
> index ff81aebddf..312269e74b 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchInfo.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchInfo.h
> @@ -2,13 +2,7 @@
> This file defines the PCH Info Protocol.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_INFO_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchPcieSmiDispatch
> .h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchPcieSmiDispatch
> .h
> index b80597ae9b..cff66f4366 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchPcieSmiDispatch
> .h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchPcieSmiDispatch
> .h
> @@ -2,13 +2,7 @@
> APIs of PCH PCIE SMI Dispatch Protocol.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_PCIE_SMI_DISPATCH_PROTOCOL_H_
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchReset.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchReset.h
> index b39543b36e..b2911ade7e 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchReset.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchReset.h
> @@ -2,13 +2,7 @@
> PCH Reset Protocol
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_RESET_PROTOCOL_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchSmiDispatch.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchSmiDispatch.h
> index 4f0508b238..3e301cb66d 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchSmiDispatch.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchSmiDispatch.h
> @@ -2,13 +2,7 @@
> APIs of PCH SMI Dispatch Protocol.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_SMI_DISPATCH_PROTOCOL_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchSmmIoTrapCont
> rol.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchSmmIoTrapCont
> rol.h
> index 5d0a4d34cf..d94dc2c480 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchSmmIoTrapCont
> rol.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchSmmIoTrapCont
> rol.h
> @@ -2,13 +2,7 @@
> PCH SMM IO Trap Control Protocol
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_SMM_IO_TRAP_CONTROL_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchSmmPeriodicTi
> merControl.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchSmmPeriodicTi
> merControl.h
> index 95c680e75c..4e2c73e28d 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchSmmPeriodicTi
> merControl.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchSmmPeriodicTi
> merControl.h
> @@ -2,13 +2,7 @@
> PCH SMM Periodic Timer Control Protocol
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_SMM_PERIODIC_TIMER_CONTROL_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchTcoSmiDispatch
> .h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchTcoSmiDispatch
> .h
> index 457cdb682c..60c627f778 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchTcoSmiDispatch
> .h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchTcoSmiDispatch
> .h
> @@ -2,13 +2,7 @@
> APIs of PCH TCO SMI Dispatch Protocol.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_TCO_SMI_DISPATCH_PROTOCOL_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/SerialGpio.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/SerialGpio.h
> index 4bc396132d..22663ce8d9 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/SerialGpio.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/SerialGpio.h
> @@ -3,13 +3,7 @@
> Intel(R) Serial Data over GPIO Pin functionality Protocol Interface.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_SERIAL_GPIO_PROTOCOL_H_
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/Spi.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/Spi.h
> index e4ce8fb472..8c66e5063f 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/Spi.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/Spi.h
> @@ -3,13 +3,7 @@
> Intel(R) PCH SPI Host Controller Compatibility Interface.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_SPI_PROTOCOL_H_
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/Wdt.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/Wdt.h
> index 4a65e016e6..171fe8aebc 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/Wdt.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/Wdt.h
> @@ -2,13 +2,7 @@
> Watchdog Timer protocol
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _DXE_WDT_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsCam.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsCam.h
> index c4be5c27e7..0e16b63d29 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsCam.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsCam.h
> @@ -22,13 +22,7 @@
> as "_PCH_" without [generation_name] inserted.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_REGS_CAM_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsDci.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsDci.h
> index d38bd7f0c4..72b4d086e2 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsDci.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsDci.h
> @@ -22,13 +22,7 @@
> as "_PCH_" without [generation_name] inserted.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_REGS_DCI_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsDmi.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsDmi.h
> index 942aeda324..c94a384c79 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsDmi.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsDmi.h
> @@ -22,13 +22,7 @@
> as "_PCH_" without [generation_name] inserted.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_REGS_DMI_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsFia.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsFia.h
> index c9e08ca854..537e83c25a 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsFia.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsFia.h
> @@ -22,13 +22,7 @@
> as "_PCH_" without [generation_name] inserted.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_REGS_FIA_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsGpio.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsGpio.h
> index a6b2c4a8e5..a8649a23a1 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsGpio.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsGpio.h
> @@ -22,13 +22,7 @@
> as "_PCH_" without [generation_name] inserted.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_REGS_GPIO_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsHda.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsHda.h
> index 1d5c0e9e76..c598c3b439 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsHda.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsHda.h
> @@ -22,13 +22,7 @@
> as "_PCH_" without [generation_name] inserted.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_REGS_HDA_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsHsio.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsHsio.h
> index faa938e5a5..635320056e 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsHsio.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsHsio.h
> @@ -2,13 +2,7 @@
> Register definition for HSIO
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_REGS_HSIO_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsIsh.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsIsh.h
> index 687a153f30..4cf546b288 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsIsh.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsIsh.h
> @@ -22,13 +22,7 @@
> as "_PCH_" without [generation_name] inserted.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_REGS_ISH_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsItss.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsItss.h
> index 21269155b5..45ba22490e 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsItss.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsItss.h
> @@ -22,13 +22,7 @@
> as "_PCH_" without [generation_name] inserted.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_REGS_ITSS_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsLan.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsLan.h
> index bb4c2c15a9..974ca27c26 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsLan.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsLan.h
> @@ -22,13 +22,7 @@
> as "_PCH_" without [generation_name] inserted.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_REGS_LAN_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsLpc.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsLpc.h
> index 7c6f639260..052680e9f0 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsLpc.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsLpc.h
> @@ -22,13 +22,7 @@
> as "_PCH_" without [generation_name] inserted.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_REGS_LPC_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsP2sb.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsP2sb.h
> index b2779ab0ce..7619bf27cd 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsP2sb.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsP2sb.h
> @@ -22,13 +22,7 @@
> as "_PCH_" without [generation_name] inserted.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_REGS_P2SB_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsPcie.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsPcie.h
> index 704f77c52f..0a1530743f 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsPcie.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsPcie.h
> @@ -22,13 +22,7 @@
> as "_PCH_" without [generation_name] inserted.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_REGS_PCIE_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsPcr.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsPcr.h
> index eac209a149..49aa13b52b 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsPcr.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsPcr.h
> @@ -22,13 +22,7 @@
> as "_PCH_" without [generation_name] inserted.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_REGS_PCR_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsPmc.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsPmc.h
> index d4c048ffe3..91b4a5f9a6 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsPmc.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsPmc.h
> @@ -22,13 +22,7 @@
> as "_PCH_" without [generation_name] inserted.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_REGS_PMC_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsPsf.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsPsf.h
> index c52f1e721d..ba5c5ce26b 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsPsf.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsPsf.h
> @@ -22,13 +22,7 @@
> as "_PCH_" without [generation_name] inserted.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_REGS_PSF_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsPsth.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsPsth.h
> index b312f7100e..0e599fef2b 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsPsth.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsPsth.h
> @@ -22,13 +22,7 @@
> as "_PCH_" without [generation_name] inserted.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_REGS_PSTH_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsSata.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsSata.h
> index 88d066ea28..5f62bb538d 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsSata.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsSata.h
> @@ -22,13 +22,7 @@
> as "_PCH_" without [generation_name] inserted.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_REGS_SATA_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsScs.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsScs.h
> index b1872adbe6..7af90cfe0c 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsScs.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsScs.h
> @@ -22,13 +22,7 @@
> as "_PCH_" without [generation_name] inserted.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_REGS_SCS_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsSerialIo.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsSerialIo.h
> index 461b935fde..eab67649ee 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsSerialIo.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsSerialIo.h
> @@ -22,13 +22,7 @@
> as "_PCH_" without [generation_name] inserted.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_REGS_SERIAL_IO_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsSmbus.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsSmbus.h
> index 9682040879..d52133fa3a 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsSmbus.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsSmbus.h
> @@ -22,13 +22,7 @@
> as "_PCH_" without [generation_name] inserted.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_REGS_SMBUS_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsSpi.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsSpi.h
> index f43c676797..6d7bf8f59a 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsSpi.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsSpi.h
> @@ -22,13 +22,7 @@
> as "_PCH_" without [generation_name] inserted.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_REGS_SPI_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsThermal.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsThermal.h
> index fe43d210ab..cdeaaab6a4 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsThermal.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsThermal.h
> @@ -22,13 +22,7 @@
> as "_PCH_" without [generation_name] inserted.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_REGS_THERMAL_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsTraceHub.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsTraceHub.h
> index 513b022f08..53526c8753 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsTraceHub.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsTraceHub.h
> @@ -22,13 +22,7 @@
> as "_PCH_" without [generation_name] inserted.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsUsb.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsUsb.h
> index 7dfe90815f..56a864cf4b 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsUsb.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsUsb.h
> @@ -22,13 +22,7 @@
> as "_PCH_" without [generation_name] inserted.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_REGS_USB_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/DxePchHdaNh
> lt.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/DxePchHdaNh
> lt.h
> index 5e7674a412..366b9d6707 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/DxePchHdaNh
> lt.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/DxePchHdaNh
> lt.h
> @@ -2,13 +2,7 @@
> Header file for DxePchHdaLib - NHLT structure definitions.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/GpioPrivateLib
> .h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/GpioPrivateLib
> .h
> index f555182bc4..395d009adf 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/GpioPrivateLib
> .h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/GpioPrivateLib
> .h
> @@ -3,13 +3,7 @@
> All function in this library is available for PEI, DXE, and SMM,
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _GPIO_PRIVATE_LIB_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/I2cMasterCo
> mmonLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/I2cMasterCo
> mmonLib.h
> index 8f0a1adf38..9c8335861d 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/I2cMasterCo
> mmonLib.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/I2cMasterCo
> mmonLib.h
> @@ -2,13 +2,7 @@
> Implement the I2C port control.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchHdaLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchHdaLib.h
> index f3f7c27340..e7d5fdc3dc 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchHdaLib.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchHdaLib.h
> @@ -2,13 +2,7 @@
> This library provides PCH HD Audio functions.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchInitComm
> onLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchInitComm
> onLib.h
> index 8c016c624f..449b38f111 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchInitComm
> onLib.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchInitComm
> onLib.h
> @@ -2,13 +2,7 @@
> Header file for PCH Init Common Lib
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_INIT_COMMON_LIB_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchPciExpress
> HelpersLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchPciExpress
> HelpersLib.h
> index 49c89a2fcc..2c800ca8e0 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchPciExpress
> HelpersLib.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchPciExpress
> HelpersLib.h
> @@ -2,13 +2,7 @@
> Header file for PCH PCI Express helpers library
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_PCI_EXPRESS_HELPERS_LIB_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchPsfPrivateL
> ib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchPsfPrivateL
> ib.h
> index ad390103ce..e72cc87a27 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchPsfPrivateL
> ib.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchPsfPrivateL
> ib.h
> @@ -2,13 +2,7 @@
> Header file for PchPsfPrivateLib.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_PSF_PRIVATE_LIB_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchSmbusCom
> monLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchSmbusCom
> monLib.h
> index 5c2a6c30e2..e6494a1a38 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchSmbusCom
> monLib.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchSmbusCom
> monLib.h
> @@ -2,13 +2,7 @@
> PCH Smbus Protocol
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_SMBUS_COMMON_LIB_H
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchSpiCommo
> nLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchSpiCommo
> nLib.h
> index 8b6b6a6c97..d408289ea2 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchSpiCommo
> nLib.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchSpiCommo
> nLib.h
> @@ -2,13 +2,7 @@
> Header file for the PCH SPI Common Driver.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_SPI_COMMON_LIB_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PeiI2cMasterL
> ib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PeiI2cMasterL
> ib.h
> index da4cfc6d19..78c07f20c6 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PeiI2cMasterL
> ib.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PeiI2cMasterL
> ib.h
> @@ -2,13 +2,7 @@
> PEI I2C Master module
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/RstPrivateLib.
> h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/RstPrivateLib.
> h
> index 2301c9fc0f..28edfda991 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/RstPrivateLib.
> h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/RstPrivateLib.
> h
> @@ -2,13 +2,7 @@
> Header file for Rst Library
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/PchConfigHob.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/PchConfigHob.h
> index fb372e92ac..9827beb085 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/PchConfigHob.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/PchConfigHob.h
> @@ -2,13 +2,7 @@
> The GUID definition for PchConfigHob
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_CONFIG_HOB_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/PchHdaEndpoints.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/PchHdaEndpoints.h
> index 97f7be6c11..4c3f1795c0 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/PchHdaEndpoints.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/PchHdaEndpoints.h
> @@ -2,13 +2,7 @@
> Header file for PchHdaLib Endpoint descriptors.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Protocol/PchNvs.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Protocol/PchNvs.h
> index ac288a56d0..b071061883 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Protocol/PchNvs.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Protocol/PchNvs.h
> @@ -2,13 +2,7 @@
> This file defines the PCH NVS Protocol.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_NVS_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Protocol/PchNvsArea.
> h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Protocol/PchNvsArea.
> h
> index 66c119f577..c82498bde5 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Protocol/PchNvsArea.
> h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Protocol/PchNvsArea.
> h
> @@ -1,13 +1,7 @@
> /**@file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Protocol/PcieIoTrap.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Protocol/PcieIoTrap.h
> index 26d13b7a7d..8e05dd2c0a 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Protocol/PcieIoTrap.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Protocol/PcieIoTrap.h
> @@ -2,13 +2,7 @@
> This file defines the PCH PCIE IoTrap Protocol.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_PCIE_IOTRAP_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseResetSystemLib/BaseRes
> etSystemLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseResetSystemLib/BaseRes
> etSystemLib.c
> index f6f708172e..0fddff71a1 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseResetSystemLib/BaseRes
> etSystemLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseResetSystemLib/BaseRes
> etSystemLib.c
> @@ -2,13 +2,7 @@
> System reset library services.
>
> Copyright (c) 2017 - 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include <Uefi.h>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseResetSystemLib/BaseRes
> etSystemLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseResetSystemLib/BaseRes
> etSystemLib.inf
> index 2af43b5091..4c46216b44 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseResetSystemLib/BaseRes
> etSystemLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseResetSystemLib/BaseRes
> etSystemLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseSmbusLib/BaseSmbusLib.
> c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseSmbusLib/BaseSmbusLib.
> c
> index 17e42dfd0b..5d09e18613 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseSmbusLib/BaseSmbusLib.
> c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseSmbusLib/BaseSmbusLib.
> c
> @@ -2,13 +2,7 @@
> PCH SMBUS library implementation built upon I/O library.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseSmbusLib/BaseSmbusLib.
> inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseSmbusLib/BaseSmbusLib.
> inf
> index a737f7105f..2894d137b9 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseSmbusLib/BaseSmbusLib.
> inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseSmbusLib/BaseSmbusLib.
> inf
> @@ -6,13 +6,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeResetSystemLib/DxeReset
> SystemLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeResetSystemLib/DxeReset
> SystemLib.c
> index c591bdddef..51facacf08 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeResetSystemLib/DxeReset
> SystemLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeResetSystemLib/DxeReset
> SystemLib.c
> @@ -2,13 +2,7 @@
> System reset library services.
>
> Copyright (c) 2017 - 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include <Base.h>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeResetSystemLib/DxeReset
> SystemLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeResetSystemLib/DxeReset
> SystemLib.inf
> index 1736c3189e..aa8877140a 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeResetSystemLib/DxeReset
> SystemLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeResetSystemLib/DxeReset
> SystemLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeRuntimeResetSystemLib/
> DxeRuntimeResetSystemLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeRuntimeResetSystemLib/
> DxeRuntimeResetSystemLib.c
> index 2bd8828836..9d09b3681b 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeRuntimeResetSystemLib/
> DxeRuntimeResetSystemLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeRuntimeResetSystemLib/
> DxeRuntimeResetSystemLib.c
> @@ -2,13 +2,7 @@
> System reset library services.
>
> Copyright (c) 2017 - 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include <Base.h>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeRuntimeResetSystemLib/
> DxeRuntimeResetSystemLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeRuntimeResetSystemLib/
> DxeRuntimeResetSystemLib.inf
> index 801876dd93..6b27661603 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeRuntimeResetSystemLib/
> DxeRuntimeResetSystemLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeRuntimeResetSystemLib/
> DxeRuntimeResetSystemLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/GpioInit.
> c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/GpioInit.
> c
> index 6e0c1c8b46..5d4d758e57 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/GpioInit.
> c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/GpioInit.
> c
> @@ -2,13 +2,7 @@
> This file contains routines for GPIO initialization
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "GpioLibrary.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/GpioLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/GpioLib.c
> index bf76d40963..9679f657f3 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/GpioLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/GpioLib.c
> @@ -2,13 +2,7 @@
> This file contains routines for GPIO
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "GpioLibrary.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/GpioLibra
> ry.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/GpioLibra
> ry.h
> index 97a5287067..ed4f2f8023 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/GpioLibra
> ry.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/GpioLibra
> ry.h
> @@ -2,13 +2,7 @@
> Header file for GPIO Lib implementation.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _GPIO_LIBRARY_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/GpioNati
> veLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/GpioNati
> veLib.c
> index e57e3ecbfa..a4f6466ed4 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/GpioNati
> veLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/GpioNati
> veLib.c
> @@ -2,13 +2,7 @@
> This file contains routines for GPIO native and chipset specific usage
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "GpioLibrary.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/PchSklGpi
> oData.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/PchSklGpi
> oData.c
> index c36792139c..42f57df921 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/PchSklGpi
> oData.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/PchSklGpi
> oData.c
> @@ -2,13 +2,7 @@
> This file contains SKL specific GPIO information
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "GpioLibrary.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/PeiDxeS
> mmGpioLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/PeiDxeS
> mmGpioLib.inf
> index 747fa67199..1282118d55 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/PeiDxeS
> mmGpioLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/PeiDxeS
> mmGpioLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchCycleDecodin
> gLib/PchCycleDecodingLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchCycleDecodin
> gLib/PchCycleDecodingLib.c
> index 1f13b094fc..540e5ba116 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchCycleDecodin
> gLib/PchCycleDecodingLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchCycleDecodin
> gLib/PchCycleDecodingLib.c
> @@ -2,13 +2,7 @@
> PCH cycle deocding configuration and query library.
>
> Copyright (c) 2017 - 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include <Base.h>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchCycleDecodin
> gLib/PeiDxeSmmPchCycleDecodingLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchCycleDecodin
> gLib/PeiDxeSmmPchCycleDecodingLib.inf
> index 446703d918..24d08f662f 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchCycleDecodin
> gLib/PeiDxeSmmPchCycleDecodingLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchCycleDecodin
> gLib/PeiDxeSmmPchCycleDecodingLib.inf
> @@ -6,13 +6,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchGbeLib/PchGb
> eLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchGbeLib/PchGb
> eLib.c
> index 277923bdcc..d3bdfd2fc8 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchGbeLib/PchGb
> eLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchGbeLib/PchGb
> eLib.c
> @@ -4,13 +4,7 @@
> But do not support UEFI RUNTIME environment call.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchGbeLib/PeiDx
> eSmmPchGbeLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchGbeLib/PeiDx
> eSmmPchGbeLib.inf
> index b05d82fce1..bfcb71ec20 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchGbeLib/PeiDx
> eSmmPchGbeLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchGbeLib/PeiDx
> eSmmPchGbeLib.inf
> @@ -6,13 +6,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchHsioLib/PchHs
> ioLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchHsioLib/PchHs
> ioLib.c
> index d3e6094954..d7483ebd97 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchHsioLib/PchHs
> ioLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchHsioLib/PchHs
> ioLib.c
> @@ -4,13 +4,7 @@
> But do not support UEFI RUNTIME environment call.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchHsioLib/PeiDx
> eSmmPchHsioLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchHsioLib/PeiDx
> eSmmPchHsioLib.inf
> index f233f3e673..11a32ad78e 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchHsioLib/PeiDx
> eSmmPchHsioLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchHsioLib/PeiDx
> eSmmPchHsioLib.inf
> @@ -6,13 +6,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchInfoLib/PchInf
> oLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchInfoLib/PchInf
> oLib.c
> index 3f72e006c8..a1c20ba04f 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchInfoLib/PchInf
> oLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchInfoLib/PchInf
> oLib.c
> @@ -5,13 +5,7 @@
> But do not support UEFI RUNTIME environment call.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include <Base.h>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchInfoLib/PchInf
> oStrLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchInfoLib/PchInf
> oStrLib.c
> index 6fb06eac2f..05b8587263 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchInfoLib/PchInf
> oStrLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchInfoLib/PchInf
> oStrLib.c
> @@ -5,13 +5,7 @@
> But do not support UEFI RUNTIME environment call.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include <Base.h>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchInfoLib/PeiDx
> eSmmPchInfoLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchInfoLib/PeiDx
> eSmmPchInfoLib.inf
> index 35566d8243..44d56ea838 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchInfoLib/PeiDx
> eSmmPchInfoLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchInfoLib/PeiDx
> eSmmPchInfoLib.inf
> @@ -6,13 +6,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchP2sbLib/PchP2
> sbLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchP2sbLib/PchP2
> sbLib.c
> index dba89d3edc..ca3a222979 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchP2sbLib/PchP2
> sbLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchP2sbLib/PchP2
> sbLib.c
> @@ -4,13 +4,7 @@
> But do not support UEFI RUNTIME environment call.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchP2sbLib/PeiDx
> eSmmPchP2sbLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchP2sbLib/PeiDx
> eSmmPchP2sbLib.inf
> index 115175f8a2..da3390c4ca 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchP2sbLib/PeiDx
> eSmmPchP2sbLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchP2sbLib/PeiDx
> eSmmPchP2sbLib.inf
> @@ -6,13 +6,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcieRpLib/Pch
> PcieRpLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcieRpLib/Pch
> PcieRpLib.c
> index 6b8a51d8d2..43caf3e9bd 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcieRpLib/Pch
> PcieRpLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcieRpLib/Pch
> PcieRpLib.c
> @@ -4,13 +4,7 @@
> But do not support UEFI RUNTIME environment call.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcieRpLib/Pei
> DxeSmmPchPcieRpLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcieRpLib/Pei
> DxeSmmPchPcieRpLib.inf
> index 79ddb969ae..6b22411162 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcieRpLib/Pei
> DxeSmmPchPcieRpLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcieRpLib/Pei
> DxeSmmPchPcieRpLib.inf
> @@ -6,13 +6,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcrLib/PchPcr
> Lib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcrLib/PchPcr
> Lib.c
> index e2585c36e0..b07a903d44 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcrLib/PchPcr
> Lib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcrLib/PchPcr
> Lib.c
> @@ -4,13 +4,7 @@
> But do not support UEFI RUNTIME environment call.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcrLib/PeiDxe
> SmmPchPcrLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcrLib/PeiDxe
> SmmPchPcrLib.inf
> index fdc523143f..2de45d5240 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcrLib/PeiDxe
> SmmPchPcrLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcrLib/PeiDxe
> SmmPchPcrLib.inf
> @@ -6,13 +6,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPmcLib/PchP
> mcLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPmcLib/PchP
> mcLib.c
> index 1985d5d133..790af0a7a1 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPmcLib/PchP
> mcLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPmcLib/PchP
> mcLib.c
> @@ -4,13 +4,7 @@
> But do not support UEFI RUNTIME environment call.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPmcLib/PeiDx
> eSmmPchPmcLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPmcLib/PeiDx
> eSmmPchPmcLib.inf
> index bd3a33ff70..8b46a59b67 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPmcLib/PeiDx
> eSmmPchPmcLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPmcLib/PeiDx
> eSmmPchPmcLib.inf
> @@ -6,13 +6,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPsfLib/PchPsfL
> ib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPsfLib/PchPsfL
> ib.c
> index 08a28f7e6d..a6f484f47b 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPsfLib/PchPsfL
> ib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPsfLib/PchPsfL
> ib.c
> @@ -2,13 +2,7 @@
> This file contains PSF routines
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include <Base.h>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPsfLib/PeiDxe
> SmmPchPsfLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPsfLib/PeiDxe
> SmmPchPsfLib.inf
> index 941f5a72dd..82db84c539 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPsfLib/PeiDxe
> SmmPchPsfLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPsfLib/PeiDxe
> SmmPchPsfLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchSbiAccessLib/
> PchSbiAccessLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchSbiAccessLib/
> PchSbiAccessLib.c
> index 9434b7f236..85a699689e 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchSbiAccessLib/
> PchSbiAccessLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchSbiAccessLib/
> PchSbiAccessLib.c
> @@ -2,13 +2,7 @@
> PCH SBI access library.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchSbiAccessLib/
> PeiDxeSmmPchSbiAccessLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchSbiAccessLib/
> PeiDxeSmmPchSbiAccessLib.inf
> index 38ca8dce0e..be8b2f55dc 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchSbiAccessLib/
> PeiDxeSmmPchSbiAccessLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchSbiAccessLib/
> PeiDxeSmmPchSbiAccessLib.inf
> @@ -6,13 +6,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchSerialIoLib/Pei
> DxeSmmPchSerialIoLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchSerialIoLib/Pei
> DxeSmmPchSerialIoLib.c
> index 7d24ed1269..03e2c60a5e 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchSerialIoLib/Pei
> DxeSmmPchSerialIoLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchSerialIoLib/Pei
> DxeSmmPchSerialIoLib.c
> @@ -4,13 +4,7 @@
> But do not support UEFI RUNTIME environment call.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchSerialIoLib/Pei
> DxeSmmPchSerialIoLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchSerialIoLib/Pei
> DxeSmmPchSerialIoLib.inf
> index 28ee07ee15..fc25c3001d 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchSerialIoLib/Pei
> DxeSmmPchSerialIoLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchSerialIoLib/Pei
> DxeSmmPchSerialIoLib.inf
> @@ -6,13 +6,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchWdtCommonL
> ib/PeiDxeSmmPchWdtCommonLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchWdtCommonL
> ib/PeiDxeSmmPchWdtCommonLib.inf
> index 723ad14ced..95e4893d6c 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchWdtCommonL
> ib/PeiDxeSmmPchWdtCommonLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchWdtCommonL
> ib/PeiDxeSmmPchWdtCommonLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchWdtCommonL
> ib/WdtCommon.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchWdtCommonL
> ib/WdtCommon.c
> index 00a2fef78d..50d2dd638e 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchWdtCommonL
> ib/WdtCommon.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchWdtCommonL
> ib/WdtCommon.c
> @@ -2,13 +2,7 @@
> Library that contains common parts of WdtPei and WdtDxe. Not a
> standalone module.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include <Uefi/UefiBaseType.h>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLib/PeiOcWdtLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLib/PeiOcWdtLib.c
> index 0996b02ea6..e8c8dab6e7 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLib/PeiOcWdtLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLib/PeiOcWdtLib.c
> @@ -2,13 +2,7 @@
> The PEI Library Implements OcWdt Support.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLib/PeiOcWdtLib.in
> f
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLib/PeiOcWdtLib.in
> f
> index a2b8f71784..32a1df1b64 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLib/PeiOcWdtLib.in
> f
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLib/PeiOcWdtLib.in
> f
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLibNull/PeiOcWdtLi
> bNull.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLibNull/PeiOcWdtLi
> bNull.c
> index fdde6803c3..ccd6c73599 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLibNull/PeiOcWdtLi
> bNull.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLibNull/PeiOcWdtLi
> bNull.c
> @@ -2,13 +2,7 @@
> The Null PEI Library Implements OcWdt Support.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLibNull/PeiOcWdtLi
> bNull.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLibNull/PeiOcWdtLi
> bNull.inf
> index 93c951d49c..dbe58c6acd 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLibNull/PeiOcWdtLi
> bNull.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLibNull/PeiOcWdtLi
> bNull.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchPreMemP
> rintPolicy.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchPreMemP
> rintPolicy.c
> index 650d414247..b7fcb0944e 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchPreMemP
> rintPolicy.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchPreMemP
> rintPolicy.c
> @@ -2,13 +2,7 @@
> Print whole PCH_PREMEM_POLICY_PPI
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "PeiPchPolicyLibrary.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchPrintPolic
> y.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchPrintPolic
> y.c
> index 13a8f9fbd6..72a78e5faf 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchPrintPolic
> y.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchPrintPolic
> y.c
> @@ -2,13 +2,7 @@
> Print whole PCH_POLICY_PPI
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "PeiPchPolicyLibrary.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchSamplePo
> licyLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchSamplePo
> licyLib.c
> index 4e57b72d6e..62b621ce2f 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchSamplePo
> licyLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchSamplePo
> licyLib.c
> @@ -2,13 +2,7 @@
> This file is to load sample board policy.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "PeiPchPolicyLibrary.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchSamplePr
> eMemPolicyLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchSamplePr
> eMemPolicyLib.c
> index fcefd76e8e..6cf9d9069e 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchSamplePr
> eMemPolicyLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchSamplePr
> eMemPolicyLib.c
> @@ -2,13 +2,7 @@
> This file is to load sample board policy.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "PeiPchPolicyLibrary.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyL
> ib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyL
> ib.c
> index f0f9f33f71..201c49b3a8 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyL
> ib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyL
> ib.c
> @@ -2,13 +2,7 @@
> This file is PeiPchPolicy library.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "PeiPchPolicyLibrary.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyL
> ib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyL
> ib.inf
> index d4d4ac1e54..39004319aa 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyL
> ib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyL
> ib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyL
> ibrary.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyL
> ibrary.h
> index 9be618d38a..f8d01614ac 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyL
> ibrary.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyL
> ibrary.h
> @@ -2,13 +2,7 @@
> Header file for the PeiPchPolicy library.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PEI_PCH_POLICY_LIBRARY_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPreMe
> mPolicyLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPreMe
> mPolicyLib.c
> index 5480cf3d5c..b5c1a39399 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPreMe
> mPolicyLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPreMe
> mPolicyLib.c
> @@ -2,13 +2,7 @@
> This file is PeiPchPreMemPolicy library.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "PeiPchPolicyLibrary.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchResetLib/PchReset.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchResetLib/PchReset.c
> index 1a30bf31f6..20e5d36892 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchResetLib/PchReset.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchResetLib/PchReset.c
> @@ -2,13 +2,7 @@
> PCH RESET PEIM DRIVER.
>
> Copyright (c) 2017 - 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include <PiPei.h>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchResetLib/PeiPchResetLi
> b.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchResetLib/PeiPchResetLi
> b.inf
> index b03a986313..b04f4006ef 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchResetLib/PeiPchResetLi
> b.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchResetLib/PeiPchResetLi
> b.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiResetSystemLib/PeiResetS
> ystemLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiResetSystemLib/PeiResetS
> ystemLib.c
> index 9429b0ecf4..6f12abf111 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiResetSystemLib/PeiResetS
> ystemLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiResetSystemLib/PeiResetS
> ystemLib.c
> @@ -2,13 +2,7 @@
> System reset library services.
>
> Copyright (c) 2017 - 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include <Base.h>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiResetSystemLib/PeiResetS
> ystemLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiResetSystemLib/PeiResetS
> ystemLib.inf
> index a259bdf6ec..18a92a6f18 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiResetSystemLib/PeiResetS
> ystemLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiResetSystemLib/PeiResetS
> ystemLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiResetSystemLib/PeiResetS
> ystemLibFsp.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiResetSystemLib/PeiResetS
> ystemLibFsp.inf
> index 9abb7c2107..e7284e6668 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiResetSystemLib/PeiResetS
> ystemLibFsp.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiResetSystemLib/PeiResetS
> ystemLibFsp.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiSpiLib/PeiSpiLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiSpiLib/PeiSpiLib.c
> index ecd6878490..aadc367a9f 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiSpiLib/PeiSpiLib.c
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiSpiLib/PeiSpiLib.c
> @@ -2,13 +2,7 @@
> PCH SPI PEI Library implements the SPI Host Controller Interface.
>
> Copyright (c) 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiSpiLib/PeiSpiLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiSpiLib/PeiSpiLib.inf
> index 9240b6ef06..31f4ffe43a 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiSpiLib/PeiSpiLib.inf
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiSpiLib/PeiSpiLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2019, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/Sm
> mSpiFlashCommonLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/Sm
> mSpiFlashCommonLib.inf
> index c7b3e864eb..d712b9e5f7 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/Sm
> mSpiFlashCommonLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/Sm
> mSpiFlashCommonLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ###
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/SpiF
> lashCommon.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/SpiF
> lashCommon.c
> index d95f51af41..7ee7ffab50 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/SpiF
> lashCommon.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/SpiF
> lashCommon.c
> @@ -3,13 +3,7 @@
> for module use.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/SpiF
> lashCommonSmmLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/SpiF
> lashCommonSmmLib.c
> index 8d2238dbf1..11133163d2 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/SpiF
> lashCommonSmmLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/SpiF
> lashCommonSmmLib.c
> @@ -2,13 +2,7 @@
> SMM Library instance of SPI Flash Common Library Class
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/BasePchSpiCommonLi
> b/BasePchSpiCommonLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/BasePchSpiCommonLi
> b/BasePchSpiCommonLib.inf
> index 128f7adcea..599b07d3d3 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/BasePchSpiCommonLi
> b/BasePchSpiCommonLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/BasePchSpiCommonLi
> b/BasePchSpiCommonLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/BasePchSpiCommonLi
> b/SpiCommon.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/BasePchSpiCommonLi
> b/SpiCommon.c
> index 0b708d4aad..58757a8cba 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/BasePchSpiCommonLi
> b/SpiCommon.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/BasePchSpiCommonLi
> b/SpiCommon.c
> @@ -2,13 +2,7 @@
> PCH SPI Common Driver implements the SPI Host Controller Compatibility
> Interface.
>
> Copyright (c) 2017 - 2019, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include <Uefi/UefiBaseType.h>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/DxePch
> HdaLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/DxePch
> HdaLib.inf
> index 52d7c8bbaf..04940c75c1 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/DxePch
> HdaLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/DxePch
> HdaLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/PchHda
> Endpoints.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/PchHda
> Endpoints.c
> index 11c6ec0269..31ea72bc55 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/PchHda
> Endpoints.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/PchHda
> Endpoints.c
> @@ -2,13 +2,7 @@
> This file contains HD Audio NHLT Endpoints definitions
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/PchHda
> Lib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/PchHda
> Lib.c
> index e577cd9038..2e93507a8a 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/PchHda
> Lib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/PchHda
> Lib.c
> @@ -2,13 +2,7 @@
> PCH HD Audio Library implementation.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/PchHda
> NhltConfig.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/PchHda
> NhltConfig.c
> index 46096a0ac3..6e56d357f5 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/PchHda
> NhltConfig.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/PchHda
> NhltConfig.c
> @@ -2,13 +2,7 @@
> This file contains HD Audio NHLT Configuration BLOBs
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeI2cMasterCom
> monLib/I2cMasterCommonLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeI2cMasterCom
> monLib/I2cMasterCommonLib.c
> index 32814bf773..16a2c73a77 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeI2cMasterCom
> monLib/I2cMasterCommonLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeI2cMasterCom
> monLib/I2cMasterCommonLib.c
> @@ -2,13 +2,7 @@
> Implement the I2C controller driver.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeI2cMasterCom
> monLib/PeiDxeI2cMasterCommonLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeI2cMasterCom
> monLib/PeiDxeI2cMasterCommonLib.inf
> index a6af85a4a0..5218191d8a 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeI2cMasterCom
> monLib/PeiDxeI2cMasterCommonLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeI2cMasterCom
> monLib/PeiDxeI2cMasterCommonLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivat
> eLib/GpioNativePrivateLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivat
> eLib/GpioNativePrivateLib.c
> index 89bf0a73ee..d47ae6fd55 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivat
> eLib/GpioNativePrivateLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivat
> eLib/GpioNativePrivateLib.c
> @@ -3,13 +3,7 @@
> used by Reference Code only.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include <Base.h>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivat
> eLib/GpioPrivateLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivat
> eLib/GpioPrivateLib.c
> index b386e071f7..bc660b0906 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivat
> eLib/GpioPrivateLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivat
> eLib/GpioPrivateLib.c
> @@ -2,13 +2,7 @@
> This file contains GPIO routines for RC usage
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include <Base.h>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivat
> eLib/PchSklGpioPrivateData.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivat
> eLib/PchSklGpioPrivateData.c
> index 3d8b128a1c..6cf855d692 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivat
> eLib/PchSklGpioPrivateData.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivat
> eLib/PchSklGpioPrivateData.c
> @@ -2,13 +2,7 @@
> This file contains SKL specific GPIO information
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include <Base.h>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivat
> eLib/PeiDxeSmmGpioPrivateLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivat
> eLib/PeiDxeSmmGpioPrivateLib.inf
> index d2542a1673..7986358ce1 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivat
> eLib/PeiDxeSmmGpioPrivateLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivat
> eLib/PeiDxeSmmGpioPrivateLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchInitCo
> mmonLib/PchInitCommon.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchInitCo
> mmonLib/PchInitCommon.c
> index a49bbc5c18..ed088bd642 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchInitCo
> mmonLib/PchInitCommon.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchInitCo
> mmonLib/PchInitCommon.c
> @@ -2,13 +2,7 @@
> Pch common library for PCH INIT PEI/DXE/SMM modules
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchInitCo
> mmonLib/PchRpfn.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchInitCo
> mmonLib/PchRpfn.c
> index 77dd285430..1cd4884bc9 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchInitCo
> mmonLib/PchRpfn.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchInitCo
> mmonLib/PchRpfn.c
> @@ -2,13 +2,7 @@
> This file contains functions that configures PCI Express Root Ports function
> swapping.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include <Uefi/UefiBaseType.h>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchInitCo
> mmonLib/PeiDxeSmmPchInitCommonLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchInitCo
> mmonLib/PeiDxeSmmPchInitCommonLib.inf
> index df4900d964..52ab228442 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchInitCo
> mmonLib/PeiDxeSmmPchInitCommonLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchInitCo
> mmonLib/PeiDxeSmmPchInitCommonLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPciExpr
> essHelpersLib/PchPciExpressHelpersLibrary.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPciExpr
> essHelpersLib/PchPciExpressHelpersLibrary.c
> index 815b800db7..04145d8373 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPciExpr
> essHelpersLib/PchPciExpressHelpersLibrary.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPciExpr
> essHelpersLib/PchPciExpressHelpersLibrary.c
> @@ -2,13 +2,7 @@
> This file contains routines that support PCI Express initialization
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "PchPciExpressHelpersLibrary.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPciExpr
> essHelpersLib/PchPciExpressHelpersLibrary.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPciExpr
> essHelpersLib/PchPciExpressHelpersLibrary.h
> index bd59b5346e..7fe8985946 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPciExpr
> essHelpersLib/PchPciExpressHelpersLibrary.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPciExpr
> essHelpersLib/PchPciExpressHelpersLibrary.h
> @@ -2,13 +2,7 @@
> Header file for PCH Pci Express helps library implementation.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_PCI_EXPRESS_HELPERS_LIBRARY_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPciExpr
> essHelpersLib/PeiDxeSmmPchPciExpressHelpersLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPciExpr
> essHelpersLib/PeiDxeSmmPchPciExpressHelpersLib.inf
> index b02f311f02..39dc89670a 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPciExpr
> essHelpersLib/PeiDxeSmmPchPciExpressHelpersLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPciExpr
> essHelpersLib/PeiDxeSmmPchPciExpressHelpersLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPsfPriv
> ateLib/PchPsfPrivateLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPsfPriv
> ateLib/PchPsfPrivateLib.c
> index ef579c825d..55124c0cb9 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPsfPriv
> ateLib/PchPsfPrivateLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPsfPriv
> ateLib/PchPsfPrivateLib.c
> @@ -2,13 +2,7 @@
> This file contains PSF routines for RC usage
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include <Base.h>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPsfPriv
> ateLib/PeiDxeSmmPchPsfPrivateLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPsfPriv
> ateLib/PeiDxeSmmPchPsfPrivateLib.inf
> index 6995171b10..0d7050500a 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPsfPriv
> ateLib/PeiDxeSmmPchPsfPrivateLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPsfPriv
> ateLib/PeiDxeSmmPchPsfPrivateLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchSmbus
> CommonLib/PchSmbusExec.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchSmbus
> CommonLib/PchSmbusExec.c
> index ad5c784bff..abdc06cd70 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchSmbus
> CommonLib/PchSmbusExec.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchSmbus
> CommonLib/PchSmbusExec.c
> @@ -2,13 +2,7 @@
> PCH Smbus Executive Code (common PEI/DXE/SMM code)
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include <Uefi/UefiBaseType.h>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchSmbus
> CommonLib/PeiDxeSmmPchSmbusCommonLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchSmbus
> CommonLib/PeiDxeSmmPchSmbusCommonLib.inf
> index 54a67614af..78324e1fef 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchSmbus
> CommonLib/PeiDxeSmmPchSmbusCommonLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchSmbus
> CommonLib/PeiDxeSmmPchSmbusCommonLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmRstPrivate
> Lib/PeiDxeSmmRstPrivateLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmRstPrivate
> Lib/PeiDxeSmmRstPrivateLib.c
> index 7436a76ec1..e97d48f777 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmRstPrivate
> Lib/PeiDxeSmmRstPrivateLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmRstPrivate
> Lib/PeiDxeSmmRstPrivateLib.c
> @@ -2,13 +2,7 @@
> Routines for Rst remapping
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmRstPrivate
> Lib/PeiDxeSmmRstPrivateLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmRstPrivate
> Lib/PeiDxeSmmRstPrivateLib.inf
> index 1bbcc7eda7..413d0c86f8 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmRstPrivate
> Lib/PeiDxeSmmRstPrivateLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmRstPrivate
> Lib/PeiDxeSmmRstPrivateLib.inf
> @@ -6,13 +6,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchAcpi.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchAcpi.c
> index 789b61170d..a0e3996664 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchAcpi.c
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchAcpi.c
> @@ -2,13 +2,7 @@
> This is the driver that initializes the Intel PCH.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "PchInit.h"
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchCio2Acpi.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchCio2Acpi.c
> index f0abea1323..0769655757 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchCio2Acpi.c
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchCio2Acpi.c
> @@ -2,13 +2,7 @@
> Initializes PCH CIO2 device ACPI data.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchHdaAcpi.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchHdaAcpi.c
> index 732dc8905d..f8839c47b5 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchHdaAcpi.c
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchHdaAcpi.c
> @@ -2,13 +2,7 @@
> Initializes the PCH HD Audio ACPI Tables.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInit.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInit.c
> index 0428479b50..40c814f460 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInit.c
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInit.c
> @@ -2,13 +2,7 @@
> This is the Common driver that initializes the Intel PCH.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "PchInit.h"
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInit.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInit.h
> index a05697d337..516606e604 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInit.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInit.h
> @@ -2,13 +2,7 @@
> Header file for PCH Initialization Driver.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_INITIALIZATION_DRIVER_H_
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxe.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxe.c
> index 1857b7f3c5..bd3efd8eda 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxe.c
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxe.c
> @@ -2,13 +2,7 @@
> This is the Uefi driver that initializes the Intel PCH.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "PchInit.h"
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxe.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxe.inf
> index 0242dcbe9a..49ede590e8 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxe.inf
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxe.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxeFsp.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxeFsp.inf
> index 18feffd894..68c1bca40c 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxeFsp.inf
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxeFsp.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitFsp.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitFsp.c
> index 9307b8fc4c..56052d8c9f 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitFsp.c
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitFsp.c
> @@ -2,13 +2,7 @@
> This is the FSP driver that initializes the Intel PCH.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "PchInit.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchRstPcieStorage.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchRstPcieStorage.c
> index 801abf2602..bcd8bb8232 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchRstPcieStorage.c
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchRstPcieStorage.c
> @@ -3,13 +3,7 @@
> In order to use this feature, Intel RST Driver is required
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "PchInit.h"
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchSata.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchSata.c
> index d1f2948de6..fabb536df0 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchSata.c
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchSata.c
> @@ -2,13 +2,7 @@
> Perform related functions for PCH Sata in DXE phase
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include <PchInit.h>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchScs.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchScs.c
> index 34227826b4..defe183965 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchScs.c
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchScs.c
> @@ -2,13 +2,7 @@
> Initializes PCH Storage and Communications Subsystem Controllers.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include <PchInit.h>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchSerialIo.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchSerialIo.c
> index 013c729ddf..93f07fa906 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchSerialIo.c
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchSerialIo.c
> @@ -2,13 +2,7 @@
> Initializes Serial IO Controllers.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include <PchInit.h>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchSerialIoDxe.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchSerialIoDxe.c
> index 3b951092b5..077012bd25 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchSerialIoDxe.c
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchSerialIoDxe.c
> @@ -2,13 +2,7 @@
> Initializes Serial IO Controllers.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include <PchInit.h>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchBiosWriteProtect.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchBiosWriteProtect.c
> index cfaf0d57bd..c1bc98bb6b 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchBiosWriteProtect.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchBiosWriteProtect.c
> @@ -2,13 +2,7 @@
> PCH BIOS Write Protect Driver.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "PchInitSmm.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchGpioSxIsolationSm
> m.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchGpioSxIsolationSm
> m.c
> index 4c3dd6cf11..4cad3c6230 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchGpioSxIsolationSm
> m.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchGpioSxIsolationSm
> m.c
> @@ -2,13 +2,7 @@
> PCH GPIO Sx Isolation Driver Entry
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "PchInitSmm.h"
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.c
> index c6e1809946..d2dba930ff 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.c
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.c
> @@ -2,13 +2,7 @@
> PCH Init Smm module for PCH specific SMI handlers.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "PchInitSmm.h"
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.h
> index 58ef567cc0..44f151c243 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.h
> @@ -2,13 +2,7 @@
> Header file for PCH Init SMM Handler
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.inf
> index 458eac090e..ea6692f6d9 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.inf
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchLanSxSmm.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchLanSxSmm.c
> index d05cb61bbc..8c2496a79e 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchLanSxSmm.c
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchLanSxSmm.c
> @@ -2,13 +2,7 @@
> PCH LAN Sx handler implementation.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchPcieSmm.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchPcieSmm.c
> index b4234f649c..aed33bba25 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchPcieSmm.c
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchPcieSmm.c
> @@ -2,13 +2,7 @@
> PCH Pcie SMM Driver Entry
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "PchInitSmm.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchPort61hSmm.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchPort61hSmm.c
> index 0717f38291..6267607a46 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchPort61hSmm.c
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchPort61hSmm.c
> @@ -2,13 +2,7 @@
> PCH Port 61h bit-4 toggling in SMM IO Trap
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchSpiAsync.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchSpiAsync.c
> index 463de1dba8..139a60631c 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchSpiAsync.c
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchSpiAsync.c
> @@ -2,13 +2,7 @@
> PCH SPI Async SMI handler.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "PchInitSmm.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchXhciSxSmm.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchXhciSxSmm.c
> index f17b125d4f..72603e36e7 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchXhciSxSmm.c
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchXhciSxSmm.c
> @@ -2,13 +2,7 @@
> PCH xHCI Sx handler implementation.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/IoTrap.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/IoTrap.c
> index ffb2105719..ea794669ba 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/IoTrap.c
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/IoTrap.c
> @@ -2,13 +2,7 @@
> Main implementation source file for the Io Trap SMM driver
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "PchSmmHelpers.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/IoTrap.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/IoTrap.h
> index 99bb3527f7..13ad2f6f1b 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/IoTrap.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/IoTrap.h
> @@ -2,13 +2,7 @@
> Defines and prototypes for the IoTrap SMM driver
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _IO_TRAP_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmiDispa
> tch.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmiDispa
> tch.c
> index a0bd9aaaa1..5f8c9375ea 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmiDispa
> tch.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmiDispa
> tch.c
> @@ -2,13 +2,7 @@
> This function handle the register/unregister of PCH specific SMI events.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "PchSmmHelpers.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmiDispa
> tcher.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmiDispa
> tcher.inf
> index a593d631d3..46c4c72617 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmiDispa
> tcher.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmiDispa
> tcher.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmm.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmm.h
> index 3eebdc1daf..508832e76e 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmm.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmm.h
> @@ -2,13 +2,7 @@
> Prototypes and defines for the PCH SMM Dispatcher.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef PCH_SMM_H
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmCor
> e.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmCor
> e.c
> index 77f0561ce4..0c494bffef 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmCor
> e.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmCor
> e.c
> @@ -3,13 +3,7 @@
> and the abstraction of the PCH SMI sources.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "PchSmm.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmEspi
> .c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmEspi
> .c
> index a4a7380737..a8a3a3dac6 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmEspi
> .c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmEspi
> .c
> @@ -2,13 +2,7 @@
> eSPI SMI implementation
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmEspi
> .h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmEspi
> .h
> index da600495c0..af152414f5 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmEspi
> .h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmEspi
> .h
> @@ -2,13 +2,7 @@
> eSPI SMI Dispatch header
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmGpi.
> c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmGpi.
> c
> index fd79538d3a..5690b91465 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmGpi.
> c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmGpi.
> c
> @@ -2,13 +2,7 @@
> File to contain all the hardware specific stuff for the Smm Gpi dispatch
> protocol.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "PchSmmHelpers.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmHelp
> ers.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmHelp
> ers.c
> index fea1ac9165..24bdf6a6e5 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmHelp
> ers.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmHelp
> ers.c
> @@ -2,13 +2,7 @@
> Helper functions for PCH SMM dispatcher.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "PchSmmHelpers.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmHelp
> ers.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmHelp
> ers.h
> index 44a8936790..dffd0e3944 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmHelp
> ers.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmHelp
> ers.h
> @@ -2,13 +2,7 @@
> Helper functions for PCH SMM
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef PCH_SMM_HELPERS_H
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmPeri
> odicTimer.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmPeri
> odicTimer.c
> index 324eaeb7e8..29afe30817 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmPeri
> odicTimer.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmPeri
> odicTimer.c
> @@ -2,13 +2,7 @@
> File to contain all the hardware specific stuff for the Periodical Timer
> dispatch protocol.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "PchSmmHelpers.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmPow
> erButton.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmPow
> erButton.c
> index 404d2a31bc..82f0f6ffb2 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmPow
> erButton.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmPow
> erButton.c
> @@ -2,13 +2,7 @@
> File to contain all the hardware specific stuff for the Smm Power Button
> dispatch protocol.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include <PchSmmHelpers.h>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmSw.
> c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmSw.
> c
> index c285c677f1..ccaac28794 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmSw.
> c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmSw.
> c
> @@ -2,13 +2,7 @@
> File to contain all the hardware specific stuff for the Smm Sw dispatch
> protocol.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "PchSmmHelpers.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmSx.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmSx.c
> index 523cea27aa..6fbe87c75d 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmSx.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmSx.c
> @@ -2,13 +2,7 @@
> File to contain all the hardware specific stuff for the Smm Sx dispatch
> protocol.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "PchSmmHelpers.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmUsb.
> c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmUsb.
> c
> index 71c11ed71d..f5ed3a1892 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmUsb.
> c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmUsb.
> c
> @@ -2,13 +2,7 @@
> File to contain all the hardware specific stuff for the Smm USB dispatch
> protocol.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "PchSmmHelpers.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchxSmmHel
> pers.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchxSmmHel
> pers.c
> index d4f4603eea..4d2a926491 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchxSmmHel
> pers.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchxSmmHel
> pers.c
> @@ -3,13 +3,7 @@
> and the abstraction of the PCH SMI sources.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "PchSmmHelpers.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchxSmmHel
> pers.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchxSmmHel
> pers.h
> index 273bed32bc..08bf728da0 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchxSmmHel
> pers.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchxSmmHel
> pers.h
> @@ -3,13 +3,7 @@
> and the abstraction of the PCH SMI sources.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCHX_SMM_HELPERS_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/SmmControl/RuntimeDxe/SmmContr
> ol.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/SmmControl/RuntimeDxe/SmmContr
> ol.inf
> index 2871b6c7c4..2695eaf9af 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/SmmControl/RuntimeDxe/SmmContr
> ol.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/SmmControl/RuntimeDxe/SmmContr
> ol.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/SmmControl/RuntimeDxe/SmmContr
> olDriver.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/SmmControl/RuntimeDxe/SmmContr
> olDriver.c
> index 96727dde8f..7abac4e110 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/SmmControl/RuntimeDxe/SmmContr
> olDriver.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/SmmControl/RuntimeDxe/SmmContr
> olDriver.c
> @@ -2,13 +2,7 @@
> This is the driver that publishes the SMM Control Protocol.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "SmmControlDriver.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/SmmControl/RuntimeDxe/SmmContr
> olDriver.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/SmmControl/RuntimeDxe/SmmContr
> olDriver.h
> index 110b93a3ca..fbb108f9d8 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/SmmControl/RuntimeDxe/SmmContr
> olDriver.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/SmmControl/RuntimeDxe/SmmContr
> olDriver.h
> @@ -2,13 +2,7 @@
> Header file for SMM Control Driver.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _SMM_CONTROL_DRIVER_H_
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Spi/Smm/PchSpi.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Spi/Smm/PchSpi.c
> index 5cc808aa9d..1d84d06134 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Spi/Smm/PchSpi.c
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Spi/Smm/PchSpi.c
> @@ -2,13 +2,7 @@
> PCH SPI SMM Driver implements the SPI Host Controller Compatibility
> Interface.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "PchSpi.h"
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Spi/Smm/PchSpi.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Spi/Smm/PchSpi.h
> index e3b6d7fd90..43e158b604 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Spi/Smm/PchSpi.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Spi/Smm/PchSpi.h
> @@ -2,13 +2,7 @@
> Header file for the PCH SPI SMM Driver.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PCH_SPI_H_
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Spi/Smm/PchSpiSmm.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Spi/Smm/PchSpiSmm.inf
> index 52f83a9953..964489064a 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Spi/Smm/PchSpiSmm.inf
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Spi/Smm/PchSpiSmm.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/Include/Library/SecPlatform
> Lib.h
> b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/Include/Library/SecPlatform
> Lib.h
> index f9bbc931aa..bf4f75effb 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/Include/Library/SecPlatform
> Lib.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/Include/Library/SecPlatform
> Lib.h
> @@ -2,13 +2,7 @@
> Prototype of SEC Platform hook library.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkModulePkg/I
> nclude/Guid/DataHubStatusCodeRecord.h
> b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkModulePkg/I
> nclude/Guid/DataHubStatusCodeRecord.h
> index d18a2eda21..7611700179 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkModulePkg/I
> nclude/Guid/DataHubStatusCodeRecord.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkModulePkg/I
> nclude/Guid/DataHubStatusCodeRecord.h
> @@ -2,13 +2,7 @@
> GUID used to identify Data Hub records logged by Status Code Protocol.
>
> Copyright (c) 2006 - 2010, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include/
> Guid/SmramMemoryReserve.h
> b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include/
> Guid/SmramMemoryReserve.h
> index 04589cf040..9918c768ba 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include/
> Guid/SmramMemoryReserve.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include/
> Guid/SmramMemoryReserve.h
> @@ -9,13 +9,7 @@
> This GUIDed HOB can be used to convey the existence of the T-SEG
> reservation and H-SEG usage
>
> Copyright (c) 2007 - 2010, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> @par Revision Reference:
> GUIDs defined in SmmCis spec version 0.9.
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include/
> Protocol/DataHub.h
> b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include/
> Protocol/DataHub.h
> index ce73e3e8a6..4890ef7895 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include/
> Protocol/DataHub.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include/
> Protocol/DataHub.h
> @@ -4,13 +4,7 @@
> has been logged. This protocol may only be called <= TPL_NOTIFY.
>
> Copyright (c) 2007 - 2010, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> @par Revision Reference:
> The Data Hub Protocol is defined in Framework for EFI Data Hub
> Specification
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include/
> Protocol/Legacy8259.h
> b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include/
> Protocol/Legacy8259.h
> index c12936f2d2..6a2e4669db 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include/
> Protocol/Legacy8259.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include/
> Protocol/Legacy8259.h
> @@ -3,13 +3,7 @@
> PCI IRQ routing needed to program the PCI Interrupt Line register.
>
> Copyright (c) 2007 - 2010, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> @par Revision Reference:
> This protocol is defined in Framework for EFI Compatibility Support Module
> spec
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include/
> Protocol/LegacyBios.h
> b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include/
> Protocol/LegacyBios.h
> index a5f8f8abf7..e60afb6dcd 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include/
> Protocol/LegacyBios.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include/
> Protocol/LegacyBios.h
> @@ -10,13 +10,7 @@
> environment. Reverse thunk is the code that does the opposite.
>
> Copyright (c) 2007 - 2010, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> @par Revision Reference:
> This protocol is defined in Framework for EFI Compatibility Support Module
> spec
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include/
> Protocol/LegacyInterrupt.h
> b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include/
> Protocol/LegacyInterrupt.h
> index f06836a97c..f4944d4c79 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include/
> Protocol/LegacyInterrupt.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include/
> Protocol/LegacyInterrupt.h
> @@ -2,13 +2,7 @@
> This protocol abstracts the PIRQ programming from the generic EFI
> Compatibility Support Modules (CSMs).
>
> Copyright (c) 2007 - 2010, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> @par Revision Reference:
> This protocol is defined in Framework for the EFI Compatibility Support
> Module specification.
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Gui
> d/AcpiS3Context.h
> b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Gui
> d/AcpiS3Context.h
> index 8f78e284f6..c5a995b8e8 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Gui
> d/AcpiS3Context.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Gui
> d/AcpiS3Context.h
> @@ -3,14 +3,7 @@
>
> Copyright (c) 2011 - 2012, 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 distribution. The
> -full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Gui
> d/ConsoleOutDevice.h
> b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Gui
> d/ConsoleOutDevice.h
> index 7ca3f424e5..0a9aef19c6 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Gui
> d/ConsoleOutDevice.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Gui
> d/ConsoleOutDevice.h
> @@ -2,13 +2,7 @@
> This GUID can be installed to the device handle to specify that the device is
> the console-out device.
>
> Copyright (c) 2006 - 2010, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Gui
> d/MemoryTypeInformation.h
> b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Gui
> d/MemoryTypeInformation.h
> index e3e2ec82fd..3b05c9a79e 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Gui
> d/MemoryTypeInformation.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Gui
> d/MemoryTypeInformation.h
> @@ -8,13 +8,7 @@
> be used to store the information for each memory type in Variable or HOB.
>
> Copyright (c) 2006 - 2010, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Libr
> ary/ResetSystemLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Libr
> ary/ResetSystemLib.h
> index 6cab22a80c..75d3e15ed7 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Libr
> ary/ResetSystemLib.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Libr
> ary/ResetSystemLib.h
> @@ -3,13 +3,7 @@
> methods that reset the whole system.
>
> Copyright (c) 2005 - 2010, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Ppi
> /SmmAccess.h
> b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Ppi
> /SmmAccess.h
> index 8255a4a1d1..83a8edb449 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Ppi
> /SmmAccess.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Ppi
> /SmmAccess.h
> @@ -13,14 +13,7 @@
>
> Copyright (c) 2010, 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 distribution. The
> -full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Ppi
> /SmmControl.h
> b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Ppi
> /SmmControl.h
> index fef5a3dca3..5bf1084a7a 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Ppi
> /SmmControl.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Ppi
> /SmmControl.h
> @@ -11,14 +11,7 @@
>
> Copyright (c) 2010, 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 distribution. The
> - full text of the license may be found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Pro
> tocol/SmmVariable.h
> b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Pro
> tocol/SmmVariable.h
> index 7e72bee166..c2dbdb3651 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Pro
> tocol/SmmVariable.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Pro
> tocol/SmmVariable.h
> @@ -3,13 +3,7 @@
> and intended for use as a means to store data in the EFI SMM environment.
>
> Copyright (c) 2010, 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 distribution. The full text of the license may be
> found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/Pch/AcpiTables/Dsdt/PchSm
> b.asl
> b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/Pch/AcpiTables/Dsdt/PchSm
> b.asl
> index 25c4960585..9f23b3bb3c 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/Pch/AcpiTables/Dsdt/PchSm
> b.asl
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/Pch/AcpiTables/Dsdt/PchSm
> b.asl
> @@ -6,13 +6,7 @@
> driver with SMBUS operation region support implemented for ACPI usage.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/SiPkg.dec
> b/Silicon/Intel/KabylakeSiliconPkg/SiPkg.dec
> index 078d10c520..a613079dd4 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/SiPkg.dec
> +++ b/Silicon/Intel/KabylakeSiliconPkg/SiPkg.dec
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017 - 2019, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/SiPkgBuildOption.dsc
> b/Silicon/Intel/KabylakeSiliconPkg/SiPkgBuildOption.dsc
> index f313e4c352..20132653bd 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/SiPkgBuildOption.dsc
> +++ b/Silicon/Intel/KabylakeSiliconPkg/SiPkgBuildOption.dsc
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/SiPkgCommonLib.dsc
> b/Silicon/Intel/KabylakeSiliconPkg/SiPkgCommonLib.dsc
> index eb7d43191f..920b02e410 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/SiPkgCommonLib.dsc
> +++ b/Silicon/Intel/KabylakeSiliconPkg/SiPkgCommonLib.dsc
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
> #
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/SiPkgDxe.dsc
> b/Silicon/Intel/KabylakeSiliconPkg/SiPkgDxe.dsc
> index 4fe0f8d18c..c39bd56c0e 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/SiPkgDxe.dsc
> +++ b/Silicon/Intel/KabylakeSiliconPkg/SiPkgDxe.dsc
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/SiPkgDxeLib.dsc
> b/Silicon/Intel/KabylakeSiliconPkg/SiPkgDxeLib.dsc
> index 9697da6c30..8c194d8e7c 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/SiPkgDxeLib.dsc
> +++ b/Silicon/Intel/KabylakeSiliconPkg/SiPkgDxeLib.dsc
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/SiPkgPei.dsc
> b/Silicon/Intel/KabylakeSiliconPkg/SiPkgPei.dsc
> index a2bc1cd49f..8bd16c3845 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/SiPkgPei.dsc
> +++ b/Silicon/Intel/KabylakeSiliconPkg/SiPkgPei.dsc
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/SiPkgPeiLib.dsc
> b/Silicon/Intel/KabylakeSiliconPkg/SiPkgPeiLib.dsc
> index bb95ce3888..86e34ff359 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/SiPkgPeiLib.dsc
> +++ b/Silicon/Intel/KabylakeSiliconPkg/SiPkgPeiLib.dsc
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017 - 2019, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/Dmar/Dmar.aslc
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/Dmar/Dmar.aslc
> index bf7b56e23e..cd3192639b 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/Dmar/Dmar.aslc
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/Dmar/Dmar.aslc
> @@ -2,13 +2,7 @@
> This file describes the contents of the ACPI DMA address Remapping
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "Dmar.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/Dmar/Dmar.h
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/Dmar/Dmar.h
> index aaa027806b..32aba45fc8 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/Dmar/Dmar.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/Dmar/Dmar.h
> @@ -3,13 +3,7 @@
> Some additional ACPI values are defined in Acpi1_0.h and Acpi2_0.h.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _SA_DMAR_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/HostBus.asl
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/HostBus.asl
> index ea14d5d479..597a10dc08 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/HostBus.asl
> +++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/HostBus.asl
> @@ -6,13 +6,7 @@
> @note This ASL file needs to be included as part of platform ACPI DSDT
> table.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaAcpiTables.inf
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaAcpiTables.inf
> index ff39573378..1488d3ba61 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaAcpiTables.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaAcpiTables.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> ##############################################################
> ##################
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/Igfx.asl
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/Igfx.asl
> index c853700c40..2770e91752 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/Igfx.asl
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/Igfx.asl
> @@ -7,13 +7,7 @@
> present in the system, etc.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxCom
> mon.asl
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxCom
> mon.asl
> index 4d28ad0068..5f46e49ff6 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxCom
> mon.asl
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxCom
> mon.asl
> @@ -4,13 +4,7 @@
> i.e. hotkeys and other system interrupts.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> //
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxDsm.
> asl
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxDsm.
> asl
> index 974f7b706d..a045242872 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxDsm.
> asl
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxDsm.
> asl
> @@ -4,13 +4,7 @@
> the Integrated Graphics Device (IGD) OpRegion/DSM mechanism
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxOpG
> bda.asl
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxOpG
> bda.asl
> index cd86e25fca..4705df772d 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxOpG
> bda.asl
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxOpG
> bda.asl
> @@ -4,13 +4,7 @@
> the Integrated Graphics Device (IGD) OpRegion/Software SCI mechanism
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> Method (GBDA, 0, Serialized)
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxOpR
> n.asl
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxOpR
> n.asl
> index 4e3b6c5522..4f85e17a0e 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxOpR
> n.asl
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxOpR
> n.asl
> @@ -6,13 +6,7 @@
> as described in the IGD OpRegion specification.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> //
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxOpSb
> cb.asl
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxOpSb
> cb.asl
> index 1f688e3b4a..e6a6f67621 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxOpSb
> cb.asl
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxOpSb
> cb.asl
> @@ -3,13 +3,7 @@
> OpRegion/Software SCI mechanism.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/Sa.asl
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/Sa.asl
> index 7bc2d80667..8b5ea28035 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/Sa.asl
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/Sa.asl
> @@ -5,13 +5,7 @@
> System Agent PCI Express* ports (PEG), iGfx and other devices.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/SaNvs.as
> l
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/SaNvs.as
> l
> index 311810020f..179b6b95b8 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/SaNvs.as
> l
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/SaNvs.as
> l
> @@ -1,13 +1,7 @@
> /**@file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/SaSsdt.a
> sl
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/SaSsdt.a
> sl
> index b19a3cfa7b..df187f593e 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/SaSsdt.a
> sl
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/SaSsdt.a
> sl
> @@ -4,13 +4,7 @@
> and BIOS.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/SaSsdt.in
> f
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/SaSsdt.in
> f
> index 43d7819263..e5f234ec2a 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/SaSsdt.in
> f
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/SaSsdt.in
> f
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> ##############################################################
> ##################
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/Graphi
> csDxeConfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/Graphi
> csDxeConfig.h
> index 8f746dcc95..81549871b7 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/Graphi
> csDxeConfig.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/Graphi
> csDxeConfig.h
> @@ -2,13 +2,7 @@
> Graphics DXE Policy definitions
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _GRAPHICS_DXE_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/Graphi
> csPeiConfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/Graphi
> csPeiConfig.h
> index ee294650bf..4063f800e8 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/Graphi
> csPeiConfig.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/Graphi
> csPeiConfig.h
> @@ -2,13 +2,7 @@
> Policy definition for Internal Graphics Config Block (PostMem)
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _GRAPHICS_PEI_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/Memo
> ryConfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/Memo
> ryConfig.h
> index 8f77fa720b..d64d3d3d0a 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/Memo
> ryConfig.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/Memo
> ryConfig.h
> @@ -2,13 +2,7 @@
> Policy definition of Memory Config Block
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _MEMORY_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/MiscD
> xeConfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/MiscD
> xeConfig.h
> index 18a5371c4b..08229cd33c 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/MiscD
> xeConfig.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/MiscD
> xeConfig.h
> @@ -2,13 +2,7 @@
> MISC DXE policy definitions
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _MISC_DXE_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/SaMisc
> PeiPreMemConfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/SaMisc
> PeiPreMemConfig.h
> index 0bf1934207..4aa02e3142 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/SaMisc
> PeiPreMemConfig.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/SaMisc
> PeiPreMemConfig.h
> @@ -2,13 +2,7 @@
> Policy details for miscellaneous configuration in System Agent
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _SA_MISC_PEI_PREMEM_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/VtdCo
> nfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/VtdCo
> nfig.h
> index 086d70849a..8430563788 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/VtdCo
> nfig.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/VtdCo
> nfig.h
> @@ -2,13 +2,7 @@
> VT-d policy definitions.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _VTD_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/DmaRemappingTab
> le.h
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/DmaRemappingTab
> le.h
> index 0c49f98f2c..08edcee410 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/DmaRemappingTab
> le.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/DmaRemappingTab
> le.h
> @@ -2,13 +2,7 @@
> This code defines ACPI DMA Remapping table related definitions.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _DMA_REMAPPING_TABLE_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Library/DxeSaPolicy
> Lib.h
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Library/DxeSaPolicy
> Lib.h
> index 12274d797d..61457dfb59 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Library/DxeSaPolicy
> Lib.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Library/DxeSaPolicy
> Lib.h
> @@ -2,13 +2,7 @@
> Prototype of the DxeSaPolicyLib library.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _DXE_SA_POLICY_LIB_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Library/PeiSaPolicy
> Lib.h
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Library/PeiSaPolicy
> Lib.h
> index 6348fd003e..28e648f4a0 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Library/PeiSaPolicy
> Lib.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Library/PeiSaPolicy
> Lib.h
> @@ -2,13 +2,7 @@
> Prototype of the PeiSaPolicy library.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PEI_SA_POLICY_LIB_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Library/SaPlatformL
> ib.h
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Library/SaPlatformL
> ib.h
> index f3762e91a5..cf62e1a9e2 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Library/SaPlatformL
> ib.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Library/SaPlatformL
> ib.h
> @@ -2,13 +2,7 @@
> Header file for SaPlatformLib.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/MemInfoHob.h
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/MemInfoHob.h
> index dbf93ac265..ae51195736 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/MemInfoHob.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/MemInfoHob.h
> @@ -4,13 +4,7 @@
> data hobs.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _MEM_INFO_HOB_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/GopPolicy
> .h
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/GopPolicy
> .h
> index e7e72e5e53..9a7f02353c 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/GopPolicy
> .h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/GopPolicy
> .h
> @@ -2,13 +2,7 @@
> Interface definition for GopPolicy Protocol.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _GOP_POLICY_PROTOCOL_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/IgdOpRegi
> on.h
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/IgdOpRegi
> on.h
> index b39ccc31d4..1410a8a309 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/IgdOpRegi
> on.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/IgdOpRegi
> on.h
> @@ -3,13 +3,7 @@
> an interface between system BIOS, ASL code, and Graphics drivers.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> @par Specification Reference:
> - IGD OpRegion/Software SCI SPEC
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/MemInfo.
> h
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/MemInfo.
> h
> index ceadd739d6..7d5dd03f55 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/MemInfo.
> h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/MemInfo.
> h
> @@ -4,13 +4,7 @@
> of each dimm and rank.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _MEM_INFO_PROTOCOL_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/SaGlobalN
> vsArea.h
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/SaGlobalN
> vsArea.h
> index 5daf183c1a..08ab89898b 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/SaGlobalN
> vsArea.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/SaGlobalN
> vsArea.h
> @@ -4,13 +4,7 @@
> used as a communications buffer between SMM/DXE/PEI code and ASL
> code.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _SYSTEM_AGENT_GLOBAL_NVS_AREA_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/SaNvs.h
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/SaNvs.h
> index 8f6ec57304..01cdf6d56d 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/SaNvs.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/SaNvs.h
> @@ -1,13 +1,7 @@
> /**@file
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/SaPolicy.h
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/SaPolicy.h
> index 577eaa8ffc..40a0ab884d 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/SaPolicy.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/SaPolicy.h
> @@ -2,13 +2,7 @@
> Interface definition details between System Agent and platform drivers
> during DXE phase.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _SA_POLICY_H_
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/SaAccess.h
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/SaAccess.h
> index 5d343ba57a..45caa7fe90 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/SaAccess.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/SaAccess.h
> @@ -2,13 +2,7 @@
> Macros to simplify and abstract the interface to PCI configuration.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _SAACCESS_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/SaPolicyCommon.h
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/SaPolicyCommon.h
> index bfe6011763..dccd4c9b3b 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/SaPolicyCommon.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/SaPolicyCommon.h
> @@ -2,13 +2,7 @@
> Main System Agent Policy structure definition which will contain several
> config blocks during runtime.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _SA_POLICY_COMMON_H_
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/SaRegs.h
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/SaRegs.h
> index 5f92981f4b..2b518853bd 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/SaRegs.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/SaRegs.h
> @@ -16,13 +16,7 @@
> as "_SA_" without [generation_name] inserted.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _SA_REGS_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/IncludePrivate/SaConfigHob
> .h
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/IncludePrivate/SaConfigHob
> .h
> index 02ec08fc96..16f31bbdfd 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/IncludePrivate/SaConfigHob
> .h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/IncludePrivate/SaConfigHob
> .h
> @@ -2,13 +2,7 @@
> The GUID definition for SaConfigHob
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _SA_CONFIG_HOB_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/Dxe
> SaPolicyLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/Dxe
> SaPolicyLib.c
> index 4909ed8f62..67fe214d0e 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/Dxe
> SaPolicyLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/Dxe
> SaPolicyLib.c
> @@ -2,13 +2,7 @@
> This file provide services for DXE phase policy default initialization
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/Dxe
> SaPolicyLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/Dxe
> SaPolicyLib.inf
> index f75ecb1388..9eb389b14f 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/Dxe
> SaPolicyLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/Dxe
> SaPolicyLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/Dxe
> SaPolicyLibrary.h
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/Dxe
> SaPolicyLibrary.h
> index f754072411..ec1b7d10e8 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/Dxe
> SaPolicyLibrary.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/Dxe
> SaPolicyLibrary.h
> @@ -2,13 +2,7 @@
> Header file for the DxeSaPolicy library.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _DXE_SA_POLICY_LIBRARY_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiDxeSmmSaPlatfo
> rmLib/PeiDxeSmmSaPlatformLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiDxeSmmSaPlatfo
> rmLib/PeiDxeSmmSaPlatformLib.inf
> index 860da17031..9fe71e5bac 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiDxeSmmSaPlatfo
> rmLib/PeiDxeSmmSaPlatformLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiDxeSmmSaPlatfo
> rmLib/PeiDxeSmmSaPlatformLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiDxeSmmSaPlatfo
> rmLib/SaPlatformLibrary.c
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiDxeSmmSaPlatfo
> rmLib/SaPlatformLibrary.c
> index df662b0222..4fd3ffa64b 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiDxeSmmSaPlatfo
> rmLib/SaPlatformLibrary.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiDxeSmmSaPlatfo
> rmLib/SaPlatformLibrary.c
> @@ -2,13 +2,7 @@
> SA Platform Lib implementation.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "SaPlatformLibrary.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiDxeSmmSaPlatfo
> rmLib/SaPlatformLibrary.h
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiDxeSmmSaPlatfo
> rmLib/SaPlatformLibrary.h
> index 632b801ad2..1e7b0d051a 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiDxeSmmSaPlatfo
> rmLib/SaPlatformLibrary.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiDxeSmmSaPlatfo
> rmLib/SaPlatformLibrary.h
> @@ -2,13 +2,7 @@
> Header file for SA Platform Lib implementation.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/Ia32/
> MrcOemPlatform.S
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/Ia32/
> MrcOemPlatform.S
> index d8fe66154a..74e5589d0b 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/Ia32/
> MrcOemPlatform.S
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/Ia32/
> MrcOemPlatform.S
> @@ -1,13 +1,7 @@
> ## @file
> #
> # Copyright (c) 2017, 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 that accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php.
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/Ia32/
> MrcOemPlatform.asm
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/Ia32/
> MrcOemPlatform.asm
> index bef8aafe1a..3899ef119e 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/Ia32/
> MrcOemPlatform.asm
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/Ia32/
> MrcOemPlatform.asm
> @@ -2,13 +2,7 @@
> ; This file provides assembly 64-bit atomic reads/writes required for
> memory initialization.
> ;
> ; Copyright (c) 2017, 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 that accompanies this
> distribution.
> -; The full text of the license may be found at
> -; http://opensource.org/licenses/bsd-license.php.
> -;
> -; THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -; WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +; SPDX-License-Identifier: BSD-2-Clause-Patent
> ;
> ;;
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/Ia32/
> MrcOemPlatform.nasm
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/Ia32/
> MrcOemPlatform.nasm
> index 5bc17065bd..03c1380f89 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/Ia32/
> MrcOemPlatform.nasm
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/Ia32/
> MrcOemPlatform.nasm
> @@ -2,13 +2,7 @@
> ; This file provides assembly 64-bit atomic reads/writes required for
> memory initialization.
> ;
> ; Copyright (c) 2017, 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 that accompanies this
> distribution.
> -; The full text of the license may be found at
> -; http://opensource.org/licenses/bsd-license.php.
> -;
> -; THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -; WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +; SPDX-License-Identifier: BSD-2-Clause-Patent
> ;
> ;;
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/Mrc
> OemPlatform.c
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/Mrc
> OemPlatform.c
> index e4d6f1b35c..f62651796a 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/Mrc
> OemPlatform.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/Mrc
> OemPlatform.c
> @@ -2,13 +2,7 @@
> This file is SampleCode for Intel SA PEI Policy initialization.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/Mrc
> OemPlatform.h
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/Mrc
> OemPlatform.h
> index f561138b04..53440d5d80 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/Mrc
> OemPlatform.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/Mrc
> OemPlatform.h
> @@ -4,13 +4,7 @@
> This file is SampleCode for Intel SA PEI Policy initialization.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSa
> PolicyLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSa
> PolicyLib.c
> index ddc83ba4b2..eb18d993e7 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSa
> PolicyLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSa
> PolicyLib.c
> @@ -2,13 +2,7 @@
> This file provides services for PEI policy default initialization
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "PeiSaPolicyLibrary.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSa
> PolicyLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSa
> PolicyLib.inf
> index 0afd31b584..8fae4cee61 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSa
> PolicyLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSa
> PolicyLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSa
> PolicyLibSample.c
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSa
> PolicyLibSample.c
> index a65349b29c..63e93094e1 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSa
> PolicyLibSample.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSa
> PolicyLibSample.c
> @@ -2,13 +2,7 @@
> This file provides services for Sample PEI policy default initialization.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include <SaPolicyCommon.h>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSa
> PolicyLibrary.h
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSa
> PolicyLibrary.h
> index e7fe3d2fcf..a44f7343dd 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSa
> PolicyLibrary.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSa
> PolicyLibrary.h
> @@ -2,13 +2,7 @@
> Header file for the PeiSaPolicy library.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _PEI_SA_POLICY_LIBRARY_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/SaPri
> ntPolicy.c
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/SaPri
> ntPolicy.c
> index 0a6ddb8a8f..8b3a81a1c4 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/SaPri
> ntPolicy.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/SaPri
> ntPolicy.c
> @@ -2,13 +2,7 @@
> This file provides service for PEI phase policy printing
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "PeiSaPolicyLibrary.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcCo
> mmonTypes.h
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcCo
> mmonTypes.h
> index 792b2ca58d..3b612e3177 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcCo
> mmonTypes.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcCo
> mmonTypes.h
> @@ -2,13 +2,7 @@
> This file contains the definitions common to the MRC API and other APIs.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _MrcCommonTypes_h_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcInt
> erface.h
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcInt
> erface.h
> index 87ad005f03..8e6aa32ed8 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcInt
> erface.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcInt
> erface.h
> @@ -2,13 +2,7 @@
> This file includes all the data structures that the MRC considers "global
> data".
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _MrcInterface_h_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcRm
> tData.h
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcRm
> tData.h
> index 51d40ff376..73cdb214f7 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcRm
> tData.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcRm
> tData.h
> @@ -3,13 +3,7 @@
> Compatible BIOS data (BDAT) table.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _MrcRmtData_h_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcSp
> dData.h
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcSp
> dData.h
> index cbfeb1cd0a..304db700c0 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcSp
> dData.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcSp
> dData.h
> @@ -2,13 +2,7 @@
> SPD data format header file.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcTy
> pes.h
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcTy
> pes.h
> index 5bb771089d..241e5adcb7 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcTy
> pes.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcTy
> pes.h
> @@ -3,13 +3,7 @@
> Include the the general MRC types
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _MRC_TYPES_H
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/GraphicsInit.c
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/GraphicsInit.c
> index 1d438e3c85..045f82a31d 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/GraphicsInit.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/GraphicsInit.c
> @@ -2,13 +2,7 @@
> DXE driver for Initializing SystemAgent Graphics ACPI table initialization.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "GraphicsInit.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/GraphicsInit.h
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/GraphicsInit.h
> index b76f775b24..00e8c08b53 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/GraphicsInit.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/GraphicsInit.h
> @@ -2,13 +2,7 @@
> Header file for initialization of GT PowerManagement
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _GRAPHICS_INIT_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/IgdOpRegion.c
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/IgdOpRegion.c
> index 8e7ef7bc29..b7e6cc44b1 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/IgdOpRegion.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/IgdOpRegion.c
> @@ -4,13 +4,7 @@
> The code in this file will load the driver and initialize the interface
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> @par Specification Reference:
> - OpRegion / Software SCI SPEC
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/IgdOpRegion.h
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/IgdOpRegion.h
> index 40616c4b82..1b960e4b11 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/IgdOpRegion.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/IgdOpRegion.h
> @@ -3,13 +3,7 @@
> Software SCI interface between system BIOS, ASL code, and Graphics
> drivers.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> @par Specification Reference:
> - OpRegion / Software SCI SPEC
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaAcpi.c
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaAcpi.c
> index 40aa155ead..09e23c250d 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaAcpi.c
> +++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaAcpi.c
> @@ -2,13 +2,7 @@
> This is the driver that initializes the Intel System Agent.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "SaInitDxe.h"
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaInit.h
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaInit.h
> index 7e9efc40bc..69cd9407eb 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaInit.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaInit.h
> @@ -2,13 +2,7 @@
> Header file for SA Common Initialization Driver.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _SA_INITIALIZATION_DRIVER_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaInitDxe.c
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaInitDxe.c
> index 0948a91a72..8ea4f3eb84 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaInitDxe.c
> +++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaInitDxe.c
> @@ -2,13 +2,7 @@
> This is the driver that initializes the Intel System Agent.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "SaInitDxe.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaInitDxe.h
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaInitDxe.h
> index 9381941b87..b77962fa2e 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaInitDxe.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaInitDxe.h
> @@ -2,13 +2,7 @@
> Header file for SA Initialization Driver.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _SA_INITIALIZATION_DXE_DRIVER_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaInitDxe.inf
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaInitDxe.inf
> index 6b01b494cd..cc05f336b3 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaInitDxe.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaInitDxe.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/VTd.c
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/VTd.c
> index ded44b661f..0adabd18bc 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/VTd.c
> +++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/VTd.c
> @@ -2,13 +2,7 @@
> This code provides a initialization of intel VT-d (Virtualization Technology
> for Directed I/O).
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "SaInitDxe.h"
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/VTd.h
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/VTd.h
> index fc84a7c41e..c74c5447ff 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/VTd.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/VTd.h
> @@ -2,13 +2,7 @@
> This code provides a initialization of intel VT-d (Virtualization Technology
> for Directed I/O).
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _VT_D_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAcces
> s.inf
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAcces
> s.inf
> index 150716529c..93ab408206 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAcces
> s.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAcces
> s.inf
> @@ -5,13 +5,7 @@
> #
> # Copyright (c) 2017, 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
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAcces
> sDriver.c
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAcces
> sDriver.c
> index 3e8fd96484..f03dbe3d27 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAcces
> sDriver.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAcces
> sDriver.c
> @@ -3,13 +3,7 @@
> instance for System Agent.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #include "SmmAccessDriver.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAcces
> sDriver.h
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAcces
> sDriver.h
> index 69e9e89b24..dbc1894af5 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAcces
> sDriver.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAcces
> sDriver.h
> @@ -2,13 +2,7 @@
> Header file for SMM Access Driver.
>
> Copyright (c) 2017, 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 that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> #ifndef _SMM_ACCESS_DRIVER_H_
> --
> 2.21.0.windows.1
^ permalink raw reply [flat|nested] 63+ messages in thread
* [[edk2-platforms][PATCH V2] 24/30] Silicon/Intel/LewisburgPkg: Replace BSD License with BSD+Patent License
2019-05-15 23:09 [[edk2-platforms][PATCH V2] 00/30] Change edk2-platforms/master to BSD+Patent License Michael D Kinney
` (22 preceding siblings ...)
2019-05-15 23:10 ` [[edk2-platforms][PATCH V2] 23/30] Silicon/Intel/KabylakeSiliconPkg: " Michael D Kinney
@ 2019-05-15 23:10 ` Michael D Kinney
2019-05-17 19:59 ` [edk2-devel] " Oram, Isaac W
2019-05-15 23:10 ` [[edk2-platforms][PATCH V2] 25/30] Silicon/Intel/PurleyRcPkg: " Michael D Kinney
` (6 subsequent siblings)
30 siblings, 1 reply; 63+ messages in thread
From: Michael D Kinney @ 2019-05-15 23:10 UTC (permalink / raw)
To: devel; +Cc: Maciej Piwko, Daocheng Bu, Isaac W Oram
https://bugzilla.tianocore.org/show_bug.cgi?id=1373
Replace BSD 2-Clause License with BSD+Patent License. This change is
based on the following emails:
https://lists.01.org/pipermail/edk2-devel/2019-February/036260.html
https://lists.01.org/pipermail/edk2-devel/2018-October/030385.html
RFCs with detailed process for the license change:
V3: https://lists.01.org/pipermail/edk2-devel/2019-March/038116.html
V2: https://lists.01.org/pipermail/edk2-devel/2019-March/037669.html
V1: https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html
Cc: Maciej Piwko <maciej.piwko@intel.com>
Cc: Daocheng Bu <daocheng.bu@intel.com>
Cc: Isaac W Oram <isaac.w.oram@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/GpioDefine.asl | 8 +-------
Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/GpioLib.asl | 8 +-------
Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/IrqLink.asl | 8 +-------
Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/Pch.asl | 8 +-------
.../Intel/LewisburgPkg/AcpiTables/Dsdt/PchAcpiTables.inf | 8 +-------
Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchHda.asl | 8 +-------
Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchHeci.asl | 8 +-------
Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchIsh.asl | 8 +-------
Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchNvs.asl | 8 +-------
Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchPcie.asl | 8 +-------
.../LewisburgPkg/AcpiTables/Dsdt/PchRstPcieStorage.asl | 8 +-------
Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchSata.asl | 8 +-------
Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchScs.asl | 8 +-------
.../Intel/LewisburgPkg/AcpiTables/Dsdt/PchSerialIo.asl | 8 +-------
Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchXdci.asl | 8 +-------
Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchXhci.asl | 8 +-------
Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP01_ADR.asl | 8 +-------
Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP02_ADR.asl | 8 +-------
Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP03_ADR.asl | 8 +-------
Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP04_ADR.asl | 8 +-------
Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP05_ADR.asl | 8 +-------
Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP06_ADR.asl | 8 +-------
Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP07_ADR.asl | 8 +-------
Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP08_ADR.asl | 8 +-------
Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP09_ADR.asl | 8 +-------
Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP10_ADR.asl | 8 +-------
Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP11_ADR.asl | 8 +-------
Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP12_ADR.asl | 8 +-------
Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP13_ADR.asl | 8 +-------
Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP14_ADR.asl | 8 +-------
Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP15_ADR.asl | 8 +-------
Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP16_ADR.asl | 8 +-------
Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP17_ADR.asl | 8 +-------
Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP18_ADR.asl | 8 +-------
Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP19_ADR.asl | 8 +-------
Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP20_ADR.asl | 8 +-------
.../Intel/LewisburgPkg/AcpiTables/Dsdt/TraceHubDebug.asl | 8 +-------
Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/usbsbd.asl | 8 +-------
Silicon/Intel/LewisburgPkg/Include/GpioConfig.h | 8 +-------
Silicon/Intel/LewisburgPkg/Include/GpioPinsSklH.h | 8 +-------
Silicon/Intel/LewisburgPkg/Include/GpioPinsSklLp.h | 8 +-------
Silicon/Intel/LewisburgPkg/Include/Library/GpioLib.h | 8 +-------
.../Intel/LewisburgPkg/Include/Library/GpioNativeLib.h | 8 +-------
.../LewisburgPkg/Include/Library/PchCycleDecodingLib.h | 8 +-------
Silicon/Intel/LewisburgPkg/Include/Library/PchGbeLib.h | 8 +-------
Silicon/Intel/LewisburgPkg/Include/Library/PchInfoLib.h | 8 +-------
Silicon/Intel/LewisburgPkg/Include/Library/PchP2sbLib.h | 8 +-------
Silicon/Intel/LewisburgPkg/Include/Library/PchPcrLib.h | 8 +-------
Silicon/Intel/LewisburgPkg/Include/Library/PchPmcLib.h | 8 +-------
Silicon/Intel/LewisburgPkg/Include/Library/PchPolicyLib.h | 8 +-------
.../Intel/LewisburgPkg/Include/Library/PchSbiAccessLib.h | 8 +-------
.../Intel/LewisburgPkg/Include/Library/PchSerialIoLib.h | 8 +-------
.../LewisburgPkg/Include/Library/SpiFlashCommonLib.h | 8 +-------
Silicon/Intel/LewisburgPkg/Include/PchAccess.h | 8 +-------
Silicon/Intel/LewisburgPkg/Include/PchLimits.h | 8 +-------
Silicon/Intel/LewisburgPkg/Include/PchPolicyCommon.h | 8 +-------
Silicon/Intel/LewisburgPkg/Include/PchReservedResources.h | 8 +-------
Silicon/Intel/LewisburgPkg/Include/PcieRegs.h | 8 +-------
.../Intel/LewisburgPkg/Include/Ppi/PchPcieDeviceTable.h | 8 +-------
Silicon/Intel/LewisburgPkg/Include/Ppi/PchPolicy.h | 8 +-------
Silicon/Intel/LewisburgPkg/Include/Ppi/PchReset.h | 8 +-------
Silicon/Intel/LewisburgPkg/Include/Ppi/Spi.h | 8 +-------
Silicon/Intel/LewisburgPkg/Include/Protocol/PchReset.h | 8 +-------
Silicon/Intel/LewisburgPkg/Include/Protocol/Spi.h | 8 +-------
Silicon/Intel/LewisburgPkg/Include/Register/PchRegsDci.h | 8 +-------
Silicon/Intel/LewisburgPkg/Include/Register/PchRegsDmi.h | 8 +-------
Silicon/Intel/LewisburgPkg/Include/Register/PchRegsEva.h | 8 +-------
Silicon/Intel/LewisburgPkg/Include/Register/PchRegsFia.h | 8 +-------
Silicon/Intel/LewisburgPkg/Include/Register/PchRegsGpio.h | 8 +-------
Silicon/Intel/LewisburgPkg/Include/Register/PchRegsHda.h | 8 +-------
Silicon/Intel/LewisburgPkg/Include/Register/PchRegsHsio.h | 8 +-------
Silicon/Intel/LewisburgPkg/Include/Register/PchRegsIsh.h | 8 +-------
Silicon/Intel/LewisburgPkg/Include/Register/PchRegsItss.h | 8 +-------
Silicon/Intel/LewisburgPkg/Include/Register/PchRegsLan.h | 8 +-------
Silicon/Intel/LewisburgPkg/Include/Register/PchRegsLpc.h | 8 +-------
Silicon/Intel/LewisburgPkg/Include/Register/PchRegsP2sb.h | 8 +-------
Silicon/Intel/LewisburgPkg/Include/Register/PchRegsPcie.h | 8 +-------
Silicon/Intel/LewisburgPkg/Include/Register/PchRegsPcr.h | 8 +-------
Silicon/Intel/LewisburgPkg/Include/Register/PchRegsPmc.h | 8 +-------
Silicon/Intel/LewisburgPkg/Include/Register/PchRegsPsf.h | 8 +-------
Silicon/Intel/LewisburgPkg/Include/Register/PchRegsPsth.h | 8 +-------
Silicon/Intel/LewisburgPkg/Include/Register/PchRegsSata.h | 8 +-------
Silicon/Intel/LewisburgPkg/Include/Register/PchRegsScs.h | 8 +-------
.../Intel/LewisburgPkg/Include/Register/PchRegsSerialIo.h | 8 +-------
.../Intel/LewisburgPkg/Include/Register/PchRegsSmbus.h | 8 +-------
Silicon/Intel/LewisburgPkg/Include/Register/PchRegsSpi.h | 8 +-------
.../Intel/LewisburgPkg/Include/Register/PchRegsThermal.h | 8 +-------
.../Intel/LewisburgPkg/Include/Register/PchRegsTraceHub.h | 8 +-------
Silicon/Intel/LewisburgPkg/Include/Register/PchRegsUsb.h | 8 +-------
Silicon/Intel/LewisburgPkg/Include/SaRegs.h | 8 +-------
.../IncludePrivate/Library/PchResetCommonLib.h | 8 +-------
Silicon/Intel/LewisburgPkg/IncludePrivate/PchHHsioAx.h | 8 +-------
Silicon/Intel/LewisburgPkg/IncludePrivate/PchHHsioBx.h | 8 +-------
Silicon/Intel/LewisburgPkg/IncludePrivate/PchHHsioDx.h | 8 +-------
Silicon/Intel/LewisburgPkg/IncludePrivate/PchHsio.h | 8 +-------
Silicon/Intel/LewisburgPkg/IncludePrivate/PchLbgHsioAx.h | 8 +-------
Silicon/Intel/LewisburgPkg/IncludePrivate/PchLbgHsioBx.h | 8 +-------
Silicon/Intel/LewisburgPkg/IncludePrivate/PchLbgHsioBxD.h | 8 +-------
.../Intel/LewisburgPkg/IncludePrivate/PchLbgHsioBxD_Ext.h | 8 +-------
.../Intel/LewisburgPkg/IncludePrivate/PchLbgHsioBx_Ext.h | 8 +-------
Silicon/Intel/LewisburgPkg/IncludePrivate/PchLbgHsioSx.h | 8 +-------
.../Intel/LewisburgPkg/IncludePrivate/PchLbgHsioSx_Ext.h | 8 +-------
Silicon/Intel/LewisburgPkg/IncludePrivate/PchLpHsioBx.h | 8 +-------
Silicon/Intel/LewisburgPkg/IncludePrivate/PchLpHsioCx.h | 8 +-------
Silicon/Intel/LewisburgPkg/IncludePrivate/PchPolicyHob.h | 8 +-------
.../DxeRuntimeResetSystemLib/DxeRuntimeResetSystemLib.inf | 8 +-------
.../Library/DxeRuntimeResetSystemLib/PchReset.c | 8 +-------
.../Library/DxeRuntimeResetSystemLib/PchReset.h | 8 +-------
.../LewisburgPkg/Library/PeiDxeSmmGpioLib/GpioInit.c | 8 +-------
.../Intel/LewisburgPkg/Library/PeiDxeSmmGpioLib/GpioLib.c | 8 +-------
.../LewisburgPkg/Library/PeiDxeSmmGpioLib/GpioLibrary.h | 8 +-------
.../LewisburgPkg/Library/PeiDxeSmmGpioLib/GpioNativeLib.c | 8 +-------
.../Library/PeiDxeSmmGpioLib/PchSklGpioData.c | 8 +-------
.../Library/PeiDxeSmmGpioLib/PeiDxeSmmGpioLib.inf | 8 +-------
.../PeiDxeSmmPchCycleDecodingLib/PchCycleDecodingLib.c | 8 +-------
.../PeiDxeSmmPchCycleDecodingLib.inf | 8 +-------
.../LewisburgPkg/Library/PeiDxeSmmPchGbeLib/PchGbeLib.c | 8 +-------
.../Library/PeiDxeSmmPchGbeLib/PeiDxeSmmPchGbeLib.inf | 8 +-------
.../LewisburgPkg/Library/PeiDxeSmmPchInfoLib/PchInfoLib.c | 8 +-------
.../Library/PeiDxeSmmPchInfoLib/PchInfoStrLib.c | 8 +-------
.../Library/PeiDxeSmmPchInfoLib/PeiDxeSmmPchInfoLib.inf | 8 +-------
.../LewisburgPkg/Library/PeiDxeSmmPchP2sbLib/PchP2sbLib.c | 8 +-------
.../Library/PeiDxeSmmPchP2sbLib/PeiDxeSmmPchP2sbLib.inf | 8 +-------
.../LewisburgPkg/Library/PeiDxeSmmPchPcrLib/PchPcrLib.c | 8 +-------
.../Library/PeiDxeSmmPchPcrLib/PeiDxeSmmPchPcrLib.inf | 8 +-------
.../LewisburgPkg/Library/PeiDxeSmmPchPmcLib/PchPmcLib.c | 8 +-------
.../Library/PeiDxeSmmPchPmcLib/PeiDxeSmmPchPmcLib.inf | 8 +-------
.../Library/PeiDxeSmmPchSbiAccessLib/PchSbiAccessLib.c | 8 +-------
.../PeiDxeSmmPchSbiAccessLib/PeiDxeSmmPchSbiAccessLib.inf | 8 +-------
.../LewisburgPkg/Library/PeiPchPolicyLib/PchPrintPolicy.c | 8 +-------
.../Library/PeiPchPolicyLib/PeiPchPolicyLib.c | 8 +-------
.../Library/PeiPchPolicyLib/PeiPchPolicyLib.inf | 8 +-------
.../Library/PeiPchPolicyLib/PeiPchPolicyLibrary.h | 8 +-------
.../LewisburgPkg/Library/PeiPchPolicyLib/Rvp3PolicyLib.c | 8 +-------
.../Library/SmmSpiFlashCommonLib/SmmSpiFlashCommonLib.inf | 8 +-------
.../Library/SmmSpiFlashCommonLib/SpiFlashCommon.c | 8 +-------
.../Library/SmmSpiFlashCommonLib/SpiFlashCommonSmmLib.c | 8 +-------
.../BasePchResetCommonLib/BasePchResetCommonLib.inf | 8 +-------
.../LibraryPrivate/BasePchResetCommonLib/PchResetCommon.c | 8 +-------
Silicon/Intel/LewisburgPkg/PchCommonLib.dsc | 8 +-------
Silicon/Intel/LewisburgPkg/PchDxeLib.dsc | 8 +-------
Silicon/Intel/LewisburgPkg/PchPeiLib.dsc | 8 +-------
Silicon/Intel/LewisburgPkg/PchRcPkg.dec | 8 +-------
143 files changed, 143 insertions(+), 1001 deletions(-)
diff --git a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/GpioDefine.asl b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/GpioDefine.asl
index 39c3a8688d..c7077b798e 100644
--- a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/GpioDefine.asl
+++ b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/GpioDefine.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/GpioLib.asl b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/GpioLib.asl
index 3d8b01af76..b7ab6e9bb1 100644
--- a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/GpioLib.asl
+++ b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/GpioLib.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/IrqLink.asl b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/IrqLink.asl
index c39e472302..d328a3e1f6 100644
--- a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/IrqLink.asl
+++ b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/IrqLink.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/Pch.asl b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/Pch.asl
index 35b1787833..0c550b528c 100644
--- a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/Pch.asl
+++ b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/Pch.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchAcpiTables.inf b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchAcpiTables.inf
index 85d84b6d52..591fa9595b 100644
--- a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchAcpiTables.inf
+++ b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchAcpiTables.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchHda.asl b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchHda.asl
index 71220d8bda..380f334207 100644
--- a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchHda.asl
+++ b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchHda.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchHeci.asl b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchHeci.asl
index 02eca833c3..e428b964f3 100644
--- a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchHeci.asl
+++ b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchHeci.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchIsh.asl b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchIsh.asl
index d05ca11667..6786b0b6e0 100644
--- a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchIsh.asl
+++ b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchIsh.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchNvs.asl b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchNvs.asl
index f41157f16b..69d3bddedb 100644
--- a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchNvs.asl
+++ b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchNvs.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchPcie.asl b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchPcie.asl
index afe2237b4c..dc5454ab45 100644
--- a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchPcie.asl
+++ b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchPcie.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchRstPcieStorage.asl b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchRstPcieStorage.asl
index bef1a7e82a..fbee724042 100644
--- a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchRstPcieStorage.asl
+++ b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchRstPcieStorage.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchSata.asl b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchSata.asl
index e28d8e25b7..de60a98c01 100644
--- a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchSata.asl
+++ b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchSata.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchScs.asl b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchScs.asl
index 154b2c5366..04ec0e7fe6 100644
--- a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchScs.asl
+++ b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchScs.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchSerialIo.asl b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchSerialIo.asl
index 26cabf3ad0..72ed66a159 100644
--- a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchSerialIo.asl
+++ b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchSerialIo.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchXdci.asl b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchXdci.asl
index 0ea61b471c..229c861af6 100644
--- a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchXdci.asl
+++ b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchXdci.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchXhci.asl b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchXhci.asl
index 4ff8ae43cb..157f318683 100644
--- a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchXhci.asl
+++ b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchXhci.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP01_ADR.asl b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP01_ADR.asl
index b02b4c5583..fcadab67b2 100644
--- a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP01_ADR.asl
+++ b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP01_ADR.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP02_ADR.asl b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP02_ADR.asl
index a433c1c17d..8585676ccc 100644
--- a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP02_ADR.asl
+++ b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP02_ADR.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP03_ADR.asl b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP03_ADR.asl
index cbbb144020..a9dee84da6 100644
--- a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP03_ADR.asl
+++ b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP03_ADR.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP04_ADR.asl b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP04_ADR.asl
index 6ebdaf3b68..6946071d7b 100644
--- a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP04_ADR.asl
+++ b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP04_ADR.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP05_ADR.asl b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP05_ADR.asl
index 83ab65b9e7..c1bf1f508a 100644
--- a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP05_ADR.asl
+++ b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP05_ADR.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP06_ADR.asl b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP06_ADR.asl
index a64cc6af86..268e303314 100644
--- a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP06_ADR.asl
+++ b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP06_ADR.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP07_ADR.asl b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP07_ADR.asl
index 6d9507498f..c4a3af057f 100644
--- a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP07_ADR.asl
+++ b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP07_ADR.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP08_ADR.asl b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP08_ADR.asl
index 306e439847..20c03e5d31 100644
--- a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP08_ADR.asl
+++ b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP08_ADR.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP09_ADR.asl b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP09_ADR.asl
index 1330fbc454..7238eb1801 100644
--- a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP09_ADR.asl
+++ b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP09_ADR.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP10_ADR.asl b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP10_ADR.asl
index 3320113a81..d88f4bde2f 100644
--- a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP10_ADR.asl
+++ b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP10_ADR.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP11_ADR.asl b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP11_ADR.asl
index 81c781ddad..c81c815ee1 100644
--- a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP11_ADR.asl
+++ b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP11_ADR.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP12_ADR.asl b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP12_ADR.asl
index 21bf23efbe..85e0ec3046 100644
--- a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP12_ADR.asl
+++ b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP12_ADR.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP13_ADR.asl b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP13_ADR.asl
index f210d57b3b..f1906e54bb 100644
--- a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP13_ADR.asl
+++ b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP13_ADR.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP14_ADR.asl b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP14_ADR.asl
index 28f1864d18..1e098e4674 100644
--- a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP14_ADR.asl
+++ b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP14_ADR.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP15_ADR.asl b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP15_ADR.asl
index 10475cecbc..2127a907f7 100644
--- a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP15_ADR.asl
+++ b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP15_ADR.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP16_ADR.asl b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP16_ADR.asl
index 2818ce3614..af61a03383 100644
--- a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP16_ADR.asl
+++ b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP16_ADR.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP17_ADR.asl b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP17_ADR.asl
index 93fcc35ead..b731fc3964 100644
--- a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP17_ADR.asl
+++ b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP17_ADR.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP18_ADR.asl b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP18_ADR.asl
index cbc5c9f3f5..7b51d7d9b2 100644
--- a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP18_ADR.asl
+++ b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP18_ADR.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP19_ADR.asl b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP19_ADR.asl
index f98acfb11a..4d43dd81af 100644
--- a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP19_ADR.asl
+++ b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP19_ADR.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP20_ADR.asl b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP20_ADR.asl
index e26cf90e3a..469f32cf60 100644
--- a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP20_ADR.asl
+++ b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP20_ADR.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/TraceHubDebug.asl b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/TraceHubDebug.asl
index 736e76241d..84e7725178 100644
--- a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/TraceHubDebug.asl
+++ b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/TraceHubDebug.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/usbsbd.asl b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/usbsbd.asl
index 2778f4247b..674acbce60 100644
--- a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/usbsbd.asl
+++ b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/usbsbd.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/GpioConfig.h b/Silicon/Intel/LewisburgPkg/Include/GpioConfig.h
index 9b9420b260..854dcb645c 100644
--- a/Silicon/Intel/LewisburgPkg/Include/GpioConfig.h
+++ b/Silicon/Intel/LewisburgPkg/Include/GpioConfig.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/GpioPinsSklH.h b/Silicon/Intel/LewisburgPkg/Include/GpioPinsSklH.h
index 304d58741c..ecd3df3e4d 100644
--- a/Silicon/Intel/LewisburgPkg/Include/GpioPinsSklH.h
+++ b/Silicon/Intel/LewisburgPkg/Include/GpioPinsSklH.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/GpioPinsSklLp.h b/Silicon/Intel/LewisburgPkg/Include/GpioPinsSklLp.h
index eb591da562..8012f43275 100644
--- a/Silicon/Intel/LewisburgPkg/Include/GpioPinsSklLp.h
+++ b/Silicon/Intel/LewisburgPkg/Include/GpioPinsSklLp.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/Library/GpioLib.h b/Silicon/Intel/LewisburgPkg/Include/Library/GpioLib.h
index 383be789fd..dcee806ada 100644
--- a/Silicon/Intel/LewisburgPkg/Include/Library/GpioLib.h
+++ b/Silicon/Intel/LewisburgPkg/Include/Library/GpioLib.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/Library/GpioNativeLib.h b/Silicon/Intel/LewisburgPkg/Include/Library/GpioNativeLib.h
index ddeeee6490..357bd68b2a 100644
--- a/Silicon/Intel/LewisburgPkg/Include/Library/GpioNativeLib.h
+++ b/Silicon/Intel/LewisburgPkg/Include/Library/GpioNativeLib.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/Library/PchCycleDecodingLib.h b/Silicon/Intel/LewisburgPkg/Include/Library/PchCycleDecodingLib.h
index ac6e7fb0aa..52c664a76c 100644
--- a/Silicon/Intel/LewisburgPkg/Include/Library/PchCycleDecodingLib.h
+++ b/Silicon/Intel/LewisburgPkg/Include/Library/PchCycleDecodingLib.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/Library/PchGbeLib.h b/Silicon/Intel/LewisburgPkg/Include/Library/PchGbeLib.h
index 4630547f72..53cbc0a839 100644
--- a/Silicon/Intel/LewisburgPkg/Include/Library/PchGbeLib.h
+++ b/Silicon/Intel/LewisburgPkg/Include/Library/PchGbeLib.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/Library/PchInfoLib.h b/Silicon/Intel/LewisburgPkg/Include/Library/PchInfoLib.h
index cfdbc44fa9..cd4c875a91 100644
--- a/Silicon/Intel/LewisburgPkg/Include/Library/PchInfoLib.h
+++ b/Silicon/Intel/LewisburgPkg/Include/Library/PchInfoLib.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/Library/PchP2sbLib.h b/Silicon/Intel/LewisburgPkg/Include/Library/PchP2sbLib.h
index f7502238d0..edba54a7ce 100644
--- a/Silicon/Intel/LewisburgPkg/Include/Library/PchP2sbLib.h
+++ b/Silicon/Intel/LewisburgPkg/Include/Library/PchP2sbLib.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/Library/PchPcrLib.h b/Silicon/Intel/LewisburgPkg/Include/Library/PchPcrLib.h
index 085295cab4..dc8078c0cf 100644
--- a/Silicon/Intel/LewisburgPkg/Include/Library/PchPcrLib.h
+++ b/Silicon/Intel/LewisburgPkg/Include/Library/PchPcrLib.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/Library/PchPmcLib.h b/Silicon/Intel/LewisburgPkg/Include/Library/PchPmcLib.h
index 87d10e3074..ff21ac51e4 100644
--- a/Silicon/Intel/LewisburgPkg/Include/Library/PchPmcLib.h
+++ b/Silicon/Intel/LewisburgPkg/Include/Library/PchPmcLib.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/Library/PchPolicyLib.h b/Silicon/Intel/LewisburgPkg/Include/Library/PchPolicyLib.h
index 20266bc1dd..b854f0f581 100644
--- a/Silicon/Intel/LewisburgPkg/Include/Library/PchPolicyLib.h
+++ b/Silicon/Intel/LewisburgPkg/Include/Library/PchPolicyLib.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/Library/PchSbiAccessLib.h b/Silicon/Intel/LewisburgPkg/Include/Library/PchSbiAccessLib.h
index 92fd63daa7..f5328c0c1c 100644
--- a/Silicon/Intel/LewisburgPkg/Include/Library/PchSbiAccessLib.h
+++ b/Silicon/Intel/LewisburgPkg/Include/Library/PchSbiAccessLib.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/Library/PchSerialIoLib.h b/Silicon/Intel/LewisburgPkg/Include/Library/PchSerialIoLib.h
index b88bc0f0bf..1ae9101f88 100644
--- a/Silicon/Intel/LewisburgPkg/Include/Library/PchSerialIoLib.h
+++ b/Silicon/Intel/LewisburgPkg/Include/Library/PchSerialIoLib.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/Library/SpiFlashCommonLib.h b/Silicon/Intel/LewisburgPkg/Include/Library/SpiFlashCommonLib.h
index 4857564ded..6390411a5c 100644
--- a/Silicon/Intel/LewisburgPkg/Include/Library/SpiFlashCommonLib.h
+++ b/Silicon/Intel/LewisburgPkg/Include/Library/SpiFlashCommonLib.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/PchAccess.h b/Silicon/Intel/LewisburgPkg/Include/PchAccess.h
index 830b8e5539..de7ff266b7 100644
--- a/Silicon/Intel/LewisburgPkg/Include/PchAccess.h
+++ b/Silicon/Intel/LewisburgPkg/Include/PchAccess.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/PchLimits.h b/Silicon/Intel/LewisburgPkg/Include/PchLimits.h
index 1f7e24b1ea..ce24100837 100644
--- a/Silicon/Intel/LewisburgPkg/Include/PchLimits.h
+++ b/Silicon/Intel/LewisburgPkg/Include/PchLimits.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/PchPolicyCommon.h b/Silicon/Intel/LewisburgPkg/Include/PchPolicyCommon.h
index 3e6f06ffe7..310591951b 100644
--- a/Silicon/Intel/LewisburgPkg/Include/PchPolicyCommon.h
+++ b/Silicon/Intel/LewisburgPkg/Include/PchPolicyCommon.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/PchReservedResources.h b/Silicon/Intel/LewisburgPkg/Include/PchReservedResources.h
index d60125b768..62a3a39361 100644
--- a/Silicon/Intel/LewisburgPkg/Include/PchReservedResources.h
+++ b/Silicon/Intel/LewisburgPkg/Include/PchReservedResources.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/PcieRegs.h b/Silicon/Intel/LewisburgPkg/Include/PcieRegs.h
index e4cf4020c8..da8aebdd03 100644
--- a/Silicon/Intel/LewisburgPkg/Include/PcieRegs.h
+++ b/Silicon/Intel/LewisburgPkg/Include/PcieRegs.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/Ppi/PchPcieDeviceTable.h b/Silicon/Intel/LewisburgPkg/Include/Ppi/PchPcieDeviceTable.h
index 36451c4962..323e7a5e7e 100644
--- a/Silicon/Intel/LewisburgPkg/Include/Ppi/PchPcieDeviceTable.h
+++ b/Silicon/Intel/LewisburgPkg/Include/Ppi/PchPcieDeviceTable.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/Ppi/PchPolicy.h b/Silicon/Intel/LewisburgPkg/Include/Ppi/PchPolicy.h
index e994763e5e..553537b61a 100644
--- a/Silicon/Intel/LewisburgPkg/Include/Ppi/PchPolicy.h
+++ b/Silicon/Intel/LewisburgPkg/Include/Ppi/PchPolicy.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/Ppi/PchReset.h b/Silicon/Intel/LewisburgPkg/Include/Ppi/PchReset.h
index f7d3481f77..965c9ac1d7 100644
--- a/Silicon/Intel/LewisburgPkg/Include/Ppi/PchReset.h
+++ b/Silicon/Intel/LewisburgPkg/Include/Ppi/PchReset.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/Ppi/Spi.h b/Silicon/Intel/LewisburgPkg/Include/Ppi/Spi.h
index 44d043cf0e..b81df73b4b 100644
--- a/Silicon/Intel/LewisburgPkg/Include/Ppi/Spi.h
+++ b/Silicon/Intel/LewisburgPkg/Include/Ppi/Spi.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/Protocol/PchReset.h b/Silicon/Intel/LewisburgPkg/Include/Protocol/PchReset.h
index d967de3b68..ad97d05a31 100644
--- a/Silicon/Intel/LewisburgPkg/Include/Protocol/PchReset.h
+++ b/Silicon/Intel/LewisburgPkg/Include/Protocol/PchReset.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/Protocol/Spi.h b/Silicon/Intel/LewisburgPkg/Include/Protocol/Spi.h
index eafedcab93..b7472c31b3 100644
--- a/Silicon/Intel/LewisburgPkg/Include/Protocol/Spi.h
+++ b/Silicon/Intel/LewisburgPkg/Include/Protocol/Spi.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsDci.h b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsDci.h
index a3dd6ed148..93d54793f3 100644
--- a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsDci.h
+++ b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsDci.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsDmi.h b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsDmi.h
index b7426e25fd..098cac742a 100644
--- a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsDmi.h
+++ b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsDmi.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsEva.h b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsEva.h
index 223d630d2c..8cf48683bf 100644
--- a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsEva.h
+++ b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsEva.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsFia.h b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsFia.h
index 6ca108be67..985e1e2a1d 100644
--- a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsFia.h
+++ b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsFia.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsGpio.h b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsGpio.h
index 24b78d0907..9b6c4851f9 100644
--- a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsGpio.h
+++ b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsGpio.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsHda.h b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsHda.h
index 3b7245eabf..a6049cb5aa 100644
--- a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsHda.h
+++ b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsHda.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsHsio.h b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsHsio.h
index 8323c16425..76016a163e 100644
--- a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsHsio.h
+++ b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsHsio.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsIsh.h b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsIsh.h
index ee011d84c4..2f519c539f 100644
--- a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsIsh.h
+++ b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsIsh.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsItss.h b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsItss.h
index d78cc615bb..762fbe3b8e 100644
--- a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsItss.h
+++ b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsItss.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsLan.h b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsLan.h
index e6e89ab68f..473216f61f 100644
--- a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsLan.h
+++ b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsLan.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsLpc.h b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsLpc.h
index 4a2f8c8533..27fb432fbf 100644
--- a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsLpc.h
+++ b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsLpc.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsP2sb.h b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsP2sb.h
index 205d3ad282..3a3f8d5967 100644
--- a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsP2sb.h
+++ b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsP2sb.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsPcie.h b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsPcie.h
index df40a8b703..e31d699b4d 100644
--- a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsPcie.h
+++ b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsPcie.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsPcr.h b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsPcr.h
index 3cd0c432b4..eea1b11ca8 100644
--- a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsPcr.h
+++ b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsPcr.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsPmc.h b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsPmc.h
index fd67b1338d..e1d780be14 100644
--- a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsPmc.h
+++ b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsPmc.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsPsf.h b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsPsf.h
index a38ef5346c..0eb61aa0b7 100644
--- a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsPsf.h
+++ b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsPsf.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsPsth.h b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsPsth.h
index 0c9ce3135f..6669cc2bb9 100644
--- a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsPsth.h
+++ b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsPsth.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsSata.h b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsSata.h
index 385f868f98..7d91f19dbc 100644
--- a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsSata.h
+++ b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsSata.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsScs.h b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsScs.h
index b58618f49c..91f8b02c09 100644
--- a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsScs.h
+++ b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsScs.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsSerialIo.h b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsSerialIo.h
index e0d048b94e..fbd681de60 100644
--- a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsSerialIo.h
+++ b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsSerialIo.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsSmbus.h b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsSmbus.h
index cc04d39653..1f0912bec8 100644
--- a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsSmbus.h
+++ b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsSmbus.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsSpi.h b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsSpi.h
index cab12792d1..ef5dd8ea18 100644
--- a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsSpi.h
+++ b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsSpi.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsThermal.h b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsThermal.h
index e9eddfe6f1..dfd6d4e37c 100644
--- a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsThermal.h
+++ b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsThermal.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsTraceHub.h b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsTraceHub.h
index 60201d1195..43c2b7c699 100644
--- a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsTraceHub.h
+++ b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsTraceHub.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsUsb.h b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsUsb.h
index 6d92b4dfff..a25e9981b3 100644
--- a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsUsb.h
+++ b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsUsb.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/SaRegs.h b/Silicon/Intel/LewisburgPkg/Include/SaRegs.h
index 322fc882d6..20a36bea36 100644
--- a/Silicon/Intel/LewisburgPkg/Include/SaRegs.h
+++ b/Silicon/Intel/LewisburgPkg/Include/SaRegs.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/IncludePrivate/Library/PchResetCommonLib.h b/Silicon/Intel/LewisburgPkg/IncludePrivate/Library/PchResetCommonLib.h
index c64d3dbb47..a1d076c06c 100644
--- a/Silicon/Intel/LewisburgPkg/IncludePrivate/Library/PchResetCommonLib.h
+++ b/Silicon/Intel/LewisburgPkg/IncludePrivate/Library/PchResetCommonLib.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/IncludePrivate/PchHHsioAx.h b/Silicon/Intel/LewisburgPkg/IncludePrivate/PchHHsioAx.h
index 9b3eb39a3e..37adb642c6 100644
--- a/Silicon/Intel/LewisburgPkg/IncludePrivate/PchHHsioAx.h
+++ b/Silicon/Intel/LewisburgPkg/IncludePrivate/PchHHsioAx.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/IncludePrivate/PchHHsioBx.h b/Silicon/Intel/LewisburgPkg/IncludePrivate/PchHHsioBx.h
index 2d191d9863..abbe638ff7 100644
--- a/Silicon/Intel/LewisburgPkg/IncludePrivate/PchHHsioBx.h
+++ b/Silicon/Intel/LewisburgPkg/IncludePrivate/PchHHsioBx.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/IncludePrivate/PchHHsioDx.h b/Silicon/Intel/LewisburgPkg/IncludePrivate/PchHHsioDx.h
index ed97364512..ea778f3855 100644
--- a/Silicon/Intel/LewisburgPkg/IncludePrivate/PchHHsioDx.h
+++ b/Silicon/Intel/LewisburgPkg/IncludePrivate/PchHHsioDx.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/IncludePrivate/PchHsio.h b/Silicon/Intel/LewisburgPkg/IncludePrivate/PchHsio.h
index 4f14f5bf63..584838fb83 100644
--- a/Silicon/Intel/LewisburgPkg/IncludePrivate/PchHsio.h
+++ b/Silicon/Intel/LewisburgPkg/IncludePrivate/PchHsio.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/IncludePrivate/PchLbgHsioAx.h b/Silicon/Intel/LewisburgPkg/IncludePrivate/PchLbgHsioAx.h
index 6c15d5fbd5..5bd69194f8 100644
--- a/Silicon/Intel/LewisburgPkg/IncludePrivate/PchLbgHsioAx.h
+++ b/Silicon/Intel/LewisburgPkg/IncludePrivate/PchLbgHsioAx.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/IncludePrivate/PchLbgHsioBx.h b/Silicon/Intel/LewisburgPkg/IncludePrivate/PchLbgHsioBx.h
index 08c0685807..4cc1ff977d 100644
--- a/Silicon/Intel/LewisburgPkg/IncludePrivate/PchLbgHsioBx.h
+++ b/Silicon/Intel/LewisburgPkg/IncludePrivate/PchLbgHsioBx.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/IncludePrivate/PchLbgHsioBxD.h b/Silicon/Intel/LewisburgPkg/IncludePrivate/PchLbgHsioBxD.h
index aa1b9d850c..ad445ba7e6 100644
--- a/Silicon/Intel/LewisburgPkg/IncludePrivate/PchLbgHsioBxD.h
+++ b/Silicon/Intel/LewisburgPkg/IncludePrivate/PchLbgHsioBxD.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/IncludePrivate/PchLbgHsioBxD_Ext.h b/Silicon/Intel/LewisburgPkg/IncludePrivate/PchLbgHsioBxD_Ext.h
index 45bd8b754c..253d4b9859 100644
--- a/Silicon/Intel/LewisburgPkg/IncludePrivate/PchLbgHsioBxD_Ext.h
+++ b/Silicon/Intel/LewisburgPkg/IncludePrivate/PchLbgHsioBxD_Ext.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/IncludePrivate/PchLbgHsioBx_Ext.h b/Silicon/Intel/LewisburgPkg/IncludePrivate/PchLbgHsioBx_Ext.h
index 2a8e17eaca..4b228c6044 100644
--- a/Silicon/Intel/LewisburgPkg/IncludePrivate/PchLbgHsioBx_Ext.h
+++ b/Silicon/Intel/LewisburgPkg/IncludePrivate/PchLbgHsioBx_Ext.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/IncludePrivate/PchLbgHsioSx.h b/Silicon/Intel/LewisburgPkg/IncludePrivate/PchLbgHsioSx.h
index 992a385501..3e3d10bd3e 100644
--- a/Silicon/Intel/LewisburgPkg/IncludePrivate/PchLbgHsioSx.h
+++ b/Silicon/Intel/LewisburgPkg/IncludePrivate/PchLbgHsioSx.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/IncludePrivate/PchLbgHsioSx_Ext.h b/Silicon/Intel/LewisburgPkg/IncludePrivate/PchLbgHsioSx_Ext.h
index 8f28fce83e..616212f4b1 100644
--- a/Silicon/Intel/LewisburgPkg/IncludePrivate/PchLbgHsioSx_Ext.h
+++ b/Silicon/Intel/LewisburgPkg/IncludePrivate/PchLbgHsioSx_Ext.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/IncludePrivate/PchLpHsioBx.h b/Silicon/Intel/LewisburgPkg/IncludePrivate/PchLpHsioBx.h
index 98125eaf1a..774a0a09f5 100644
--- a/Silicon/Intel/LewisburgPkg/IncludePrivate/PchLpHsioBx.h
+++ b/Silicon/Intel/LewisburgPkg/IncludePrivate/PchLpHsioBx.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/IncludePrivate/PchLpHsioCx.h b/Silicon/Intel/LewisburgPkg/IncludePrivate/PchLpHsioCx.h
index 0548f446de..9740763098 100644
--- a/Silicon/Intel/LewisburgPkg/IncludePrivate/PchLpHsioCx.h
+++ b/Silicon/Intel/LewisburgPkg/IncludePrivate/PchLpHsioCx.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/IncludePrivate/PchPolicyHob.h b/Silicon/Intel/LewisburgPkg/IncludePrivate/PchPolicyHob.h
index eb2bff904e..1fafaae47e 100644
--- a/Silicon/Intel/LewisburgPkg/IncludePrivate/PchPolicyHob.h
+++ b/Silicon/Intel/LewisburgPkg/IncludePrivate/PchPolicyHob.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Library/DxeRuntimeResetSystemLib/DxeRuntimeResetSystemLib.inf b/Silicon/Intel/LewisburgPkg/Library/DxeRuntimeResetSystemLib/DxeRuntimeResetSystemLib.inf
index 353aafa572..6943b7fe87 100644
--- a/Silicon/Intel/LewisburgPkg/Library/DxeRuntimeResetSystemLib/DxeRuntimeResetSystemLib.inf
+++ b/Silicon/Intel/LewisburgPkg/Library/DxeRuntimeResetSystemLib/DxeRuntimeResetSystemLib.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Silicon/Intel/LewisburgPkg/Library/DxeRuntimeResetSystemLib/PchReset.c b/Silicon/Intel/LewisburgPkg/Library/DxeRuntimeResetSystemLib/PchReset.c
index ea7a7a1bc0..7604ce15b3 100644
--- a/Silicon/Intel/LewisburgPkg/Library/DxeRuntimeResetSystemLib/PchReset.c
+++ b/Silicon/Intel/LewisburgPkg/Library/DxeRuntimeResetSystemLib/PchReset.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018 - 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Library/DxeRuntimeResetSystemLib/PchReset.h b/Silicon/Intel/LewisburgPkg/Library/DxeRuntimeResetSystemLib/PchReset.h
index bfcd15888c..f07948a1fe 100644
--- a/Silicon/Intel/LewisburgPkg/Library/DxeRuntimeResetSystemLib/PchReset.h
+++ b/Silicon/Intel/LewisburgPkg/Library/DxeRuntimeResetSystemLib/PchReset.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmGpioLib/GpioInit.c b/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmGpioLib/GpioInit.c
index 422ecfcee1..89f601736a 100644
--- a/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmGpioLib/GpioInit.c
+++ b/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmGpioLib/GpioInit.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmGpioLib/GpioLib.c b/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmGpioLib/GpioLib.c
index 0b82c2b8df..d94ff8a693 100644
--- a/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmGpioLib/GpioLib.c
+++ b/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmGpioLib/GpioLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmGpioLib/GpioLibrary.h b/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmGpioLib/GpioLibrary.h
index 8618099e24..6cb918fd38 100644
--- a/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmGpioLib/GpioLibrary.h
+++ b/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmGpioLib/GpioLibrary.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmGpioLib/GpioNativeLib.c b/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmGpioLib/GpioNativeLib.c
index a86c144679..314e8d5c98 100644
--- a/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmGpioLib/GpioNativeLib.c
+++ b/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmGpioLib/GpioNativeLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmGpioLib/PchSklGpioData.c b/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmGpioLib/PchSklGpioData.c
index 62d93d6c86..f62e71b9de 100644
--- a/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmGpioLib/PchSklGpioData.c
+++ b/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmGpioLib/PchSklGpioData.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmGpioLib/PeiDxeSmmGpioLib.inf b/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmGpioLib/PeiDxeSmmGpioLib.inf
index 0d7c56c0d0..1c314be940 100644
--- a/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmGpioLib/PeiDxeSmmGpioLib.inf
+++ b/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmGpioLib/PeiDxeSmmGpioLib.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchCycleDecodingLib/PchCycleDecodingLib.c b/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchCycleDecodingLib/PchCycleDecodingLib.c
index 3629bc5157..07f50ef7a7 100644
--- a/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchCycleDecodingLib/PchCycleDecodingLib.c
+++ b/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchCycleDecodingLib/PchCycleDecodingLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchCycleDecodingLib/PeiDxeSmmPchCycleDecodingLib.inf b/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchCycleDecodingLib/PeiDxeSmmPchCycleDecodingLib.inf
index c0cf90854f..66f6bf979f 100644
--- a/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchCycleDecodingLib/PeiDxeSmmPchCycleDecodingLib.inf
+++ b/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchCycleDecodingLib/PeiDxeSmmPchCycleDecodingLib.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchGbeLib/PchGbeLib.c b/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchGbeLib/PchGbeLib.c
index 9d3304a1aa..181334cce9 100644
--- a/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchGbeLib/PchGbeLib.c
+++ b/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchGbeLib/PchGbeLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchGbeLib/PeiDxeSmmPchGbeLib.inf b/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchGbeLib/PeiDxeSmmPchGbeLib.inf
index 59388180f1..df16b403f1 100644
--- a/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchGbeLib/PeiDxeSmmPchGbeLib.inf
+++ b/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchGbeLib/PeiDxeSmmPchGbeLib.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchInfoLib/PchInfoLib.c b/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchInfoLib/PchInfoLib.c
index 31966dd609..34b08d0e8d 100644
--- a/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchInfoLib/PchInfoLib.c
+++ b/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchInfoLib/PchInfoLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchInfoLib/PchInfoStrLib.c b/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchInfoLib/PchInfoStrLib.c
index 641277c083..4c077488eb 100644
--- a/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchInfoLib/PchInfoStrLib.c
+++ b/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchInfoLib/PchInfoStrLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchInfoLib/PeiDxeSmmPchInfoLib.inf b/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchInfoLib/PeiDxeSmmPchInfoLib.inf
index 2b3fdeb495..1fd7d606bd 100644
--- a/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchInfoLib/PeiDxeSmmPchInfoLib.inf
+++ b/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchInfoLib/PeiDxeSmmPchInfoLib.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchP2sbLib/PchP2sbLib.c b/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchP2sbLib/PchP2sbLib.c
index 6e91828d64..5e8af8915d 100644
--- a/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchP2sbLib/PchP2sbLib.c
+++ b/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchP2sbLib/PchP2sbLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchP2sbLib/PeiDxeSmmPchP2sbLib.inf b/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchP2sbLib/PeiDxeSmmPchP2sbLib.inf
index 4f57152b2e..714f711a24 100644
--- a/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchP2sbLib/PeiDxeSmmPchP2sbLib.inf
+++ b/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchP2sbLib/PeiDxeSmmPchP2sbLib.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchPcrLib/PchPcrLib.c b/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchPcrLib/PchPcrLib.c
index 032349bd4e..5bb0f13eeb 100644
--- a/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchPcrLib/PchPcrLib.c
+++ b/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchPcrLib/PchPcrLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchPcrLib/PeiDxeSmmPchPcrLib.inf b/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchPcrLib/PeiDxeSmmPchPcrLib.inf
index c54dc2c4e2..647cc61953 100644
--- a/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchPcrLib/PeiDxeSmmPchPcrLib.inf
+++ b/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchPcrLib/PeiDxeSmmPchPcrLib.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchPmcLib/PchPmcLib.c b/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchPmcLib/PchPmcLib.c
index 9796cb0561..b988232a3d 100644
--- a/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchPmcLib/PchPmcLib.c
+++ b/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchPmcLib/PchPmcLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchPmcLib/PeiDxeSmmPchPmcLib.inf b/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchPmcLib/PeiDxeSmmPchPmcLib.inf
index ffb37a199a..7f0a73f944 100644
--- a/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchPmcLib/PeiDxeSmmPchPmcLib.inf
+++ b/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchPmcLib/PeiDxeSmmPchPmcLib.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchSbiAccessLib/PchSbiAccessLib.c b/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchSbiAccessLib/PchSbiAccessLib.c
index 444b2822c7..6f0030ac33 100644
--- a/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchSbiAccessLib/PchSbiAccessLib.c
+++ b/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchSbiAccessLib/PchSbiAccessLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchSbiAccessLib/PeiDxeSmmPchSbiAccessLib.inf b/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchSbiAccessLib/PeiDxeSmmPchSbiAccessLib.inf
index 4f6d2a8a21..fbda2fd181 100644
--- a/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchSbiAccessLib/PeiDxeSmmPchSbiAccessLib.inf
+++ b/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchSbiAccessLib/PeiDxeSmmPchSbiAccessLib.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Silicon/Intel/LewisburgPkg/Library/PeiPchPolicyLib/PchPrintPolicy.c b/Silicon/Intel/LewisburgPkg/Library/PeiPchPolicyLib/PchPrintPolicy.c
index a555ff9c6e..33fa00b25f 100644
--- a/Silicon/Intel/LewisburgPkg/Library/PeiPchPolicyLib/PchPrintPolicy.c
+++ b/Silicon/Intel/LewisburgPkg/Library/PeiPchPolicyLib/PchPrintPolicy.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Library/PeiPchPolicyLib/PeiPchPolicyLib.c b/Silicon/Intel/LewisburgPkg/Library/PeiPchPolicyLib/PeiPchPolicyLib.c
index f5ec0d5fb1..c5f9c39265 100644
--- a/Silicon/Intel/LewisburgPkg/Library/PeiPchPolicyLib/PeiPchPolicyLib.c
+++ b/Silicon/Intel/LewisburgPkg/Library/PeiPchPolicyLib/PeiPchPolicyLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Library/PeiPchPolicyLib/PeiPchPolicyLib.inf b/Silicon/Intel/LewisburgPkg/Library/PeiPchPolicyLib/PeiPchPolicyLib.inf
index fa433c9333..82294d0dc6 100644
--- a/Silicon/Intel/LewisburgPkg/Library/PeiPchPolicyLib/PeiPchPolicyLib.inf
+++ b/Silicon/Intel/LewisburgPkg/Library/PeiPchPolicyLib/PeiPchPolicyLib.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Silicon/Intel/LewisburgPkg/Library/PeiPchPolicyLib/PeiPchPolicyLibrary.h b/Silicon/Intel/LewisburgPkg/Library/PeiPchPolicyLib/PeiPchPolicyLibrary.h
index 9932afdc04..5a35f0ba47 100644
--- a/Silicon/Intel/LewisburgPkg/Library/PeiPchPolicyLib/PeiPchPolicyLibrary.h
+++ b/Silicon/Intel/LewisburgPkg/Library/PeiPchPolicyLib/PeiPchPolicyLibrary.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Library/PeiPchPolicyLib/Rvp3PolicyLib.c b/Silicon/Intel/LewisburgPkg/Library/PeiPchPolicyLib/Rvp3PolicyLib.c
index 62cc91f821..0fe114e167 100644
--- a/Silicon/Intel/LewisburgPkg/Library/PeiPchPolicyLib/Rvp3PolicyLib.c
+++ b/Silicon/Intel/LewisburgPkg/Library/PeiPchPolicyLib/Rvp3PolicyLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Library/SmmSpiFlashCommonLib/SmmSpiFlashCommonLib.inf b/Silicon/Intel/LewisburgPkg/Library/SmmSpiFlashCommonLib/SmmSpiFlashCommonLib.inf
index 0972343872..affc90bc3d 100644
--- a/Silicon/Intel/LewisburgPkg/Library/SmmSpiFlashCommonLib/SmmSpiFlashCommonLib.inf
+++ b/Silicon/Intel/LewisburgPkg/Library/SmmSpiFlashCommonLib/SmmSpiFlashCommonLib.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Silicon/Intel/LewisburgPkg/Library/SmmSpiFlashCommonLib/SpiFlashCommon.c b/Silicon/Intel/LewisburgPkg/Library/SmmSpiFlashCommonLib/SpiFlashCommon.c
index 9d1e3fb60e..4c9c4c8456 100644
--- a/Silicon/Intel/LewisburgPkg/Library/SmmSpiFlashCommonLib/SpiFlashCommon.c
+++ b/Silicon/Intel/LewisburgPkg/Library/SmmSpiFlashCommonLib/SpiFlashCommon.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Library/SmmSpiFlashCommonLib/SpiFlashCommonSmmLib.c b/Silicon/Intel/LewisburgPkg/Library/SmmSpiFlashCommonLib/SpiFlashCommonSmmLib.c
index befff4c8dd..aa12fb9e92 100644
--- a/Silicon/Intel/LewisburgPkg/Library/SmmSpiFlashCommonLib/SpiFlashCommonSmmLib.c
+++ b/Silicon/Intel/LewisburgPkg/Library/SmmSpiFlashCommonLib/SpiFlashCommonSmmLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/LibraryPrivate/BasePchResetCommonLib/BasePchResetCommonLib.inf b/Silicon/Intel/LewisburgPkg/LibraryPrivate/BasePchResetCommonLib/BasePchResetCommonLib.inf
index 3f493a7d4e..687f6e4252 100644
--- a/Silicon/Intel/LewisburgPkg/LibraryPrivate/BasePchResetCommonLib/BasePchResetCommonLib.inf
+++ b/Silicon/Intel/LewisburgPkg/LibraryPrivate/BasePchResetCommonLib/BasePchResetCommonLib.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Silicon/Intel/LewisburgPkg/LibraryPrivate/BasePchResetCommonLib/PchResetCommon.c b/Silicon/Intel/LewisburgPkg/LibraryPrivate/BasePchResetCommonLib/PchResetCommon.c
index 7b3c894700..65ba4831c7 100644
--- a/Silicon/Intel/LewisburgPkg/LibraryPrivate/BasePchResetCommonLib/PchResetCommon.c
+++ b/Silicon/Intel/LewisburgPkg/LibraryPrivate/BasePchResetCommonLib/PchResetCommon.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/PchCommonLib.dsc b/Silicon/Intel/LewisburgPkg/PchCommonLib.dsc
index c12fe32b7e..ae8b9dc831 100644
--- a/Silicon/Intel/LewisburgPkg/PchCommonLib.dsc
+++ b/Silicon/Intel/LewisburgPkg/PchCommonLib.dsc
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Silicon/Intel/LewisburgPkg/PchDxeLib.dsc b/Silicon/Intel/LewisburgPkg/PchDxeLib.dsc
index d5dc5667c7..ffbd3e6da8 100644
--- a/Silicon/Intel/LewisburgPkg/PchDxeLib.dsc
+++ b/Silicon/Intel/LewisburgPkg/PchDxeLib.dsc
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Silicon/Intel/LewisburgPkg/PchPeiLib.dsc b/Silicon/Intel/LewisburgPkg/PchPeiLib.dsc
index 6503f1799a..46ddb965e6 100644
--- a/Silicon/Intel/LewisburgPkg/PchPeiLib.dsc
+++ b/Silicon/Intel/LewisburgPkg/PchPeiLib.dsc
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Silicon/Intel/LewisburgPkg/PchRcPkg.dec b/Silicon/Intel/LewisburgPkg/PchRcPkg.dec
index 441d9e75e3..71f57dc2b8 100644
--- a/Silicon/Intel/LewisburgPkg/PchRcPkg.dec
+++ b/Silicon/Intel/LewisburgPkg/PchRcPkg.dec
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
--
2.21.0.windows.1
^ permalink raw reply related [flat|nested] 63+ messages in thread* Re: [edk2-devel] [[edk2-platforms][PATCH V2] 24/30] Silicon/Intel/LewisburgPkg: Replace BSD License with BSD+Patent License
2019-05-15 23:10 ` [[edk2-platforms][PATCH V2] 24/30] Silicon/Intel/LewisburgPkg: " Michael D Kinney
@ 2019-05-17 19:59 ` Oram, Isaac W
0 siblings, 0 replies; 63+ messages in thread
From: Oram, Isaac W @ 2019-05-17 19:59 UTC (permalink / raw)
To: devel@edk2.groups.io, Kinney, Michael D; +Cc: Piwko, Maciej, Bu, Daocheng
Reviewed-by: Isaac W Oram<Isaac.w.oram@intel.com>
-----Original Message-----
From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Kinney, Michael D
Sent: Wednesday, May 15, 2019 4:10 PM
To: devel@edk2.groups.io
Cc: Piwko, Maciej <maciej.piwko@intel.com>; Bu, Daocheng <daocheng.bu@intel.com>; Oram, Isaac W <isaac.w.oram@intel.com>
Subject: [edk2-devel] [[edk2-platforms][PATCH V2] 24/30] Silicon/Intel/LewisburgPkg: Replace BSD License with BSD+Patent License
https://bugzilla.tianocore.org/show_bug.cgi?id=1373
Replace BSD 2-Clause License with BSD+Patent License. This change is
based on the following emails:
https://lists.01.org/pipermail/edk2-devel/2019-February/036260.html
https://lists.01.org/pipermail/edk2-devel/2018-October/030385.html
RFCs with detailed process for the license change:
V3: https://lists.01.org/pipermail/edk2-devel/2019-March/038116.html
V2: https://lists.01.org/pipermail/edk2-devel/2019-March/037669.html
V1: https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html
Cc: Maciej Piwko <maciej.piwko@intel.com>
Cc: Daocheng Bu <daocheng.bu@intel.com>
Cc: Isaac W Oram <isaac.w.oram@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/GpioDefine.asl | 8 +-------
Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/GpioLib.asl | 8 +-------
Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/IrqLink.asl | 8 +-------
Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/Pch.asl | 8 +-------
.../Intel/LewisburgPkg/AcpiTables/Dsdt/PchAcpiTables.inf | 8 +-------
Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchHda.asl | 8 +-------
Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchHeci.asl | 8 +-------
Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchIsh.asl | 8 +-------
Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchNvs.asl | 8 +-------
Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchPcie.asl | 8 +-------
.../LewisburgPkg/AcpiTables/Dsdt/PchRstPcieStorage.asl | 8 +-------
Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchSata.asl | 8 +-------
Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchScs.asl | 8 +-------
.../Intel/LewisburgPkg/AcpiTables/Dsdt/PchSerialIo.asl | 8 +-------
Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchXdci.asl | 8 +-------
Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchXhci.asl | 8 +-------
Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP01_ADR.asl | 8 +-------
Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP02_ADR.asl | 8 +-------
Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP03_ADR.asl | 8 +-------
Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP04_ADR.asl | 8 +-------
Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP05_ADR.asl | 8 +-------
Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP06_ADR.asl | 8 +-------
Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP07_ADR.asl | 8 +-------
Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP08_ADR.asl | 8 +-------
Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP09_ADR.asl | 8 +-------
Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP10_ADR.asl | 8 +-------
Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP11_ADR.asl | 8 +-------
Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP12_ADR.asl | 8 +-------
Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP13_ADR.asl | 8 +-------
Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP14_ADR.asl | 8 +-------
Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP15_ADR.asl | 8 +-------
Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP16_ADR.asl | 8 +-------
Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP17_ADR.asl | 8 +-------
Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP18_ADR.asl | 8 +-------
Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP19_ADR.asl | 8 +-------
Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP20_ADR.asl | 8 +-------
.../Intel/LewisburgPkg/AcpiTables/Dsdt/TraceHubDebug.asl | 8 +-------
Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/usbsbd.asl | 8 +-------
Silicon/Intel/LewisburgPkg/Include/GpioConfig.h | 8 +-------
Silicon/Intel/LewisburgPkg/Include/GpioPinsSklH.h | 8 +-------
Silicon/Intel/LewisburgPkg/Include/GpioPinsSklLp.h | 8 +-------
Silicon/Intel/LewisburgPkg/Include/Library/GpioLib.h | 8 +-------
.../Intel/LewisburgPkg/Include/Library/GpioNativeLib.h | 8 +-------
.../LewisburgPkg/Include/Library/PchCycleDecodingLib.h | 8 +-------
Silicon/Intel/LewisburgPkg/Include/Library/PchGbeLib.h | 8 +-------
Silicon/Intel/LewisburgPkg/Include/Library/PchInfoLib.h | 8 +-------
Silicon/Intel/LewisburgPkg/Include/Library/PchP2sbLib.h | 8 +-------
Silicon/Intel/LewisburgPkg/Include/Library/PchPcrLib.h | 8 +-------
Silicon/Intel/LewisburgPkg/Include/Library/PchPmcLib.h | 8 +-------
Silicon/Intel/LewisburgPkg/Include/Library/PchPolicyLib.h | 8 +-------
.../Intel/LewisburgPkg/Include/Library/PchSbiAccessLib.h | 8 +-------
.../Intel/LewisburgPkg/Include/Library/PchSerialIoLib.h | 8 +-------
.../LewisburgPkg/Include/Library/SpiFlashCommonLib.h | 8 +-------
Silicon/Intel/LewisburgPkg/Include/PchAccess.h | 8 +-------
Silicon/Intel/LewisburgPkg/Include/PchLimits.h | 8 +-------
Silicon/Intel/LewisburgPkg/Include/PchPolicyCommon.h | 8 +-------
Silicon/Intel/LewisburgPkg/Include/PchReservedResources.h | 8 +-------
Silicon/Intel/LewisburgPkg/Include/PcieRegs.h | 8 +-------
.../Intel/LewisburgPkg/Include/Ppi/PchPcieDeviceTable.h | 8 +-------
Silicon/Intel/LewisburgPkg/Include/Ppi/PchPolicy.h | 8 +-------
Silicon/Intel/LewisburgPkg/Include/Ppi/PchReset.h | 8 +-------
Silicon/Intel/LewisburgPkg/Include/Ppi/Spi.h | 8 +-------
Silicon/Intel/LewisburgPkg/Include/Protocol/PchReset.h | 8 +-------
Silicon/Intel/LewisburgPkg/Include/Protocol/Spi.h | 8 +-------
Silicon/Intel/LewisburgPkg/Include/Register/PchRegsDci.h | 8 +-------
Silicon/Intel/LewisburgPkg/Include/Register/PchRegsDmi.h | 8 +-------
Silicon/Intel/LewisburgPkg/Include/Register/PchRegsEva.h | 8 +-------
Silicon/Intel/LewisburgPkg/Include/Register/PchRegsFia.h | 8 +-------
Silicon/Intel/LewisburgPkg/Include/Register/PchRegsGpio.h | 8 +-------
Silicon/Intel/LewisburgPkg/Include/Register/PchRegsHda.h | 8 +-------
Silicon/Intel/LewisburgPkg/Include/Register/PchRegsHsio.h | 8 +-------
Silicon/Intel/LewisburgPkg/Include/Register/PchRegsIsh.h | 8 +-------
Silicon/Intel/LewisburgPkg/Include/Register/PchRegsItss.h | 8 +-------
Silicon/Intel/LewisburgPkg/Include/Register/PchRegsLan.h | 8 +-------
Silicon/Intel/LewisburgPkg/Include/Register/PchRegsLpc.h | 8 +-------
Silicon/Intel/LewisburgPkg/Include/Register/PchRegsP2sb.h | 8 +-------
Silicon/Intel/LewisburgPkg/Include/Register/PchRegsPcie.h | 8 +-------
Silicon/Intel/LewisburgPkg/Include/Register/PchRegsPcr.h | 8 +-------
Silicon/Intel/LewisburgPkg/Include/Register/PchRegsPmc.h | 8 +-------
Silicon/Intel/LewisburgPkg/Include/Register/PchRegsPsf.h | 8 +-------
Silicon/Intel/LewisburgPkg/Include/Register/PchRegsPsth.h | 8 +-------
Silicon/Intel/LewisburgPkg/Include/Register/PchRegsSata.h | 8 +-------
Silicon/Intel/LewisburgPkg/Include/Register/PchRegsScs.h | 8 +-------
.../Intel/LewisburgPkg/Include/Register/PchRegsSerialIo.h | 8 +-------
.../Intel/LewisburgPkg/Include/Register/PchRegsSmbus.h | 8 +-------
Silicon/Intel/LewisburgPkg/Include/Register/PchRegsSpi.h | 8 +-------
.../Intel/LewisburgPkg/Include/Register/PchRegsThermal.h | 8 +-------
.../Intel/LewisburgPkg/Include/Register/PchRegsTraceHub.h | 8 +-------
Silicon/Intel/LewisburgPkg/Include/Register/PchRegsUsb.h | 8 +-------
Silicon/Intel/LewisburgPkg/Include/SaRegs.h | 8 +-------
.../IncludePrivate/Library/PchResetCommonLib.h | 8 +-------
Silicon/Intel/LewisburgPkg/IncludePrivate/PchHHsioAx.h | 8 +-------
Silicon/Intel/LewisburgPkg/IncludePrivate/PchHHsioBx.h | 8 +-------
Silicon/Intel/LewisburgPkg/IncludePrivate/PchHHsioDx.h | 8 +-------
Silicon/Intel/LewisburgPkg/IncludePrivate/PchHsio.h | 8 +-------
Silicon/Intel/LewisburgPkg/IncludePrivate/PchLbgHsioAx.h | 8 +-------
Silicon/Intel/LewisburgPkg/IncludePrivate/PchLbgHsioBx.h | 8 +-------
Silicon/Intel/LewisburgPkg/IncludePrivate/PchLbgHsioBxD.h | 8 +-------
.../Intel/LewisburgPkg/IncludePrivate/PchLbgHsioBxD_Ext.h | 8 +-------
.../Intel/LewisburgPkg/IncludePrivate/PchLbgHsioBx_Ext.h | 8 +-------
Silicon/Intel/LewisburgPkg/IncludePrivate/PchLbgHsioSx.h | 8 +-------
.../Intel/LewisburgPkg/IncludePrivate/PchLbgHsioSx_Ext.h | 8 +-------
Silicon/Intel/LewisburgPkg/IncludePrivate/PchLpHsioBx.h | 8 +-------
Silicon/Intel/LewisburgPkg/IncludePrivate/PchLpHsioCx.h | 8 +-------
Silicon/Intel/LewisburgPkg/IncludePrivate/PchPolicyHob.h | 8 +-------
.../DxeRuntimeResetSystemLib/DxeRuntimeResetSystemLib.inf | 8 +-------
.../Library/DxeRuntimeResetSystemLib/PchReset.c | 8 +-------
.../Library/DxeRuntimeResetSystemLib/PchReset.h | 8 +-------
.../LewisburgPkg/Library/PeiDxeSmmGpioLib/GpioInit.c | 8 +-------
.../Intel/LewisburgPkg/Library/PeiDxeSmmGpioLib/GpioLib.c | 8 +-------
.../LewisburgPkg/Library/PeiDxeSmmGpioLib/GpioLibrary.h | 8 +-------
.../LewisburgPkg/Library/PeiDxeSmmGpioLib/GpioNativeLib.c | 8 +-------
.../Library/PeiDxeSmmGpioLib/PchSklGpioData.c | 8 +-------
.../Library/PeiDxeSmmGpioLib/PeiDxeSmmGpioLib.inf | 8 +-------
.../PeiDxeSmmPchCycleDecodingLib/PchCycleDecodingLib.c | 8 +-------
.../PeiDxeSmmPchCycleDecodingLib.inf | 8 +-------
.../LewisburgPkg/Library/PeiDxeSmmPchGbeLib/PchGbeLib.c | 8 +-------
.../Library/PeiDxeSmmPchGbeLib/PeiDxeSmmPchGbeLib.inf | 8 +-------
.../LewisburgPkg/Library/PeiDxeSmmPchInfoLib/PchInfoLib.c | 8 +-------
.../Library/PeiDxeSmmPchInfoLib/PchInfoStrLib.c | 8 +-------
.../Library/PeiDxeSmmPchInfoLib/PeiDxeSmmPchInfoLib.inf | 8 +-------
.../LewisburgPkg/Library/PeiDxeSmmPchP2sbLib/PchP2sbLib.c | 8 +-------
.../Library/PeiDxeSmmPchP2sbLib/PeiDxeSmmPchP2sbLib.inf | 8 +-------
.../LewisburgPkg/Library/PeiDxeSmmPchPcrLib/PchPcrLib.c | 8 +-------
.../Library/PeiDxeSmmPchPcrLib/PeiDxeSmmPchPcrLib.inf | 8 +-------
.../LewisburgPkg/Library/PeiDxeSmmPchPmcLib/PchPmcLib.c | 8 +-------
.../Library/PeiDxeSmmPchPmcLib/PeiDxeSmmPchPmcLib.inf | 8 +-------
.../Library/PeiDxeSmmPchSbiAccessLib/PchSbiAccessLib.c | 8 +-------
.../PeiDxeSmmPchSbiAccessLib/PeiDxeSmmPchSbiAccessLib.inf | 8 +-------
.../LewisburgPkg/Library/PeiPchPolicyLib/PchPrintPolicy.c | 8 +-------
.../Library/PeiPchPolicyLib/PeiPchPolicyLib.c | 8 +-------
.../Library/PeiPchPolicyLib/PeiPchPolicyLib.inf | 8 +-------
.../Library/PeiPchPolicyLib/PeiPchPolicyLibrary.h | 8 +-------
.../LewisburgPkg/Library/PeiPchPolicyLib/Rvp3PolicyLib.c | 8 +-------
.../Library/SmmSpiFlashCommonLib/SmmSpiFlashCommonLib.inf | 8 +-------
.../Library/SmmSpiFlashCommonLib/SpiFlashCommon.c | 8 +-------
.../Library/SmmSpiFlashCommonLib/SpiFlashCommonSmmLib.c | 8 +-------
.../BasePchResetCommonLib/BasePchResetCommonLib.inf | 8 +-------
.../LibraryPrivate/BasePchResetCommonLib/PchResetCommon.c | 8 +-------
Silicon/Intel/LewisburgPkg/PchCommonLib.dsc | 8 +-------
Silicon/Intel/LewisburgPkg/PchDxeLib.dsc | 8 +-------
Silicon/Intel/LewisburgPkg/PchPeiLib.dsc | 8 +-------
Silicon/Intel/LewisburgPkg/PchRcPkg.dec | 8 +-------
143 files changed, 143 insertions(+), 1001 deletions(-)
diff --git a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/GpioDefine.asl b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/GpioDefine.asl
index 39c3a8688d..c7077b798e 100644
--- a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/GpioDefine.asl
+++ b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/GpioDefine.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/GpioLib.asl b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/GpioLib.asl
index 3d8b01af76..b7ab6e9bb1 100644
--- a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/GpioLib.asl
+++ b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/GpioLib.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/IrqLink.asl b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/IrqLink.asl
index c39e472302..d328a3e1f6 100644
--- a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/IrqLink.asl
+++ b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/IrqLink.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/Pch.asl b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/Pch.asl
index 35b1787833..0c550b528c 100644
--- a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/Pch.asl
+++ b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/Pch.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchAcpiTables.inf b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchAcpiTables.inf
index 85d84b6d52..591fa9595b 100644
--- a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchAcpiTables.inf
+++ b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchAcpiTables.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchHda.asl b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchHda.asl
index 71220d8bda..380f334207 100644
--- a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchHda.asl
+++ b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchHda.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchHeci.asl b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchHeci.asl
index 02eca833c3..e428b964f3 100644
--- a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchHeci.asl
+++ b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchHeci.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchIsh.asl b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchIsh.asl
index d05ca11667..6786b0b6e0 100644
--- a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchIsh.asl
+++ b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchIsh.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchNvs.asl b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchNvs.asl
index f41157f16b..69d3bddedb 100644
--- a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchNvs.asl
+++ b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchNvs.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchPcie.asl b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchPcie.asl
index afe2237b4c..dc5454ab45 100644
--- a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchPcie.asl
+++ b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchPcie.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchRstPcieStorage.asl b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchRstPcieStorage.asl
index bef1a7e82a..fbee724042 100644
--- a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchRstPcieStorage.asl
+++ b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchRstPcieStorage.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchSata.asl b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchSata.asl
index e28d8e25b7..de60a98c01 100644
--- a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchSata.asl
+++ b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchSata.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchScs.asl b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchScs.asl
index 154b2c5366..04ec0e7fe6 100644
--- a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchScs.asl
+++ b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchScs.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchSerialIo.asl b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchSerialIo.asl
index 26cabf3ad0..72ed66a159 100644
--- a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchSerialIo.asl
+++ b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchSerialIo.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchXdci.asl b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchXdci.asl
index 0ea61b471c..229c861af6 100644
--- a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchXdci.asl
+++ b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchXdci.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchXhci.asl b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchXhci.asl
index 4ff8ae43cb..157f318683 100644
--- a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchXhci.asl
+++ b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/PchXhci.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP01_ADR.asl b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP01_ADR.asl
index b02b4c5583..fcadab67b2 100644
--- a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP01_ADR.asl
+++ b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP01_ADR.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP02_ADR.asl b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP02_ADR.asl
index a433c1c17d..8585676ccc 100644
--- a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP02_ADR.asl
+++ b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP02_ADR.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP03_ADR.asl b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP03_ADR.asl
index cbbb144020..a9dee84da6 100644
--- a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP03_ADR.asl
+++ b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP03_ADR.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP04_ADR.asl b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP04_ADR.asl
index 6ebdaf3b68..6946071d7b 100644
--- a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP04_ADR.asl
+++ b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP04_ADR.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP05_ADR.asl b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP05_ADR.asl
index 83ab65b9e7..c1bf1f508a 100644
--- a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP05_ADR.asl
+++ b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP05_ADR.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP06_ADR.asl b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP06_ADR.asl
index a64cc6af86..268e303314 100644
--- a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP06_ADR.asl
+++ b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP06_ADR.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP07_ADR.asl b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP07_ADR.asl
index 6d9507498f..c4a3af057f 100644
--- a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP07_ADR.asl
+++ b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP07_ADR.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP08_ADR.asl b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP08_ADR.asl
index 306e439847..20c03e5d31 100644
--- a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP08_ADR.asl
+++ b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP08_ADR.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP09_ADR.asl b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP09_ADR.asl
index 1330fbc454..7238eb1801 100644
--- a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP09_ADR.asl
+++ b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP09_ADR.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP10_ADR.asl b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP10_ADR.asl
index 3320113a81..d88f4bde2f 100644
--- a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP10_ADR.asl
+++ b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP10_ADR.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP11_ADR.asl b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP11_ADR.asl
index 81c781ddad..c81c815ee1 100644
--- a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP11_ADR.asl
+++ b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP11_ADR.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP12_ADR.asl b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP12_ADR.asl
index 21bf23efbe..85e0ec3046 100644
--- a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP12_ADR.asl
+++ b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP12_ADR.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP13_ADR.asl b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP13_ADR.asl
index f210d57b3b..f1906e54bb 100644
--- a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP13_ADR.asl
+++ b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP13_ADR.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP14_ADR.asl b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP14_ADR.asl
index 28f1864d18..1e098e4674 100644
--- a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP14_ADR.asl
+++ b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP14_ADR.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP15_ADR.asl b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP15_ADR.asl
index 10475cecbc..2127a907f7 100644
--- a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP15_ADR.asl
+++ b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP15_ADR.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP16_ADR.asl b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP16_ADR.asl
index 2818ce3614..af61a03383 100644
--- a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP16_ADR.asl
+++ b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP16_ADR.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP17_ADR.asl b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP17_ADR.asl
index 93fcc35ead..b731fc3964 100644
--- a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP17_ADR.asl
+++ b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP17_ADR.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP18_ADR.asl b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP18_ADR.asl
index cbc5c9f3f5..7b51d7d9b2 100644
--- a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP18_ADR.asl
+++ b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP18_ADR.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP19_ADR.asl b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP19_ADR.asl
index f98acfb11a..4d43dd81af 100644
--- a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP19_ADR.asl
+++ b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP19_ADR.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP20_ADR.asl b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP20_ADR.asl
index e26cf90e3a..469f32cf60 100644
--- a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP20_ADR.asl
+++ b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/RP20_ADR.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/TraceHubDebug.asl b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/TraceHubDebug.asl
index 736e76241d..84e7725178 100644
--- a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/TraceHubDebug.asl
+++ b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/TraceHubDebug.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/usbsbd.asl b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/usbsbd.asl
index 2778f4247b..674acbce60 100644
--- a/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/usbsbd.asl
+++ b/Silicon/Intel/LewisburgPkg/AcpiTables/Dsdt/usbsbd.asl
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/GpioConfig.h b/Silicon/Intel/LewisburgPkg/Include/GpioConfig.h
index 9b9420b260..854dcb645c 100644
--- a/Silicon/Intel/LewisburgPkg/Include/GpioConfig.h
+++ b/Silicon/Intel/LewisburgPkg/Include/GpioConfig.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/GpioPinsSklH.h b/Silicon/Intel/LewisburgPkg/Include/GpioPinsSklH.h
index 304d58741c..ecd3df3e4d 100644
--- a/Silicon/Intel/LewisburgPkg/Include/GpioPinsSklH.h
+++ b/Silicon/Intel/LewisburgPkg/Include/GpioPinsSklH.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/GpioPinsSklLp.h b/Silicon/Intel/LewisburgPkg/Include/GpioPinsSklLp.h
index eb591da562..8012f43275 100644
--- a/Silicon/Intel/LewisburgPkg/Include/GpioPinsSklLp.h
+++ b/Silicon/Intel/LewisburgPkg/Include/GpioPinsSklLp.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/Library/GpioLib.h b/Silicon/Intel/LewisburgPkg/Include/Library/GpioLib.h
index 383be789fd..dcee806ada 100644
--- a/Silicon/Intel/LewisburgPkg/Include/Library/GpioLib.h
+++ b/Silicon/Intel/LewisburgPkg/Include/Library/GpioLib.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/Library/GpioNativeLib.h b/Silicon/Intel/LewisburgPkg/Include/Library/GpioNativeLib.h
index ddeeee6490..357bd68b2a 100644
--- a/Silicon/Intel/LewisburgPkg/Include/Library/GpioNativeLib.h
+++ b/Silicon/Intel/LewisburgPkg/Include/Library/GpioNativeLib.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/Library/PchCycleDecodingLib.h b/Silicon/Intel/LewisburgPkg/Include/Library/PchCycleDecodingLib.h
index ac6e7fb0aa..52c664a76c 100644
--- a/Silicon/Intel/LewisburgPkg/Include/Library/PchCycleDecodingLib.h
+++ b/Silicon/Intel/LewisburgPkg/Include/Library/PchCycleDecodingLib.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/Library/PchGbeLib.h b/Silicon/Intel/LewisburgPkg/Include/Library/PchGbeLib.h
index 4630547f72..53cbc0a839 100644
--- a/Silicon/Intel/LewisburgPkg/Include/Library/PchGbeLib.h
+++ b/Silicon/Intel/LewisburgPkg/Include/Library/PchGbeLib.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/Library/PchInfoLib.h b/Silicon/Intel/LewisburgPkg/Include/Library/PchInfoLib.h
index cfdbc44fa9..cd4c875a91 100644
--- a/Silicon/Intel/LewisburgPkg/Include/Library/PchInfoLib.h
+++ b/Silicon/Intel/LewisburgPkg/Include/Library/PchInfoLib.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/Library/PchP2sbLib.h b/Silicon/Intel/LewisburgPkg/Include/Library/PchP2sbLib.h
index f7502238d0..edba54a7ce 100644
--- a/Silicon/Intel/LewisburgPkg/Include/Library/PchP2sbLib.h
+++ b/Silicon/Intel/LewisburgPkg/Include/Library/PchP2sbLib.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/Library/PchPcrLib.h b/Silicon/Intel/LewisburgPkg/Include/Library/PchPcrLib.h
index 085295cab4..dc8078c0cf 100644
--- a/Silicon/Intel/LewisburgPkg/Include/Library/PchPcrLib.h
+++ b/Silicon/Intel/LewisburgPkg/Include/Library/PchPcrLib.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/Library/PchPmcLib.h b/Silicon/Intel/LewisburgPkg/Include/Library/PchPmcLib.h
index 87d10e3074..ff21ac51e4 100644
--- a/Silicon/Intel/LewisburgPkg/Include/Library/PchPmcLib.h
+++ b/Silicon/Intel/LewisburgPkg/Include/Library/PchPmcLib.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/Library/PchPolicyLib.h b/Silicon/Intel/LewisburgPkg/Include/Library/PchPolicyLib.h
index 20266bc1dd..b854f0f581 100644
--- a/Silicon/Intel/LewisburgPkg/Include/Library/PchPolicyLib.h
+++ b/Silicon/Intel/LewisburgPkg/Include/Library/PchPolicyLib.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/Library/PchSbiAccessLib.h b/Silicon/Intel/LewisburgPkg/Include/Library/PchSbiAccessLib.h
index 92fd63daa7..f5328c0c1c 100644
--- a/Silicon/Intel/LewisburgPkg/Include/Library/PchSbiAccessLib.h
+++ b/Silicon/Intel/LewisburgPkg/Include/Library/PchSbiAccessLib.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/Library/PchSerialIoLib.h b/Silicon/Intel/LewisburgPkg/Include/Library/PchSerialIoLib.h
index b88bc0f0bf..1ae9101f88 100644
--- a/Silicon/Intel/LewisburgPkg/Include/Library/PchSerialIoLib.h
+++ b/Silicon/Intel/LewisburgPkg/Include/Library/PchSerialIoLib.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/Library/SpiFlashCommonLib.h b/Silicon/Intel/LewisburgPkg/Include/Library/SpiFlashCommonLib.h
index 4857564ded..6390411a5c 100644
--- a/Silicon/Intel/LewisburgPkg/Include/Library/SpiFlashCommonLib.h
+++ b/Silicon/Intel/LewisburgPkg/Include/Library/SpiFlashCommonLib.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/PchAccess.h b/Silicon/Intel/LewisburgPkg/Include/PchAccess.h
index 830b8e5539..de7ff266b7 100644
--- a/Silicon/Intel/LewisburgPkg/Include/PchAccess.h
+++ b/Silicon/Intel/LewisburgPkg/Include/PchAccess.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/PchLimits.h b/Silicon/Intel/LewisburgPkg/Include/PchLimits.h
index 1f7e24b1ea..ce24100837 100644
--- a/Silicon/Intel/LewisburgPkg/Include/PchLimits.h
+++ b/Silicon/Intel/LewisburgPkg/Include/PchLimits.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/PchPolicyCommon.h b/Silicon/Intel/LewisburgPkg/Include/PchPolicyCommon.h
index 3e6f06ffe7..310591951b 100644
--- a/Silicon/Intel/LewisburgPkg/Include/PchPolicyCommon.h
+++ b/Silicon/Intel/LewisburgPkg/Include/PchPolicyCommon.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/PchReservedResources.h b/Silicon/Intel/LewisburgPkg/Include/PchReservedResources.h
index d60125b768..62a3a39361 100644
--- a/Silicon/Intel/LewisburgPkg/Include/PchReservedResources.h
+++ b/Silicon/Intel/LewisburgPkg/Include/PchReservedResources.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/PcieRegs.h b/Silicon/Intel/LewisburgPkg/Include/PcieRegs.h
index e4cf4020c8..da8aebdd03 100644
--- a/Silicon/Intel/LewisburgPkg/Include/PcieRegs.h
+++ b/Silicon/Intel/LewisburgPkg/Include/PcieRegs.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/Ppi/PchPcieDeviceTable.h b/Silicon/Intel/LewisburgPkg/Include/Ppi/PchPcieDeviceTable.h
index 36451c4962..323e7a5e7e 100644
--- a/Silicon/Intel/LewisburgPkg/Include/Ppi/PchPcieDeviceTable.h
+++ b/Silicon/Intel/LewisburgPkg/Include/Ppi/PchPcieDeviceTable.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/Ppi/PchPolicy.h b/Silicon/Intel/LewisburgPkg/Include/Ppi/PchPolicy.h
index e994763e5e..553537b61a 100644
--- a/Silicon/Intel/LewisburgPkg/Include/Ppi/PchPolicy.h
+++ b/Silicon/Intel/LewisburgPkg/Include/Ppi/PchPolicy.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/Ppi/PchReset.h b/Silicon/Intel/LewisburgPkg/Include/Ppi/PchReset.h
index f7d3481f77..965c9ac1d7 100644
--- a/Silicon/Intel/LewisburgPkg/Include/Ppi/PchReset.h
+++ b/Silicon/Intel/LewisburgPkg/Include/Ppi/PchReset.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/Ppi/Spi.h b/Silicon/Intel/LewisburgPkg/Include/Ppi/Spi.h
index 44d043cf0e..b81df73b4b 100644
--- a/Silicon/Intel/LewisburgPkg/Include/Ppi/Spi.h
+++ b/Silicon/Intel/LewisburgPkg/Include/Ppi/Spi.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/Protocol/PchReset.h b/Silicon/Intel/LewisburgPkg/Include/Protocol/PchReset.h
index d967de3b68..ad97d05a31 100644
--- a/Silicon/Intel/LewisburgPkg/Include/Protocol/PchReset.h
+++ b/Silicon/Intel/LewisburgPkg/Include/Protocol/PchReset.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/Protocol/Spi.h b/Silicon/Intel/LewisburgPkg/Include/Protocol/Spi.h
index eafedcab93..b7472c31b3 100644
--- a/Silicon/Intel/LewisburgPkg/Include/Protocol/Spi.h
+++ b/Silicon/Intel/LewisburgPkg/Include/Protocol/Spi.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsDci.h b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsDci.h
index a3dd6ed148..93d54793f3 100644
--- a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsDci.h
+++ b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsDci.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsDmi.h b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsDmi.h
index b7426e25fd..098cac742a 100644
--- a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsDmi.h
+++ b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsDmi.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsEva.h b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsEva.h
index 223d630d2c..8cf48683bf 100644
--- a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsEva.h
+++ b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsEva.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsFia.h b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsFia.h
index 6ca108be67..985e1e2a1d 100644
--- a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsFia.h
+++ b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsFia.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsGpio.h b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsGpio.h
index 24b78d0907..9b6c4851f9 100644
--- a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsGpio.h
+++ b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsGpio.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsHda.h b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsHda.h
index 3b7245eabf..a6049cb5aa 100644
--- a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsHda.h
+++ b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsHda.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsHsio.h b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsHsio.h
index 8323c16425..76016a163e 100644
--- a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsHsio.h
+++ b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsHsio.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsIsh.h b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsIsh.h
index ee011d84c4..2f519c539f 100644
--- a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsIsh.h
+++ b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsIsh.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsItss.h b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsItss.h
index d78cc615bb..762fbe3b8e 100644
--- a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsItss.h
+++ b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsItss.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsLan.h b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsLan.h
index e6e89ab68f..473216f61f 100644
--- a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsLan.h
+++ b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsLan.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsLpc.h b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsLpc.h
index 4a2f8c8533..27fb432fbf 100644
--- a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsLpc.h
+++ b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsLpc.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsP2sb.h b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsP2sb.h
index 205d3ad282..3a3f8d5967 100644
--- a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsP2sb.h
+++ b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsP2sb.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsPcie.h b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsPcie.h
index df40a8b703..e31d699b4d 100644
--- a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsPcie.h
+++ b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsPcie.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsPcr.h b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsPcr.h
index 3cd0c432b4..eea1b11ca8 100644
--- a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsPcr.h
+++ b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsPcr.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsPmc.h b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsPmc.h
index fd67b1338d..e1d780be14 100644
--- a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsPmc.h
+++ b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsPmc.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsPsf.h b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsPsf.h
index a38ef5346c..0eb61aa0b7 100644
--- a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsPsf.h
+++ b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsPsf.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsPsth.h b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsPsth.h
index 0c9ce3135f..6669cc2bb9 100644
--- a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsPsth.h
+++ b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsPsth.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsSata.h b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsSata.h
index 385f868f98..7d91f19dbc 100644
--- a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsSata.h
+++ b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsSata.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsScs.h b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsScs.h
index b58618f49c..91f8b02c09 100644
--- a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsScs.h
+++ b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsScs.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsSerialIo.h b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsSerialIo.h
index e0d048b94e..fbd681de60 100644
--- a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsSerialIo.h
+++ b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsSerialIo.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsSmbus.h b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsSmbus.h
index cc04d39653..1f0912bec8 100644
--- a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsSmbus.h
+++ b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsSmbus.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsSpi.h b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsSpi.h
index cab12792d1..ef5dd8ea18 100644
--- a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsSpi.h
+++ b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsSpi.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsThermal.h b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsThermal.h
index e9eddfe6f1..dfd6d4e37c 100644
--- a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsThermal.h
+++ b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsThermal.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsTraceHub.h b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsTraceHub.h
index 60201d1195..43c2b7c699 100644
--- a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsTraceHub.h
+++ b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsTraceHub.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsUsb.h b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsUsb.h
index 6d92b4dfff..a25e9981b3 100644
--- a/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsUsb.h
+++ b/Silicon/Intel/LewisburgPkg/Include/Register/PchRegsUsb.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Include/SaRegs.h b/Silicon/Intel/LewisburgPkg/Include/SaRegs.h
index 322fc882d6..20a36bea36 100644
--- a/Silicon/Intel/LewisburgPkg/Include/SaRegs.h
+++ b/Silicon/Intel/LewisburgPkg/Include/SaRegs.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/IncludePrivate/Library/PchResetCommonLib.h b/Silicon/Intel/LewisburgPkg/IncludePrivate/Library/PchResetCommonLib.h
index c64d3dbb47..a1d076c06c 100644
--- a/Silicon/Intel/LewisburgPkg/IncludePrivate/Library/PchResetCommonLib.h
+++ b/Silicon/Intel/LewisburgPkg/IncludePrivate/Library/PchResetCommonLib.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/IncludePrivate/PchHHsioAx.h b/Silicon/Intel/LewisburgPkg/IncludePrivate/PchHHsioAx.h
index 9b3eb39a3e..37adb642c6 100644
--- a/Silicon/Intel/LewisburgPkg/IncludePrivate/PchHHsioAx.h
+++ b/Silicon/Intel/LewisburgPkg/IncludePrivate/PchHHsioAx.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/IncludePrivate/PchHHsioBx.h b/Silicon/Intel/LewisburgPkg/IncludePrivate/PchHHsioBx.h
index 2d191d9863..abbe638ff7 100644
--- a/Silicon/Intel/LewisburgPkg/IncludePrivate/PchHHsioBx.h
+++ b/Silicon/Intel/LewisburgPkg/IncludePrivate/PchHHsioBx.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/IncludePrivate/PchHHsioDx.h b/Silicon/Intel/LewisburgPkg/IncludePrivate/PchHHsioDx.h
index ed97364512..ea778f3855 100644
--- a/Silicon/Intel/LewisburgPkg/IncludePrivate/PchHHsioDx.h
+++ b/Silicon/Intel/LewisburgPkg/IncludePrivate/PchHHsioDx.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/IncludePrivate/PchHsio.h b/Silicon/Intel/LewisburgPkg/IncludePrivate/PchHsio.h
index 4f14f5bf63..584838fb83 100644
--- a/Silicon/Intel/LewisburgPkg/IncludePrivate/PchHsio.h
+++ b/Silicon/Intel/LewisburgPkg/IncludePrivate/PchHsio.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/IncludePrivate/PchLbgHsioAx.h b/Silicon/Intel/LewisburgPkg/IncludePrivate/PchLbgHsioAx.h
index 6c15d5fbd5..5bd69194f8 100644
--- a/Silicon/Intel/LewisburgPkg/IncludePrivate/PchLbgHsioAx.h
+++ b/Silicon/Intel/LewisburgPkg/IncludePrivate/PchLbgHsioAx.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/IncludePrivate/PchLbgHsioBx.h b/Silicon/Intel/LewisburgPkg/IncludePrivate/PchLbgHsioBx.h
index 08c0685807..4cc1ff977d 100644
--- a/Silicon/Intel/LewisburgPkg/IncludePrivate/PchLbgHsioBx.h
+++ b/Silicon/Intel/LewisburgPkg/IncludePrivate/PchLbgHsioBx.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/IncludePrivate/PchLbgHsioBxD.h b/Silicon/Intel/LewisburgPkg/IncludePrivate/PchLbgHsioBxD.h
index aa1b9d850c..ad445ba7e6 100644
--- a/Silicon/Intel/LewisburgPkg/IncludePrivate/PchLbgHsioBxD.h
+++ b/Silicon/Intel/LewisburgPkg/IncludePrivate/PchLbgHsioBxD.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/IncludePrivate/PchLbgHsioBxD_Ext.h b/Silicon/Intel/LewisburgPkg/IncludePrivate/PchLbgHsioBxD_Ext.h
index 45bd8b754c..253d4b9859 100644
--- a/Silicon/Intel/LewisburgPkg/IncludePrivate/PchLbgHsioBxD_Ext.h
+++ b/Silicon/Intel/LewisburgPkg/IncludePrivate/PchLbgHsioBxD_Ext.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/IncludePrivate/PchLbgHsioBx_Ext.h b/Silicon/Intel/LewisburgPkg/IncludePrivate/PchLbgHsioBx_Ext.h
index 2a8e17eaca..4b228c6044 100644
--- a/Silicon/Intel/LewisburgPkg/IncludePrivate/PchLbgHsioBx_Ext.h
+++ b/Silicon/Intel/LewisburgPkg/IncludePrivate/PchLbgHsioBx_Ext.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/IncludePrivate/PchLbgHsioSx.h b/Silicon/Intel/LewisburgPkg/IncludePrivate/PchLbgHsioSx.h
index 992a385501..3e3d10bd3e 100644
--- a/Silicon/Intel/LewisburgPkg/IncludePrivate/PchLbgHsioSx.h
+++ b/Silicon/Intel/LewisburgPkg/IncludePrivate/PchLbgHsioSx.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/IncludePrivate/PchLbgHsioSx_Ext.h b/Silicon/Intel/LewisburgPkg/IncludePrivate/PchLbgHsioSx_Ext.h
index 8f28fce83e..616212f4b1 100644
--- a/Silicon/Intel/LewisburgPkg/IncludePrivate/PchLbgHsioSx_Ext.h
+++ b/Silicon/Intel/LewisburgPkg/IncludePrivate/PchLbgHsioSx_Ext.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/IncludePrivate/PchLpHsioBx.h b/Silicon/Intel/LewisburgPkg/IncludePrivate/PchLpHsioBx.h
index 98125eaf1a..774a0a09f5 100644
--- a/Silicon/Intel/LewisburgPkg/IncludePrivate/PchLpHsioBx.h
+++ b/Silicon/Intel/LewisburgPkg/IncludePrivate/PchLpHsioBx.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/IncludePrivate/PchLpHsioCx.h b/Silicon/Intel/LewisburgPkg/IncludePrivate/PchLpHsioCx.h
index 0548f446de..9740763098 100644
--- a/Silicon/Intel/LewisburgPkg/IncludePrivate/PchLpHsioCx.h
+++ b/Silicon/Intel/LewisburgPkg/IncludePrivate/PchLpHsioCx.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/IncludePrivate/PchPolicyHob.h b/Silicon/Intel/LewisburgPkg/IncludePrivate/PchPolicyHob.h
index eb2bff904e..1fafaae47e 100644
--- a/Silicon/Intel/LewisburgPkg/IncludePrivate/PchPolicyHob.h
+++ b/Silicon/Intel/LewisburgPkg/IncludePrivate/PchPolicyHob.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Library/DxeRuntimeResetSystemLib/DxeRuntimeResetSystemLib.inf b/Silicon/Intel/LewisburgPkg/Library/DxeRuntimeResetSystemLib/DxeRuntimeResetSystemLib.inf
index 353aafa572..6943b7fe87 100644
--- a/Silicon/Intel/LewisburgPkg/Library/DxeRuntimeResetSystemLib/DxeRuntimeResetSystemLib.inf
+++ b/Silicon/Intel/LewisburgPkg/Library/DxeRuntimeResetSystemLib/DxeRuntimeResetSystemLib.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Silicon/Intel/LewisburgPkg/Library/DxeRuntimeResetSystemLib/PchReset.c b/Silicon/Intel/LewisburgPkg/Library/DxeRuntimeResetSystemLib/PchReset.c
index ea7a7a1bc0..7604ce15b3 100644
--- a/Silicon/Intel/LewisburgPkg/Library/DxeRuntimeResetSystemLib/PchReset.c
+++ b/Silicon/Intel/LewisburgPkg/Library/DxeRuntimeResetSystemLib/PchReset.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018 - 2019, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Library/DxeRuntimeResetSystemLib/PchReset.h b/Silicon/Intel/LewisburgPkg/Library/DxeRuntimeResetSystemLib/PchReset.h
index bfcd15888c..f07948a1fe 100644
--- a/Silicon/Intel/LewisburgPkg/Library/DxeRuntimeResetSystemLib/PchReset.h
+++ b/Silicon/Intel/LewisburgPkg/Library/DxeRuntimeResetSystemLib/PchReset.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmGpioLib/GpioInit.c b/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmGpioLib/GpioInit.c
index 422ecfcee1..89f601736a 100644
--- a/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmGpioLib/GpioInit.c
+++ b/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmGpioLib/GpioInit.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmGpioLib/GpioLib.c b/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmGpioLib/GpioLib.c
index 0b82c2b8df..d94ff8a693 100644
--- a/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmGpioLib/GpioLib.c
+++ b/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmGpioLib/GpioLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmGpioLib/GpioLibrary.h b/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmGpioLib/GpioLibrary.h
index 8618099e24..6cb918fd38 100644
--- a/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmGpioLib/GpioLibrary.h
+++ b/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmGpioLib/GpioLibrary.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmGpioLib/GpioNativeLib.c b/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmGpioLib/GpioNativeLib.c
index a86c144679..314e8d5c98 100644
--- a/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmGpioLib/GpioNativeLib.c
+++ b/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmGpioLib/GpioNativeLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmGpioLib/PchSklGpioData.c b/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmGpioLib/PchSklGpioData.c
index 62d93d6c86..f62e71b9de 100644
--- a/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmGpioLib/PchSklGpioData.c
+++ b/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmGpioLib/PchSklGpioData.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmGpioLib/PeiDxeSmmGpioLib.inf b/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmGpioLib/PeiDxeSmmGpioLib.inf
index 0d7c56c0d0..1c314be940 100644
--- a/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmGpioLib/PeiDxeSmmGpioLib.inf
+++ b/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmGpioLib/PeiDxeSmmGpioLib.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchCycleDecodingLib/PchCycleDecodingLib.c b/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchCycleDecodingLib/PchCycleDecodingLib.c
index 3629bc5157..07f50ef7a7 100644
--- a/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchCycleDecodingLib/PchCycleDecodingLib.c
+++ b/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchCycleDecodingLib/PchCycleDecodingLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchCycleDecodingLib/PeiDxeSmmPchCycleDecodingLib.inf b/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchCycleDecodingLib/PeiDxeSmmPchCycleDecodingLib.inf
index c0cf90854f..66f6bf979f 100644
--- a/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchCycleDecodingLib/PeiDxeSmmPchCycleDecodingLib.inf
+++ b/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchCycleDecodingLib/PeiDxeSmmPchCycleDecodingLib.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchGbeLib/PchGbeLib.c b/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchGbeLib/PchGbeLib.c
index 9d3304a1aa..181334cce9 100644
--- a/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchGbeLib/PchGbeLib.c
+++ b/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchGbeLib/PchGbeLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchGbeLib/PeiDxeSmmPchGbeLib.inf b/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchGbeLib/PeiDxeSmmPchGbeLib.inf
index 59388180f1..df16b403f1 100644
--- a/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchGbeLib/PeiDxeSmmPchGbeLib.inf
+++ b/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchGbeLib/PeiDxeSmmPchGbeLib.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchInfoLib/PchInfoLib.c b/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchInfoLib/PchInfoLib.c
index 31966dd609..34b08d0e8d 100644
--- a/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchInfoLib/PchInfoLib.c
+++ b/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchInfoLib/PchInfoLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchInfoLib/PchInfoStrLib.c b/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchInfoLib/PchInfoStrLib.c
index 641277c083..4c077488eb 100644
--- a/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchInfoLib/PchInfoStrLib.c
+++ b/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchInfoLib/PchInfoStrLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchInfoLib/PeiDxeSmmPchInfoLib.inf b/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchInfoLib/PeiDxeSmmPchInfoLib.inf
index 2b3fdeb495..1fd7d606bd 100644
--- a/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchInfoLib/PeiDxeSmmPchInfoLib.inf
+++ b/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchInfoLib/PeiDxeSmmPchInfoLib.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchP2sbLib/PchP2sbLib.c b/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchP2sbLib/PchP2sbLib.c
index 6e91828d64..5e8af8915d 100644
--- a/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchP2sbLib/PchP2sbLib.c
+++ b/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchP2sbLib/PchP2sbLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchP2sbLib/PeiDxeSmmPchP2sbLib.inf b/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchP2sbLib/PeiDxeSmmPchP2sbLib.inf
index 4f57152b2e..714f711a24 100644
--- a/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchP2sbLib/PeiDxeSmmPchP2sbLib.inf
+++ b/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchP2sbLib/PeiDxeSmmPchP2sbLib.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchPcrLib/PchPcrLib.c b/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchPcrLib/PchPcrLib.c
index 032349bd4e..5bb0f13eeb 100644
--- a/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchPcrLib/PchPcrLib.c
+++ b/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchPcrLib/PchPcrLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchPcrLib/PeiDxeSmmPchPcrLib.inf b/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchPcrLib/PeiDxeSmmPchPcrLib.inf
index c54dc2c4e2..647cc61953 100644
--- a/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchPcrLib/PeiDxeSmmPchPcrLib.inf
+++ b/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchPcrLib/PeiDxeSmmPchPcrLib.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchPmcLib/PchPmcLib.c b/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchPmcLib/PchPmcLib.c
index 9796cb0561..b988232a3d 100644
--- a/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchPmcLib/PchPmcLib.c
+++ b/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchPmcLib/PchPmcLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchPmcLib/PeiDxeSmmPchPmcLib.inf b/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchPmcLib/PeiDxeSmmPchPmcLib.inf
index ffb37a199a..7f0a73f944 100644
--- a/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchPmcLib/PeiDxeSmmPchPmcLib.inf
+++ b/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchPmcLib/PeiDxeSmmPchPmcLib.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchSbiAccessLib/PchSbiAccessLib.c b/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchSbiAccessLib/PchSbiAccessLib.c
index 444b2822c7..6f0030ac33 100644
--- a/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchSbiAccessLib/PchSbiAccessLib.c
+++ b/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchSbiAccessLib/PchSbiAccessLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchSbiAccessLib/PeiDxeSmmPchSbiAccessLib.inf b/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchSbiAccessLib/PeiDxeSmmPchSbiAccessLib.inf
index 4f6d2a8a21..fbda2fd181 100644
--- a/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchSbiAccessLib/PeiDxeSmmPchSbiAccessLib.inf
+++ b/Silicon/Intel/LewisburgPkg/Library/PeiDxeSmmPchSbiAccessLib/PeiDxeSmmPchSbiAccessLib.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Silicon/Intel/LewisburgPkg/Library/PeiPchPolicyLib/PchPrintPolicy.c b/Silicon/Intel/LewisburgPkg/Library/PeiPchPolicyLib/PchPrintPolicy.c
index a555ff9c6e..33fa00b25f 100644
--- a/Silicon/Intel/LewisburgPkg/Library/PeiPchPolicyLib/PchPrintPolicy.c
+++ b/Silicon/Intel/LewisburgPkg/Library/PeiPchPolicyLib/PchPrintPolicy.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Library/PeiPchPolicyLib/PeiPchPolicyLib.c b/Silicon/Intel/LewisburgPkg/Library/PeiPchPolicyLib/PeiPchPolicyLib.c
index f5ec0d5fb1..c5f9c39265 100644
--- a/Silicon/Intel/LewisburgPkg/Library/PeiPchPolicyLib/PeiPchPolicyLib.c
+++ b/Silicon/Intel/LewisburgPkg/Library/PeiPchPolicyLib/PeiPchPolicyLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Library/PeiPchPolicyLib/PeiPchPolicyLib.inf b/Silicon/Intel/LewisburgPkg/Library/PeiPchPolicyLib/PeiPchPolicyLib.inf
index fa433c9333..82294d0dc6 100644
--- a/Silicon/Intel/LewisburgPkg/Library/PeiPchPolicyLib/PeiPchPolicyLib.inf
+++ b/Silicon/Intel/LewisburgPkg/Library/PeiPchPolicyLib/PeiPchPolicyLib.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Silicon/Intel/LewisburgPkg/Library/PeiPchPolicyLib/PeiPchPolicyLibrary.h b/Silicon/Intel/LewisburgPkg/Library/PeiPchPolicyLib/PeiPchPolicyLibrary.h
index 9932afdc04..5a35f0ba47 100644
--- a/Silicon/Intel/LewisburgPkg/Library/PeiPchPolicyLib/PeiPchPolicyLibrary.h
+++ b/Silicon/Intel/LewisburgPkg/Library/PeiPchPolicyLib/PeiPchPolicyLibrary.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Library/PeiPchPolicyLib/Rvp3PolicyLib.c b/Silicon/Intel/LewisburgPkg/Library/PeiPchPolicyLib/Rvp3PolicyLib.c
index 62cc91f821..0fe114e167 100644
--- a/Silicon/Intel/LewisburgPkg/Library/PeiPchPolicyLib/Rvp3PolicyLib.c
+++ b/Silicon/Intel/LewisburgPkg/Library/PeiPchPolicyLib/Rvp3PolicyLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Library/SmmSpiFlashCommonLib/SmmSpiFlashCommonLib.inf b/Silicon/Intel/LewisburgPkg/Library/SmmSpiFlashCommonLib/SmmSpiFlashCommonLib.inf
index 0972343872..affc90bc3d 100644
--- a/Silicon/Intel/LewisburgPkg/Library/SmmSpiFlashCommonLib/SmmSpiFlashCommonLib.inf
+++ b/Silicon/Intel/LewisburgPkg/Library/SmmSpiFlashCommonLib/SmmSpiFlashCommonLib.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Silicon/Intel/LewisburgPkg/Library/SmmSpiFlashCommonLib/SpiFlashCommon.c b/Silicon/Intel/LewisburgPkg/Library/SmmSpiFlashCommonLib/SpiFlashCommon.c
index 9d1e3fb60e..4c9c4c8456 100644
--- a/Silicon/Intel/LewisburgPkg/Library/SmmSpiFlashCommonLib/SpiFlashCommon.c
+++ b/Silicon/Intel/LewisburgPkg/Library/SmmSpiFlashCommonLib/SpiFlashCommon.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/Library/SmmSpiFlashCommonLib/SpiFlashCommonSmmLib.c b/Silicon/Intel/LewisburgPkg/Library/SmmSpiFlashCommonLib/SpiFlashCommonSmmLib.c
index befff4c8dd..aa12fb9e92 100644
--- a/Silicon/Intel/LewisburgPkg/Library/SmmSpiFlashCommonLib/SpiFlashCommonSmmLib.c
+++ b/Silicon/Intel/LewisburgPkg/Library/SmmSpiFlashCommonLib/SpiFlashCommonSmmLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/LibraryPrivate/BasePchResetCommonLib/BasePchResetCommonLib.inf b/Silicon/Intel/LewisburgPkg/LibraryPrivate/BasePchResetCommonLib/BasePchResetCommonLib.inf
index 3f493a7d4e..687f6e4252 100644
--- a/Silicon/Intel/LewisburgPkg/LibraryPrivate/BasePchResetCommonLib/BasePchResetCommonLib.inf
+++ b/Silicon/Intel/LewisburgPkg/LibraryPrivate/BasePchResetCommonLib/BasePchResetCommonLib.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Silicon/Intel/LewisburgPkg/LibraryPrivate/BasePchResetCommonLib/PchResetCommon.c b/Silicon/Intel/LewisburgPkg/LibraryPrivate/BasePchResetCommonLib/PchResetCommon.c
index 7b3c894700..65ba4831c7 100644
--- a/Silicon/Intel/LewisburgPkg/LibraryPrivate/BasePchResetCommonLib/PchResetCommon.c
+++ b/Silicon/Intel/LewisburgPkg/LibraryPrivate/BasePchResetCommonLib/PchResetCommon.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/LewisburgPkg/PchCommonLib.dsc b/Silicon/Intel/LewisburgPkg/PchCommonLib.dsc
index c12fe32b7e..ae8b9dc831 100644
--- a/Silicon/Intel/LewisburgPkg/PchCommonLib.dsc
+++ b/Silicon/Intel/LewisburgPkg/PchCommonLib.dsc
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Silicon/Intel/LewisburgPkg/PchDxeLib.dsc b/Silicon/Intel/LewisburgPkg/PchDxeLib.dsc
index d5dc5667c7..ffbd3e6da8 100644
--- a/Silicon/Intel/LewisburgPkg/PchDxeLib.dsc
+++ b/Silicon/Intel/LewisburgPkg/PchDxeLib.dsc
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Silicon/Intel/LewisburgPkg/PchPeiLib.dsc b/Silicon/Intel/LewisburgPkg/PchPeiLib.dsc
index 6503f1799a..46ddb965e6 100644
--- a/Silicon/Intel/LewisburgPkg/PchPeiLib.dsc
+++ b/Silicon/Intel/LewisburgPkg/PchPeiLib.dsc
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Silicon/Intel/LewisburgPkg/PchRcPkg.dec b/Silicon/Intel/LewisburgPkg/PchRcPkg.dec
index 441d9e75e3..71f57dc2b8 100644
--- a/Silicon/Intel/LewisburgPkg/PchRcPkg.dec
+++ b/Silicon/Intel/LewisburgPkg/PchRcPkg.dec
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
--
2.21.0.windows.1
^ permalink raw reply related [flat|nested] 63+ messages in thread
* [[edk2-platforms][PATCH V2] 25/30] Silicon/Intel/PurleyRcPkg: Replace BSD License with BSD+Patent License
2019-05-15 23:09 [[edk2-platforms][PATCH V2] 00/30] Change edk2-platforms/master to BSD+Patent License Michael D Kinney
` (23 preceding siblings ...)
2019-05-15 23:10 ` [[edk2-platforms][PATCH V2] 24/30] Silicon/Intel/LewisburgPkg: " Michael D Kinney
@ 2019-05-15 23:10 ` Michael D Kinney
2019-05-17 19:59 ` [edk2-devel] " Oram, Isaac W
2019-05-15 23:10 ` [[edk2-platforms][PATCH V2] 26/30] Silicon/Intel/PurleySktPkg: " Michael D Kinney
` (5 subsequent siblings)
30 siblings, 1 reply; 63+ messages in thread
From: Michael D Kinney @ 2019-05-15 23:10 UTC (permalink / raw)
To: devel; +Cc: Thad Gillispie, Daocheng Bu, Isaac W Oram
https://bugzilla.tianocore.org/show_bug.cgi?id=1373
Replace BSD 2-Clause License with BSD+Patent License. This change is
based on the following emails:
https://lists.01.org/pipermail/edk2-devel/2019-February/036260.html
https://lists.01.org/pipermail/edk2-devel/2018-October/030385.html
RFCs with detailed process for the license change:
V3: https://lists.01.org/pipermail/edk2-devel/2019-March/038116.html
V2: https://lists.01.org/pipermail/edk2-devel/2019-March/037669.html
V1: https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html
Cc: Thad Gillispie <thad.gillispie@intel.com>
Cc: Daocheng Bu <daocheng.bu@intel.com>
Cc: Isaac W Oram <isaac.w.oram@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
.../Intel/PurleyRcPkg/Include/Library/CsrToPcieAddress.h | 8 +-------
Silicon/Intel/PurleyRcPkg/Include/Library/MmPciBaseLib.h | 8 +-------
Silicon/Intel/PurleyRcPkg/Include/Library/PcieAddress.h | 8 +-------
.../PurleyRcPkg/Include/Library/PciePlatformHookLib.h | 8 +-------
Silicon/Intel/PurleyRcPkg/Include/Library/UsraAccessApi.h | 8 +-------
Silicon/Intel/PurleyRcPkg/Include/MaxSocket.h | 8 +-------
Silicon/Intel/PurleyRcPkg/Include/Ppi/SiliconRegAccess.h | 8 +-------
.../Intel/PurleyRcPkg/Include/Protocol/SiliconRegAccess.h | 8 +-------
Silicon/Intel/PurleyRcPkg/Include/UsraAccessType.h | 8 +-------
.../BaseMemoryCoreLib/Chip/Skx/Include/Iio/IioConfig.h | 8 +-------
.../Chip/Skx/Include/Iio/IioPlatformData.h | 8 +-------
.../BaseMemoryCoreLib/Chip/Skx/Include/Iio/IioRegs.h | 8 +-------
.../Chip/Skx/Include/Iio/IioSetupDefinitions.h | 8 +-------
.../Library/BaseMemoryCoreLib/Chip/Skx/Include/KtiDisc.h | 8 +-------
.../Library/BaseMemoryCoreLib/Chip/Skx/Include/KtiHost.h | 8 +-------
.../Library/BaseMemoryCoreLib/Chip/Skx/Include/KtiSi.h | 8 +-------
.../Chip/Skx/Include/Protocol/CpuCsrAccess.h | 8 +-------
.../Chip/Skx/Include/Setup/IioUniversalData.h | 8 +-------
.../Library/BaseMemoryCoreLib/Core/Include/CpuHost.h | 8 +-------
.../BaseMemoryCoreLib/Core/Include/CsrToPcieAddress.h | 8 +-------
.../Library/BaseMemoryCoreLib/Core/Include/DataTypes.h | 8 +-------
.../Library/BaseMemoryCoreLib/Core/Include/MemHost.h | 8 +-------
.../BaseMemoryCoreLib/Core/Include/MemHostChipCommon.h | 8 +-------
.../Library/BaseMemoryCoreLib/Core/Include/MemRegs.h | 8 +-------
.../BaseMemoryCoreLib/Core/Include/MrcCommonTypes.h | 8 +-------
.../Library/BaseMemoryCoreLib/Core/Include/PcieAddress.h | 8 +-------
.../Library/BaseMemoryCoreLib/Core/Include/Printf.h | 8 +-------
.../Library/BaseMemoryCoreLib/Core/Include/SysHost.h | 8 +-------
.../BaseMemoryCoreLib/Core/Include/SysHostChipCommon.h | 8 +-------
.../Library/BaseMemoryCoreLib/Core/Include/SysRegs.h | 8 +-------
.../Library/BaseMemoryCoreLib/Core/Include/UsbDebugPort.h | 8 +-------
.../Platform/Purley/Include/MemDefaults.h | 8 +-------
.../Platform/Purley/Include/MemPlatform.h | 8 +-------
.../Platform/Purley/Include/PlatformHost.h | 8 +-------
.../Library/CsrToPcieLibNull/BaseCsrToPcieLibNull.inf | 8 +-------
.../PurleyRcPkg/Library/CsrToPcieLibNull/CsrToPcieLib.c | 8 +-------
.../PurleyRcPkg/Library/DxeMmPciBaseLib/DxeMmPciBaseLib.c | 8 +-------
.../Library/DxeMmPciBaseLib/DxeMmPciBaseLib.inf | 8 +-------
.../PurleyRcPkg/Library/DxeMmPciBaseLib/SmmMmPciBaseLib.c | 8 +-------
.../Library/DxeMmPciBaseLib/SmmMmPciBaseLib.inf | 8 +-------
.../Intel/PurleyRcPkg/Library/MmPciBaseLib/MmPciBaseLib.c | 8 +-------
.../PurleyRcPkg/Library/MmPciBaseLib/MmPciBaseLib.inf | 8 +-------
.../PurleyRcPkg/Library/PcieAddressLib/PcieAddressLib.c | 8 +-------
.../PurleyRcPkg/Library/PcieAddressLib/PcieAddressLib.inf | 8 +-------
.../Intel/PurleyRcPkg/Library/UsraAccessLib/CsrAccess.c | 8 +-------
.../Intel/PurleyRcPkg/Library/UsraAccessLib/PcieAccess.c | 8 +-------
.../PurleyRcPkg/Library/UsraAccessLib/UsraAccessLib.c | 8 +-------
.../PurleyRcPkg/Library/UsraAccessLib/UsraAccessLib.h | 8 +-------
.../PurleyRcPkg/Library/UsraAccessLib/UsraAccessLib.inf | 8 +-------
Silicon/Intel/PurleyRcPkg/RcCommonLib.dsc | 8 +-------
Silicon/Intel/PurleyRcPkg/RcDxeLib.dsc | 8 +-------
Silicon/Intel/PurleyRcPkg/RcPeiLib.dsc | 8 +-------
Silicon/Intel/PurleyRcPkg/RcPkg.dec | 8 +-------
53 files changed, 53 insertions(+), 371 deletions(-)
diff --git a/Silicon/Intel/PurleyRcPkg/Include/Library/CsrToPcieAddress.h b/Silicon/Intel/PurleyRcPkg/Include/Library/CsrToPcieAddress.h
index a4aaa24ba8..d86b5f0f65 100644
--- a/Silicon/Intel/PurleyRcPkg/Include/Library/CsrToPcieAddress.h
+++ b/Silicon/Intel/PurleyRcPkg/Include/Library/CsrToPcieAddress.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleyRcPkg/Include/Library/MmPciBaseLib.h b/Silicon/Intel/PurleyRcPkg/Include/Library/MmPciBaseLib.h
index 22b4179db3..bdf7f3e569 100644
--- a/Silicon/Intel/PurleyRcPkg/Include/Library/MmPciBaseLib.h
+++ b/Silicon/Intel/PurleyRcPkg/Include/Library/MmPciBaseLib.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleyRcPkg/Include/Library/PcieAddress.h b/Silicon/Intel/PurleyRcPkg/Include/Library/PcieAddress.h
index 3f0cbf8e6f..00fdf45e07 100644
--- a/Silicon/Intel/PurleyRcPkg/Include/Library/PcieAddress.h
+++ b/Silicon/Intel/PurleyRcPkg/Include/Library/PcieAddress.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleyRcPkg/Include/Library/PciePlatformHookLib.h b/Silicon/Intel/PurleyRcPkg/Include/Library/PciePlatformHookLib.h
index 6712b78ea6..c1093136b0 100644
--- a/Silicon/Intel/PurleyRcPkg/Include/Library/PciePlatformHookLib.h
+++ b/Silicon/Intel/PurleyRcPkg/Include/Library/PciePlatformHookLib.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleyRcPkg/Include/Library/UsraAccessApi.h b/Silicon/Intel/PurleyRcPkg/Include/Library/UsraAccessApi.h
index cbe365cea3..a43831b4f5 100644
--- a/Silicon/Intel/PurleyRcPkg/Include/Library/UsraAccessApi.h
+++ b/Silicon/Intel/PurleyRcPkg/Include/Library/UsraAccessApi.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleyRcPkg/Include/MaxSocket.h b/Silicon/Intel/PurleyRcPkg/Include/MaxSocket.h
index f380967cc4..8552d20191 100644
--- a/Silicon/Intel/PurleyRcPkg/Include/MaxSocket.h
+++ b/Silicon/Intel/PurleyRcPkg/Include/MaxSocket.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleyRcPkg/Include/Ppi/SiliconRegAccess.h b/Silicon/Intel/PurleyRcPkg/Include/Ppi/SiliconRegAccess.h
index c0f4624a8f..5a440eedb6 100644
--- a/Silicon/Intel/PurleyRcPkg/Include/Ppi/SiliconRegAccess.h
+++ b/Silicon/Intel/PurleyRcPkg/Include/Ppi/SiliconRegAccess.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleyRcPkg/Include/Protocol/SiliconRegAccess.h b/Silicon/Intel/PurleyRcPkg/Include/Protocol/SiliconRegAccess.h
index 72e556b270..7d6e93dfcc 100644
--- a/Silicon/Intel/PurleyRcPkg/Include/Protocol/SiliconRegAccess.h
+++ b/Silicon/Intel/PurleyRcPkg/Include/Protocol/SiliconRegAccess.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleyRcPkg/Include/UsraAccessType.h b/Silicon/Intel/PurleyRcPkg/Include/UsraAccessType.h
index d3a97a6446..143069b782 100644
--- a/Silicon/Intel/PurleyRcPkg/Include/UsraAccessType.h
+++ b/Silicon/Intel/PurleyRcPkg/Include/UsraAccessType.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Chip/Skx/Include/Iio/IioConfig.h b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Chip/Skx/Include/Iio/IioConfig.h
index 79ab649751..0d2554b81e 100644
--- a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Chip/Skx/Include/Iio/IioConfig.h
+++ b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Chip/Skx/Include/Iio/IioConfig.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Chip/Skx/Include/Iio/IioPlatformData.h b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Chip/Skx/Include/Iio/IioPlatformData.h
index 7c980cb458..c33d1d7348 100644
--- a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Chip/Skx/Include/Iio/IioPlatformData.h
+++ b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Chip/Skx/Include/Iio/IioPlatformData.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Chip/Skx/Include/Iio/IioRegs.h b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Chip/Skx/Include/Iio/IioRegs.h
index f91a879a4e..cf9475c4e2 100644
--- a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Chip/Skx/Include/Iio/IioRegs.h
+++ b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Chip/Skx/Include/Iio/IioRegs.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Chip/Skx/Include/Iio/IioSetupDefinitions.h b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Chip/Skx/Include/Iio/IioSetupDefinitions.h
index bd505703b0..61b7389cff 100644
--- a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Chip/Skx/Include/Iio/IioSetupDefinitions.h
+++ b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Chip/Skx/Include/Iio/IioSetupDefinitions.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Chip/Skx/Include/KtiDisc.h b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Chip/Skx/Include/KtiDisc.h
index a393e46639..44bf2ec2ff 100644
--- a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Chip/Skx/Include/KtiDisc.h
+++ b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Chip/Skx/Include/KtiDisc.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Chip/Skx/Include/KtiHost.h b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Chip/Skx/Include/KtiHost.h
index afbd81265b..7824cfe33b 100644
--- a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Chip/Skx/Include/KtiHost.h
+++ b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Chip/Skx/Include/KtiHost.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Chip/Skx/Include/KtiSi.h b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Chip/Skx/Include/KtiSi.h
index 41904a724e..89934b97b7 100644
--- a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Chip/Skx/Include/KtiSi.h
+++ b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Chip/Skx/Include/KtiSi.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Chip/Skx/Include/Protocol/CpuCsrAccess.h b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Chip/Skx/Include/Protocol/CpuCsrAccess.h
index 4c03534e8a..9894a8d397 100644
--- a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Chip/Skx/Include/Protocol/CpuCsrAccess.h
+++ b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Chip/Skx/Include/Protocol/CpuCsrAccess.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Chip/Skx/Include/Setup/IioUniversalData.h b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Chip/Skx/Include/Setup/IioUniversalData.h
index 2c03670a02..481efeacbd 100644
--- a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Chip/Skx/Include/Setup/IioUniversalData.h
+++ b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Chip/Skx/Include/Setup/IioUniversalData.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/CpuHost.h b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/CpuHost.h
index 6a5f37d3d4..b7768e5f6a 100644
--- a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/CpuHost.h
+++ b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/CpuHost.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/CsrToPcieAddress.h b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/CsrToPcieAddress.h
index 62313e536f..a09bae07a3 100644
--- a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/CsrToPcieAddress.h
+++ b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/CsrToPcieAddress.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/DataTypes.h b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/DataTypes.h
index 83c1ace657..493408b256 100644
--- a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/DataTypes.h
+++ b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/DataTypes.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/MemHost.h b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/MemHost.h
index e9bc5fddf9..f2f50227bd 100644
--- a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/MemHost.h
+++ b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/MemHost.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/MemHostChipCommon.h b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/MemHostChipCommon.h
index 8a0de60293..87f1e2d15c 100644
--- a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/MemHostChipCommon.h
+++ b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/MemHostChipCommon.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/MemRegs.h b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/MemRegs.h
index 5e68cab7c5..d29a5d0971 100644
--- a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/MemRegs.h
+++ b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/MemRegs.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/MrcCommonTypes.h b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/MrcCommonTypes.h
index 3f444664b0..0f6727924f 100644
--- a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/MrcCommonTypes.h
+++ b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/MrcCommonTypes.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/PcieAddress.h b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/PcieAddress.h
index 00882a17e6..3b47495cb7 100644
--- a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/PcieAddress.h
+++ b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/PcieAddress.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/Printf.h b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/Printf.h
index 082c6effd5..b531b711ed 100644
--- a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/Printf.h
+++ b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/Printf.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/SysHost.h b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/SysHost.h
index c3b6693a0b..7fde63d166 100644
--- a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/SysHost.h
+++ b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/SysHost.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/SysHostChipCommon.h b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/SysHostChipCommon.h
index 2b0685674f..d49767573b 100644
--- a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/SysHostChipCommon.h
+++ b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/SysHostChipCommon.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/SysRegs.h b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/SysRegs.h
index 565d13db60..4ee6b7ba17 100644
--- a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/SysRegs.h
+++ b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/SysRegs.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/UsbDebugPort.h b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/UsbDebugPort.h
index e6d9d37ba9..172e794042 100644
--- a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/UsbDebugPort.h
+++ b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/UsbDebugPort.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Platform/Purley/Include/MemDefaults.h b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Platform/Purley/Include/MemDefaults.h
index 54e8fb7351..18198162dd 100644
--- a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Platform/Purley/Include/MemDefaults.h
+++ b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Platform/Purley/Include/MemDefaults.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Platform/Purley/Include/MemPlatform.h b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Platform/Purley/Include/MemPlatform.h
index 747e6c2b5d..2171c762c8 100644
--- a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Platform/Purley/Include/MemPlatform.h
+++ b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Platform/Purley/Include/MemPlatform.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Platform/Purley/Include/PlatformHost.h b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Platform/Purley/Include/PlatformHost.h
index 89a5dc80e9..21cb8b1961 100644
--- a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Platform/Purley/Include/PlatformHost.h
+++ b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Platform/Purley/Include/PlatformHost.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleyRcPkg/Library/CsrToPcieLibNull/BaseCsrToPcieLibNull.inf b/Silicon/Intel/PurleyRcPkg/Library/CsrToPcieLibNull/BaseCsrToPcieLibNull.inf
index 572fa786c9..57d5ad1c8d 100644
--- a/Silicon/Intel/PurleyRcPkg/Library/CsrToPcieLibNull/BaseCsrToPcieLibNull.inf
+++ b/Silicon/Intel/PurleyRcPkg/Library/CsrToPcieLibNull/BaseCsrToPcieLibNull.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Silicon/Intel/PurleyRcPkg/Library/CsrToPcieLibNull/CsrToPcieLib.c b/Silicon/Intel/PurleyRcPkg/Library/CsrToPcieLibNull/CsrToPcieLib.c
index cbdc4a8672..46aaf529d4 100644
--- a/Silicon/Intel/PurleyRcPkg/Library/CsrToPcieLibNull/CsrToPcieLib.c
+++ b/Silicon/Intel/PurleyRcPkg/Library/CsrToPcieLibNull/CsrToPcieLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleyRcPkg/Library/DxeMmPciBaseLib/DxeMmPciBaseLib.c b/Silicon/Intel/PurleyRcPkg/Library/DxeMmPciBaseLib/DxeMmPciBaseLib.c
index ca10f59d7e..396f0e0c8c 100644
--- a/Silicon/Intel/PurleyRcPkg/Library/DxeMmPciBaseLib/DxeMmPciBaseLib.c
+++ b/Silicon/Intel/PurleyRcPkg/Library/DxeMmPciBaseLib/DxeMmPciBaseLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleyRcPkg/Library/DxeMmPciBaseLib/DxeMmPciBaseLib.inf b/Silicon/Intel/PurleyRcPkg/Library/DxeMmPciBaseLib/DxeMmPciBaseLib.inf
index bf09f99bfc..1ffb25d30c 100644
--- a/Silicon/Intel/PurleyRcPkg/Library/DxeMmPciBaseLib/DxeMmPciBaseLib.inf
+++ b/Silicon/Intel/PurleyRcPkg/Library/DxeMmPciBaseLib/DxeMmPciBaseLib.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Silicon/Intel/PurleyRcPkg/Library/DxeMmPciBaseLib/SmmMmPciBaseLib.c b/Silicon/Intel/PurleyRcPkg/Library/DxeMmPciBaseLib/SmmMmPciBaseLib.c
index 913e90809f..9296bb983e 100644
--- a/Silicon/Intel/PurleyRcPkg/Library/DxeMmPciBaseLib/SmmMmPciBaseLib.c
+++ b/Silicon/Intel/PurleyRcPkg/Library/DxeMmPciBaseLib/SmmMmPciBaseLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleyRcPkg/Library/DxeMmPciBaseLib/SmmMmPciBaseLib.inf b/Silicon/Intel/PurleyRcPkg/Library/DxeMmPciBaseLib/SmmMmPciBaseLib.inf
index 8202be4831..56bf480b70 100644
--- a/Silicon/Intel/PurleyRcPkg/Library/DxeMmPciBaseLib/SmmMmPciBaseLib.inf
+++ b/Silicon/Intel/PurleyRcPkg/Library/DxeMmPciBaseLib/SmmMmPciBaseLib.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Silicon/Intel/PurleyRcPkg/Library/MmPciBaseLib/MmPciBaseLib.c b/Silicon/Intel/PurleyRcPkg/Library/MmPciBaseLib/MmPciBaseLib.c
index 6381cb30eb..601e31da73 100644
--- a/Silicon/Intel/PurleyRcPkg/Library/MmPciBaseLib/MmPciBaseLib.c
+++ b/Silicon/Intel/PurleyRcPkg/Library/MmPciBaseLib/MmPciBaseLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleyRcPkg/Library/MmPciBaseLib/MmPciBaseLib.inf b/Silicon/Intel/PurleyRcPkg/Library/MmPciBaseLib/MmPciBaseLib.inf
index 4c3411b4ff..c114b2b944 100644
--- a/Silicon/Intel/PurleyRcPkg/Library/MmPciBaseLib/MmPciBaseLib.inf
+++ b/Silicon/Intel/PurleyRcPkg/Library/MmPciBaseLib/MmPciBaseLib.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Silicon/Intel/PurleyRcPkg/Library/PcieAddressLib/PcieAddressLib.c b/Silicon/Intel/PurleyRcPkg/Library/PcieAddressLib/PcieAddressLib.c
index 23c05347d5..28d41d42a4 100644
--- a/Silicon/Intel/PurleyRcPkg/Library/PcieAddressLib/PcieAddressLib.c
+++ b/Silicon/Intel/PurleyRcPkg/Library/PcieAddressLib/PcieAddressLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleyRcPkg/Library/PcieAddressLib/PcieAddressLib.inf b/Silicon/Intel/PurleyRcPkg/Library/PcieAddressLib/PcieAddressLib.inf
index d88e65e593..f6c10001bc 100644
--- a/Silicon/Intel/PurleyRcPkg/Library/PcieAddressLib/PcieAddressLib.inf
+++ b/Silicon/Intel/PurleyRcPkg/Library/PcieAddressLib/PcieAddressLib.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Silicon/Intel/PurleyRcPkg/Library/UsraAccessLib/CsrAccess.c b/Silicon/Intel/PurleyRcPkg/Library/UsraAccessLib/CsrAccess.c
index b8f2663591..75142ea48b 100644
--- a/Silicon/Intel/PurleyRcPkg/Library/UsraAccessLib/CsrAccess.c
+++ b/Silicon/Intel/PurleyRcPkg/Library/UsraAccessLib/CsrAccess.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleyRcPkg/Library/UsraAccessLib/PcieAccess.c b/Silicon/Intel/PurleyRcPkg/Library/UsraAccessLib/PcieAccess.c
index 5af2c5953a..97dee6286a 100644
--- a/Silicon/Intel/PurleyRcPkg/Library/UsraAccessLib/PcieAccess.c
+++ b/Silicon/Intel/PurleyRcPkg/Library/UsraAccessLib/PcieAccess.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleyRcPkg/Library/UsraAccessLib/UsraAccessLib.c b/Silicon/Intel/PurleyRcPkg/Library/UsraAccessLib/UsraAccessLib.c
index d01d69192f..709c43c4bb 100644
--- a/Silicon/Intel/PurleyRcPkg/Library/UsraAccessLib/UsraAccessLib.c
+++ b/Silicon/Intel/PurleyRcPkg/Library/UsraAccessLib/UsraAccessLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleyRcPkg/Library/UsraAccessLib/UsraAccessLib.h b/Silicon/Intel/PurleyRcPkg/Library/UsraAccessLib/UsraAccessLib.h
index f41c0a548e..80f1241365 100644
--- a/Silicon/Intel/PurleyRcPkg/Library/UsraAccessLib/UsraAccessLib.h
+++ b/Silicon/Intel/PurleyRcPkg/Library/UsraAccessLib/UsraAccessLib.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleyRcPkg/Library/UsraAccessLib/UsraAccessLib.inf b/Silicon/Intel/PurleyRcPkg/Library/UsraAccessLib/UsraAccessLib.inf
index ecb5eccf44..2e8ac41d72 100644
--- a/Silicon/Intel/PurleyRcPkg/Library/UsraAccessLib/UsraAccessLib.inf
+++ b/Silicon/Intel/PurleyRcPkg/Library/UsraAccessLib/UsraAccessLib.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Silicon/Intel/PurleyRcPkg/RcCommonLib.dsc b/Silicon/Intel/PurleyRcPkg/RcCommonLib.dsc
index 9ef96c2c1d..1e34107540 100644
--- a/Silicon/Intel/PurleyRcPkg/RcCommonLib.dsc
+++ b/Silicon/Intel/PurleyRcPkg/RcCommonLib.dsc
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Silicon/Intel/PurleyRcPkg/RcDxeLib.dsc b/Silicon/Intel/PurleyRcPkg/RcDxeLib.dsc
index a52e22a58b..d668eedd24 100644
--- a/Silicon/Intel/PurleyRcPkg/RcDxeLib.dsc
+++ b/Silicon/Intel/PurleyRcPkg/RcDxeLib.dsc
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Silicon/Intel/PurleyRcPkg/RcPeiLib.dsc b/Silicon/Intel/PurleyRcPkg/RcPeiLib.dsc
index 6503f1799a..46ddb965e6 100644
--- a/Silicon/Intel/PurleyRcPkg/RcPeiLib.dsc
+++ b/Silicon/Intel/PurleyRcPkg/RcPeiLib.dsc
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Silicon/Intel/PurleyRcPkg/RcPkg.dec b/Silicon/Intel/PurleyRcPkg/RcPkg.dec
index 90cc93288b..29d08ddf2b 100644
--- a/Silicon/Intel/PurleyRcPkg/RcPkg.dec
+++ b/Silicon/Intel/PurleyRcPkg/RcPkg.dec
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
--
2.21.0.windows.1
^ permalink raw reply related [flat|nested] 63+ messages in thread* Re: [edk2-devel] [[edk2-platforms][PATCH V2] 25/30] Silicon/Intel/PurleyRcPkg: Replace BSD License with BSD+Patent License
2019-05-15 23:10 ` [[edk2-platforms][PATCH V2] 25/30] Silicon/Intel/PurleyRcPkg: " Michael D Kinney
@ 2019-05-17 19:59 ` Oram, Isaac W
0 siblings, 0 replies; 63+ messages in thread
From: Oram, Isaac W @ 2019-05-17 19:59 UTC (permalink / raw)
To: devel@edk2.groups.io, Kinney, Michael D; +Cc: Gillispie, Thad, Bu, Daocheng
Reviewed-by: Isaac W Oram<Isaac.w.oram@intel.com>
-----Original Message-----
From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Kinney, Michael D
Sent: Wednesday, May 15, 2019 4:10 PM
To: devel@edk2.groups.io
Cc: Gillispie, Thad <thad.gillispie@intel.com>; Bu, Daocheng <daocheng.bu@intel.com>; Oram, Isaac W <isaac.w.oram@intel.com>
Subject: [edk2-devel] [[edk2-platforms][PATCH V2] 25/30] Silicon/Intel/PurleyRcPkg: Replace BSD License with BSD+Patent License
https://bugzilla.tianocore.org/show_bug.cgi?id=1373
Replace BSD 2-Clause License with BSD+Patent License. This change is
based on the following emails:
https://lists.01.org/pipermail/edk2-devel/2019-February/036260.html
https://lists.01.org/pipermail/edk2-devel/2018-October/030385.html
RFCs with detailed process for the license change:
V3: https://lists.01.org/pipermail/edk2-devel/2019-March/038116.html
V2: https://lists.01.org/pipermail/edk2-devel/2019-March/037669.html
V1: https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html
Cc: Thad Gillispie <thad.gillispie@intel.com>
Cc: Daocheng Bu <daocheng.bu@intel.com>
Cc: Isaac W Oram <isaac.w.oram@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
.../Intel/PurleyRcPkg/Include/Library/CsrToPcieAddress.h | 8 +-------
Silicon/Intel/PurleyRcPkg/Include/Library/MmPciBaseLib.h | 8 +-------
Silicon/Intel/PurleyRcPkg/Include/Library/PcieAddress.h | 8 +-------
.../PurleyRcPkg/Include/Library/PciePlatformHookLib.h | 8 +-------
Silicon/Intel/PurleyRcPkg/Include/Library/UsraAccessApi.h | 8 +-------
Silicon/Intel/PurleyRcPkg/Include/MaxSocket.h | 8 +-------
Silicon/Intel/PurleyRcPkg/Include/Ppi/SiliconRegAccess.h | 8 +-------
.../Intel/PurleyRcPkg/Include/Protocol/SiliconRegAccess.h | 8 +-------
Silicon/Intel/PurleyRcPkg/Include/UsraAccessType.h | 8 +-------
.../BaseMemoryCoreLib/Chip/Skx/Include/Iio/IioConfig.h | 8 +-------
.../Chip/Skx/Include/Iio/IioPlatformData.h | 8 +-------
.../BaseMemoryCoreLib/Chip/Skx/Include/Iio/IioRegs.h | 8 +-------
.../Chip/Skx/Include/Iio/IioSetupDefinitions.h | 8 +-------
.../Library/BaseMemoryCoreLib/Chip/Skx/Include/KtiDisc.h | 8 +-------
.../Library/BaseMemoryCoreLib/Chip/Skx/Include/KtiHost.h | 8 +-------
.../Library/BaseMemoryCoreLib/Chip/Skx/Include/KtiSi.h | 8 +-------
.../Chip/Skx/Include/Protocol/CpuCsrAccess.h | 8 +-------
.../Chip/Skx/Include/Setup/IioUniversalData.h | 8 +-------
.../Library/BaseMemoryCoreLib/Core/Include/CpuHost.h | 8 +-------
.../BaseMemoryCoreLib/Core/Include/CsrToPcieAddress.h | 8 +-------
.../Library/BaseMemoryCoreLib/Core/Include/DataTypes.h | 8 +-------
.../Library/BaseMemoryCoreLib/Core/Include/MemHost.h | 8 +-------
.../BaseMemoryCoreLib/Core/Include/MemHostChipCommon.h | 8 +-------
.../Library/BaseMemoryCoreLib/Core/Include/MemRegs.h | 8 +-------
.../BaseMemoryCoreLib/Core/Include/MrcCommonTypes.h | 8 +-------
.../Library/BaseMemoryCoreLib/Core/Include/PcieAddress.h | 8 +-------
.../Library/BaseMemoryCoreLib/Core/Include/Printf.h | 8 +-------
.../Library/BaseMemoryCoreLib/Core/Include/SysHost.h | 8 +-------
.../BaseMemoryCoreLib/Core/Include/SysHostChipCommon.h | 8 +-------
.../Library/BaseMemoryCoreLib/Core/Include/SysRegs.h | 8 +-------
.../Library/BaseMemoryCoreLib/Core/Include/UsbDebugPort.h | 8 +-------
.../Platform/Purley/Include/MemDefaults.h | 8 +-------
.../Platform/Purley/Include/MemPlatform.h | 8 +-------
.../Platform/Purley/Include/PlatformHost.h | 8 +-------
.../Library/CsrToPcieLibNull/BaseCsrToPcieLibNull.inf | 8 +-------
.../PurleyRcPkg/Library/CsrToPcieLibNull/CsrToPcieLib.c | 8 +-------
.../PurleyRcPkg/Library/DxeMmPciBaseLib/DxeMmPciBaseLib.c | 8 +-------
.../Library/DxeMmPciBaseLib/DxeMmPciBaseLib.inf | 8 +-------
.../PurleyRcPkg/Library/DxeMmPciBaseLib/SmmMmPciBaseLib.c | 8 +-------
.../Library/DxeMmPciBaseLib/SmmMmPciBaseLib.inf | 8 +-------
.../Intel/PurleyRcPkg/Library/MmPciBaseLib/MmPciBaseLib.c | 8 +-------
.../PurleyRcPkg/Library/MmPciBaseLib/MmPciBaseLib.inf | 8 +-------
.../PurleyRcPkg/Library/PcieAddressLib/PcieAddressLib.c | 8 +-------
.../PurleyRcPkg/Library/PcieAddressLib/PcieAddressLib.inf | 8 +-------
.../Intel/PurleyRcPkg/Library/UsraAccessLib/CsrAccess.c | 8 +-------
.../Intel/PurleyRcPkg/Library/UsraAccessLib/PcieAccess.c | 8 +-------
.../PurleyRcPkg/Library/UsraAccessLib/UsraAccessLib.c | 8 +-------
.../PurleyRcPkg/Library/UsraAccessLib/UsraAccessLib.h | 8 +-------
.../PurleyRcPkg/Library/UsraAccessLib/UsraAccessLib.inf | 8 +-------
Silicon/Intel/PurleyRcPkg/RcCommonLib.dsc | 8 +-------
Silicon/Intel/PurleyRcPkg/RcDxeLib.dsc | 8 +-------
Silicon/Intel/PurleyRcPkg/RcPeiLib.dsc | 8 +-------
Silicon/Intel/PurleyRcPkg/RcPkg.dec | 8 +-------
53 files changed, 53 insertions(+), 371 deletions(-)
diff --git a/Silicon/Intel/PurleyRcPkg/Include/Library/CsrToPcieAddress.h b/Silicon/Intel/PurleyRcPkg/Include/Library/CsrToPcieAddress.h
index a4aaa24ba8..d86b5f0f65 100644
--- a/Silicon/Intel/PurleyRcPkg/Include/Library/CsrToPcieAddress.h
+++ b/Silicon/Intel/PurleyRcPkg/Include/Library/CsrToPcieAddress.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleyRcPkg/Include/Library/MmPciBaseLib.h b/Silicon/Intel/PurleyRcPkg/Include/Library/MmPciBaseLib.h
index 22b4179db3..bdf7f3e569 100644
--- a/Silicon/Intel/PurleyRcPkg/Include/Library/MmPciBaseLib.h
+++ b/Silicon/Intel/PurleyRcPkg/Include/Library/MmPciBaseLib.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleyRcPkg/Include/Library/PcieAddress.h b/Silicon/Intel/PurleyRcPkg/Include/Library/PcieAddress.h
index 3f0cbf8e6f..00fdf45e07 100644
--- a/Silicon/Intel/PurleyRcPkg/Include/Library/PcieAddress.h
+++ b/Silicon/Intel/PurleyRcPkg/Include/Library/PcieAddress.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleyRcPkg/Include/Library/PciePlatformHookLib.h b/Silicon/Intel/PurleyRcPkg/Include/Library/PciePlatformHookLib.h
index 6712b78ea6..c1093136b0 100644
--- a/Silicon/Intel/PurleyRcPkg/Include/Library/PciePlatformHookLib.h
+++ b/Silicon/Intel/PurleyRcPkg/Include/Library/PciePlatformHookLib.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleyRcPkg/Include/Library/UsraAccessApi.h b/Silicon/Intel/PurleyRcPkg/Include/Library/UsraAccessApi.h
index cbe365cea3..a43831b4f5 100644
--- a/Silicon/Intel/PurleyRcPkg/Include/Library/UsraAccessApi.h
+++ b/Silicon/Intel/PurleyRcPkg/Include/Library/UsraAccessApi.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleyRcPkg/Include/MaxSocket.h b/Silicon/Intel/PurleyRcPkg/Include/MaxSocket.h
index f380967cc4..8552d20191 100644
--- a/Silicon/Intel/PurleyRcPkg/Include/MaxSocket.h
+++ b/Silicon/Intel/PurleyRcPkg/Include/MaxSocket.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleyRcPkg/Include/Ppi/SiliconRegAccess.h b/Silicon/Intel/PurleyRcPkg/Include/Ppi/SiliconRegAccess.h
index c0f4624a8f..5a440eedb6 100644
--- a/Silicon/Intel/PurleyRcPkg/Include/Ppi/SiliconRegAccess.h
+++ b/Silicon/Intel/PurleyRcPkg/Include/Ppi/SiliconRegAccess.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleyRcPkg/Include/Protocol/SiliconRegAccess.h b/Silicon/Intel/PurleyRcPkg/Include/Protocol/SiliconRegAccess.h
index 72e556b270..7d6e93dfcc 100644
--- a/Silicon/Intel/PurleyRcPkg/Include/Protocol/SiliconRegAccess.h
+++ b/Silicon/Intel/PurleyRcPkg/Include/Protocol/SiliconRegAccess.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleyRcPkg/Include/UsraAccessType.h b/Silicon/Intel/PurleyRcPkg/Include/UsraAccessType.h
index d3a97a6446..143069b782 100644
--- a/Silicon/Intel/PurleyRcPkg/Include/UsraAccessType.h
+++ b/Silicon/Intel/PurleyRcPkg/Include/UsraAccessType.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Chip/Skx/Include/Iio/IioConfig.h b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Chip/Skx/Include/Iio/IioConfig.h
index 79ab649751..0d2554b81e 100644
--- a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Chip/Skx/Include/Iio/IioConfig.h
+++ b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Chip/Skx/Include/Iio/IioConfig.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Chip/Skx/Include/Iio/IioPlatformData.h b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Chip/Skx/Include/Iio/IioPlatformData.h
index 7c980cb458..c33d1d7348 100644
--- a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Chip/Skx/Include/Iio/IioPlatformData.h
+++ b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Chip/Skx/Include/Iio/IioPlatformData.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Chip/Skx/Include/Iio/IioRegs.h b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Chip/Skx/Include/Iio/IioRegs.h
index f91a879a4e..cf9475c4e2 100644
--- a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Chip/Skx/Include/Iio/IioRegs.h
+++ b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Chip/Skx/Include/Iio/IioRegs.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Chip/Skx/Include/Iio/IioSetupDefinitions.h b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Chip/Skx/Include/Iio/IioSetupDefinitions.h
index bd505703b0..61b7389cff 100644
--- a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Chip/Skx/Include/Iio/IioSetupDefinitions.h
+++ b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Chip/Skx/Include/Iio/IioSetupDefinitions.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Chip/Skx/Include/KtiDisc.h b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Chip/Skx/Include/KtiDisc.h
index a393e46639..44bf2ec2ff 100644
--- a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Chip/Skx/Include/KtiDisc.h
+++ b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Chip/Skx/Include/KtiDisc.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Chip/Skx/Include/KtiHost.h b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Chip/Skx/Include/KtiHost.h
index afbd81265b..7824cfe33b 100644
--- a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Chip/Skx/Include/KtiHost.h
+++ b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Chip/Skx/Include/KtiHost.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Chip/Skx/Include/KtiSi.h b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Chip/Skx/Include/KtiSi.h
index 41904a724e..89934b97b7 100644
--- a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Chip/Skx/Include/KtiSi.h
+++ b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Chip/Skx/Include/KtiSi.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Chip/Skx/Include/Protocol/CpuCsrAccess.h b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Chip/Skx/Include/Protocol/CpuCsrAccess.h
index 4c03534e8a..9894a8d397 100644
--- a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Chip/Skx/Include/Protocol/CpuCsrAccess.h
+++ b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Chip/Skx/Include/Protocol/CpuCsrAccess.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Chip/Skx/Include/Setup/IioUniversalData.h b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Chip/Skx/Include/Setup/IioUniversalData.h
index 2c03670a02..481efeacbd 100644
--- a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Chip/Skx/Include/Setup/IioUniversalData.h
+++ b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Chip/Skx/Include/Setup/IioUniversalData.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/CpuHost.h b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/CpuHost.h
index 6a5f37d3d4..b7768e5f6a 100644
--- a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/CpuHost.h
+++ b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/CpuHost.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/CsrToPcieAddress.h b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/CsrToPcieAddress.h
index 62313e536f..a09bae07a3 100644
--- a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/CsrToPcieAddress.h
+++ b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/CsrToPcieAddress.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/DataTypes.h b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/DataTypes.h
index 83c1ace657..493408b256 100644
--- a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/DataTypes.h
+++ b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/DataTypes.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/MemHost.h b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/MemHost.h
index e9bc5fddf9..f2f50227bd 100644
--- a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/MemHost.h
+++ b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/MemHost.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/MemHostChipCommon.h b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/MemHostChipCommon.h
index 8a0de60293..87f1e2d15c 100644
--- a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/MemHostChipCommon.h
+++ b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/MemHostChipCommon.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/MemRegs.h b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/MemRegs.h
index 5e68cab7c5..d29a5d0971 100644
--- a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/MemRegs.h
+++ b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/MemRegs.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/MrcCommonTypes.h b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/MrcCommonTypes.h
index 3f444664b0..0f6727924f 100644
--- a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/MrcCommonTypes.h
+++ b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/MrcCommonTypes.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/PcieAddress.h b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/PcieAddress.h
index 00882a17e6..3b47495cb7 100644
--- a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/PcieAddress.h
+++ b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/PcieAddress.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/Printf.h b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/Printf.h
index 082c6effd5..b531b711ed 100644
--- a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/Printf.h
+++ b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/Printf.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/SysHost.h b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/SysHost.h
index c3b6693a0b..7fde63d166 100644
--- a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/SysHost.h
+++ b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/SysHost.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/SysHostChipCommon.h b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/SysHostChipCommon.h
index 2b0685674f..d49767573b 100644
--- a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/SysHostChipCommon.h
+++ b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/SysHostChipCommon.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/SysRegs.h b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/SysRegs.h
index 565d13db60..4ee6b7ba17 100644
--- a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/SysRegs.h
+++ b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/SysRegs.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/UsbDebugPort.h b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/UsbDebugPort.h
index e6d9d37ba9..172e794042 100644
--- a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/UsbDebugPort.h
+++ b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Core/Include/UsbDebugPort.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Platform/Purley/Include/MemDefaults.h b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Platform/Purley/Include/MemDefaults.h
index 54e8fb7351..18198162dd 100644
--- a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Platform/Purley/Include/MemDefaults.h
+++ b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Platform/Purley/Include/MemDefaults.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Platform/Purley/Include/MemPlatform.h b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Platform/Purley/Include/MemPlatform.h
index 747e6c2b5d..2171c762c8 100644
--- a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Platform/Purley/Include/MemPlatform.h
+++ b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Platform/Purley/Include/MemPlatform.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Platform/Purley/Include/PlatformHost.h b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Platform/Purley/Include/PlatformHost.h
index 89a5dc80e9..21cb8b1961 100644
--- a/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Platform/Purley/Include/PlatformHost.h
+++ b/Silicon/Intel/PurleyRcPkg/Library/BaseMemoryCoreLib/Platform/Purley/Include/PlatformHost.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleyRcPkg/Library/CsrToPcieLibNull/BaseCsrToPcieLibNull.inf b/Silicon/Intel/PurleyRcPkg/Library/CsrToPcieLibNull/BaseCsrToPcieLibNull.inf
index 572fa786c9..57d5ad1c8d 100644
--- a/Silicon/Intel/PurleyRcPkg/Library/CsrToPcieLibNull/BaseCsrToPcieLibNull.inf
+++ b/Silicon/Intel/PurleyRcPkg/Library/CsrToPcieLibNull/BaseCsrToPcieLibNull.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Silicon/Intel/PurleyRcPkg/Library/CsrToPcieLibNull/CsrToPcieLib.c b/Silicon/Intel/PurleyRcPkg/Library/CsrToPcieLibNull/CsrToPcieLib.c
index cbdc4a8672..46aaf529d4 100644
--- a/Silicon/Intel/PurleyRcPkg/Library/CsrToPcieLibNull/CsrToPcieLib.c
+++ b/Silicon/Intel/PurleyRcPkg/Library/CsrToPcieLibNull/CsrToPcieLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleyRcPkg/Library/DxeMmPciBaseLib/DxeMmPciBaseLib.c b/Silicon/Intel/PurleyRcPkg/Library/DxeMmPciBaseLib/DxeMmPciBaseLib.c
index ca10f59d7e..396f0e0c8c 100644
--- a/Silicon/Intel/PurleyRcPkg/Library/DxeMmPciBaseLib/DxeMmPciBaseLib.c
+++ b/Silicon/Intel/PurleyRcPkg/Library/DxeMmPciBaseLib/DxeMmPciBaseLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleyRcPkg/Library/DxeMmPciBaseLib/DxeMmPciBaseLib.inf b/Silicon/Intel/PurleyRcPkg/Library/DxeMmPciBaseLib/DxeMmPciBaseLib.inf
index bf09f99bfc..1ffb25d30c 100644
--- a/Silicon/Intel/PurleyRcPkg/Library/DxeMmPciBaseLib/DxeMmPciBaseLib.inf
+++ b/Silicon/Intel/PurleyRcPkg/Library/DxeMmPciBaseLib/DxeMmPciBaseLib.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Silicon/Intel/PurleyRcPkg/Library/DxeMmPciBaseLib/SmmMmPciBaseLib.c b/Silicon/Intel/PurleyRcPkg/Library/DxeMmPciBaseLib/SmmMmPciBaseLib.c
index 913e90809f..9296bb983e 100644
--- a/Silicon/Intel/PurleyRcPkg/Library/DxeMmPciBaseLib/SmmMmPciBaseLib.c
+++ b/Silicon/Intel/PurleyRcPkg/Library/DxeMmPciBaseLib/SmmMmPciBaseLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleyRcPkg/Library/DxeMmPciBaseLib/SmmMmPciBaseLib.inf b/Silicon/Intel/PurleyRcPkg/Library/DxeMmPciBaseLib/SmmMmPciBaseLib.inf
index 8202be4831..56bf480b70 100644
--- a/Silicon/Intel/PurleyRcPkg/Library/DxeMmPciBaseLib/SmmMmPciBaseLib.inf
+++ b/Silicon/Intel/PurleyRcPkg/Library/DxeMmPciBaseLib/SmmMmPciBaseLib.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Silicon/Intel/PurleyRcPkg/Library/MmPciBaseLib/MmPciBaseLib.c b/Silicon/Intel/PurleyRcPkg/Library/MmPciBaseLib/MmPciBaseLib.c
index 6381cb30eb..601e31da73 100644
--- a/Silicon/Intel/PurleyRcPkg/Library/MmPciBaseLib/MmPciBaseLib.c
+++ b/Silicon/Intel/PurleyRcPkg/Library/MmPciBaseLib/MmPciBaseLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleyRcPkg/Library/MmPciBaseLib/MmPciBaseLib.inf b/Silicon/Intel/PurleyRcPkg/Library/MmPciBaseLib/MmPciBaseLib.inf
index 4c3411b4ff..c114b2b944 100644
--- a/Silicon/Intel/PurleyRcPkg/Library/MmPciBaseLib/MmPciBaseLib.inf
+++ b/Silicon/Intel/PurleyRcPkg/Library/MmPciBaseLib/MmPciBaseLib.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Silicon/Intel/PurleyRcPkg/Library/PcieAddressLib/PcieAddressLib.c b/Silicon/Intel/PurleyRcPkg/Library/PcieAddressLib/PcieAddressLib.c
index 23c05347d5..28d41d42a4 100644
--- a/Silicon/Intel/PurleyRcPkg/Library/PcieAddressLib/PcieAddressLib.c
+++ b/Silicon/Intel/PurleyRcPkg/Library/PcieAddressLib/PcieAddressLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleyRcPkg/Library/PcieAddressLib/PcieAddressLib.inf b/Silicon/Intel/PurleyRcPkg/Library/PcieAddressLib/PcieAddressLib.inf
index d88e65e593..f6c10001bc 100644
--- a/Silicon/Intel/PurleyRcPkg/Library/PcieAddressLib/PcieAddressLib.inf
+++ b/Silicon/Intel/PurleyRcPkg/Library/PcieAddressLib/PcieAddressLib.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Silicon/Intel/PurleyRcPkg/Library/UsraAccessLib/CsrAccess.c b/Silicon/Intel/PurleyRcPkg/Library/UsraAccessLib/CsrAccess.c
index b8f2663591..75142ea48b 100644
--- a/Silicon/Intel/PurleyRcPkg/Library/UsraAccessLib/CsrAccess.c
+++ b/Silicon/Intel/PurleyRcPkg/Library/UsraAccessLib/CsrAccess.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleyRcPkg/Library/UsraAccessLib/PcieAccess.c b/Silicon/Intel/PurleyRcPkg/Library/UsraAccessLib/PcieAccess.c
index 5af2c5953a..97dee6286a 100644
--- a/Silicon/Intel/PurleyRcPkg/Library/UsraAccessLib/PcieAccess.c
+++ b/Silicon/Intel/PurleyRcPkg/Library/UsraAccessLib/PcieAccess.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleyRcPkg/Library/UsraAccessLib/UsraAccessLib.c b/Silicon/Intel/PurleyRcPkg/Library/UsraAccessLib/UsraAccessLib.c
index d01d69192f..709c43c4bb 100644
--- a/Silicon/Intel/PurleyRcPkg/Library/UsraAccessLib/UsraAccessLib.c
+++ b/Silicon/Intel/PurleyRcPkg/Library/UsraAccessLib/UsraAccessLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleyRcPkg/Library/UsraAccessLib/UsraAccessLib.h b/Silicon/Intel/PurleyRcPkg/Library/UsraAccessLib/UsraAccessLib.h
index f41c0a548e..80f1241365 100644
--- a/Silicon/Intel/PurleyRcPkg/Library/UsraAccessLib/UsraAccessLib.h
+++ b/Silicon/Intel/PurleyRcPkg/Library/UsraAccessLib/UsraAccessLib.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleyRcPkg/Library/UsraAccessLib/UsraAccessLib.inf b/Silicon/Intel/PurleyRcPkg/Library/UsraAccessLib/UsraAccessLib.inf
index ecb5eccf44..2e8ac41d72 100644
--- a/Silicon/Intel/PurleyRcPkg/Library/UsraAccessLib/UsraAccessLib.inf
+++ b/Silicon/Intel/PurleyRcPkg/Library/UsraAccessLib/UsraAccessLib.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Silicon/Intel/PurleyRcPkg/RcCommonLib.dsc b/Silicon/Intel/PurleyRcPkg/RcCommonLib.dsc
index 9ef96c2c1d..1e34107540 100644
--- a/Silicon/Intel/PurleyRcPkg/RcCommonLib.dsc
+++ b/Silicon/Intel/PurleyRcPkg/RcCommonLib.dsc
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Silicon/Intel/PurleyRcPkg/RcDxeLib.dsc b/Silicon/Intel/PurleyRcPkg/RcDxeLib.dsc
index a52e22a58b..d668eedd24 100644
--- a/Silicon/Intel/PurleyRcPkg/RcDxeLib.dsc
+++ b/Silicon/Intel/PurleyRcPkg/RcDxeLib.dsc
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Silicon/Intel/PurleyRcPkg/RcPeiLib.dsc b/Silicon/Intel/PurleyRcPkg/RcPeiLib.dsc
index 6503f1799a..46ddb965e6 100644
--- a/Silicon/Intel/PurleyRcPkg/RcPeiLib.dsc
+++ b/Silicon/Intel/PurleyRcPkg/RcPeiLib.dsc
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Silicon/Intel/PurleyRcPkg/RcPkg.dec b/Silicon/Intel/PurleyRcPkg/RcPkg.dec
index 90cc93288b..29d08ddf2b 100644
--- a/Silicon/Intel/PurleyRcPkg/RcPkg.dec
+++ b/Silicon/Intel/PurleyRcPkg/RcPkg.dec
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
--
2.21.0.windows.1
^ permalink raw reply related [flat|nested] 63+ messages in thread
* [[edk2-platforms][PATCH V2] 26/30] Silicon/Intel/PurleySktPkg: Replace BSD License with BSD+Patent License
2019-05-15 23:09 [[edk2-platforms][PATCH V2] 00/30] Change edk2-platforms/master to BSD+Patent License Michael D Kinney
` (24 preceding siblings ...)
2019-05-15 23:10 ` [[edk2-platforms][PATCH V2] 25/30] Silicon/Intel/PurleyRcPkg: " Michael D Kinney
@ 2019-05-15 23:10 ` Michael D Kinney
2019-05-17 19:59 ` [edk2-devel] " Oram, Isaac W
2019-05-15 23:10 ` [[edk2-platforms][PATCH V2] 27/30] Silicon/Marvell: " Michael D Kinney
` (4 subsequent siblings)
30 siblings, 1 reply; 63+ messages in thread
From: Michael D Kinney @ 2019-05-15 23:10 UTC (permalink / raw)
To: devel; +Cc: Thad Gillispie, Daocheng Bu, Isaac W Oram
https://bugzilla.tianocore.org/show_bug.cgi?id=1373
Replace BSD 2-Clause License with BSD+Patent License. This change is
based on the following emails:
https://lists.01.org/pipermail/edk2-devel/2019-February/036260.html
https://lists.01.org/pipermail/edk2-devel/2018-October/030385.html
RFCs with detailed process for the license change:
V3: https://lists.01.org/pipermail/edk2-devel/2019-March/038116.html
V2: https://lists.01.org/pipermail/edk2-devel/2019-March/037669.html
V1: https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html
Cc: Thad Gillispie <thad.gillispie@intel.com>
Cc: Daocheng Bu <daocheng.bu@intel.com>
Cc: Isaac W Oram <isaac.w.oram@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
.../Intel/PurleySktPkg/Iio/Include/Protocol/IioSystem.h | 8 +-------
.../Intel/PurleySktPkg/Include/Guid/MemoryConfigData.h | 8 +-------
Silicon/Intel/PurleySktPkg/Include/Guid/MemoryMapData.h | 8 +-------
.../Intel/PurleySktPkg/Include/Guid/PartialMirrorGuid.h | 8 +-------
.../Intel/PurleySktPkg/Include/Guid/SmramMemoryReserve.h | 8 +-------
.../PurleySktPkg/Include/Guid/SocketCommonRcVariable.h | 8 +-------
.../Intel/PurleySktPkg/Include/Guid/SocketIioVariable.h | 8 +-------
.../PurleySktPkg/Include/Guid/SocketMemoryVariable.h | 8 +-------
.../PurleySktPkg/Include/Guid/SocketMpLinkVariable.h | 8 +-------
.../PurleySktPkg/Include/Guid/SocketPciResourceData.h | 8 +-------
.../Include/Guid/SocketPowermanagementVariable.h | 8 +-------
.../Include/Guid/SocketProcessorCoreVariable.h | 8 +-------
Silicon/Intel/PurleySktPkg/Include/Guid/SocketVariable.h | 8 +-------
Silicon/Intel/PurleySktPkg/Include/Library/CpuPpmLib.h | 8 +-------
Silicon/Intel/PurleySktPkg/Include/Protocol/IioUds.h | 8 +-------
Silicon/Intel/PurleySktPkg/Include/Protocol/PciCallback.h | 8 +-------
Silicon/Intel/PurleySktPkg/Include/SocketConfiguration.h | 8 +-------
Silicon/Intel/PurleySktPkg/Include/UncoreCommonIncludes.h | 8 +-------
.../Library/CsrToPcieLib/CpuCsrAccessDefine.h | 8 +-------
.../PurleySktPkg/Library/CsrToPcieLib/CsrToPcieDxeLib.inf | 8 +-------
.../PurleySktPkg/Library/CsrToPcieLib/CsrToPcieLib.c | 8 +-------
.../PurleySktPkg/Library/CsrToPcieLib/CsrToPciePeiLib.inf | 8 +-------
.../PurleySktPkg/Library/PcieAddressLib/PcieAddressLib.c | 8 +-------
.../Library/PcieAddressLib/PcieAddressLib.inf | 8 +-------
.../Library/ProcMemInit/Chip/Common/CpuPciAccessCommon.c | 8 +-------
.../Library/ProcMemInit/Chip/Include/CpuCsrAccessDefine.h | 8 +-------
.../Library/ProcMemInit/Chip/Include/CpuPciAccess.h | 8 +-------
.../Library/ProcMemInit/Chip/Include/CpuPciAccessCommon.h | 8 +-------
.../Override/IA32FamilyCpuPkg/IA32FamilyCpuPkg.dec | 8 +-------
.../IA32FamilyCpuPkg/Include/Library/CpuConfigLib.h | 8 +-------
.../Include/Protocol/IntelCpuPcdsSetDone.h | 8 +-------
Silicon/Intel/PurleySktPkg/SktCommonLib.dsc | 8 +-------
Silicon/Intel/PurleySktPkg/SktDxeLib.dsc | 8 +-------
Silicon/Intel/PurleySktPkg/SktPeiLib.dsc | 8 +-------
Silicon/Intel/PurleySktPkg/SocketPkg.dec | 8 +-------
35 files changed, 35 insertions(+), 245 deletions(-)
diff --git a/Silicon/Intel/PurleySktPkg/Iio/Include/Protocol/IioSystem.h b/Silicon/Intel/PurleySktPkg/Iio/Include/Protocol/IioSystem.h
index b4a2639219..0a8d3064c3 100644
--- a/Silicon/Intel/PurleySktPkg/Iio/Include/Protocol/IioSystem.h
+++ b/Silicon/Intel/PurleySktPkg/Iio/Include/Protocol/IioSystem.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleySktPkg/Include/Guid/MemoryConfigData.h b/Silicon/Intel/PurleySktPkg/Include/Guid/MemoryConfigData.h
index 5102ba7a8f..f7c57af8a5 100644
--- a/Silicon/Intel/PurleySktPkg/Include/Guid/MemoryConfigData.h
+++ b/Silicon/Intel/PurleySktPkg/Include/Guid/MemoryConfigData.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleySktPkg/Include/Guid/MemoryMapData.h b/Silicon/Intel/PurleySktPkg/Include/Guid/MemoryMapData.h
index b5cc47bbf5..dbc8529c46 100644
--- a/Silicon/Intel/PurleySktPkg/Include/Guid/MemoryMapData.h
+++ b/Silicon/Intel/PurleySktPkg/Include/Guid/MemoryMapData.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleySktPkg/Include/Guid/PartialMirrorGuid.h b/Silicon/Intel/PurleySktPkg/Include/Guid/PartialMirrorGuid.h
index d8e770fba6..05ecf5f15b 100644
--- a/Silicon/Intel/PurleySktPkg/Include/Guid/PartialMirrorGuid.h
+++ b/Silicon/Intel/PurleySktPkg/Include/Guid/PartialMirrorGuid.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleySktPkg/Include/Guid/SmramMemoryReserve.h b/Silicon/Intel/PurleySktPkg/Include/Guid/SmramMemoryReserve.h
index 26b708279f..46e8198f00 100644
--- a/Silicon/Intel/PurleySktPkg/Include/Guid/SmramMemoryReserve.h
+++ b/Silicon/Intel/PurleySktPkg/Include/Guid/SmramMemoryReserve.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleySktPkg/Include/Guid/SocketCommonRcVariable.h b/Silicon/Intel/PurleySktPkg/Include/Guid/SocketCommonRcVariable.h
index b2472e14bd..f3d2be733c 100644
--- a/Silicon/Intel/PurleySktPkg/Include/Guid/SocketCommonRcVariable.h
+++ b/Silicon/Intel/PurleySktPkg/Include/Guid/SocketCommonRcVariable.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleySktPkg/Include/Guid/SocketIioVariable.h b/Silicon/Intel/PurleySktPkg/Include/Guid/SocketIioVariable.h
index 2a47851f17..9bdfe35942 100644
--- a/Silicon/Intel/PurleySktPkg/Include/Guid/SocketIioVariable.h
+++ b/Silicon/Intel/PurleySktPkg/Include/Guid/SocketIioVariable.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleySktPkg/Include/Guid/SocketMemoryVariable.h b/Silicon/Intel/PurleySktPkg/Include/Guid/SocketMemoryVariable.h
index ef0b5a300a..1c58598d92 100644
--- a/Silicon/Intel/PurleySktPkg/Include/Guid/SocketMemoryVariable.h
+++ b/Silicon/Intel/PurleySktPkg/Include/Guid/SocketMemoryVariable.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleySktPkg/Include/Guid/SocketMpLinkVariable.h b/Silicon/Intel/PurleySktPkg/Include/Guid/SocketMpLinkVariable.h
index 3f51792d8b..2a0c1a9694 100644
--- a/Silicon/Intel/PurleySktPkg/Include/Guid/SocketMpLinkVariable.h
+++ b/Silicon/Intel/PurleySktPkg/Include/Guid/SocketMpLinkVariable.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleySktPkg/Include/Guid/SocketPciResourceData.h b/Silicon/Intel/PurleySktPkg/Include/Guid/SocketPciResourceData.h
index 7aa2ad7fc8..5c8ca9fd74 100644
--- a/Silicon/Intel/PurleySktPkg/Include/Guid/SocketPciResourceData.h
+++ b/Silicon/Intel/PurleySktPkg/Include/Guid/SocketPciResourceData.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleySktPkg/Include/Guid/SocketPowermanagementVariable.h b/Silicon/Intel/PurleySktPkg/Include/Guid/SocketPowermanagementVariable.h
index a6724ef0c3..9de3b40e2e 100644
--- a/Silicon/Intel/PurleySktPkg/Include/Guid/SocketPowermanagementVariable.h
+++ b/Silicon/Intel/PurleySktPkg/Include/Guid/SocketPowermanagementVariable.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleySktPkg/Include/Guid/SocketProcessorCoreVariable.h b/Silicon/Intel/PurleySktPkg/Include/Guid/SocketProcessorCoreVariable.h
index 37c614bca2..78e7043874 100644
--- a/Silicon/Intel/PurleySktPkg/Include/Guid/SocketProcessorCoreVariable.h
+++ b/Silicon/Intel/PurleySktPkg/Include/Guid/SocketProcessorCoreVariable.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleySktPkg/Include/Guid/SocketVariable.h b/Silicon/Intel/PurleySktPkg/Include/Guid/SocketVariable.h
index ac6c4dc0aa..391bfb4e1e 100644
--- a/Silicon/Intel/PurleySktPkg/Include/Guid/SocketVariable.h
+++ b/Silicon/Intel/PurleySktPkg/Include/Guid/SocketVariable.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleySktPkg/Include/Library/CpuPpmLib.h b/Silicon/Intel/PurleySktPkg/Include/Library/CpuPpmLib.h
index 22f312f80b..0f18d41bda 100644
--- a/Silicon/Intel/PurleySktPkg/Include/Library/CpuPpmLib.h
+++ b/Silicon/Intel/PurleySktPkg/Include/Library/CpuPpmLib.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleySktPkg/Include/Protocol/IioUds.h b/Silicon/Intel/PurleySktPkg/Include/Protocol/IioUds.h
index 10834e0cdf..8fbafa710a 100644
--- a/Silicon/Intel/PurleySktPkg/Include/Protocol/IioUds.h
+++ b/Silicon/Intel/PurleySktPkg/Include/Protocol/IioUds.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleySktPkg/Include/Protocol/PciCallback.h b/Silicon/Intel/PurleySktPkg/Include/Protocol/PciCallback.h
index 9b8bfecc45..fd668737bd 100644
--- a/Silicon/Intel/PurleySktPkg/Include/Protocol/PciCallback.h
+++ b/Silicon/Intel/PurleySktPkg/Include/Protocol/PciCallback.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleySktPkg/Include/SocketConfiguration.h b/Silicon/Intel/PurleySktPkg/Include/SocketConfiguration.h
index aaf78d7084..ea1f5e3827 100644
--- a/Silicon/Intel/PurleySktPkg/Include/SocketConfiguration.h
+++ b/Silicon/Intel/PurleySktPkg/Include/SocketConfiguration.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleySktPkg/Include/UncoreCommonIncludes.h b/Silicon/Intel/PurleySktPkg/Include/UncoreCommonIncludes.h
index f6a0aa5743..233d57d7ad 100644
--- a/Silicon/Intel/PurleySktPkg/Include/UncoreCommonIncludes.h
+++ b/Silicon/Intel/PurleySktPkg/Include/UncoreCommonIncludes.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleySktPkg/Library/CsrToPcieLib/CpuCsrAccessDefine.h b/Silicon/Intel/PurleySktPkg/Library/CsrToPcieLib/CpuCsrAccessDefine.h
index e40505d880..cd0ee66d4a 100644
--- a/Silicon/Intel/PurleySktPkg/Library/CsrToPcieLib/CpuCsrAccessDefine.h
+++ b/Silicon/Intel/PurleySktPkg/Library/CsrToPcieLib/CpuCsrAccessDefine.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleySktPkg/Library/CsrToPcieLib/CsrToPcieDxeLib.inf b/Silicon/Intel/PurleySktPkg/Library/CsrToPcieLib/CsrToPcieDxeLib.inf
index ccdf763bef..acdd279a09 100644
--- a/Silicon/Intel/PurleySktPkg/Library/CsrToPcieLib/CsrToPcieDxeLib.inf
+++ b/Silicon/Intel/PurleySktPkg/Library/CsrToPcieLib/CsrToPcieDxeLib.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Silicon/Intel/PurleySktPkg/Library/CsrToPcieLib/CsrToPcieLib.c b/Silicon/Intel/PurleySktPkg/Library/CsrToPcieLib/CsrToPcieLib.c
index d6b98f2aec..feeebebf70 100644
--- a/Silicon/Intel/PurleySktPkg/Library/CsrToPcieLib/CsrToPcieLib.c
+++ b/Silicon/Intel/PurleySktPkg/Library/CsrToPcieLib/CsrToPcieLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleySktPkg/Library/CsrToPcieLib/CsrToPciePeiLib.inf b/Silicon/Intel/PurleySktPkg/Library/CsrToPcieLib/CsrToPciePeiLib.inf
index 27616a22f4..c16eaf7c42 100644
--- a/Silicon/Intel/PurleySktPkg/Library/CsrToPcieLib/CsrToPciePeiLib.inf
+++ b/Silicon/Intel/PurleySktPkg/Library/CsrToPcieLib/CsrToPciePeiLib.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Silicon/Intel/PurleySktPkg/Library/PcieAddressLib/PcieAddressLib.c b/Silicon/Intel/PurleySktPkg/Library/PcieAddressLib/PcieAddressLib.c
index 456e5cf3ab..e0087f0eda 100644
--- a/Silicon/Intel/PurleySktPkg/Library/PcieAddressLib/PcieAddressLib.c
+++ b/Silicon/Intel/PurleySktPkg/Library/PcieAddressLib/PcieAddressLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleySktPkg/Library/PcieAddressLib/PcieAddressLib.inf b/Silicon/Intel/PurleySktPkg/Library/PcieAddressLib/PcieAddressLib.inf
index 157e61c860..3661cb8225 100644
--- a/Silicon/Intel/PurleySktPkg/Library/PcieAddressLib/PcieAddressLib.inf
+++ b/Silicon/Intel/PurleySktPkg/Library/PcieAddressLib/PcieAddressLib.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Silicon/Intel/PurleySktPkg/Library/ProcMemInit/Chip/Common/CpuPciAccessCommon.c b/Silicon/Intel/PurleySktPkg/Library/ProcMemInit/Chip/Common/CpuPciAccessCommon.c
index 78e648da7b..292dbec37b 100644
--- a/Silicon/Intel/PurleySktPkg/Library/ProcMemInit/Chip/Common/CpuPciAccessCommon.c
+++ b/Silicon/Intel/PurleySktPkg/Library/ProcMemInit/Chip/Common/CpuPciAccessCommon.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleySktPkg/Library/ProcMemInit/Chip/Include/CpuCsrAccessDefine.h b/Silicon/Intel/PurleySktPkg/Library/ProcMemInit/Chip/Include/CpuCsrAccessDefine.h
index 484949006f..bee66dbed9 100644
--- a/Silicon/Intel/PurleySktPkg/Library/ProcMemInit/Chip/Include/CpuCsrAccessDefine.h
+++ b/Silicon/Intel/PurleySktPkg/Library/ProcMemInit/Chip/Include/CpuCsrAccessDefine.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleySktPkg/Library/ProcMemInit/Chip/Include/CpuPciAccess.h b/Silicon/Intel/PurleySktPkg/Library/ProcMemInit/Chip/Include/CpuPciAccess.h
index df7bb8954d..6ace86975a 100644
--- a/Silicon/Intel/PurleySktPkg/Library/ProcMemInit/Chip/Include/CpuPciAccess.h
+++ b/Silicon/Intel/PurleySktPkg/Library/ProcMemInit/Chip/Include/CpuPciAccess.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleySktPkg/Library/ProcMemInit/Chip/Include/CpuPciAccessCommon.h b/Silicon/Intel/PurleySktPkg/Library/ProcMemInit/Chip/Include/CpuPciAccessCommon.h
index 2b8c367f5e..6638168d80 100644
--- a/Silicon/Intel/PurleySktPkg/Library/ProcMemInit/Chip/Include/CpuPciAccessCommon.h
+++ b/Silicon/Intel/PurleySktPkg/Library/ProcMemInit/Chip/Include/CpuPciAccessCommon.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleySktPkg/Override/IA32FamilyCpuPkg/IA32FamilyCpuPkg.dec b/Silicon/Intel/PurleySktPkg/Override/IA32FamilyCpuPkg/IA32FamilyCpuPkg.dec
index e773767a31..36a0c1ee89 100644
--- a/Silicon/Intel/PurleySktPkg/Override/IA32FamilyCpuPkg/IA32FamilyCpuPkg.dec
+++ b/Silicon/Intel/PurleySktPkg/Override/IA32FamilyCpuPkg/IA32FamilyCpuPkg.dec
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Silicon/Intel/PurleySktPkg/Override/IA32FamilyCpuPkg/Include/Library/CpuConfigLib.h b/Silicon/Intel/PurleySktPkg/Override/IA32FamilyCpuPkg/Include/Library/CpuConfigLib.h
index ef9ffb7fe2..7794c37640 100644
--- a/Silicon/Intel/PurleySktPkg/Override/IA32FamilyCpuPkg/Include/Library/CpuConfigLib.h
+++ b/Silicon/Intel/PurleySktPkg/Override/IA32FamilyCpuPkg/Include/Library/CpuConfigLib.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleySktPkg/Override/IA32FamilyCpuPkg/Include/Protocol/IntelCpuPcdsSetDone.h b/Silicon/Intel/PurleySktPkg/Override/IA32FamilyCpuPkg/Include/Protocol/IntelCpuPcdsSetDone.h
index 0bf7d0c2e0..e21cf0b679 100644
--- a/Silicon/Intel/PurleySktPkg/Override/IA32FamilyCpuPkg/Include/Protocol/IntelCpuPcdsSetDone.h
+++ b/Silicon/Intel/PurleySktPkg/Override/IA32FamilyCpuPkg/Include/Protocol/IntelCpuPcdsSetDone.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleySktPkg/SktCommonLib.dsc b/Silicon/Intel/PurleySktPkg/SktCommonLib.dsc
index e721adb7f9..531805306f 100644
--- a/Silicon/Intel/PurleySktPkg/SktCommonLib.dsc
+++ b/Silicon/Intel/PurleySktPkg/SktCommonLib.dsc
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Silicon/Intel/PurleySktPkg/SktDxeLib.dsc b/Silicon/Intel/PurleySktPkg/SktDxeLib.dsc
index 30a8f76f93..5d9352935d 100644
--- a/Silicon/Intel/PurleySktPkg/SktDxeLib.dsc
+++ b/Silicon/Intel/PurleySktPkg/SktDxeLib.dsc
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Silicon/Intel/PurleySktPkg/SktPeiLib.dsc b/Silicon/Intel/PurleySktPkg/SktPeiLib.dsc
index 08abd42ebd..3d8f2f8536 100644
--- a/Silicon/Intel/PurleySktPkg/SktPeiLib.dsc
+++ b/Silicon/Intel/PurleySktPkg/SktPeiLib.dsc
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Silicon/Intel/PurleySktPkg/SocketPkg.dec b/Silicon/Intel/PurleySktPkg/SocketPkg.dec
index e109e8763b..2ff937f5d8 100644
--- a/Silicon/Intel/PurleySktPkg/SocketPkg.dec
+++ b/Silicon/Intel/PurleySktPkg/SocketPkg.dec
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
--
2.21.0.windows.1
^ permalink raw reply related [flat|nested] 63+ messages in thread* Re: [edk2-devel] [[edk2-platforms][PATCH V2] 26/30] Silicon/Intel/PurleySktPkg: Replace BSD License with BSD+Patent License
2019-05-15 23:10 ` [[edk2-platforms][PATCH V2] 26/30] Silicon/Intel/PurleySktPkg: " Michael D Kinney
@ 2019-05-17 19:59 ` Oram, Isaac W
0 siblings, 0 replies; 63+ messages in thread
From: Oram, Isaac W @ 2019-05-17 19:59 UTC (permalink / raw)
To: devel@edk2.groups.io, Kinney, Michael D; +Cc: Gillispie, Thad, Bu, Daocheng
Reviewed-by: Isaac W Oram<Isaac.w.oram@intel.com>
-----Original Message-----
From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Kinney, Michael D
Sent: Wednesday, May 15, 2019 4:10 PM
To: devel@edk2.groups.io
Cc: Gillispie, Thad <thad.gillispie@intel.com>; Bu, Daocheng <daocheng.bu@intel.com>; Oram, Isaac W <isaac.w.oram@intel.com>
Subject: [edk2-devel] [[edk2-platforms][PATCH V2] 26/30] Silicon/Intel/PurleySktPkg: Replace BSD License with BSD+Patent License
https://bugzilla.tianocore.org/show_bug.cgi?id=1373
Replace BSD 2-Clause License with BSD+Patent License. This change is based on the following emails:
https://lists.01.org/pipermail/edk2-devel/2019-February/036260.html
https://lists.01.org/pipermail/edk2-devel/2018-October/030385.html
RFCs with detailed process for the license change:
V3: https://lists.01.org/pipermail/edk2-devel/2019-March/038116.html
V2: https://lists.01.org/pipermail/edk2-devel/2019-March/037669.html
V1: https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html
Cc: Thad Gillispie <thad.gillispie@intel.com>
Cc: Daocheng Bu <daocheng.bu@intel.com>
Cc: Isaac W Oram <isaac.w.oram@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
.../Intel/PurleySktPkg/Iio/Include/Protocol/IioSystem.h | 8 +-------
.../Intel/PurleySktPkg/Include/Guid/MemoryConfigData.h | 8 +-------
Silicon/Intel/PurleySktPkg/Include/Guid/MemoryMapData.h | 8 +-------
.../Intel/PurleySktPkg/Include/Guid/PartialMirrorGuid.h | 8 +-------
.../Intel/PurleySktPkg/Include/Guid/SmramMemoryReserve.h | 8 +-------
.../PurleySktPkg/Include/Guid/SocketCommonRcVariable.h | 8 +-------
.../Intel/PurleySktPkg/Include/Guid/SocketIioVariable.h | 8 +-------
.../PurleySktPkg/Include/Guid/SocketMemoryVariable.h | 8 +-------
.../PurleySktPkg/Include/Guid/SocketMpLinkVariable.h | 8 +-------
.../PurleySktPkg/Include/Guid/SocketPciResourceData.h | 8 +-------
.../Include/Guid/SocketPowermanagementVariable.h | 8 +-------
.../Include/Guid/SocketProcessorCoreVariable.h | 8 +-------
Silicon/Intel/PurleySktPkg/Include/Guid/SocketVariable.h | 8 +-------
Silicon/Intel/PurleySktPkg/Include/Library/CpuPpmLib.h | 8 +-------
Silicon/Intel/PurleySktPkg/Include/Protocol/IioUds.h | 8 +-------
Silicon/Intel/PurleySktPkg/Include/Protocol/PciCallback.h | 8 +------- Silicon/Intel/PurleySktPkg/Include/SocketConfiguration.h | 8 +------- Silicon/Intel/PurleySktPkg/Include/UncoreCommonIncludes.h | 8 +-------
.../Library/CsrToPcieLib/CpuCsrAccessDefine.h | 8 +-------
.../PurleySktPkg/Library/CsrToPcieLib/CsrToPcieDxeLib.inf | 8 +-------
.../PurleySktPkg/Library/CsrToPcieLib/CsrToPcieLib.c | 8 +-------
.../PurleySktPkg/Library/CsrToPcieLib/CsrToPciePeiLib.inf | 8 +------- .../PurleySktPkg/Library/PcieAddressLib/PcieAddressLib.c | 8 +-------
.../Library/PcieAddressLib/PcieAddressLib.inf | 8 +-------
.../Library/ProcMemInit/Chip/Common/CpuPciAccessCommon.c | 8 +------- .../Library/ProcMemInit/Chip/Include/CpuCsrAccessDefine.h | 8 +-------
.../Library/ProcMemInit/Chip/Include/CpuPciAccess.h | 8 +-------
.../Library/ProcMemInit/Chip/Include/CpuPciAccessCommon.h | 8 +-------
.../Override/IA32FamilyCpuPkg/IA32FamilyCpuPkg.dec | 8 +-------
.../IA32FamilyCpuPkg/Include/Library/CpuConfigLib.h | 8 +-------
.../Include/Protocol/IntelCpuPcdsSetDone.h | 8 +-------
Silicon/Intel/PurleySktPkg/SktCommonLib.dsc | 8 +-------
Silicon/Intel/PurleySktPkg/SktDxeLib.dsc | 8 +-------
Silicon/Intel/PurleySktPkg/SktPeiLib.dsc | 8 +-------
Silicon/Intel/PurleySktPkg/SocketPkg.dec | 8 +-------
35 files changed, 35 insertions(+), 245 deletions(-)
diff --git a/Silicon/Intel/PurleySktPkg/Iio/Include/Protocol/IioSystem.h b/Silicon/Intel/PurleySktPkg/Iio/Include/Protocol/IioSystem.h
index b4a2639219..0a8d3064c3 100644
--- a/Silicon/Intel/PurleySktPkg/Iio/Include/Protocol/IioSystem.h
+++ b/Silicon/Intel/PurleySktPkg/Iio/Include/Protocol/IioSystem.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleySktPkg/Include/Guid/MemoryConfigData.h b/Silicon/Intel/PurleySktPkg/Include/Guid/MemoryConfigData.h
index 5102ba7a8f..f7c57af8a5 100644
--- a/Silicon/Intel/PurleySktPkg/Include/Guid/MemoryConfigData.h
+++ b/Silicon/Intel/PurleySktPkg/Include/Guid/MemoryConfigData.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleySktPkg/Include/Guid/MemoryMapData.h b/Silicon/Intel/PurleySktPkg/Include/Guid/MemoryMapData.h
index b5cc47bbf5..dbc8529c46 100644
--- a/Silicon/Intel/PurleySktPkg/Include/Guid/MemoryMapData.h
+++ b/Silicon/Intel/PurleySktPkg/Include/Guid/MemoryMapData.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleySktPkg/Include/Guid/PartialMirrorGuid.h b/Silicon/Intel/PurleySktPkg/Include/Guid/PartialMirrorGuid.h
index d8e770fba6..05ecf5f15b 100644
--- a/Silicon/Intel/PurleySktPkg/Include/Guid/PartialMirrorGuid.h
+++ b/Silicon/Intel/PurleySktPkg/Include/Guid/PartialMirrorGuid.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleySktPkg/Include/Guid/SmramMemoryReserve.h b/Silicon/Intel/PurleySktPkg/Include/Guid/SmramMemoryReserve.h
index 26b708279f..46e8198f00 100644
--- a/Silicon/Intel/PurleySktPkg/Include/Guid/SmramMemoryReserve.h
+++ b/Silicon/Intel/PurleySktPkg/Include/Guid/SmramMemoryReserve.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleySktPkg/Include/Guid/SocketCommonRcVariable.h b/Silicon/Intel/PurleySktPkg/Include/Guid/SocketCommonRcVariable.h
index b2472e14bd..f3d2be733c 100644
--- a/Silicon/Intel/PurleySktPkg/Include/Guid/SocketCommonRcVariable.h
+++ b/Silicon/Intel/PurleySktPkg/Include/Guid/SocketCommonRcVariable.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleySktPkg/Include/Guid/SocketIioVariable.h b/Silicon/Intel/PurleySktPkg/Include/Guid/SocketIioVariable.h
index 2a47851f17..9bdfe35942 100644
--- a/Silicon/Intel/PurleySktPkg/Include/Guid/SocketIioVariable.h
+++ b/Silicon/Intel/PurleySktPkg/Include/Guid/SocketIioVariable.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleySktPkg/Include/Guid/SocketMemoryVariable.h b/Silicon/Intel/PurleySktPkg/Include/Guid/SocketMemoryVariable.h
index ef0b5a300a..1c58598d92 100644
--- a/Silicon/Intel/PurleySktPkg/Include/Guid/SocketMemoryVariable.h
+++ b/Silicon/Intel/PurleySktPkg/Include/Guid/SocketMemoryVariable.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleySktPkg/Include/Guid/SocketMpLinkVariable.h b/Silicon/Intel/PurleySktPkg/Include/Guid/SocketMpLinkVariable.h
index 3f51792d8b..2a0c1a9694 100644
--- a/Silicon/Intel/PurleySktPkg/Include/Guid/SocketMpLinkVariable.h
+++ b/Silicon/Intel/PurleySktPkg/Include/Guid/SocketMpLinkVariable.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleySktPkg/Include/Guid/SocketPciResourceData.h b/Silicon/Intel/PurleySktPkg/Include/Guid/SocketPciResourceData.h
index 7aa2ad7fc8..5c8ca9fd74 100644
--- a/Silicon/Intel/PurleySktPkg/Include/Guid/SocketPciResourceData.h
+++ b/Silicon/Intel/PurleySktPkg/Include/Guid/SocketPciResourceData.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleySktPkg/Include/Guid/SocketPowermanagementVariable.h b/Silicon/Intel/PurleySktPkg/Include/Guid/SocketPowermanagementVariable.h
index a6724ef0c3..9de3b40e2e 100644
--- a/Silicon/Intel/PurleySktPkg/Include/Guid/SocketPowermanagementVariable.h
+++ b/Silicon/Intel/PurleySktPkg/Include/Guid/SocketPowermanagementVaria
+++ ble.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleySktPkg/Include/Guid/SocketProcessorCoreVariable.h b/Silicon/Intel/PurleySktPkg/Include/Guid/SocketProcessorCoreVariable.h
index 37c614bca2..78e7043874 100644
--- a/Silicon/Intel/PurleySktPkg/Include/Guid/SocketProcessorCoreVariable.h
+++ b/Silicon/Intel/PurleySktPkg/Include/Guid/SocketProcessorCoreVariabl
+++ e.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleySktPkg/Include/Guid/SocketVariable.h b/Silicon/Intel/PurleySktPkg/Include/Guid/SocketVariable.h
index ac6c4dc0aa..391bfb4e1e 100644
--- a/Silicon/Intel/PurleySktPkg/Include/Guid/SocketVariable.h
+++ b/Silicon/Intel/PurleySktPkg/Include/Guid/SocketVariable.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleySktPkg/Include/Library/CpuPpmLib.h b/Silicon/Intel/PurleySktPkg/Include/Library/CpuPpmLib.h
index 22f312f80b..0f18d41bda 100644
--- a/Silicon/Intel/PurleySktPkg/Include/Library/CpuPpmLib.h
+++ b/Silicon/Intel/PurleySktPkg/Include/Library/CpuPpmLib.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleySktPkg/Include/Protocol/IioUds.h b/Silicon/Intel/PurleySktPkg/Include/Protocol/IioUds.h
index 10834e0cdf..8fbafa710a 100644
--- a/Silicon/Intel/PurleySktPkg/Include/Protocol/IioUds.h
+++ b/Silicon/Intel/PurleySktPkg/Include/Protocol/IioUds.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleySktPkg/Include/Protocol/PciCallback.h b/Silicon/Intel/PurleySktPkg/Include/Protocol/PciCallback.h
index 9b8bfecc45..fd668737bd 100644
--- a/Silicon/Intel/PurleySktPkg/Include/Protocol/PciCallback.h
+++ b/Silicon/Intel/PurleySktPkg/Include/Protocol/PciCallback.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleySktPkg/Include/SocketConfiguration.h b/Silicon/Intel/PurleySktPkg/Include/SocketConfiguration.h
index aaf78d7084..ea1f5e3827 100644
--- a/Silicon/Intel/PurleySktPkg/Include/SocketConfiguration.h
+++ b/Silicon/Intel/PurleySktPkg/Include/SocketConfiguration.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleySktPkg/Include/UncoreCommonIncludes.h b/Silicon/Intel/PurleySktPkg/Include/UncoreCommonIncludes.h
index f6a0aa5743..233d57d7ad 100644
--- a/Silicon/Intel/PurleySktPkg/Include/UncoreCommonIncludes.h
+++ b/Silicon/Intel/PurleySktPkg/Include/UncoreCommonIncludes.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleySktPkg/Library/CsrToPcieLib/CpuCsrAccessDefine.h b/Silicon/Intel/PurleySktPkg/Library/CsrToPcieLib/CpuCsrAccessDefine.h
index e40505d880..cd0ee66d4a 100644
--- a/Silicon/Intel/PurleySktPkg/Library/CsrToPcieLib/CpuCsrAccessDefine.h
+++ b/Silicon/Intel/PurleySktPkg/Library/CsrToPcieLib/CpuCsrAccessDefine
+++ .h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleySktPkg/Library/CsrToPcieLib/CsrToPcieDxeLib.inf b/Silicon/Intel/PurleySktPkg/Library/CsrToPcieLib/CsrToPcieDxeLib.inf
index ccdf763bef..acdd279a09 100644
--- a/Silicon/Intel/PurleySktPkg/Library/CsrToPcieLib/CsrToPcieDxeLib.inf
+++ b/Silicon/Intel/PurleySktPkg/Library/CsrToPcieLib/CsrToPcieDxeLib.in
+++ f
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at -# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Silicon/Intel/PurleySktPkg/Library/CsrToPcieLib/CsrToPcieLib.c b/Silicon/Intel/PurleySktPkg/Library/CsrToPcieLib/CsrToPcieLib.c
index d6b98f2aec..feeebebf70 100644
--- a/Silicon/Intel/PurleySktPkg/Library/CsrToPcieLib/CsrToPcieLib.c
+++ b/Silicon/Intel/PurleySktPkg/Library/CsrToPcieLib/CsrToPcieLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleySktPkg/Library/CsrToPcieLib/CsrToPciePeiLib.inf b/Silicon/Intel/PurleySktPkg/Library/CsrToPcieLib/CsrToPciePeiLib.inf
index 27616a22f4..c16eaf7c42 100644
--- a/Silicon/Intel/PurleySktPkg/Library/CsrToPcieLib/CsrToPciePeiLib.inf
+++ b/Silicon/Intel/PurleySktPkg/Library/CsrToPcieLib/CsrToPciePeiLib.in
+++ f
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at -# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Silicon/Intel/PurleySktPkg/Library/PcieAddressLib/PcieAddressLib.c b/Silicon/Intel/PurleySktPkg/Library/PcieAddressLib/PcieAddressLib.c
index 456e5cf3ab..e0087f0eda 100644
--- a/Silicon/Intel/PurleySktPkg/Library/PcieAddressLib/PcieAddressLib.c
+++ b/Silicon/Intel/PurleySktPkg/Library/PcieAddressLib/PcieAddressLib.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleySktPkg/Library/PcieAddressLib/PcieAddressLib.inf b/Silicon/Intel/PurleySktPkg/Library/PcieAddressLib/PcieAddressLib.inf
index 157e61c860..3661cb8225 100644
--- a/Silicon/Intel/PurleySktPkg/Library/PcieAddressLib/PcieAddressLib.inf
+++ b/Silicon/Intel/PurleySktPkg/Library/PcieAddressLib/PcieAddressLib.i
+++ nf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at -# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Silicon/Intel/PurleySktPkg/Library/ProcMemInit/Chip/Common/CpuPciAccessCommon.c b/Silicon/Intel/PurleySktPkg/Library/ProcMemInit/Chip/Common/CpuPciAccessCommon.c
index 78e648da7b..292dbec37b 100644
--- a/Silicon/Intel/PurleySktPkg/Library/ProcMemInit/Chip/Common/CpuPciAccessCommon.c
+++ b/Silicon/Intel/PurleySktPkg/Library/ProcMemInit/Chip/Common/CpuPciA
+++ ccessCommon.c
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleySktPkg/Library/ProcMemInit/Chip/Include/CpuCsrAccessDefine.h b/Silicon/Intel/PurleySktPkg/Library/ProcMemInit/Chip/Include/CpuCsrAccessDefine.h
index 484949006f..bee66dbed9 100644
--- a/Silicon/Intel/PurleySktPkg/Library/ProcMemInit/Chip/Include/CpuCsrAccessDefine.h
+++ b/Silicon/Intel/PurleySktPkg/Library/ProcMemInit/Chip/Include/CpuCsr
+++ AccessDefine.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleySktPkg/Library/ProcMemInit/Chip/Include/CpuPciAccess.h b/Silicon/Intel/PurleySktPkg/Library/ProcMemInit/Chip/Include/CpuPciAccess.h
index df7bb8954d..6ace86975a 100644
--- a/Silicon/Intel/PurleySktPkg/Library/ProcMemInit/Chip/Include/CpuPciAccess.h
+++ b/Silicon/Intel/PurleySktPkg/Library/ProcMemInit/Chip/Include/CpuPci
+++ Access.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleySktPkg/Library/ProcMemInit/Chip/Include/CpuPciAccessCommon.h b/Silicon/Intel/PurleySktPkg/Library/ProcMemInit/Chip/Include/CpuPciAccessCommon.h
index 2b8c367f5e..6638168d80 100644
--- a/Silicon/Intel/PurleySktPkg/Library/ProcMemInit/Chip/Include/CpuPciAccessCommon.h
+++ b/Silicon/Intel/PurleySktPkg/Library/ProcMemInit/Chip/Include/CpuPci
+++ AccessCommon.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleySktPkg/Override/IA32FamilyCpuPkg/IA32FamilyCpuPkg.dec b/Silicon/Intel/PurleySktPkg/Override/IA32FamilyCpuPkg/IA32FamilyCpuPkg.dec
index e773767a31..36a0c1ee89 100644
--- a/Silicon/Intel/PurleySktPkg/Override/IA32FamilyCpuPkg/IA32FamilyCpuPkg.dec
+++ b/Silicon/Intel/PurleySktPkg/Override/IA32FamilyCpuPkg/IA32FamilyCpu
+++ Pkg.dec
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at -# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Silicon/Intel/PurleySktPkg/Override/IA32FamilyCpuPkg/Include/Library/CpuConfigLib.h b/Silicon/Intel/PurleySktPkg/Override/IA32FamilyCpuPkg/Include/Library/CpuConfigLib.h
index ef9ffb7fe2..7794c37640 100644
--- a/Silicon/Intel/PurleySktPkg/Override/IA32FamilyCpuPkg/Include/Library/CpuConfigLib.h
+++ b/Silicon/Intel/PurleySktPkg/Override/IA32FamilyCpuPkg/Include/Libra
+++ ry/CpuConfigLib.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleySktPkg/Override/IA32FamilyCpuPkg/Include/Protocol/IntelCpuPcdsSetDone.h b/Silicon/Intel/PurleySktPkg/Override/IA32FamilyCpuPkg/Include/Protocol/IntelCpuPcdsSetDone.h
index 0bf7d0c2e0..e21cf0b679 100644
--- a/Silicon/Intel/PurleySktPkg/Override/IA32FamilyCpuPkg/Include/Protocol/IntelCpuPcdsSetDone.h
+++ b/Silicon/Intel/PurleySktPkg/Override/IA32FamilyCpuPkg/Include/Proto
+++ col/IntelCpuPcdsSetDone.h
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, 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 that accompanies this distribution.
-The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Intel/PurleySktPkg/SktCommonLib.dsc b/Silicon/Intel/PurleySktPkg/SktCommonLib.dsc
index e721adb7f9..531805306f 100644
--- a/Silicon/Intel/PurleySktPkg/SktCommonLib.dsc
+++ b/Silicon/Intel/PurleySktPkg/SktCommonLib.dsc
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at -# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Silicon/Intel/PurleySktPkg/SktDxeLib.dsc b/Silicon/Intel/PurleySktPkg/SktDxeLib.dsc
index 30a8f76f93..5d9352935d 100644
--- a/Silicon/Intel/PurleySktPkg/SktDxeLib.dsc
+++ b/Silicon/Intel/PurleySktPkg/SktDxeLib.dsc
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at -# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Silicon/Intel/PurleySktPkg/SktPeiLib.dsc b/Silicon/Intel/PurleySktPkg/SktPeiLib.dsc
index 08abd42ebd..3d8f2f8536 100644
--- a/Silicon/Intel/PurleySktPkg/SktPeiLib.dsc
+++ b/Silicon/Intel/PurleySktPkg/SktPeiLib.dsc
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at -# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
diff --git a/Silicon/Intel/PurleySktPkg/SocketPkg.dec b/Silicon/Intel/PurleySktPkg/SocketPkg.dec
index e109e8763b..2ff937f5d8 100644
--- a/Silicon/Intel/PurleySktPkg/SocketPkg.dec
+++ b/Silicon/Intel/PurleySktPkg/SocketPkg.dec
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, 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 distribution.
-# The full text of the license may be found at -# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
###
--
2.21.0.windows.1
^ permalink raw reply related [flat|nested] 63+ messages in thread
* [[edk2-platforms][PATCH V2] 27/30] Silicon/Marvell: Replace BSD License with BSD+Patent License
2019-05-15 23:09 [[edk2-platforms][PATCH V2] 00/30] Change edk2-platforms/master to BSD+Patent License Michael D Kinney
` (25 preceding siblings ...)
2019-05-15 23:10 ` [[edk2-platforms][PATCH V2] 26/30] Silicon/Intel/PurleySktPkg: " Michael D Kinney
@ 2019-05-15 23:10 ` Michael D Kinney
2019-05-17 10:50 ` Leif Lindholm
2019-05-15 23:10 ` [[edk2-platforms][PATCH V2] 28/30] Silicon/NXP: " Michael D Kinney
` (3 subsequent siblings)
30 siblings, 1 reply; 63+ messages in thread
From: Michael D Kinney @ 2019-05-15 23:10 UTC (permalink / raw)
To: devel; +Cc: Leif Lindholm, Ard Biesheuvel
https://bugzilla.tianocore.org/show_bug.cgi?id=1373
Replace BSD 2-Clause License with BSD+Patent License. This change is
based on the following emails:
https://lists.01.org/pipermail/edk2-devel/2019-February/036260.html
https://lists.01.org/pipermail/edk2-devel/2018-October/030385.html
RFCs with detailed process for the license change:
V3: https://lists.01.org/pipermail/edk2-devel/2019-March/038116.html
V2: https://lists.01.org/pipermail/edk2-devel/2019-March/037669.html
V1: https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
| 8 +-------
Silicon/Marvell/Armada7k8k/AcpiTables/Armada70x0Db.inf | 8 +-------
.../Marvell/Armada7k8k/AcpiTables/Armada70x0Db/Dsdt.asl | 8 +-------
Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0Db.inf | 8 +-------
.../Marvell/Armada7k8k/AcpiTables/Armada80x0Db/Dsdt.asl | 8 +-------
Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0McBin.inf | 8 +-------
.../Armada7k8k/AcpiTables/Armada80x0McBin/Dsdt.asl | 8 +-------
Silicon/Marvell/Armada7k8k/AcpiTables/Fadt.aslc | 8 +-------
Silicon/Marvell/Armada7k8k/AcpiTables/Gtdt.aslc | 8 +-------
Silicon/Marvell/Armada7k8k/AcpiTables/IcuInterrupts.h | 8 +-------
Silicon/Marvell/Armada7k8k/AcpiTables/Madt.aslc | 8 +-------
Silicon/Marvell/Armada7k8k/AcpiTables/Pptt.aslc | 8 +-------
Silicon/Marvell/Armada7k8k/AcpiTables/Spcr.aslc | 8 +-------
Silicon/Marvell/Armada7k8k/Armada7k8k.fdf | 8 +-------
Silicon/Marvell/Armada7k8k/Armada7k8kCapsule.fdf | 8 +-------
Silicon/Marvell/Armada7k8k/DeviceTree/Armada70x0Db.inf | 8 +-------
Silicon/Marvell/Armada7k8k/DeviceTree/Armada80x0Db.inf | 8 +-------
Silicon/Marvell/Armada7k8k/DeviceTree/Armada80x0McBin.inf | 8 +-------
.../Drivers/Armada7k8kRngDxe/Armada7k8kRngDxe.c | 8 +-------
.../Drivers/Armada7k8kRngDxe/Armada7k8kRngDxe.inf | 8 +-------
.../Marvell/Armada7k8k/Drivers/PlatInitDxe/PlatInitDxe.c | 8 +-------
.../Armada7k8k/Drivers/PlatInitDxe/PlatInitDxe.inf | 8 +-------
.../PlatformFlashAccessLib/PlatformFlashAccessLib.c | 8 +-------
.../PlatformFlashAccessLib/PlatformFlashAccessLib.inf | 8 +-------
.../SystemFirmwareDescriptor.aslc | 8 +-------
.../SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf | 8 +-------
.../SystemFirmwareDescriptorPei.c | 8 +-------
.../SystemFirmwareUpdateConfig.ini | 8 +-------
.../Library/Armada7k8kLib/AArch64/ArmPlatformHelper.S | 5 +----
.../Library/Armada7k8kLib/ARM/ArmPlatformHelper.S | 5 +----
.../Armada7k8k/Library/Armada7k8kLib/Armada7k8kLib.c | 8 +-------
.../Armada7k8kMemoryInitPeiLib.c | 8 +-------
.../Armada7k8kMemoryInitPeiLib.inf | 8 +-------
.../Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescLib.c | 8 +-------
.../Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescLib.h | 8 +-------
.../Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescLib.inf | 8 +-------
.../Library/RealTimeClockLib/RealTimeClockLib.c | 8 +-------
.../Library/RealTimeClockLib/RealTimeClockLib.inf | 7 +------
Silicon/Marvell/Drivers/Gpio/MvGpioDxe/MvGpioDxe.c | 8 +-------
Silicon/Marvell/Drivers/Gpio/MvGpioDxe/MvGpioDxe.h | 8 +-------
Silicon/Marvell/Drivers/Gpio/MvGpioDxe/MvGpioDxe.inf | 8 +-------
Silicon/Marvell/Drivers/Gpio/MvPca95xxDxe/MvPca95xxDxe.c | 8 +-------
Silicon/Marvell/Drivers/Gpio/MvPca95xxDxe/MvPca95xxDxe.h | 8 +-------
.../Marvell/Drivers/Gpio/MvPca95xxDxe/MvPca95xxDxe.inf | 8 +-------
Silicon/Marvell/Drivers/SdMmc/XenonDxe/XenonDxe.inf | 7 +------
Silicon/Marvell/Drivers/SdMmc/XenonDxe/XenonPciHci.c | 8 +-------
Silicon/Marvell/Drivers/SdMmc/XenonDxe/XenonPciHci.h | 8 +-------
Silicon/Marvell/Drivers/Spi/MvFvbDxe/MvFvbDxe.c | 8 +-------
Silicon/Marvell/Drivers/Spi/MvFvbDxe/MvFvbDxe.h | 8 +-------
Silicon/Marvell/Include/IndustryStandard/MvSmc.h | 8 +-------
Silicon/Marvell/Include/Library/ArmadaBoardDescLib.h | 8 +-------
Silicon/Marvell/Include/Library/ArmadaIcuLib.h | 8 +-------
Silicon/Marvell/Include/Library/ArmadaSoCDescLib.h | 8 +-------
Silicon/Marvell/Include/Library/MvGpioLib.h | 8 +-------
Silicon/Marvell/Include/Library/NonDiscoverableInitLib.h | 8 +-------
Silicon/Marvell/Include/Protocol/MvI2c.h | 8 +-------
Silicon/Marvell/Library/IcuLib/IcuLib.c | 8 +-------
Silicon/Marvell/Library/IcuLib/IcuLib.h | 8 +-------
Silicon/Marvell/Library/IcuLib/IcuLib.inf | 8 +-------
Silicon/Marvell/Library/MvGpioLib/MvGpioLib.c | 8 +-------
Silicon/Marvell/Library/MvGpioLib/MvGpioLib.inf | 8 +-------
61 files changed, 61 insertions(+), 419 deletions(-)
--git a/Silicon/Marvell/Armada7k8k/AcpiTables/AcpiHeader.h b/Silicon/Marvell/Armada7k8k/AcpiTables/AcpiHeader.h
index f5ebd27d02..90ab607845 100644
--- a/Silicon/Marvell/Armada7k8k/AcpiTables/AcpiHeader.h
+++ b/Silicon/Marvell/Armada7k8k/AcpiTables/AcpiHeader.h
@@ -5,13 +5,7 @@
Copyright (c) 2017, Linaro Ltd. All rights reserved.<BR>
Copyright (C) 2018, Marvell International Ltd. and its affiliates.<BR>
- This program and the accompanying materials
- are licensed and made available under the terms and conditions of the BSD License
- which accompanies this distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Marvell/Armada7k8k/AcpiTables/Armada70x0Db.inf b/Silicon/Marvell/Armada7k8k/AcpiTables/Armada70x0Db.inf
index 659c333381..926f3667cc 100644
--- a/Silicon/Marvell/Armada7k8k/AcpiTables/Armada70x0Db.inf
+++ b/Silicon/Marvell/Armada7k8k/AcpiTables/Armada70x0Db.inf
@@ -6,13 +6,7 @@
# Copyright (c) 2018, Linaro, Ltd. All rights reserved.<BR>
# Copyright (C) 2018, Marvell International Ltd. and its affiliates.<BR>
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Marvell/Armada7k8k/AcpiTables/Armada70x0Db/Dsdt.asl b/Silicon/Marvell/Armada7k8k/AcpiTables/Armada70x0Db/Dsdt.asl
index 621b688818..20369c5f72 100644
--- a/Silicon/Marvell/Armada7k8k/AcpiTables/Armada70x0Db/Dsdt.asl
+++ b/Silicon/Marvell/Armada7k8k/AcpiTables/Armada70x0Db/Dsdt.asl
@@ -5,13 +5,7 @@
Copyright (c) 2018, Linaro Ltd. All rights reserved.<BR>
Copyright (C) 2018, Marvell International Ltd. and its affiliates.<BR>
- This program and the accompanying materials
- are licensed and made available under the terms and conditions of the BSD License
- which accompanies this distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0Db.inf b/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0Db.inf
index 35a679b884..8367f07d96 100644
--- a/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0Db.inf
+++ b/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0Db.inf
@@ -6,13 +6,7 @@
# Copyright (c) 2018, Linaro, Ltd. All rights reserved.<BR>
# Copyright (C) 2018, Marvell International Ltd. and its affiliates.<BR>
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0Db/Dsdt.asl b/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0Db/Dsdt.asl
index 7c659497bd..822a8e4878 100644
--- a/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0Db/Dsdt.asl
+++ b/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0Db/Dsdt.asl
@@ -5,13 +5,7 @@
Copyright (c) 2018, Linaro Ltd. All rights reserved.<BR>
Copyright (C) 2018, Marvell International Ltd. and its affiliates.<BR>
- This program and the accompanying materials
- are licensed and made available under the terms and conditions of the BSD License
- which accompanies this distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0McBin.inf b/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0McBin.inf
index 9e52281fca..e1416f07ab 100644
--- a/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0McBin.inf
+++ b/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0McBin.inf
@@ -6,13 +6,7 @@
# Copyright (c) 2018, Linaro, Ltd. All rights reserved.<BR>
# Copyright (C) 2018, Marvell International Ltd. and its affiliates.<BR>
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0McBin/Dsdt.asl b/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0McBin/Dsdt.asl
index 87cb93a80e..638698ace9 100644
--- a/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0McBin/Dsdt.asl
+++ b/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0McBin/Dsdt.asl
@@ -4,13 +4,7 @@
Copyright (c) 2018, Linaro Ltd. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Marvell/Armada7k8k/AcpiTables/Fadt.aslc b/Silicon/Marvell/Armada7k8k/AcpiTables/Fadt.aslc
index de88210e40..f3656dd3a5 100644
--- a/Silicon/Marvell/Armada7k8k/AcpiTables/Fadt.aslc
+++ b/Silicon/Marvell/Armada7k8k/AcpiTables/Fadt.aslc
@@ -5,13 +5,7 @@
Copyright (c) 2017, Linaro Ltd. All rights reserved.<BR>
Copyright (C) 2018, Marvell International Ltd. and its affiliates.<BR>
- This program and the accompanying materials
- are licensed and made available under the terms and conditions of the BSD License
- which accompanies this distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Marvell/Armada7k8k/AcpiTables/Gtdt.aslc b/Silicon/Marvell/Armada7k8k/AcpiTables/Gtdt.aslc
index 16a8806f86..a08d0b9ccf 100644
--- a/Silicon/Marvell/Armada7k8k/AcpiTables/Gtdt.aslc
+++ b/Silicon/Marvell/Armada7k8k/AcpiTables/Gtdt.aslc
@@ -5,13 +5,7 @@
Copyright (c) 2017, Linaro Ltd. All rights reserved.<BR>
Copyright (C) 2018, Marvell International Ltd. and its affiliates.<BR>
- This program and the accompanying materials
- are licensed and made available under the terms and conditions of the BSD License
- which accompanies this distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Marvell/Armada7k8k/AcpiTables/IcuInterrupts.h b/Silicon/Marvell/Armada7k8k/AcpiTables/IcuInterrupts.h
index 5746ad477b..dd33cb5e7b 100644
--- a/Silicon/Marvell/Armada7k8k/AcpiTables/IcuInterrupts.h
+++ b/Silicon/Marvell/Armada7k8k/AcpiTables/IcuInterrupts.h
@@ -2,13 +2,7 @@
Copyright (C) 2018, Marvell International Ltd. and its affiliates.
- This program and the accompanying materials are licensed and made available
- under the terms and conditions of the BSD License which accompanies this
- distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
Glossary - abbreviations used in Marvell SampleAtReset library implementation:
ICU - Interrupt Consolidation Unit
diff --git a/Silicon/Marvell/Armada7k8k/AcpiTables/Madt.aslc b/Silicon/Marvell/Armada7k8k/AcpiTables/Madt.aslc
index 7ab927d165..5b553cd923 100644
--- a/Silicon/Marvell/Armada7k8k/AcpiTables/Madt.aslc
+++ b/Silicon/Marvell/Armada7k8k/AcpiTables/Madt.aslc
@@ -5,13 +5,7 @@
Copyright (c) 2017, Linaro Ltd. All rights reserved.<BR>
Copyright (C) 2018, Marvell International Ltd. and its affiliates.<BR>
- This program and the accompanying materials
- are licensed and made available under the terms and conditions of the BSD License
- which accompanies this distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Marvell/Armada7k8k/AcpiTables/Pptt.aslc b/Silicon/Marvell/Armada7k8k/AcpiTables/Pptt.aslc
index 8de29bd383..e03bfcd621 100644
--- a/Silicon/Marvell/Armada7k8k/AcpiTables/Pptt.aslc
+++ b/Silicon/Marvell/Armada7k8k/AcpiTables/Pptt.aslc
@@ -3,13 +3,7 @@
Copyright (c) 2018, Linaro Ltd. All rights reserved.<BR>
Copyright (c) 2018, Marvell International Ltd. 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
- distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Marvell/Armada7k8k/AcpiTables/Spcr.aslc b/Silicon/Marvell/Armada7k8k/AcpiTables/Spcr.aslc
index 1c7c8424c0..438cf7880e 100644
--- a/Silicon/Marvell/Armada7k8k/AcpiTables/Spcr.aslc
+++ b/Silicon/Marvell/Armada7k8k/AcpiTables/Spcr.aslc
@@ -4,13 +4,7 @@
Copyright (c) 2017, Linaro Limited. All rights reserved.
Copyright (C) 2018, Marvell International Ltd. and its affiliates.
- This program and the accompanying materials
- are licensed and made available under the terms and conditions of the BSD License
- which accompanies this distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
Based on the files under ArmPlatformPkg/ArmJunoPkg/AcpiTables/
diff --git a/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf b/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
index 8a050ef987..d2bbdedcfa 100644
--- a/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
+++ b/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
@@ -1,13 +1,7 @@
#
# Copyright (C) Marvell International Ltd. and its affiliates
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
################################################################################
diff --git a/Silicon/Marvell/Armada7k8k/Armada7k8kCapsule.fdf b/Silicon/Marvell/Armada7k8k/Armada7k8kCapsule.fdf
index 1ca6cddc91..be717bc3cc 100644
--- a/Silicon/Marvell/Armada7k8k/Armada7k8kCapsule.fdf
+++ b/Silicon/Marvell/Armada7k8k/Armada7k8kCapsule.fdf
@@ -1,13 +1,7 @@
#
# Copyright (C) Marvell International Ltd. and its affiliates
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
[FD.Armada_Capsule]
diff --git a/Silicon/Marvell/Armada7k8k/DeviceTree/Armada70x0Db.inf b/Silicon/Marvell/Armada7k8k/DeviceTree/Armada70x0Db.inf
index 1f2d9ea170..b533578a89 100644
--- a/Silicon/Marvell/Armada7k8k/DeviceTree/Armada70x0Db.inf
+++ b/Silicon/Marvell/Armada7k8k/DeviceTree/Armada70x0Db.inf
@@ -4,13 +4,7 @@
#
# Copyright (c) 2018, Marvell International Ltd. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Marvell/Armada7k8k/DeviceTree/Armada80x0Db.inf b/Silicon/Marvell/Armada7k8k/DeviceTree/Armada80x0Db.inf
index e4dd41cac3..378fad240b 100644
--- a/Silicon/Marvell/Armada7k8k/DeviceTree/Armada80x0Db.inf
+++ b/Silicon/Marvell/Armada7k8k/DeviceTree/Armada80x0Db.inf
@@ -4,13 +4,7 @@
#
# Copyright (c) 2018, Marvell International Ltd. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Marvell/Armada7k8k/DeviceTree/Armada80x0McBin.inf b/Silicon/Marvell/Armada7k8k/DeviceTree/Armada80x0McBin.inf
index 810a52b2ab..540e1a79f3 100644
--- a/Silicon/Marvell/Armada7k8k/DeviceTree/Armada80x0McBin.inf
+++ b/Silicon/Marvell/Armada7k8k/DeviceTree/Armada80x0McBin.inf
@@ -4,13 +4,7 @@
#
# Copyright (c) 2018, Marvell International Ltd. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Marvell/Armada7k8k/Drivers/Armada7k8kRngDxe/Armada7k8kRngDxe.c b/Silicon/Marvell/Armada7k8k/Drivers/Armada7k8kRngDxe/Armada7k8kRngDxe.c
index 2cbc3e4bfb..6fed663b14 100644
--- a/Silicon/Marvell/Armada7k8k/Drivers/Armada7k8kRngDxe/Armada7k8kRngDxe.c
+++ b/Silicon/Marvell/Armada7k8k/Drivers/Armada7k8kRngDxe/Armada7k8kRngDxe.c
@@ -4,13 +4,7 @@
Copyright (C) 2017, Linaro Ltd. 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
- distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT
- WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Marvell/Armada7k8k/Drivers/Armada7k8kRngDxe/Armada7k8kRngDxe.inf b/Silicon/Marvell/Armada7k8k/Drivers/Armada7k8kRngDxe/Armada7k8kRngDxe.inf
index e6561f3cb8..4c766eeff8 100644
--- a/Silicon/Marvell/Armada7k8k/Drivers/Armada7k8kRngDxe/Armada7k8kRngDxe.inf
+++ b/Silicon/Marvell/Armada7k8k/Drivers/Armada7k8kRngDxe/Armada7k8kRngDxe.inf
@@ -3,13 +3,7 @@
#
# Copyright (C) 2017, Linaro Ltd. 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
-# distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT
-# WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Marvell/Armada7k8k/Drivers/PlatInitDxe/PlatInitDxe.c b/Silicon/Marvell/Armada7k8k/Drivers/PlatInitDxe/PlatInitDxe.c
index 2629daa35f..758412c48c 100644
--- a/Silicon/Marvell/Armada7k8k/Drivers/PlatInitDxe/PlatInitDxe.c
+++ b/Silicon/Marvell/Armada7k8k/Drivers/PlatInitDxe/PlatInitDxe.c
@@ -2,13 +2,7 @@
Copyright (c) 2017, Linaro Limited. All rights reserved.
Copyright (c) 2017, Marvell International Ltd. and its affiliates
- This program and the accompanying materials
- are licensed and made available under the terms and conditions of the BSD License
- which accompanies this distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Marvell/Armada7k8k/Drivers/PlatInitDxe/PlatInitDxe.inf b/Silicon/Marvell/Armada7k8k/Drivers/PlatInitDxe/PlatInitDxe.inf
index df10526fae..9f4447afc2 100644
--- a/Silicon/Marvell/Armada7k8k/Drivers/PlatInitDxe/PlatInitDxe.inf
+++ b/Silicon/Marvell/Armada7k8k/Drivers/PlatInitDxe/PlatInitDxe.inf
@@ -2,13 +2,7 @@
# Copyright (c) 2017, Linaro Limited. All rights reserved.
# Copyright (c) 2017, Marvell International Ltd. and its affiliates
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#*/
diff --git a/Silicon/Marvell/Armada7k8k/Feature/Capsule/PlatformFlashAccessLib/PlatformFlashAccessLib.c b/Silicon/Marvell/Armada7k8k/Feature/Capsule/PlatformFlashAccessLib/PlatformFlashAccessLib.c
index faa3a13dd2..0529d7d96c 100644
--- a/Silicon/Marvell/Armada7k8k/Feature/Capsule/PlatformFlashAccessLib/PlatformFlashAccessLib.c
+++ b/Silicon/Marvell/Armada7k8k/Feature/Capsule/PlatformFlashAccessLib/PlatformFlashAccessLib.c
@@ -3,13 +3,7 @@
Copyright (c) 2018 Marvell International Ltd.<BR>
- This program and the accompanying materials
- are licensed and made available under the terms and conditions of the BSD License
- which accompanies this distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Marvell/Armada7k8k/Feature/Capsule/PlatformFlashAccessLib/PlatformFlashAccessLib.inf b/Silicon/Marvell/Armada7k8k/Feature/Capsule/PlatformFlashAccessLib/PlatformFlashAccessLib.inf
index fd94759900..69a7b71c51 100644
--- a/Silicon/Marvell/Armada7k8k/Feature/Capsule/PlatformFlashAccessLib/PlatformFlashAccessLib.inf
+++ b/Silicon/Marvell/Armada7k8k/Feature/Capsule/PlatformFlashAccessLib/PlatformFlashAccessLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, Linaro, Ltd. All rights reserved.<BR>
# Copyright (c) 2018, Marvell International, Ltd. 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 distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Marvell/Armada7k8k/Feature/Capsule/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc b/Silicon/Marvell/Armada7k8k/Feature/Capsule/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc
index fbccdc2d09..1499fd6999 100644
--- a/Silicon/Marvell/Armada7k8k/Feature/Capsule/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc
+++ b/Silicon/Marvell/Armada7k8k/Feature/Capsule/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc
@@ -5,13 +5,7 @@
Copyright (c) 2018, Linaro Limited. All rights reserved.
Copyright (c) 2016, 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Marvell/Armada7k8k/Feature/Capsule/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf b/Silicon/Marvell/Armada7k8k/Feature/Capsule/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf
index e6967b21f1..7bf1f2f41a 100644
--- a/Silicon/Marvell/Armada7k8k/Feature/Capsule/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf
+++ b/Silicon/Marvell/Armada7k8k/Feature/Capsule/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf
@@ -5,13 +5,7 @@
# Copyright (c) 2018, Linaro Limited. All rights reserved.
# Copyright (c) 2016, 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 distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Marvell/Armada7k8k/Feature/Capsule/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c b/Silicon/Marvell/Armada7k8k/Feature/Capsule/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c
index c55c4d98a5..1343fb1ffa 100644
--- a/Silicon/Marvell/Armada7k8k/Feature/Capsule/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c
+++ b/Silicon/Marvell/Armada7k8k/Feature/Capsule/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c
@@ -5,13 +5,7 @@
Copyright (c) 2018, Linaro Limited. All rights reserved.
Copyright (c) 2016, 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Marvell/Armada7k8k/Feature/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini b/Silicon/Marvell/Armada7k8k/Feature/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini
index fb0bd0bfa5..442060bfbc 100644
--- a/Silicon/Marvell/Armada7k8k/Feature/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini
+++ b/Silicon/Marvell/Armada7k8k/Feature/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, Marvell International Ltd.<BR>
# Copyright (c) 2016, 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 distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/AArch64/ArmPlatformHelper.S b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/AArch64/ArmPlatformHelper.S
index 72f8cfce77..6ae908a7b4 100644
--- a/Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/AArch64/ArmPlatformHelper.S
+++ b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/AArch64/ArmPlatformHelper.S
@@ -3,10 +3,7 @@
// Copyright (c) 2012-2013, ARM Limited. All rights reserved.
// Copyright (c) 2016, Marvell. All rights reserved.
//
-// This program and the accompanying materials are licensed and made available
-// under the terms and conditions of the BSD License which accompanies this
-// distribution. The full text of the license may be found at
-// http://opensource.org/licenses/bsd-license.php
+// SPDX-License-Identifier: BSD-2-Clause-Patent
//
// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED
diff --git a/Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/ARM/ArmPlatformHelper.S b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/ARM/ArmPlatformHelper.S
index 21459e50a7..4416163060 100644
--- a/Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/ARM/ArmPlatformHelper.S
+++ b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/ARM/ArmPlatformHelper.S
@@ -4,10 +4,7 @@
// Copyright (c) 2016, Marvell. All rights reserved.
// Copyright (c) 2017, Linaro Limited. All rights reserved.
//
-// This program and the accompanying materials are licensed and made available
-// under the terms and conditions of the BSD License which accompanies this
-// distribution. The full text of the license may be found at
-// http://opensource.org/licenses/bsd-license.php
+// SPDX-License-Identifier: BSD-2-Clause-Patent
//
// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED
diff --git a/Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/Armada7k8kLib.c b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/Armada7k8kLib.c
index 233f7b14a4..df838ff5ef 100644
--- a/Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/Armada7k8kLib.c
+++ b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/Armada7k8kLib.c
@@ -3,13 +3,7 @@
* Copyright (c) 2011-2012, ARM Limited. All rights reserved.
* Copyright (c) 2016, Marvell International Ltd. All rights reserved.
*
-* This program and the accompanying materials are licensed and made available
-* under the terms and conditions of the BSD License which accompanies this
-* distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Marvell/Armada7k8k/Library/Armada7k8kMemoryInitPeiLib/Armada7k8kMemoryInitPeiLib.c b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kMemoryInitPeiLib/Armada7k8kMemoryInitPeiLib.c
index 571f77e02f..0f953d4f04 100644
--- a/Silicon/Marvell/Armada7k8k/Library/Armada7k8kMemoryInitPeiLib/Armada7k8kMemoryInitPeiLib.c
+++ b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kMemoryInitPeiLib/Armada7k8kMemoryInitPeiLib.c
@@ -3,13 +3,7 @@
* Copyright (c) 2011-2015, ARM Limited. All rights reserved.
* Copyright (c) 2017, ARM Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Marvell/Armada7k8k/Library/Armada7k8kMemoryInitPeiLib/Armada7k8kMemoryInitPeiLib.inf b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kMemoryInitPeiLib/Armada7k8kMemoryInitPeiLib.inf
index 360de90180..f0b469ee55 100644
--- a/Silicon/Marvell/Armada7k8k/Library/Armada7k8kMemoryInitPeiLib/Armada7k8kMemoryInitPeiLib.inf
+++ b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kMemoryInitPeiLib/Armada7k8kMemoryInitPeiLib.inf
@@ -3,13 +3,7 @@
# Copyright (c) 2011-2014, ARM Ltd. All rights reserved.<BR>
# Copyright (c) 2017, Linaro Ltd. 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 distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
diff --git a/Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescLib.c b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescLib.c
index 355be641a9..b6379667aa 100644
--- a/Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescLib.c
+++ b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescLib.c
@@ -2,13 +2,7 @@
*
* Copyright (C) 2018, Marvell International Ltd. and its affiliates.
*
-* This program and the accompanying materials are licensed and made available
-* under the terms and conditions of the BSD License which accompanies this
-* distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
* Glossary - abbreviations used in Marvell SampleAtReset library implementation:
* AP - Application Processor hardware block (Armada 7k8k incorporates AP806)
diff --git a/Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescLib.h b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescLib.h
index 8bbc5b0b09..74883fd3a6 100644
--- a/Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescLib.h
+++ b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescLib.h
@@ -2,13 +2,7 @@
*
* Copyright (C) 2018, Marvell International Ltd. and its affiliates.
*
-* This program and the accompanying materials are licensed and made available
-* under the terms and conditions of the BSD License which accompanies this
-* distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
* Glossary - abbreviations used in Marvell SampleAtReset library implementation:
* AP - Application Processor hardware block (Armada 7k8k incorporates AP806)
diff --git a/Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescLib.inf b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescLib.inf
index 48a320cf9b..d5809c6789 100644
--- a/Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescLib.inf
+++ b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescLib.inf
@@ -2,13 +2,7 @@
#
# Copyright (C) 2018, Marvell International Ltd. and its affiliates<BR>
#
-# This program and the accompanying materials are licensed and made available
-# under the terms and conditions of the BSD License which accompanies this
-# distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
-# IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Marvell/Armada7k8k/Library/RealTimeClockLib/RealTimeClockLib.c b/Silicon/Marvell/Armada7k8k/Library/RealTimeClockLib/RealTimeClockLib.c
index 7de5ed77ef..1974e0144c 100644
--- a/Silicon/Marvell/Armada7k8k/Library/RealTimeClockLib/RealTimeClockLib.c
+++ b/Silicon/Marvell/Armada7k8k/Library/RealTimeClockLib/RealTimeClockLib.c
@@ -5,13 +5,7 @@
Copyright (c) 2011 - 2014, ARM Ltd. All rights reserved.<BR>
Copyright (c) 2017, Marvell International Ltd. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
/**
diff --git a/Silicon/Marvell/Armada7k8k/Library/RealTimeClockLib/RealTimeClockLib.inf b/Silicon/Marvell/Armada7k8k/Library/RealTimeClockLib/RealTimeClockLib.inf
index 1ecd444177..733827e61a 100644
--- a/Silicon/Marvell/Armada7k8k/Library/RealTimeClockLib/RealTimeClockLib.inf
+++ b/Silicon/Marvell/Armada7k8k/Library/RealTimeClockLib/RealTimeClockLib.inf
@@ -4,12 +4,7 @@
# Copyright (c) 2011 - 2014, ARM Ltd. All rights reserved.<BR>
# Copyright (c) 2017, Marvell International Ltd. 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 distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
#/**
diff --git a/Silicon/Marvell/Drivers/Gpio/MvGpioDxe/MvGpioDxe.c b/Silicon/Marvell/Drivers/Gpio/MvGpioDxe/MvGpioDxe.c
index 1d37eccb48..4cf4407544 100644
--- a/Silicon/Marvell/Drivers/Gpio/MvGpioDxe/MvGpioDxe.c
+++ b/Silicon/Marvell/Drivers/Gpio/MvGpioDxe/MvGpioDxe.c
@@ -2,13 +2,7 @@
*
* Copyright (c) 2018, Marvell International Ltd. All rights reserved.
*
-* This program and the accompanying materials are licensed and made available
-* under the terms and conditions of the BSD License which accompanies this
-* distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Marvell/Drivers/Gpio/MvGpioDxe/MvGpioDxe.h b/Silicon/Marvell/Drivers/Gpio/MvGpioDxe/MvGpioDxe.h
index 6e56ec15f3..1cb006a036 100644
--- a/Silicon/Marvell/Drivers/Gpio/MvGpioDxe/MvGpioDxe.h
+++ b/Silicon/Marvell/Drivers/Gpio/MvGpioDxe/MvGpioDxe.h
@@ -2,13 +2,7 @@
*
* Copyright (c) 2018, Marvell International Ltd. All rights reserved.
*
-* This program and the accompanying materials are licensed and made available
-* under the terms and conditions of the BSD License which accompanies this
-* distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
#ifndef __MV_GPIO_H__
diff --git a/Silicon/Marvell/Drivers/Gpio/MvGpioDxe/MvGpioDxe.inf b/Silicon/Marvell/Drivers/Gpio/MvGpioDxe/MvGpioDxe.inf
index 5ff91302da..6f36c2db2e 100644
--- a/Silicon/Marvell/Drivers/Gpio/MvGpioDxe/MvGpioDxe.inf
+++ b/Silicon/Marvell/Drivers/Gpio/MvGpioDxe/MvGpioDxe.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2017, Marvell International Ltd. 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
-# distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
-# IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
[Defines]
diff --git a/Silicon/Marvell/Drivers/Gpio/MvPca95xxDxe/MvPca95xxDxe.c b/Silicon/Marvell/Drivers/Gpio/MvPca95xxDxe/MvPca95xxDxe.c
index 8e7ea7712c..1bf3bcdc2c 100644
--- a/Silicon/Marvell/Drivers/Gpio/MvPca95xxDxe/MvPca95xxDxe.c
+++ b/Silicon/Marvell/Drivers/Gpio/MvPca95xxDxe/MvPca95xxDxe.c
@@ -2,13 +2,7 @@
*
* Copyright (c) 2018, Marvell International Ltd. All rights reserved.
*
-* This program and the accompanying materials are licensed and made available
-* under the terms and conditions of the BSD License which accompanies this
-* distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Marvell/Drivers/Gpio/MvPca95xxDxe/MvPca95xxDxe.h b/Silicon/Marvell/Drivers/Gpio/MvPca95xxDxe/MvPca95xxDxe.h
index 29eb123798..a2498128f8 100644
--- a/Silicon/Marvell/Drivers/Gpio/MvPca95xxDxe/MvPca95xxDxe.h
+++ b/Silicon/Marvell/Drivers/Gpio/MvPca95xxDxe/MvPca95xxDxe.h
@@ -2,13 +2,7 @@
*
* Copyright (c) 2018, Marvell International Ltd. All rights reserved.
*
-* This program and the accompanying materials are licensed and made available
-* under the terms and conditions of the BSD License which accompanies this
-* distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
#ifndef __MV_PCA953X_H__
diff --git a/Silicon/Marvell/Drivers/Gpio/MvPca95xxDxe/MvPca95xxDxe.inf b/Silicon/Marvell/Drivers/Gpio/MvPca95xxDxe/MvPca95xxDxe.inf
index 3b1ab4ee6a..c202d811f2 100644
--- a/Silicon/Marvell/Drivers/Gpio/MvPca95xxDxe/MvPca95xxDxe.inf
+++ b/Silicon/Marvell/Drivers/Gpio/MvPca95xxDxe/MvPca95xxDxe.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2017, Marvell International Ltd. 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
-# distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
-# IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
[Defines]
diff --git a/Silicon/Marvell/Drivers/SdMmc/XenonDxe/XenonDxe.inf b/Silicon/Marvell/Drivers/SdMmc/XenonDxe/XenonDxe.inf
index 09c58421cd..18f1b164fd 100644
--- a/Silicon/Marvell/Drivers/SdMmc/XenonDxe/XenonDxe.inf
+++ b/Silicon/Marvell/Drivers/SdMmc/XenonDxe/XenonDxe.inf
@@ -8,12 +8,7 @@
# Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>
# Copyright (C) 2018, Marvell International Ltd. 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 distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#
##
diff --git a/Silicon/Marvell/Drivers/SdMmc/XenonDxe/XenonPciHci.c b/Silicon/Marvell/Drivers/SdMmc/XenonDxe/XenonPciHci.c
index 8a22046bd6..93fcfb3e4d 100644
--- a/Silicon/Marvell/Drivers/SdMmc/XenonDxe/XenonPciHci.c
+++ b/Silicon/Marvell/Drivers/SdMmc/XenonDxe/XenonPciHci.c
@@ -7,13 +7,7 @@
Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2018, Marvell International, Ltd. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Marvell/Drivers/SdMmc/XenonDxe/XenonPciHci.h b/Silicon/Marvell/Drivers/SdMmc/XenonDxe/XenonPciHci.h
index 152ba967de..c0bac77b9b 100644
--- a/Silicon/Marvell/Drivers/SdMmc/XenonDxe/XenonPciHci.h
+++ b/Silicon/Marvell/Drivers/SdMmc/XenonDxe/XenonPciHci.h
@@ -5,13 +5,7 @@
Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2018, Marvell International, Ltd. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Marvell/Drivers/Spi/MvFvbDxe/MvFvbDxe.c b/Silicon/Marvell/Drivers/Spi/MvFvbDxe/MvFvbDxe.c
index 62f9e57b13..fba75b6c26 100644
--- a/Silicon/Marvell/Drivers/Spi/MvFvbDxe/MvFvbDxe.c
+++ b/Silicon/Marvell/Drivers/Spi/MvFvbDxe/MvFvbDxe.c
@@ -3,13 +3,7 @@
Copyright (c) 2011 - 2014, ARM Ltd. All rights reserved.<BR>
Copyright (c) 2017 Marvell International Ltd.<BR>
- This program and the accompanying materials are licensed and made available
- under the terms and conditions of the BSD License which accompanies this
- distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
--*/
diff --git a/Silicon/Marvell/Drivers/Spi/MvFvbDxe/MvFvbDxe.h b/Silicon/Marvell/Drivers/Spi/MvFvbDxe/MvFvbDxe.h
index e8df9a5ec7..be6b5cb8b0 100644
--- a/Silicon/Marvell/Drivers/Spi/MvFvbDxe/MvFvbDxe.h
+++ b/Silicon/Marvell/Drivers/Spi/MvFvbDxe/MvFvbDxe.h
@@ -3,13 +3,7 @@
Copyright (c) 2011 - 2014, ARM Ltd. All rights reserved.<BR>
Copyright (c) 2017 Marvell International Ltd.<BR>
- This program and the accompanying materials
- are licensed and made available under the terms and conditions of the BSD License
- which accompanies this distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Marvell/Include/IndustryStandard/MvSmc.h b/Silicon/Marvell/Include/IndustryStandard/MvSmc.h
index e5c89d9318..976c23c772 100644
--- a/Silicon/Marvell/Include/IndustryStandard/MvSmc.h
+++ b/Silicon/Marvell/Include/IndustryStandard/MvSmc.h
@@ -2,13 +2,7 @@
*
* Copyright (C) 2019, Marvell International Ltd. and its affiliates.
*
-* This program and the accompanying materials are licensed and made available
-* under the terms and conditions of the BSD License which accompanies this
-* distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Marvell/Include/Library/ArmadaBoardDescLib.h b/Silicon/Marvell/Include/Library/ArmadaBoardDescLib.h
index 6ec5ace8dd..a6d39c4f21 100644
--- a/Silicon/Marvell/Include/Library/ArmadaBoardDescLib.h
+++ b/Silicon/Marvell/Include/Library/ArmadaBoardDescLib.h
@@ -2,13 +2,7 @@
*
* Copyright (C) 2018, Marvell International Ltd. and its affiliates
*
-* This program and the accompanying materials are licensed and made available
-* under the terms and conditions of the BSD License which accompanies this
-* distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
#ifndef __ARMADA_BOARD_DESC_LIB_H__
diff --git a/Silicon/Marvell/Include/Library/ArmadaIcuLib.h b/Silicon/Marvell/Include/Library/ArmadaIcuLib.h
index db66efbb73..9f3dd85a96 100644
--- a/Silicon/Marvell/Include/Library/ArmadaIcuLib.h
+++ b/Silicon/Marvell/Include/Library/ArmadaIcuLib.h
@@ -2,13 +2,7 @@
*
* Copyright (C) 2018, Marvell International Ltd. and its affiliates
*
-* This program and the accompanying materials are licensed and made available
-* under the terms and conditions of the BSD License which accompanies this
-* distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
#ifndef __ARMADA_ICU_LIB_H__
diff --git a/Silicon/Marvell/Include/Library/ArmadaSoCDescLib.h b/Silicon/Marvell/Include/Library/ArmadaSoCDescLib.h
index fc17c3a8a4..cd9c9f26fe 100644
--- a/Silicon/Marvell/Include/Library/ArmadaSoCDescLib.h
+++ b/Silicon/Marvell/Include/Library/ArmadaSoCDescLib.h
@@ -2,13 +2,7 @@
*
* Copyright (C) 2018, Marvell International Ltd. and its affiliates
*
-* This program and the accompanying materials are licensed and made available
-* under the terms and conditions of the BSD License which accompanies this
-* distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
#ifndef __ARMADA_SOC_DESC_LIB_H__
diff --git a/Silicon/Marvell/Include/Library/MvGpioLib.h b/Silicon/Marvell/Include/Library/MvGpioLib.h
index a14acdff63..6ca9e79c1f 100644
--- a/Silicon/Marvell/Include/Library/MvGpioLib.h
+++ b/Silicon/Marvell/Include/Library/MvGpioLib.h
@@ -2,13 +2,7 @@
*
* Copyright (C) 2018, Marvell International Ltd. and its affiliates.
*
-* This program and the accompanying materials are licensed and made available
-* under the terms and conditions of the BSD License which accompanies this
-* distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
#ifndef __MV_GPIO_LIB_H__
diff --git a/Silicon/Marvell/Include/Library/NonDiscoverableInitLib.h b/Silicon/Marvell/Include/Library/NonDiscoverableInitLib.h
index 18de24fdb0..c353846606 100644
--- a/Silicon/Marvell/Include/Library/NonDiscoverableInitLib.h
+++ b/Silicon/Marvell/Include/Library/NonDiscoverableInitLib.h
@@ -3,13 +3,7 @@
* Copyright (c) 2017, Linaro Ltd. All rights reserved.
* Copyright (c) 2018, Marvell International Ltd. All rights reserved.
*
-* This program and the accompanying materials are licensed and made available
-* under the terms and conditions of the BSD License which accompanies this
-* distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Marvell/Include/Protocol/MvI2c.h b/Silicon/Marvell/Include/Protocol/MvI2c.h
index d8e644eaad..1d1978e3b3 100644
--- a/Silicon/Marvell/Include/Protocol/MvI2c.h
+++ b/Silicon/Marvell/Include/Protocol/MvI2c.h
@@ -2,13 +2,7 @@
*
* Copyright (c) 2018, Marvell International Ltd. All rights reserved.
*
-* This program and the accompanying materials are licensed and made available
-* under the terms and conditions of the BSD License which accompanies this
-* distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
#ifndef __MV_I2C_H__
diff --git a/Silicon/Marvell/Library/IcuLib/IcuLib.c b/Silicon/Marvell/Library/IcuLib/IcuLib.c
index e88337c0d2..343c21b0be 100644
--- a/Silicon/Marvell/Library/IcuLib/IcuLib.c
+++ b/Silicon/Marvell/Library/IcuLib/IcuLib.c
@@ -2,13 +2,7 @@
*
* Copyright (C) 2018, Marvell International Ltd. and its affiliates.
*
-* This program and the accompanying materials are licensed and made available
-* under the terms and conditions of the BSD License which accompanies this
-* distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
* Glossary - abbreviations used in Marvell SampleAtReset library implementation:
* ICU - Interrupt Consolidation Unit
diff --git a/Silicon/Marvell/Library/IcuLib/IcuLib.h b/Silicon/Marvell/Library/IcuLib/IcuLib.h
index 40df00c6d0..22027f6bc0 100644
--- a/Silicon/Marvell/Library/IcuLib/IcuLib.h
+++ b/Silicon/Marvell/Library/IcuLib/IcuLib.h
@@ -2,13 +2,7 @@
*
* Copyright (C) 2018, Marvell International Ltd. and its affiliates.
*
-* This program and the accompanying materials are licensed and made available
-* under the terms and conditions of the BSD License which accompanies this
-* distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
* Glossary - abbreviations used in Marvell SampleAtReset library implementation:
* ICU - Interrupt Consolidation Unit
diff --git a/Silicon/Marvell/Library/IcuLib/IcuLib.inf b/Silicon/Marvell/Library/IcuLib/IcuLib.inf
index ea662becd7..a2adf412a7 100644
--- a/Silicon/Marvell/Library/IcuLib/IcuLib.inf
+++ b/Silicon/Marvell/Library/IcuLib/IcuLib.inf
@@ -2,13 +2,7 @@
#
# Copyright (C) 2018, Marvell International Ltd. and its affiliates<BR>
#
-# This program and the accompanying materials are licensed and made available
-# under the terms and conditions of the BSD License which accompanies this
-# distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
-# IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Marvell/Library/MvGpioLib/MvGpioLib.c b/Silicon/Marvell/Library/MvGpioLib/MvGpioLib.c
index a95d5ae846..95eabf8022 100644
--- a/Silicon/Marvell/Library/MvGpioLib/MvGpioLib.c
+++ b/Silicon/Marvell/Library/MvGpioLib/MvGpioLib.c
@@ -2,13 +2,7 @@
*
* Copyright (C) 2018, Marvell International Ltd. and its affiliates.
*
-* This program and the accompanying materials are licensed and made available
-* under the terms and conditions of the BSD License which accompanies this
-* distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
#include <Uefi.h>
diff --git a/Silicon/Marvell/Library/MvGpioLib/MvGpioLib.inf b/Silicon/Marvell/Library/MvGpioLib/MvGpioLib.inf
index 3bc54ce561..24db268bc7 100644
--- a/Silicon/Marvell/Library/MvGpioLib/MvGpioLib.inf
+++ b/Silicon/Marvell/Library/MvGpioLib/MvGpioLib.inf
@@ -2,13 +2,7 @@
#
# Copyright (C) 2018, Marvell International Ltd. and its affiliates<BR>
#
-# This program and the accompanying materials are licensed and made available
-# under the terms and conditions of the BSD License which accompanies this
-# distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
-# IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
--
2.21.0.windows.1
^ permalink raw reply related [flat|nested] 63+ messages in thread* Re: [[edk2-platforms][PATCH V2] 27/30] Silicon/Marvell: Replace BSD License with BSD+Patent License
2019-05-15 23:10 ` [[edk2-platforms][PATCH V2] 27/30] Silicon/Marvell: " Michael D Kinney
@ 2019-05-17 10:50 ` Leif Lindholm
2019-05-28 9:50 ` Leif Lindholm
0 siblings, 1 reply; 63+ messages in thread
From: Leif Lindholm @ 2019-05-17 10:50 UTC (permalink / raw)
To: Michael D Kinney; +Cc: devel, Ard Biesheuvel
On Wed, May 15, 2019 at 04:10:08PM -0700, Michael D Kinney wrote:
> https://bugzilla.tianocore.org/show_bug.cgi?id=1373
>
> Replace BSD 2-Clause License with BSD+Patent License. This change is
> based on the following emails:
>
> https://lists.01.org/pipermail/edk2-devel/2019-February/036260.html
> https://lists.01.org/pipermail/edk2-devel/2018-October/030385.html
>
> RFCs with detailed process for the license change:
>
> V3: https://lists.01.org/pipermail/edk2-devel/2019-March/038116.html
> V2: https://lists.01.org/pipermail/edk2-devel/2019-March/037669.html
> V1: https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html
As far as I can tell, this excludes the source files currently
licensed under 3-clause BSD (2-clause plus non-endorsement clause).
This is correct, and as discussed offline, but it would be worth
pointing it out explicitly in the commit message.
(Conversations about relicensing the 3-clause files are happening in
the background.)
Other than that, looks good to me.
/
Leif
> Cc: Leif Lindholm <leif.lindholm@linaro.org>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
> ---
> Silicon/Marvell/Armada7k8k/AcpiTables/AcpiHeader.h | 8 +-------
> Silicon/Marvell/Armada7k8k/AcpiTables/Armada70x0Db.inf | 8 +-------
> .../Marvell/Armada7k8k/AcpiTables/Armada70x0Db/Dsdt.asl | 8 +-------
> Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0Db.inf | 8 +-------
> .../Marvell/Armada7k8k/AcpiTables/Armada80x0Db/Dsdt.asl | 8 +-------
> Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0McBin.inf | 8 +-------
> .../Armada7k8k/AcpiTables/Armada80x0McBin/Dsdt.asl | 8 +-------
> Silicon/Marvell/Armada7k8k/AcpiTables/Fadt.aslc | 8 +-------
> Silicon/Marvell/Armada7k8k/AcpiTables/Gtdt.aslc | 8 +-------
> Silicon/Marvell/Armada7k8k/AcpiTables/IcuInterrupts.h | 8 +-------
> Silicon/Marvell/Armada7k8k/AcpiTables/Madt.aslc | 8 +-------
> Silicon/Marvell/Armada7k8k/AcpiTables/Pptt.aslc | 8 +-------
> Silicon/Marvell/Armada7k8k/AcpiTables/Spcr.aslc | 8 +-------
> Silicon/Marvell/Armada7k8k/Armada7k8k.fdf | 8 +-------
> Silicon/Marvell/Armada7k8k/Armada7k8kCapsule.fdf | 8 +-------
> Silicon/Marvell/Armada7k8k/DeviceTree/Armada70x0Db.inf | 8 +-------
> Silicon/Marvell/Armada7k8k/DeviceTree/Armada80x0Db.inf | 8 +-------
> Silicon/Marvell/Armada7k8k/DeviceTree/Armada80x0McBin.inf | 8 +-------
> .../Drivers/Armada7k8kRngDxe/Armada7k8kRngDxe.c | 8 +-------
> .../Drivers/Armada7k8kRngDxe/Armada7k8kRngDxe.inf | 8 +-------
> .../Marvell/Armada7k8k/Drivers/PlatInitDxe/PlatInitDxe.c | 8 +-------
> .../Armada7k8k/Drivers/PlatInitDxe/PlatInitDxe.inf | 8 +-------
> .../PlatformFlashAccessLib/PlatformFlashAccessLib.c | 8 +-------
> .../PlatformFlashAccessLib/PlatformFlashAccessLib.inf | 8 +-------
> .../SystemFirmwareDescriptor.aslc | 8 +-------
> .../SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf | 8 +-------
> .../SystemFirmwareDescriptorPei.c | 8 +-------
> .../SystemFirmwareUpdateConfig.ini | 8 +-------
> .../Library/Armada7k8kLib/AArch64/ArmPlatformHelper.S | 5 +----
> .../Library/Armada7k8kLib/ARM/ArmPlatformHelper.S | 5 +----
> .../Armada7k8k/Library/Armada7k8kLib/Armada7k8kLib.c | 8 +-------
> .../Armada7k8kMemoryInitPeiLib.c | 8 +-------
> .../Armada7k8kMemoryInitPeiLib.inf | 8 +-------
> .../Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescLib.c | 8 +-------
> .../Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescLib.h | 8 +-------
> .../Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescLib.inf | 8 +-------
> .../Library/RealTimeClockLib/RealTimeClockLib.c | 8 +-------
> .../Library/RealTimeClockLib/RealTimeClockLib.inf | 7 +------
> Silicon/Marvell/Drivers/Gpio/MvGpioDxe/MvGpioDxe.c | 8 +-------
> Silicon/Marvell/Drivers/Gpio/MvGpioDxe/MvGpioDxe.h | 8 +-------
> Silicon/Marvell/Drivers/Gpio/MvGpioDxe/MvGpioDxe.inf | 8 +-------
> Silicon/Marvell/Drivers/Gpio/MvPca95xxDxe/MvPca95xxDxe.c | 8 +-------
> Silicon/Marvell/Drivers/Gpio/MvPca95xxDxe/MvPca95xxDxe.h | 8 +-------
> .../Marvell/Drivers/Gpio/MvPca95xxDxe/MvPca95xxDxe.inf | 8 +-------
> Silicon/Marvell/Drivers/SdMmc/XenonDxe/XenonDxe.inf | 7 +------
> Silicon/Marvell/Drivers/SdMmc/XenonDxe/XenonPciHci.c | 8 +-------
> Silicon/Marvell/Drivers/SdMmc/XenonDxe/XenonPciHci.h | 8 +-------
> Silicon/Marvell/Drivers/Spi/MvFvbDxe/MvFvbDxe.c | 8 +-------
> Silicon/Marvell/Drivers/Spi/MvFvbDxe/MvFvbDxe.h | 8 +-------
> Silicon/Marvell/Include/IndustryStandard/MvSmc.h | 8 +-------
> Silicon/Marvell/Include/Library/ArmadaBoardDescLib.h | 8 +-------
> Silicon/Marvell/Include/Library/ArmadaIcuLib.h | 8 +-------
> Silicon/Marvell/Include/Library/ArmadaSoCDescLib.h | 8 +-------
> Silicon/Marvell/Include/Library/MvGpioLib.h | 8 +-------
> Silicon/Marvell/Include/Library/NonDiscoverableInitLib.h | 8 +-------
> Silicon/Marvell/Include/Protocol/MvI2c.h | 8 +-------
> Silicon/Marvell/Library/IcuLib/IcuLib.c | 8 +-------
> Silicon/Marvell/Library/IcuLib/IcuLib.h | 8 +-------
> Silicon/Marvell/Library/IcuLib/IcuLib.inf | 8 +-------
> Silicon/Marvell/Library/MvGpioLib/MvGpioLib.c | 8 +-------
> Silicon/Marvell/Library/MvGpioLib/MvGpioLib.inf | 8 +-------
> 61 files changed, 61 insertions(+), 419 deletions(-)
>
> diff --git a/Silicon/Marvell/Armada7k8k/AcpiTables/AcpiHeader.h b/Silicon/Marvell/Armada7k8k/AcpiTables/AcpiHeader.h
> index f5ebd27d02..90ab607845 100644
> --- a/Silicon/Marvell/Armada7k8k/AcpiTables/AcpiHeader.h
> +++ b/Silicon/Marvell/Armada7k8k/AcpiTables/AcpiHeader.h
> @@ -5,13 +5,7 @@
> Copyright (c) 2017, Linaro Ltd. All rights reserved.<BR>
> Copyright (C) 2018, Marvell International Ltd. and its affiliates.<BR>
>
> - This program and the accompanying materials
> - are licensed and made available under the terms and conditions of the BSD License
> - which accompanies this distribution. The full text of the license may be found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Marvell/Armada7k8k/AcpiTables/Armada70x0Db.inf b/Silicon/Marvell/Armada7k8k/AcpiTables/Armada70x0Db.inf
> index 659c333381..926f3667cc 100644
> --- a/Silicon/Marvell/Armada7k8k/AcpiTables/Armada70x0Db.inf
> +++ b/Silicon/Marvell/Armada7k8k/AcpiTables/Armada70x0Db.inf
> @@ -6,13 +6,7 @@
> # Copyright (c) 2018, Linaro, Ltd. All rights reserved.<BR>
> # Copyright (C) 2018, Marvell International Ltd. and its affiliates.<BR>
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD License
> -# which accompanies this distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Silicon/Marvell/Armada7k8k/AcpiTables/Armada70x0Db/Dsdt.asl b/Silicon/Marvell/Armada7k8k/AcpiTables/Armada70x0Db/Dsdt.asl
> index 621b688818..20369c5f72 100644
> --- a/Silicon/Marvell/Armada7k8k/AcpiTables/Armada70x0Db/Dsdt.asl
> +++ b/Silicon/Marvell/Armada7k8k/AcpiTables/Armada70x0Db/Dsdt.asl
> @@ -5,13 +5,7 @@
> Copyright (c) 2018, Linaro Ltd. All rights reserved.<BR>
> Copyright (C) 2018, Marvell International Ltd. and its affiliates.<BR>
>
> - This program and the accompanying materials
> - are licensed and made available under the terms and conditions of the BSD License
> - which accompanies this distribution. The full text of the license may be found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0Db.inf b/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0Db.inf
> index 35a679b884..8367f07d96 100644
> --- a/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0Db.inf
> +++ b/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0Db.inf
> @@ -6,13 +6,7 @@
> # Copyright (c) 2018, Linaro, Ltd. All rights reserved.<BR>
> # Copyright (C) 2018, Marvell International Ltd. and its affiliates.<BR>
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD License
> -# which accompanies this distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0Db/Dsdt.asl b/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0Db/Dsdt.asl
> index 7c659497bd..822a8e4878 100644
> --- a/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0Db/Dsdt.asl
> +++ b/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0Db/Dsdt.asl
> @@ -5,13 +5,7 @@
> Copyright (c) 2018, Linaro Ltd. All rights reserved.<BR>
> Copyright (C) 2018, Marvell International Ltd. and its affiliates.<BR>
>
> - This program and the accompanying materials
> - are licensed and made available under the terms and conditions of the BSD License
> - which accompanies this distribution. The full text of the license may be found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0McBin.inf b/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0McBin.inf
> index 9e52281fca..e1416f07ab 100644
> --- a/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0McBin.inf
> +++ b/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0McBin.inf
> @@ -6,13 +6,7 @@
> # Copyright (c) 2018, Linaro, Ltd. All rights reserved.<BR>
> # Copyright (C) 2018, Marvell International Ltd. and its affiliates.<BR>
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD License
> -# which accompanies this distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0McBin/Dsdt.asl b/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0McBin/Dsdt.asl
> index 87cb93a80e..638698ace9 100644
> --- a/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0McBin/Dsdt.asl
> +++ b/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0McBin/Dsdt.asl
> @@ -4,13 +4,7 @@
>
> Copyright (c) 2018, Linaro Ltd. 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 distribution. The full text of the license may be found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Marvell/Armada7k8k/AcpiTables/Fadt.aslc b/Silicon/Marvell/Armada7k8k/AcpiTables/Fadt.aslc
> index de88210e40..f3656dd3a5 100644
> --- a/Silicon/Marvell/Armada7k8k/AcpiTables/Fadt.aslc
> +++ b/Silicon/Marvell/Armada7k8k/AcpiTables/Fadt.aslc
> @@ -5,13 +5,7 @@
> Copyright (c) 2017, Linaro Ltd. All rights reserved.<BR>
> Copyright (C) 2018, Marvell International Ltd. and its affiliates.<BR>
>
> - This program and the accompanying materials
> - are licensed and made available under the terms and conditions of the BSD License
> - which accompanies this distribution. The full text of the license may be found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Marvell/Armada7k8k/AcpiTables/Gtdt.aslc b/Silicon/Marvell/Armada7k8k/AcpiTables/Gtdt.aslc
> index 16a8806f86..a08d0b9ccf 100644
> --- a/Silicon/Marvell/Armada7k8k/AcpiTables/Gtdt.aslc
> +++ b/Silicon/Marvell/Armada7k8k/AcpiTables/Gtdt.aslc
> @@ -5,13 +5,7 @@
> Copyright (c) 2017, Linaro Ltd. All rights reserved.<BR>
> Copyright (C) 2018, Marvell International Ltd. and its affiliates.<BR>
>
> - This program and the accompanying materials
> - are licensed and made available under the terms and conditions of the BSD License
> - which accompanies this distribution. The full text of the license may be found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Marvell/Armada7k8k/AcpiTables/IcuInterrupts.h b/Silicon/Marvell/Armada7k8k/AcpiTables/IcuInterrupts.h
> index 5746ad477b..dd33cb5e7b 100644
> --- a/Silicon/Marvell/Armada7k8k/AcpiTables/IcuInterrupts.h
> +++ b/Silicon/Marvell/Armada7k8k/AcpiTables/IcuInterrupts.h
> @@ -2,13 +2,7 @@
>
> Copyright (C) 2018, Marvell International Ltd. and its affiliates.
>
> - This program and the accompanying materials are licensed and made available
> - under the terms and conditions of the BSD License which accompanies this
> - distribution. The full text of the license may be found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> Glossary - abbreviations used in Marvell SampleAtReset library implementation:
> ICU - Interrupt Consolidation Unit
> diff --git a/Silicon/Marvell/Armada7k8k/AcpiTables/Madt.aslc b/Silicon/Marvell/Armada7k8k/AcpiTables/Madt.aslc
> index 7ab927d165..5b553cd923 100644
> --- a/Silicon/Marvell/Armada7k8k/AcpiTables/Madt.aslc
> +++ b/Silicon/Marvell/Armada7k8k/AcpiTables/Madt.aslc
> @@ -5,13 +5,7 @@
> Copyright (c) 2017, Linaro Ltd. All rights reserved.<BR>
> Copyright (C) 2018, Marvell International Ltd. and its affiliates.<BR>
>
> - This program and the accompanying materials
> - are licensed and made available under the terms and conditions of the BSD License
> - which accompanies this distribution. The full text of the license may be found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Marvell/Armada7k8k/AcpiTables/Pptt.aslc b/Silicon/Marvell/Armada7k8k/AcpiTables/Pptt.aslc
> index 8de29bd383..e03bfcd621 100644
> --- a/Silicon/Marvell/Armada7k8k/AcpiTables/Pptt.aslc
> +++ b/Silicon/Marvell/Armada7k8k/AcpiTables/Pptt.aslc
> @@ -3,13 +3,7 @@
> Copyright (c) 2018, Linaro Ltd. All rights reserved.<BR>
> Copyright (c) 2018, Marvell International Ltd. 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
> - distribution. The full text of the license may be found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Marvell/Armada7k8k/AcpiTables/Spcr.aslc b/Silicon/Marvell/Armada7k8k/AcpiTables/Spcr.aslc
> index 1c7c8424c0..438cf7880e 100644
> --- a/Silicon/Marvell/Armada7k8k/AcpiTables/Spcr.aslc
> +++ b/Silicon/Marvell/Armada7k8k/AcpiTables/Spcr.aslc
> @@ -4,13 +4,7 @@
> Copyright (c) 2017, Linaro Limited. All rights reserved.
> Copyright (C) 2018, Marvell International Ltd. and its affiliates.
>
> - This program and the accompanying materials
> - are licensed and made available under the terms and conditions of the BSD License
> - which accompanies this distribution. The full text of the license may be found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> Based on the files under ArmPlatformPkg/ArmJunoPkg/AcpiTables/
>
> diff --git a/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf b/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
> index 8a050ef987..d2bbdedcfa 100644
> --- a/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
> +++ b/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
> @@ -1,13 +1,7 @@
> #
> # Copyright (C) Marvell International Ltd. and its affiliates
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD License
> -# which accompanies this distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
>
> ################################################################################
> diff --git a/Silicon/Marvell/Armada7k8k/Armada7k8kCapsule.fdf b/Silicon/Marvell/Armada7k8k/Armada7k8kCapsule.fdf
> index 1ca6cddc91..be717bc3cc 100644
> --- a/Silicon/Marvell/Armada7k8k/Armada7k8kCapsule.fdf
> +++ b/Silicon/Marvell/Armada7k8k/Armada7k8kCapsule.fdf
> @@ -1,13 +1,7 @@
> #
> # Copyright (C) Marvell International Ltd. and its affiliates
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD License
> -# which accompanies this distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
>
> [FD.Armada_Capsule]
> diff --git a/Silicon/Marvell/Armada7k8k/DeviceTree/Armada70x0Db.inf b/Silicon/Marvell/Armada7k8k/DeviceTree/Armada70x0Db.inf
> index 1f2d9ea170..b533578a89 100644
> --- a/Silicon/Marvell/Armada7k8k/DeviceTree/Armada70x0Db.inf
> +++ b/Silicon/Marvell/Armada7k8k/DeviceTree/Armada70x0Db.inf
> @@ -4,13 +4,7 @@
> #
> # Copyright (c) 2018, Marvell International Ltd. All rights reserved.
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD License
> -# which accompanies this distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Silicon/Marvell/Armada7k8k/DeviceTree/Armada80x0Db.inf b/Silicon/Marvell/Armada7k8k/DeviceTree/Armada80x0Db.inf
> index e4dd41cac3..378fad240b 100644
> --- a/Silicon/Marvell/Armada7k8k/DeviceTree/Armada80x0Db.inf
> +++ b/Silicon/Marvell/Armada7k8k/DeviceTree/Armada80x0Db.inf
> @@ -4,13 +4,7 @@
> #
> # Copyright (c) 2018, Marvell International Ltd. All rights reserved.
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD License
> -# which accompanies this distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Silicon/Marvell/Armada7k8k/DeviceTree/Armada80x0McBin.inf b/Silicon/Marvell/Armada7k8k/DeviceTree/Armada80x0McBin.inf
> index 810a52b2ab..540e1a79f3 100644
> --- a/Silicon/Marvell/Armada7k8k/DeviceTree/Armada80x0McBin.inf
> +++ b/Silicon/Marvell/Armada7k8k/DeviceTree/Armada80x0McBin.inf
> @@ -4,13 +4,7 @@
> #
> # Copyright (c) 2018, Marvell International Ltd. All rights reserved.
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD License
> -# which accompanies this distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Silicon/Marvell/Armada7k8k/Drivers/Armada7k8kRngDxe/Armada7k8kRngDxe.c b/Silicon/Marvell/Armada7k8k/Drivers/Armada7k8kRngDxe/Armada7k8kRngDxe.c
> index 2cbc3e4bfb..6fed663b14 100644
> --- a/Silicon/Marvell/Armada7k8k/Drivers/Armada7k8kRngDxe/Armada7k8kRngDxe.c
> +++ b/Silicon/Marvell/Armada7k8k/Drivers/Armada7k8kRngDxe/Armada7k8kRngDxe.c
> @@ -4,13 +4,7 @@
>
> Copyright (C) 2017, Linaro Ltd. 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
> - distribution. The full text of the license may be found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT
> - WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Marvell/Armada7k8k/Drivers/Armada7k8kRngDxe/Armada7k8kRngDxe.inf b/Silicon/Marvell/Armada7k8k/Drivers/Armada7k8kRngDxe/Armada7k8kRngDxe.inf
> index e6561f3cb8..4c766eeff8 100644
> --- a/Silicon/Marvell/Armada7k8k/Drivers/Armada7k8kRngDxe/Armada7k8kRngDxe.inf
> +++ b/Silicon/Marvell/Armada7k8k/Drivers/Armada7k8kRngDxe/Armada7k8kRngDxe.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (C) 2017, Linaro Ltd. 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
> -# distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT
> -# WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Silicon/Marvell/Armada7k8k/Drivers/PlatInitDxe/PlatInitDxe.c b/Silicon/Marvell/Armada7k8k/Drivers/PlatInitDxe/PlatInitDxe.c
> index 2629daa35f..758412c48c 100644
> --- a/Silicon/Marvell/Armada7k8k/Drivers/PlatInitDxe/PlatInitDxe.c
> +++ b/Silicon/Marvell/Armada7k8k/Drivers/PlatInitDxe/PlatInitDxe.c
> @@ -2,13 +2,7 @@
> Copyright (c) 2017, Linaro Limited. All rights reserved.
> Copyright (c) 2017, Marvell International Ltd. and its affiliates
>
> - This program and the accompanying materials
> - are licensed and made available under the terms and conditions of the BSD License
> - which accompanies this distribution. The full text of the license may be found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Marvell/Armada7k8k/Drivers/PlatInitDxe/PlatInitDxe.inf b/Silicon/Marvell/Armada7k8k/Drivers/PlatInitDxe/PlatInitDxe.inf
> index df10526fae..9f4447afc2 100644
> --- a/Silicon/Marvell/Armada7k8k/Drivers/PlatInitDxe/PlatInitDxe.inf
> +++ b/Silicon/Marvell/Armada7k8k/Drivers/PlatInitDxe/PlatInitDxe.inf
> @@ -2,13 +2,7 @@
> # Copyright (c) 2017, Linaro Limited. All rights reserved.
> # Copyright (c) 2017, Marvell International Ltd. and its affiliates
> #
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the BSD License
> -# which accompanies this distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> #*/
>
> diff --git a/Silicon/Marvell/Armada7k8k/Feature/Capsule/PlatformFlashAccessLib/PlatformFlashAccessLib.c b/Silicon/Marvell/Armada7k8k/Feature/Capsule/PlatformFlashAccessLib/PlatformFlashAccessLib.c
> index faa3a13dd2..0529d7d96c 100644
> --- a/Silicon/Marvell/Armada7k8k/Feature/Capsule/PlatformFlashAccessLib/PlatformFlashAccessLib.c
> +++ b/Silicon/Marvell/Armada7k8k/Feature/Capsule/PlatformFlashAccessLib/PlatformFlashAccessLib.c
> @@ -3,13 +3,7 @@
>
> Copyright (c) 2018 Marvell International Ltd.<BR>
>
> - This program and the accompanying materials
> - are licensed and made available under the terms and conditions of the BSD License
> - which accompanies this distribution. The full text of the license may be found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Marvell/Armada7k8k/Feature/Capsule/PlatformFlashAccessLib/PlatformFlashAccessLib.inf b/Silicon/Marvell/Armada7k8k/Feature/Capsule/PlatformFlashAccessLib/PlatformFlashAccessLib.inf
> index fd94759900..69a7b71c51 100644
> --- a/Silicon/Marvell/Armada7k8k/Feature/Capsule/PlatformFlashAccessLib/PlatformFlashAccessLib.inf
> +++ b/Silicon/Marvell/Armada7k8k/Feature/Capsule/PlatformFlashAccessLib/PlatformFlashAccessLib.inf
> @@ -3,13 +3,7 @@
> #
> # Copyright (c) 2017, Linaro, Ltd. All rights reserved.<BR>
> # Copyright (c) 2018, Marvell International, Ltd. 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 distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Silicon/Marvell/Armada7k8k/Feature/Capsule/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc b/Silicon/Marvell/Armada7k8k/Feature/Capsule/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc
> index fbccdc2d09..1499fd6999 100644
> --- a/Silicon/Marvell/Armada7k8k/Feature/Capsule/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc
> +++ b/Silicon/Marvell/Armada7k8k/Feature/Capsule/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc
> @@ -5,13 +5,7 @@
> Copyright (c) 2018, Linaro Limited. All rights reserved.
> Copyright (c) 2016, 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 distribution. The full text of the license may be found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Marvell/Armada7k8k/Feature/Capsule/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf b/Silicon/Marvell/Armada7k8k/Feature/Capsule/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf
> index e6967b21f1..7bf1f2f41a 100644
> --- a/Silicon/Marvell/Armada7k8k/Feature/Capsule/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf
> +++ b/Silicon/Marvell/Armada7k8k/Feature/Capsule/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf
> @@ -5,13 +5,7 @@
> # Copyright (c) 2018, Linaro Limited. All rights reserved.
> # Copyright (c) 2016, 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 distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Silicon/Marvell/Armada7k8k/Feature/Capsule/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c b/Silicon/Marvell/Armada7k8k/Feature/Capsule/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c
> index c55c4d98a5..1343fb1ffa 100644
> --- a/Silicon/Marvell/Armada7k8k/Feature/Capsule/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c
> +++ b/Silicon/Marvell/Armada7k8k/Feature/Capsule/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c
> @@ -5,13 +5,7 @@
> Copyright (c) 2018, Linaro Limited. All rights reserved.
> Copyright (c) 2016, 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 distribution. The full text of the license may be found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Marvell/Armada7k8k/Feature/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini b/Silicon/Marvell/Armada7k8k/Feature/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini
> index fb0bd0bfa5..442060bfbc 100644
> --- a/Silicon/Marvell/Armada7k8k/Feature/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini
> +++ b/Silicon/Marvell/Armada7k8k/Feature/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini
> @@ -2,13 +2,7 @@
> #
> # Copyright (c) 2018, Marvell International Ltd.<BR>
> # Copyright (c) 2016, 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 distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/AArch64/ArmPlatformHelper.S b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/AArch64/ArmPlatformHelper.S
> index 72f8cfce77..6ae908a7b4 100644
> --- a/Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/AArch64/ArmPlatformHelper.S
> +++ b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/AArch64/ArmPlatformHelper.S
> @@ -3,10 +3,7 @@
> // Copyright (c) 2012-2013, ARM Limited. All rights reserved.
> // Copyright (c) 2016, Marvell. All rights reserved.
> //
> -// This program and the accompanying materials are licensed and made available
> -// under the terms and conditions of the BSD License which accompanies this
> -// distribution. The full text of the license may be found at
> -// http://opensource.org/licenses/bsd-license.php
> +// SPDX-License-Identifier: BSD-2-Clause-Patent
> //
> // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED
> diff --git a/Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/ARM/ArmPlatformHelper.S b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/ARM/ArmPlatformHelper.S
> index 21459e50a7..4416163060 100644
> --- a/Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/ARM/ArmPlatformHelper.S
> +++ b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/ARM/ArmPlatformHelper.S
> @@ -4,10 +4,7 @@
> // Copyright (c) 2016, Marvell. All rights reserved.
> // Copyright (c) 2017, Linaro Limited. All rights reserved.
> //
> -// This program and the accompanying materials are licensed and made available
> -// under the terms and conditions of the BSD License which accompanies this
> -// distribution. The full text of the license may be found at
> -// http://opensource.org/licenses/bsd-license.php
> +// SPDX-License-Identifier: BSD-2-Clause-Patent
> //
> // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED
> diff --git a/Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/Armada7k8kLib.c b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/Armada7k8kLib.c
> index 233f7b14a4..df838ff5ef 100644
> --- a/Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/Armada7k8kLib.c
> +++ b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/Armada7k8kLib.c
> @@ -3,13 +3,7 @@
> * Copyright (c) 2011-2012, ARM Limited. All rights reserved.
> * Copyright (c) 2016, Marvell International Ltd. All rights reserved.
> *
> -* This program and the accompanying materials are licensed and made available
> -* under the terms and conditions of the BSD License which accompanies this
> -* distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Silicon/Marvell/Armada7k8k/Library/Armada7k8kMemoryInitPeiLib/Armada7k8kMemoryInitPeiLib.c b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kMemoryInitPeiLib/Armada7k8kMemoryInitPeiLib.c
> index 571f77e02f..0f953d4f04 100644
> --- a/Silicon/Marvell/Armada7k8k/Library/Armada7k8kMemoryInitPeiLib/Armada7k8kMemoryInitPeiLib.c
> +++ b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kMemoryInitPeiLib/Armada7k8kMemoryInitPeiLib.c
> @@ -3,13 +3,7 @@
> * Copyright (c) 2011-2015, ARM Limited. All rights reserved.
> * Copyright (c) 2017, ARM Limited. All rights reserved.
> *
> -* This program and the accompanying materials
> -* are licensed and made available under the terms and conditions of the BSD License
> -* which accompanies this distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Silicon/Marvell/Armada7k8k/Library/Armada7k8kMemoryInitPeiLib/Armada7k8kMemoryInitPeiLib.inf b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kMemoryInitPeiLib/Armada7k8kMemoryInitPeiLib.inf
> index 360de90180..f0b469ee55 100644
> --- a/Silicon/Marvell/Armada7k8k/Library/Armada7k8kMemoryInitPeiLib/Armada7k8kMemoryInitPeiLib.inf
> +++ b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kMemoryInitPeiLib/Armada7k8kMemoryInitPeiLib.inf
> @@ -3,13 +3,7 @@
> # Copyright (c) 2011-2014, ARM Ltd. All rights reserved.<BR>
> # Copyright (c) 2017, Linaro Ltd. 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 distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> #**/
>
> diff --git a/Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescLib.c b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescLib.c
> index 355be641a9..b6379667aa 100644
> --- a/Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescLib.c
> +++ b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescLib.c
> @@ -2,13 +2,7 @@
> *
> * Copyright (C) 2018, Marvell International Ltd. and its affiliates.
> *
> -* This program and the accompanying materials are licensed and made available
> -* under the terms and conditions of the BSD License which accompanies this
> -* distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> * Glossary - abbreviations used in Marvell SampleAtReset library implementation:
> * AP - Application Processor hardware block (Armada 7k8k incorporates AP806)
> diff --git a/Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescLib.h b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescLib.h
> index 8bbc5b0b09..74883fd3a6 100644
> --- a/Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescLib.h
> +++ b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescLib.h
> @@ -2,13 +2,7 @@
> *
> * Copyright (C) 2018, Marvell International Ltd. and its affiliates.
> *
> -* This program and the accompanying materials are licensed and made available
> -* under the terms and conditions of the BSD License which accompanies this
> -* distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> * Glossary - abbreviations used in Marvell SampleAtReset library implementation:
> * AP - Application Processor hardware block (Armada 7k8k incorporates AP806)
> diff --git a/Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescLib.inf b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescLib.inf
> index 48a320cf9b..d5809c6789 100644
> --- a/Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescLib.inf
> +++ b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescLib.inf
> @@ -2,13 +2,7 @@
> #
> # Copyright (C) 2018, Marvell International Ltd. and its affiliates<BR>
> #
> -# This program and the accompanying materials are licensed and made available
> -# under the terms and conditions of the BSD License which accompanies this
> -# distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> -# IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Silicon/Marvell/Armada7k8k/Library/RealTimeClockLib/RealTimeClockLib.c b/Silicon/Marvell/Armada7k8k/Library/RealTimeClockLib/RealTimeClockLib.c
> index 7de5ed77ef..1974e0144c 100644
> --- a/Silicon/Marvell/Armada7k8k/Library/RealTimeClockLib/RealTimeClockLib.c
> +++ b/Silicon/Marvell/Armada7k8k/Library/RealTimeClockLib/RealTimeClockLib.c
> @@ -5,13 +5,7 @@
> Copyright (c) 2011 - 2014, ARM Ltd. All rights reserved.<BR>
> Copyright (c) 2017, Marvell International Ltd. 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 distribution. The full text of the license may be found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> /**
> diff --git a/Silicon/Marvell/Armada7k8k/Library/RealTimeClockLib/RealTimeClockLib.inf b/Silicon/Marvell/Armada7k8k/Library/RealTimeClockLib/RealTimeClockLib.inf
> index 1ecd444177..733827e61a 100644
> --- a/Silicon/Marvell/Armada7k8k/Library/RealTimeClockLib/RealTimeClockLib.inf
> +++ b/Silicon/Marvell/Armada7k8k/Library/RealTimeClockLib/RealTimeClockLib.inf
> @@ -4,12 +4,7 @@
> # Copyright (c) 2011 - 2014, ARM Ltd. All rights reserved.<BR>
> # Copyright (c) 2017, Marvell International Ltd. 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 distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> #**/
> #/**
> diff --git a/Silicon/Marvell/Drivers/Gpio/MvGpioDxe/MvGpioDxe.c b/Silicon/Marvell/Drivers/Gpio/MvGpioDxe/MvGpioDxe.c
> index 1d37eccb48..4cf4407544 100644
> --- a/Silicon/Marvell/Drivers/Gpio/MvGpioDxe/MvGpioDxe.c
> +++ b/Silicon/Marvell/Drivers/Gpio/MvGpioDxe/MvGpioDxe.c
> @@ -2,13 +2,7 @@
> *
> * Copyright (c) 2018, Marvell International Ltd. All rights reserved.
> *
> -* This program and the accompanying materials are licensed and made available
> -* under the terms and conditions of the BSD License which accompanies this
> -* distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Silicon/Marvell/Drivers/Gpio/MvGpioDxe/MvGpioDxe.h b/Silicon/Marvell/Drivers/Gpio/MvGpioDxe/MvGpioDxe.h
> index 6e56ec15f3..1cb006a036 100644
> --- a/Silicon/Marvell/Drivers/Gpio/MvGpioDxe/MvGpioDxe.h
> +++ b/Silicon/Marvell/Drivers/Gpio/MvGpioDxe/MvGpioDxe.h
> @@ -2,13 +2,7 @@
> *
> * Copyright (c) 2018, Marvell International Ltd. All rights reserved.
> *
> -* This program and the accompanying materials are licensed and made available
> -* under the terms and conditions of the BSD License which accompanies this
> -* distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
> #ifndef __MV_GPIO_H__
> diff --git a/Silicon/Marvell/Drivers/Gpio/MvGpioDxe/MvGpioDxe.inf b/Silicon/Marvell/Drivers/Gpio/MvGpioDxe/MvGpioDxe.inf
> index 5ff91302da..6f36c2db2e 100644
> --- a/Silicon/Marvell/Drivers/Gpio/MvGpioDxe/MvGpioDxe.inf
> +++ b/Silicon/Marvell/Drivers/Gpio/MvGpioDxe/MvGpioDxe.inf
> @@ -2,13 +2,7 @@
> #
> # Copyright (c) 2017, Marvell International Ltd. 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
> -# distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> -# IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
>
> [Defines]
> diff --git a/Silicon/Marvell/Drivers/Gpio/MvPca95xxDxe/MvPca95xxDxe.c b/Silicon/Marvell/Drivers/Gpio/MvPca95xxDxe/MvPca95xxDxe.c
> index 8e7ea7712c..1bf3bcdc2c 100644
> --- a/Silicon/Marvell/Drivers/Gpio/MvPca95xxDxe/MvPca95xxDxe.c
> +++ b/Silicon/Marvell/Drivers/Gpio/MvPca95xxDxe/MvPca95xxDxe.c
> @@ -2,13 +2,7 @@
> *
> * Copyright (c) 2018, Marvell International Ltd. All rights reserved.
> *
> -* This program and the accompanying materials are licensed and made available
> -* under the terms and conditions of the BSD License which accompanies this
> -* distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Silicon/Marvell/Drivers/Gpio/MvPca95xxDxe/MvPca95xxDxe.h b/Silicon/Marvell/Drivers/Gpio/MvPca95xxDxe/MvPca95xxDxe.h
> index 29eb123798..a2498128f8 100644
> --- a/Silicon/Marvell/Drivers/Gpio/MvPca95xxDxe/MvPca95xxDxe.h
> +++ b/Silicon/Marvell/Drivers/Gpio/MvPca95xxDxe/MvPca95xxDxe.h
> @@ -2,13 +2,7 @@
> *
> * Copyright (c) 2018, Marvell International Ltd. All rights reserved.
> *
> -* This program and the accompanying materials are licensed and made available
> -* under the terms and conditions of the BSD License which accompanies this
> -* distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
> #ifndef __MV_PCA953X_H__
> diff --git a/Silicon/Marvell/Drivers/Gpio/MvPca95xxDxe/MvPca95xxDxe.inf b/Silicon/Marvell/Drivers/Gpio/MvPca95xxDxe/MvPca95xxDxe.inf
> index 3b1ab4ee6a..c202d811f2 100644
> --- a/Silicon/Marvell/Drivers/Gpio/MvPca95xxDxe/MvPca95xxDxe.inf
> +++ b/Silicon/Marvell/Drivers/Gpio/MvPca95xxDxe/MvPca95xxDxe.inf
> @@ -2,13 +2,7 @@
> #
> # Copyright (c) 2017, Marvell International Ltd. 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
> -# distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> -# IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
>
> [Defines]
> diff --git a/Silicon/Marvell/Drivers/SdMmc/XenonDxe/XenonDxe.inf b/Silicon/Marvell/Drivers/SdMmc/XenonDxe/XenonDxe.inf
> index 09c58421cd..18f1b164fd 100644
> --- a/Silicon/Marvell/Drivers/SdMmc/XenonDxe/XenonDxe.inf
> +++ b/Silicon/Marvell/Drivers/SdMmc/XenonDxe/XenonDxe.inf
> @@ -8,12 +8,7 @@
> # Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>
> # Copyright (C) 2018, Marvell International Ltd. 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 distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> #
> ##
> diff --git a/Silicon/Marvell/Drivers/SdMmc/XenonDxe/XenonPciHci.c b/Silicon/Marvell/Drivers/SdMmc/XenonDxe/XenonPciHci.c
> index 8a22046bd6..93fcfb3e4d 100644
> --- a/Silicon/Marvell/Drivers/SdMmc/XenonDxe/XenonPciHci.c
> +++ b/Silicon/Marvell/Drivers/SdMmc/XenonDxe/XenonPciHci.c
> @@ -7,13 +7,7 @@
> Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.<BR>
> Copyright (c) 2018, Marvell International, Ltd. 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 distribution. The full text of the license may be found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Marvell/Drivers/SdMmc/XenonDxe/XenonPciHci.h b/Silicon/Marvell/Drivers/SdMmc/XenonDxe/XenonPciHci.h
> index 152ba967de..c0bac77b9b 100644
> --- a/Silicon/Marvell/Drivers/SdMmc/XenonDxe/XenonPciHci.h
> +++ b/Silicon/Marvell/Drivers/SdMmc/XenonDxe/XenonPciHci.h
> @@ -5,13 +5,7 @@
> Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>
> Copyright (c) 2018, Marvell International, Ltd. 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 distribution. The full text of the license may be found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Marvell/Drivers/Spi/MvFvbDxe/MvFvbDxe.c b/Silicon/Marvell/Drivers/Spi/MvFvbDxe/MvFvbDxe.c
> index 62f9e57b13..fba75b6c26 100644
> --- a/Silicon/Marvell/Drivers/Spi/MvFvbDxe/MvFvbDxe.c
> +++ b/Silicon/Marvell/Drivers/Spi/MvFvbDxe/MvFvbDxe.c
> @@ -3,13 +3,7 @@
> Copyright (c) 2011 - 2014, ARM Ltd. All rights reserved.<BR>
> Copyright (c) 2017 Marvell International Ltd.<BR>
>
> - This program and the accompanying materials are licensed and made available
> - under the terms and conditions of the BSD License which accompanies this
> - distribution. The full text of the license may be found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> --*/
>
> diff --git a/Silicon/Marvell/Drivers/Spi/MvFvbDxe/MvFvbDxe.h b/Silicon/Marvell/Drivers/Spi/MvFvbDxe/MvFvbDxe.h
> index e8df9a5ec7..be6b5cb8b0 100644
> --- a/Silicon/Marvell/Drivers/Spi/MvFvbDxe/MvFvbDxe.h
> +++ b/Silicon/Marvell/Drivers/Spi/MvFvbDxe/MvFvbDxe.h
> @@ -3,13 +3,7 @@
> Copyright (c) 2011 - 2014, ARM Ltd. All rights reserved.<BR>
> Copyright (c) 2017 Marvell International Ltd.<BR>
>
> - This program and the accompanying materials
> - are licensed and made available under the terms and conditions of the BSD License
> - which accompanies this distribution. The full text of the license may be found at
> - http://opensource.org/licenses/bsd-license.php
> -
> - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git a/Silicon/Marvell/Include/IndustryStandard/MvSmc.h b/Silicon/Marvell/Include/IndustryStandard/MvSmc.h
> index e5c89d9318..976c23c772 100644
> --- a/Silicon/Marvell/Include/IndustryStandard/MvSmc.h
> +++ b/Silicon/Marvell/Include/IndustryStandard/MvSmc.h
> @@ -2,13 +2,7 @@
> *
> * Copyright (C) 2019, Marvell International Ltd. and its affiliates.
> *
> -* This program and the accompanying materials are licensed and made available
> -* under the terms and conditions of the BSD License which accompanies this
> -* distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Silicon/Marvell/Include/Library/ArmadaBoardDescLib.h b/Silicon/Marvell/Include/Library/ArmadaBoardDescLib.h
> index 6ec5ace8dd..a6d39c4f21 100644
> --- a/Silicon/Marvell/Include/Library/ArmadaBoardDescLib.h
> +++ b/Silicon/Marvell/Include/Library/ArmadaBoardDescLib.h
> @@ -2,13 +2,7 @@
> *
> * Copyright (C) 2018, Marvell International Ltd. and its affiliates
> *
> -* This program and the accompanying materials are licensed and made available
> -* under the terms and conditions of the BSD License which accompanies this
> -* distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
> #ifndef __ARMADA_BOARD_DESC_LIB_H__
> diff --git a/Silicon/Marvell/Include/Library/ArmadaIcuLib.h b/Silicon/Marvell/Include/Library/ArmadaIcuLib.h
> index db66efbb73..9f3dd85a96 100644
> --- a/Silicon/Marvell/Include/Library/ArmadaIcuLib.h
> +++ b/Silicon/Marvell/Include/Library/ArmadaIcuLib.h
> @@ -2,13 +2,7 @@
> *
> * Copyright (C) 2018, Marvell International Ltd. and its affiliates
> *
> -* This program and the accompanying materials are licensed and made available
> -* under the terms and conditions of the BSD License which accompanies this
> -* distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
> #ifndef __ARMADA_ICU_LIB_H__
> diff --git a/Silicon/Marvell/Include/Library/ArmadaSoCDescLib.h b/Silicon/Marvell/Include/Library/ArmadaSoCDescLib.h
> index fc17c3a8a4..cd9c9f26fe 100644
> --- a/Silicon/Marvell/Include/Library/ArmadaSoCDescLib.h
> +++ b/Silicon/Marvell/Include/Library/ArmadaSoCDescLib.h
> @@ -2,13 +2,7 @@
> *
> * Copyright (C) 2018, Marvell International Ltd. and its affiliates
> *
> -* This program and the accompanying materials are licensed and made available
> -* under the terms and conditions of the BSD License which accompanies this
> -* distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
> #ifndef __ARMADA_SOC_DESC_LIB_H__
> diff --git a/Silicon/Marvell/Include/Library/MvGpioLib.h b/Silicon/Marvell/Include/Library/MvGpioLib.h
> index a14acdff63..6ca9e79c1f 100644
> --- a/Silicon/Marvell/Include/Library/MvGpioLib.h
> +++ b/Silicon/Marvell/Include/Library/MvGpioLib.h
> @@ -2,13 +2,7 @@
> *
> * Copyright (C) 2018, Marvell International Ltd. and its affiliates.
> *
> -* This program and the accompanying materials are licensed and made available
> -* under the terms and conditions of the BSD License which accompanies this
> -* distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
> #ifndef __MV_GPIO_LIB_H__
> diff --git a/Silicon/Marvell/Include/Library/NonDiscoverableInitLib.h b/Silicon/Marvell/Include/Library/NonDiscoverableInitLib.h
> index 18de24fdb0..c353846606 100644
> --- a/Silicon/Marvell/Include/Library/NonDiscoverableInitLib.h
> +++ b/Silicon/Marvell/Include/Library/NonDiscoverableInitLib.h
> @@ -3,13 +3,7 @@
> * Copyright (c) 2017, Linaro Ltd. All rights reserved.
> * Copyright (c) 2018, Marvell International Ltd. All rights reserved.
> *
> -* This program and the accompanying materials are licensed and made available
> -* under the terms and conditions of the BSD License which accompanies this
> -* distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
>
> diff --git a/Silicon/Marvell/Include/Protocol/MvI2c.h b/Silicon/Marvell/Include/Protocol/MvI2c.h
> index d8e644eaad..1d1978e3b3 100644
> --- a/Silicon/Marvell/Include/Protocol/MvI2c.h
> +++ b/Silicon/Marvell/Include/Protocol/MvI2c.h
> @@ -2,13 +2,7 @@
> *
> * Copyright (c) 2018, Marvell International Ltd. All rights reserved.
> *
> -* This program and the accompanying materials are licensed and made available
> -* under the terms and conditions of the BSD License which accompanies this
> -* distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
> #ifndef __MV_I2C_H__
> diff --git a/Silicon/Marvell/Library/IcuLib/IcuLib.c b/Silicon/Marvell/Library/IcuLib/IcuLib.c
> index e88337c0d2..343c21b0be 100644
> --- a/Silicon/Marvell/Library/IcuLib/IcuLib.c
> +++ b/Silicon/Marvell/Library/IcuLib/IcuLib.c
> @@ -2,13 +2,7 @@
> *
> * Copyright (C) 2018, Marvell International Ltd. and its affiliates.
> *
> -* This program and the accompanying materials are licensed and made available
> -* under the terms and conditions of the BSD License which accompanies this
> -* distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> * Glossary - abbreviations used in Marvell SampleAtReset library implementation:
> * ICU - Interrupt Consolidation Unit
> diff --git a/Silicon/Marvell/Library/IcuLib/IcuLib.h b/Silicon/Marvell/Library/IcuLib/IcuLib.h
> index 40df00c6d0..22027f6bc0 100644
> --- a/Silicon/Marvell/Library/IcuLib/IcuLib.h
> +++ b/Silicon/Marvell/Library/IcuLib/IcuLib.h
> @@ -2,13 +2,7 @@
> *
> * Copyright (C) 2018, Marvell International Ltd. and its affiliates.
> *
> -* This program and the accompanying materials are licensed and made available
> -* under the terms and conditions of the BSD License which accompanies this
> -* distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> * Glossary - abbreviations used in Marvell SampleAtReset library implementation:
> * ICU - Interrupt Consolidation Unit
> diff --git a/Silicon/Marvell/Library/IcuLib/IcuLib.inf b/Silicon/Marvell/Library/IcuLib/IcuLib.inf
> index ea662becd7..a2adf412a7 100644
> --- a/Silicon/Marvell/Library/IcuLib/IcuLib.inf
> +++ b/Silicon/Marvell/Library/IcuLib/IcuLib.inf
> @@ -2,13 +2,7 @@
> #
> # Copyright (C) 2018, Marvell International Ltd. and its affiliates<BR>
> #
> -# This program and the accompanying materials are licensed and made available
> -# under the terms and conditions of the BSD License which accompanies this
> -# distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> -# IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git a/Silicon/Marvell/Library/MvGpioLib/MvGpioLib.c b/Silicon/Marvell/Library/MvGpioLib/MvGpioLib.c
> index a95d5ae846..95eabf8022 100644
> --- a/Silicon/Marvell/Library/MvGpioLib/MvGpioLib.c
> +++ b/Silicon/Marvell/Library/MvGpioLib/MvGpioLib.c
> @@ -2,13 +2,7 @@
> *
> * Copyright (C) 2018, Marvell International Ltd. and its affiliates.
> *
> -* This program and the accompanying materials are licensed and made available
> -* under the terms and conditions of the BSD License which accompanies this
> -* distribution. The full text of the license may be found at
> -* http://opensource.org/licenses/bsd-license.php
> -*
> -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +* SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> **/
> #include <Uefi.h>
> diff --git a/Silicon/Marvell/Library/MvGpioLib/MvGpioLib.inf b/Silicon/Marvell/Library/MvGpioLib/MvGpioLib.inf
> index 3bc54ce561..24db268bc7 100644
> --- a/Silicon/Marvell/Library/MvGpioLib/MvGpioLib.inf
> +++ b/Silicon/Marvell/Library/MvGpioLib/MvGpioLib.inf
> @@ -2,13 +2,7 @@
> #
> # Copyright (C) 2018, Marvell International Ltd. and its affiliates<BR>
> #
> -# This program and the accompanying materials are licensed and made available
> -# under the terms and conditions of the BSD License which accompanies this
> -# distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> -# IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> --
> 2.21.0.windows.1
>
^ permalink raw reply [flat|nested] 63+ messages in thread* Re: [[edk2-platforms][PATCH V2] 27/30] Silicon/Marvell: Replace BSD License with BSD+Patent License
2019-05-17 10:50 ` Leif Lindholm
@ 2019-05-28 9:50 ` Leif Lindholm
2019-05-28 10:23 ` Marcin Wojtas
0 siblings, 1 reply; 63+ messages in thread
From: Leif Lindholm @ 2019-05-28 9:50 UTC (permalink / raw)
To: Michael D Kinney, Marcin Wojtas; +Cc: devel, Ard Biesheuvel
On Fri, May 17, 2019 at 11:50:06AM +0100, Leif Lindholm wrote:
> On Wed, May 15, 2019 at 04:10:08PM -0700, Michael D Kinney wrote:
> > https://bugzilla.tianocore.org/show_bug.cgi?id=1373
> >
> > Replace BSD 2-Clause License with BSD+Patent License. This change is
> > based on the following emails:
> >
> > https://lists.01.org/pipermail/edk2-devel/2019-February/036260.html
> > https://lists.01.org/pipermail/edk2-devel/2018-October/030385.html
> >
> > RFCs with detailed process for the license change:
> >
> > V3: https://lists.01.org/pipermail/edk2-devel/2019-March/038116.html
> > V2: https://lists.01.org/pipermail/edk2-devel/2019-March/037669.html
> > V1: https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html
>
> As far as I can tell, this excludes the source files currently
> licensed under 3-clause BSD (2-clause plus non-endorsement clause).
> This is correct, and as discussed offline, but it would be worth
> pointing it out explicitly in the commit message.
>
> (Conversations about relicensing the 3-clause files are happening in
> the background.)
Marcin, can you confirm the outcome of that discussion (for all
Marvell 3-clause BSD source files in the tree, not just the ones
affected by this specific patch)?
/
Leif
^ permalink raw reply [flat|nested] 63+ messages in thread* Re: [[edk2-platforms][PATCH V2] 27/30] Silicon/Marvell: Replace BSD License with BSD+Patent License
2019-05-28 9:50 ` Leif Lindholm
@ 2019-05-28 10:23 ` Marcin Wojtas
2019-05-28 11:59 ` [EXT] " Nadav Haklai
0 siblings, 1 reply; 63+ messages in thread
From: Marcin Wojtas @ 2019-05-28 10:23 UTC (permalink / raw)
To: Leif Lindholm, nadavh
Cc: Michael D Kinney, edk2-devel-groups-io, Ard Biesheuvel
Adding Nadav Haklai from Marvell.
wt., 28 maj 2019 o 11:50 Leif Lindholm <leif.lindholm@linaro.org> napisał(a):
>
> On Fri, May 17, 2019 at 11:50:06AM +0100, Leif Lindholm wrote:
> > On Wed, May 15, 2019 at 04:10:08PM -0700, Michael D Kinney wrote:
> > > https://bugzilla.tianocore.org/show_bug.cgi?id=1373
> > >
> > > Replace BSD 2-Clause License with BSD+Patent License. This change is
> > > based on the following emails:
> > >
> > > https://lists.01.org/pipermail/edk2-devel/2019-February/036260.html
> > > https://lists.01.org/pipermail/edk2-devel/2018-October/030385.html
> > >
> > > RFCs with detailed process for the license change:
> > >
> > > V3: https://lists.01.org/pipermail/edk2-devel/2019-March/038116.html
> > > V2: https://lists.01.org/pipermail/edk2-devel/2019-March/037669.html
> > > V1: https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html
> >
> > As far as I can tell, this excludes the source files currently
> > licensed under 3-clause BSD (2-clause plus non-endorsement clause).
> > This is correct, and as discussed offline, but it would be worth
> > pointing it out explicitly in the commit message.
> >
> > (Conversations about relicensing the 3-clause files are happening in
> > the background.)
>
> Marcin, can you confirm the outcome of that discussion (for all
> Marvell 3-clause BSD source files in the tree, not just the ones
> affected by this specific patch)?
>
I confirm. Nadav, can you please also let know if you approve?
Best regards,
Marcin
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: [EXT] Re: [[edk2-platforms][PATCH V2] 27/30] Silicon/Marvell: Replace BSD License with BSD+Patent License
2019-05-28 10:23 ` Marcin Wojtas
@ 2019-05-28 11:59 ` Nadav Haklai
0 siblings, 0 replies; 63+ messages in thread
From: Nadav Haklai @ 2019-05-28 11:59 UTC (permalink / raw)
To: Marcin Wojtas, Leif Lindholm
Cc: Michael D Kinney, edk2-devel-groups-io, Ard Biesheuvel
Marvell approves this change.
Thanks,
Nadav
-----Original Message-----
From: Marcin Wojtas <mw@semihalf.com>
Sent: Tuesday, May 28, 2019 1:23 PM
To: Leif Lindholm <leif.lindholm@linaro.org>; Nadav Haklai <nadavh@marvell.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>; edk2-devel-groups-io <devel@edk2.groups.io>; Ard Biesheuvel <ard.biesheuvel@linaro.org>
Subject: [EXT] Re: [[edk2-platforms][PATCH V2] 27/30] Silicon/Marvell: Replace BSD License with BSD+Patent License
External Email
----------------------------------------------------------------------
Adding Nadav Haklai from Marvell.
wt., 28 maj 2019 o 11:50 Leif Lindholm <leif.lindholm@linaro.org> napisał(a):
>
> On Fri, May 17, 2019 at 11:50:06AM +0100, Leif Lindholm wrote:
> > On Wed, May 15, 2019 at 04:10:08PM -0700, Michael D Kinney wrote:
> > > https://bugzilla.tianocore.org/show_bug.cgi?id=1373
> > >
> > > Replace BSD 2-Clause License with BSD+Patent License. This change
> > > is based on the following emails:
> > >
> > > https://lists.01.org/pipermail/edk2-devel/2019-February/036260.html
> > >
> > > https://lists.01.org/pipermail/edk2-devel/2018-October/030385.html
> > >
> > > RFCs with detailed process for the license change:
> > >
> > > V3: https://lists.01.org/pipermail/edk2-devel/2019-March/038116.html
> > > V2: https://lists.01.org/pipermail/edk2-devel/2019-March/037669.html
> > > V1:
> > > https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html
> >
> > As far as I can tell, this excludes the source files currently
> > licensed under 3-clause BSD (2-clause plus non-endorsement clause).
> > This is correct, and as discussed offline, but it would be worth
> > pointing it out explicitly in the commit message.
> >
> > (Conversations about relicensing the 3-clause files are happening in
> > the background.)
>
> Marcin, can you confirm the outcome of that discussion (for all
> Marvell 3-clause BSD source files in the tree, not just the ones
> affected by this specific patch)?
>
I confirm. Nadav, can you please also let know if you approve?
Best regards,
Marcin
^ permalink raw reply [flat|nested] 63+ messages in thread
* [[edk2-platforms][PATCH V2] 28/30] Silicon/NXP: Replace BSD License with BSD+Patent License
2019-05-15 23:09 [[edk2-platforms][PATCH V2] 00/30] Change edk2-platforms/master to BSD+Patent License Michael D Kinney
` (26 preceding siblings ...)
2019-05-15 23:10 ` [[edk2-platforms][PATCH V2] 27/30] Silicon/Marvell: " Michael D Kinney
@ 2019-05-15 23:10 ` Michael D Kinney
2019-05-15 23:10 ` [[edk2-platforms][PATCH V2] 29/30] Silicon/Socionext: " Michael D Kinney
` (2 subsequent siblings)
30 siblings, 0 replies; 63+ messages in thread
From: Michael D Kinney @ 2019-05-15 23:10 UTC (permalink / raw)
To: devel; +Cc: Leif Lindholm, Ard Biesheuvel
https://bugzilla.tianocore.org/show_bug.cgi?id=1373
Replace BSD 2-Clause License with BSD+Patent License. This change is
based on the following emails:
https://lists.01.org/pipermail/edk2-devel/2019-February/036260.html
https://lists.01.org/pipermail/edk2-devel/2018-October/030385.html
RFCs with detailed process for the license change:
V3: https://lists.01.org/pipermail/edk2-devel/2019-March/038116.html
V2: https://lists.01.org/pipermail/edk2-devel/2019-March/037669.html
V1: https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
.../Pcf8563RealTimeClockLib/Pcf8563RealTimeClockLib.c | 8 +-------
.../Pcf8563RealTimeClockLib/Pcf8563RealTimeClockLib.dec | 7 +------
.../Pcf8563RealTimeClockLib/Pcf8563RealTimeClockLib.inf | 7 +------
3 files changed, 3 insertions(+), 19 deletions(-)
diff --git a/Silicon/NXP/Library/Pcf8563RealTimeClockLib/Pcf8563RealTimeClockLib.c b/Silicon/NXP/Library/Pcf8563RealTimeClockLib/Pcf8563RealTimeClockLib.c
index 77d8998cfd..7310fecb39 100644
--- a/Silicon/NXP/Library/Pcf8563RealTimeClockLib/Pcf8563RealTimeClockLib.c
+++ b/Silicon/NXP/Library/Pcf8563RealTimeClockLib/Pcf8563RealTimeClockLib.c
@@ -2,13 +2,7 @@
Copyright (c) 2017, Linaro, Ltd. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/NXP/Library/Pcf8563RealTimeClockLib/Pcf8563RealTimeClockLib.dec b/Silicon/NXP/Library/Pcf8563RealTimeClockLib/Pcf8563RealTimeClockLib.dec
index 94c4a3f1ef..0bceea369d 100644
--- a/Silicon/NXP/Library/Pcf8563RealTimeClockLib/Pcf8563RealTimeClockLib.dec
+++ b/Silicon/NXP/Library/Pcf8563RealTimeClockLib/Pcf8563RealTimeClockLib.dec
@@ -2,12 +2,7 @@
#
# Copyright (c) 2017, Linaro, Ltd. 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 distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#
#**/
diff --git a/Silicon/NXP/Library/Pcf8563RealTimeClockLib/Pcf8563RealTimeClockLib.inf b/Silicon/NXP/Library/Pcf8563RealTimeClockLib/Pcf8563RealTimeClockLib.inf
index e232902c6b..d30b5be208 100644
--- a/Silicon/NXP/Library/Pcf8563RealTimeClockLib/Pcf8563RealTimeClockLib.inf
+++ b/Silicon/NXP/Library/Pcf8563RealTimeClockLib/Pcf8563RealTimeClockLib.inf
@@ -2,12 +2,7 @@
#
# Copyright (c) 2017, Linaro, Ltd. 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 distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#
#**/
--
2.21.0.windows.1
^ permalink raw reply related [flat|nested] 63+ messages in thread* [[edk2-platforms][PATCH V2] 29/30] Silicon/Socionext: Replace BSD License with BSD+Patent License
2019-05-15 23:09 [[edk2-platforms][PATCH V2] 00/30] Change edk2-platforms/master to BSD+Patent License Michael D Kinney
` (27 preceding siblings ...)
2019-05-15 23:10 ` [[edk2-platforms][PATCH V2] 28/30] Silicon/NXP: " Michael D Kinney
@ 2019-05-15 23:10 ` Michael D Kinney
2019-05-17 11:09 ` [[edk2-platforms][PATCH V2] 00/30] Change edk2-platforms/master to " Leif Lindholm
2019-05-17 21:33 ` [edk2-devel] " Michael D Kinney
30 siblings, 0 replies; 63+ messages in thread
From: Michael D Kinney @ 2019-05-15 23:10 UTC (permalink / raw)
To: devel; +Cc: Leif Lindholm, Ard Biesheuvel
https://bugzilla.tianocore.org/show_bug.cgi?id=1373
Replace BSD 2-Clause License with BSD+Patent License. This change is
based on the following emails:
https://lists.01.org/pipermail/edk2-devel/2019-February/036260.html
https://lists.01.org/pipermail/edk2-devel/2018-October/030385.html
RFCs with detailed process for the license change:
V3: https://lists.01.org/pipermail/edk2-devel/2019-March/038116.html
V2: https://lists.01.org/pipermail/edk2-devel/2019-March/037669.html
V1: https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
Silicon/Openmoko/ChaosKeyDxe/ChaosKeyDriver.c | 8 +-------
Silicon/Openmoko/ChaosKeyDxe/ChaosKeyDriver.h | 8 +-------
Silicon/Openmoko/ChaosKeyDxe/ChaosKeyDxe.inf | 8 +-------
Silicon/Openmoko/ChaosKeyDxe/ComponentName.c | 8 +-------
Silicon/Openmoko/ChaosKeyDxe/DriverBinding.c | 8 +-------
Silicon/Openmoko/Openmoko.dsc | 8 +-------
Silicon/Socionext/SynQuacer/Acpi.dsc.inc | 8 +-------
.../Socionext/SynQuacer/AcpiTables/AcpiSsdtRootPci.asl | 8 +-------
Silicon/Socionext/SynQuacer/AcpiTables/AcpiTables.h | 8 +-------
Silicon/Socionext/SynQuacer/AcpiTables/AcpiTables.inf | 8 +-------
Silicon/Socionext/SynQuacer/AcpiTables/Dsdt.asl | 8 +-------
Silicon/Socionext/SynQuacer/AcpiTables/Fadt.aslc | 8 +-------
Silicon/Socionext/SynQuacer/AcpiTables/Gtdt.aslc | 8 +-------
Silicon/Socionext/SynQuacer/AcpiTables/Iort.aslc | 8 +-------
Silicon/Socionext/SynQuacer/AcpiTables/Madt.aslc | 8 +-------
Silicon/Socionext/SynQuacer/AcpiTables/Mcfg.aslc | 8 +-------
Silicon/Socionext/SynQuacer/AcpiTables/Pptt.aslc | 8 +-------
Silicon/Socionext/SynQuacer/AcpiTables/Spcr.aslc | 8 +-------
Silicon/Socionext/SynQuacer/DeviceTree/DeveloperBox.dts | 9 +--------
Silicon/Socionext/SynQuacer/DeviceTree/DeveloperBox.inf | 8 +-------
Silicon/Socionext/SynQuacer/DeviceTree/SynQuacer.dtsi | 9 +--------
.../Socionext/SynQuacer/DeviceTree/SynQuacerCaches.dtsi | 9 +--------
.../SynQuacer/DeviceTree/SynQuacerEvalBoard.dts | 9 +--------
.../SynQuacer/DeviceTree/SynQuacerEvalBoard.inf | 8 +-------
.../Socionext/SynQuacer/Drivers/Fip006Dxe/Fip006Dxe.dec | 8 +-------
.../Socionext/SynQuacer/Drivers/Fip006Dxe/Fip006Dxe.inf | 8 +-------
.../Socionext/SynQuacer/Drivers/Fip006Dxe/Fip006Reg.h | 8 +-------
.../SynQuacer/Drivers/Fip006Dxe/Fip006StandaloneMm.inf | 8 +-------
Silicon/Socionext/SynQuacer/Drivers/Fip006Dxe/NorFlash.c | 8 +-------
Silicon/Socionext/SynQuacer/Drivers/Fip006Dxe/NorFlash.h | 8 +-------
.../Socionext/SynQuacer/Drivers/Fip006Dxe/NorFlashDxe.c | 8 +-------
.../Socionext/SynQuacer/Drivers/Fip006Dxe/NorFlashFvb.c | 8 +-------
.../Socionext/SynQuacer/Drivers/Fip006Dxe/NorFlashSmm.c | 8 +-------
.../SynQuacer/Drivers/Net/NetsecDxe/ComponentName.c | 8 +-------
.../SynQuacer/Drivers/Net/NetsecDxe/DriverBinding.c | 8 +-------
.../SynQuacer/Drivers/Net/NetsecDxe/NetsecDxe.c | 8 +-------
.../SynQuacer/Drivers/Net/NetsecDxe/NetsecDxe.dec | 8 +-------
.../SynQuacer/Drivers/Net/NetsecDxe/NetsecDxe.h | 8 +-------
.../SynQuacer/Drivers/Net/NetsecDxe/NetsecDxe.inf | 8 +-------
.../netsec_for_uefi/netsec_sdk/include/ogma_api.h | 8 +-------
.../netsec_for_uefi/netsec_sdk/include/ogma_basic_type.h | 8 +-------
.../netsec_for_uefi/netsec_sdk/include/ogma_version.h | 8 +-------
.../netsec_for_uefi/netsec_sdk/src/ogma_basic_access.c | 8 +-------
.../netsec_for_uefi/netsec_sdk/src/ogma_basic_access.h | 8 +-------
.../netsec_sdk/src/ogma_desc_ring_access.c | 8 +-------
.../netsec_sdk/src/ogma_desc_ring_access_internal.h | 8 +-------
.../netsec_for_uefi/netsec_sdk/src/ogma_gmac_access.c | 8 +-------
.../netsec_for_uefi/netsec_sdk/src/ogma_internal.h | 8 +-------
.../NetsecDxe/netsec_for_uefi/netsec_sdk/src/ogma_misc.c | 8 +-------
.../netsec_for_uefi/netsec_sdk/src/ogma_misc_internal.h | 8 +-------
.../NetsecDxe/netsec_for_uefi/netsec_sdk/src/ogma_reg.h | 8 +-------
.../netsec_for_uefi/netsec_sdk/src/ogma_reg_f_gmac_4mt.h | 8 +-------
.../netsec_for_uefi/netsec_sdk/src/ogma_reg_netsec.h | 8 +-------
.../Drivers/Net/NetsecDxe/netsec_for_uefi/ogma_config.h | 8 +-------
.../Drivers/Net/NetsecDxe/netsec_for_uefi/pfdep.h | 8 +-------
.../Drivers/Net/NetsecDxe/netsec_for_uefi/pfdep_uefi.c | 8 +-------
.../Socionext/SynQuacer/Drivers/OpteeRngDxe/OpteeRng.c | 8 +-------
.../SynQuacer/Drivers/OpteeRngDxe/OpteeRngDxe.inf | 8 +-------
.../SynQuacer/Drivers/OpteeRngDxe/OpteeRngDxe.uni | 7 +------
| 7 +------
Silicon/Socionext/SynQuacer/Drivers/PlatformDxe/Emmc.asl | 8 +-------
Silicon/Socionext/SynQuacer/Drivers/PlatformDxe/Emmc.c | 8 +-------
Silicon/Socionext/SynQuacer/Drivers/PlatformDxe/Pci.c | 8 +-------
.../SynQuacer/Drivers/PlatformDxe/PlatformDxe.c | 8 +-------
.../SynQuacer/Drivers/PlatformDxe/PlatformDxe.h | 8 +-------
.../SynQuacer/Drivers/PlatformDxe/PlatformDxe.inf | 8 +-------
.../SynQuacer/Drivers/PlatformDxe/PlatformDxeHii.uni | 8 +-------
.../SynQuacer/Drivers/PlatformDxe/PlatformDxeHii.vfr | 8 +-------
.../Drivers/SynQuacerGpioPei/SynQuacerGpioPei.c | 8 +-------
.../Drivers/SynQuacerGpioPei/SynQuacerGpioPei.inf | 8 +-------
.../SynQuacer/Drivers/SynQuacerI2cDxe/ComponentName.c | 8 +-------
.../SynQuacer/Drivers/SynQuacerI2cDxe/DriverBinding.c | 8 +-------
.../SynQuacer/Drivers/SynQuacerI2cDxe/SynQuacerI2cDxe.c | 7 +------
.../SynQuacer/Drivers/SynQuacerI2cDxe/SynQuacerI2cDxe.h | 7 +------
.../Drivers/SynQuacerI2cDxe/SynQuacerI2cDxe.inf | 7 +------
.../SynQuacerPciCpuIo2Dxe/SynQuacerPciCpuIo2Dxe.c | 8 +-------
.../SynQuacerPciCpuIo2Dxe/SynQuacerPciCpuIo2Dxe.inf | 8 +-------
.../SynQuacer/Include/Guid/SynQuacerPlatformFormSet.h | 8 +-------
Silicon/Socionext/SynQuacer/Include/Platform/DramInfo.h | 8 +-------
Silicon/Socionext/SynQuacer/Include/Platform/MemoryMap.h | 8 +-------
Silicon/Socionext/SynQuacer/Include/Platform/Pcie.h | 8 +-------
Silicon/Socionext/SynQuacer/Include/Platform/VarStore.h | 8 +-------
Silicon/Socionext/SynQuacer/Include/Ppi/DramInfo.h | 8 +-------
.../Library/NorFlashSynQuacerLib/NorFlashSynQuacer.c | 8 +-------
.../NorFlashSynQuacerLib/NorFlashSynQuacerLib.inf | 8 +-------
.../SynQuacerDtbLoaderLib/SynQuacerDtbLoaderLib.c | 8 +-------
.../SynQuacerDtbLoaderLib/SynQuacerDtbLoaderLib.inf | 8 +-------
.../Library/SynQuacerLib/AArch64/SynQuacerHelper.S | 8 +-------
.../SynQuacer/Library/SynQuacerLib/Arm/SynQuacerHelper.S | 8 +-------
.../Socionext/SynQuacer/Library/SynQuacerLib/SynQuacer.c | 8 +-------
.../SynQuacer/Library/SynQuacerLib/SynQuacerLib.inf | 8 +-------
.../SynQuacerMemoryInitPeiLib.c | 8 +-------
.../SynQuacerMemoryInitPeiLib.inf | 8 +-------
.../SynQuacerPciHostBridgeLib.c | 8 +-------
.../SynQuacerPciHostBridgeLib.inf | 8 +-------
.../SynQuacerPciHostBridgeLibConstructor.c | 8 +-------
.../Library/SynQuacerPciSegmentLib/PciSegmentLib.c | 9 +--------
.../SynQuacerPciSegmentLib/SynQuacerPciSegmentLib.inf | 7 +------
.../SynQuacerPlatformFlashAccessLib.c | 8 +-------
.../SynQuacerPlatformFlashAccessLib.inf | 8 +-------
.../SynQuacerPlatformPeiLib/SynQuacerPlatformPeiLib.c | 8 +-------
.../SynQuacerPlatformPeiLib/SynQuacerPlatformPeiLib.inf | 8 +-------
Silicon/Socionext/SynQuacer/Stage2Tables/GNUmakefile | 8 +-------
Silicon/Socionext/SynQuacer/Stage2Tables/Stage2Tables.S | 8 +-------
.../Socionext/SynQuacer/Stage2Tables/Stage2Tables.inf | 8 +-------
Silicon/Socionext/SynQuacer/SynQuacer.dec | 8 +-------
106 files changed, 106 insertions(+), 741 deletions(-)
diff --git a/Silicon/Openmoko/ChaosKeyDxe/ChaosKeyDriver.c b/Silicon/Openmoko/ChaosKeyDxe/ChaosKeyDriver.c
index 970b2300ca..3bb9d3e2f1 100644
--- a/Silicon/Openmoko/ChaosKeyDxe/ChaosKeyDriver.c
+++ b/Silicon/Openmoko/ChaosKeyDxe/ChaosKeyDriver.c
@@ -3,13 +3,7 @@
Copyright (c) 2016 - 2017, Linaro Ltd. 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 distribution. The full text of the license may
- be found at http://opensource.org/licenses/bsd-license.php.
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Openmoko/ChaosKeyDxe/ChaosKeyDriver.h b/Silicon/Openmoko/ChaosKeyDxe/ChaosKeyDriver.h
index 37cdbe0c30..97cfbbb755 100644
--- a/Silicon/Openmoko/ChaosKeyDxe/ChaosKeyDriver.h
+++ b/Silicon/Openmoko/ChaosKeyDxe/ChaosKeyDriver.h
@@ -3,13 +3,7 @@
Copyright (c) 2016 - 2017, Linaro Ltd. 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 distribution. The full text of the license may
- be found at http://opensource.org/licenses/bsd-license.php.
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Openmoko/ChaosKeyDxe/ChaosKeyDxe.inf b/Silicon/Openmoko/ChaosKeyDxe/ChaosKeyDxe.inf
index 2ff84956ca..420310634d 100644
--- a/Silicon/Openmoko/ChaosKeyDxe/ChaosKeyDxe.inf
+++ b/Silicon/Openmoko/ChaosKeyDxe/ChaosKeyDxe.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2016 - 2017, Linaro Ltd. 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 distribution. The full text of the license may
-# be found at http://opensource.org/licenses/bsd-license.php.
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Openmoko/ChaosKeyDxe/ComponentName.c b/Silicon/Openmoko/ChaosKeyDxe/ComponentName.c
index 5c7e1825e8..25117e2500 100644
--- a/Silicon/Openmoko/ChaosKeyDxe/ComponentName.c
+++ b/Silicon/Openmoko/ChaosKeyDxe/ComponentName.c
@@ -3,13 +3,7 @@
Copyright (c) 2017, Linaro Ltd. All rights reserved.
- This program and the accompanying materials
- are licensed and made available under the terms and conditions of the BSD License
- which accompanies this distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Openmoko/ChaosKeyDxe/DriverBinding.c b/Silicon/Openmoko/ChaosKeyDxe/DriverBinding.c
index 3ae61b2cc5..e7d0d3fe56 100644
--- a/Silicon/Openmoko/ChaosKeyDxe/DriverBinding.c
+++ b/Silicon/Openmoko/ChaosKeyDxe/DriverBinding.c
@@ -3,13 +3,7 @@
Copyright (c) 2016 - 2017, Linaro Ltd. 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 distribution. The full text of the license may
- be found at http://opensource.org/licenses/bsd-license.php.
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Openmoko/Openmoko.dsc b/Silicon/Openmoko/Openmoko.dsc
index 2b6ffe894f..572be3d730 100644
--- a/Silicon/Openmoko/Openmoko.dsc
+++ b/Silicon/Openmoko/Openmoko.dsc
@@ -2,13 +2,7 @@
#
# Copyright (c) 2017, Linaro, Ltd. 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 distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Socionext/SynQuacer/Acpi.dsc.inc b/Silicon/Socionext/SynQuacer/Acpi.dsc.inc
index 73a5ea40e3..acd9035533 100644
--- a/Silicon/Socionext/SynQuacer/Acpi.dsc.inc
+++ b/Silicon/Socionext/SynQuacer/Acpi.dsc.inc
@@ -1,13 +1,7 @@
#
# Copyright (c) 2018, Linaro Limited. All rights reserved.
#
-# This program and the accompanying materials are licensed and made available
-# under the terms and conditions of the BSD License which accompanies this
-# distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
################################################################################
diff --git a/Silicon/Socionext/SynQuacer/AcpiTables/AcpiSsdtRootPci.asl b/Silicon/Socionext/SynQuacer/AcpiTables/AcpiSsdtRootPci.asl
index 77d4763d1a..a5b152899d 100644
--- a/Silicon/Socionext/SynQuacer/AcpiTables/AcpiSsdtRootPci.asl
+++ b/Silicon/Socionext/SynQuacer/AcpiTables/AcpiSsdtRootPci.asl
@@ -4,13 +4,7 @@
Copyright (c) 2014-2016, ARM Ltd. All rights reserved.<BR>
Copyright (c) 2018, Linaro Ltd. 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
- distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Socionext/SynQuacer/AcpiTables/AcpiTables.h b/Silicon/Socionext/SynQuacer/AcpiTables/AcpiTables.h
index 734a60a5b0..971d7fbb9d 100644
--- a/Silicon/Socionext/SynQuacer/AcpiTables/AcpiTables.h
+++ b/Silicon/Socionext/SynQuacer/AcpiTables/AcpiTables.h
@@ -3,13 +3,7 @@
* Copyright (c) 2013-2014, ARM Limited. All rights reserved.
* Copyright (c) 2018, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials are licensed and made available
-* under the terms and conditions of the BSD License which accompanies this
-* distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Socionext/SynQuacer/AcpiTables/AcpiTables.inf b/Silicon/Socionext/SynQuacer/AcpiTables/AcpiTables.inf
index 6fbdf4d67a..96efb2d38e 100644
--- a/Silicon/Socionext/SynQuacer/AcpiTables/AcpiTables.inf
+++ b/Silicon/Socionext/SynQuacer/AcpiTables/AcpiTables.inf
@@ -5,13 +5,7 @@
# Copyright (c) 2014-2016, ARM Ltd. All rights reserved.
# Copyright (c) 2018, Linaro Ltd. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Socionext/SynQuacer/AcpiTables/Dsdt.asl b/Silicon/Socionext/SynQuacer/AcpiTables/Dsdt.asl
index 44cdf65689..c8d8120d26 100644
--- a/Silicon/Socionext/SynQuacer/AcpiTables/Dsdt.asl
+++ b/Silicon/Socionext/SynQuacer/AcpiTables/Dsdt.asl
@@ -4,13 +4,7 @@
Copyright (c) 2014-2016, ARM Ltd. All rights reserved.<BR>
Copyright (c) 2018, Linaro Ltd. 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
- distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Socionext/SynQuacer/AcpiTables/Fadt.aslc b/Silicon/Socionext/SynQuacer/AcpiTables/Fadt.aslc
index 0bc4c6a87b..2053a3165a 100644
--- a/Silicon/Socionext/SynQuacer/AcpiTables/Fadt.aslc
+++ b/Silicon/Socionext/SynQuacer/AcpiTables/Fadt.aslc
@@ -4,13 +4,7 @@
* Copyright (c) 2012 - 2016, ARM Limited. All rights reserved.
* Copyright (c) 2018, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials are licensed and made available
-* under the terms and conditions of the BSD License which accompanies this
-* distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Socionext/SynQuacer/AcpiTables/Gtdt.aslc b/Silicon/Socionext/SynQuacer/AcpiTables/Gtdt.aslc
index b739199094..c811fc5a0c 100644
--- a/Silicon/Socionext/SynQuacer/AcpiTables/Gtdt.aslc
+++ b/Silicon/Socionext/SynQuacer/AcpiTables/Gtdt.aslc
@@ -4,13 +4,7 @@
* Copyright (c) 2012 - 2016, ARM Limited. All rights reserved.
* Copyright (c) 2018, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials are licensed and made available
-* under the terms and conditions of the BSD License which accompanies this
-* distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Socionext/SynQuacer/AcpiTables/Iort.aslc b/Silicon/Socionext/SynQuacer/AcpiTables/Iort.aslc
index 3f2aaa3d88..4627347028 100644
--- a/Silicon/Socionext/SynQuacer/AcpiTables/Iort.aslc
+++ b/Silicon/Socionext/SynQuacer/AcpiTables/Iort.aslc
@@ -2,13 +2,7 @@
Copyright (c) 2018, Linaro Ltd. 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
- distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Socionext/SynQuacer/AcpiTables/Madt.aslc b/Silicon/Socionext/SynQuacer/AcpiTables/Madt.aslc
index 6bbf216d80..b998b56f99 100644
--- a/Silicon/Socionext/SynQuacer/AcpiTables/Madt.aslc
+++ b/Silicon/Socionext/SynQuacer/AcpiTables/Madt.aslc
@@ -4,13 +4,7 @@
* Copyright (c) 2012 - 2016, ARM Limited. All rights reserved.
* Copyright (c) 2018, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials are licensed and made available
-* under the terms and conditions of the BSD License which accompanies this
-* distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Socionext/SynQuacer/AcpiTables/Mcfg.aslc b/Silicon/Socionext/SynQuacer/AcpiTables/Mcfg.aslc
index 089b9e95af..300af6b85f 100644
--- a/Silicon/Socionext/SynQuacer/AcpiTables/Mcfg.aslc
+++ b/Silicon/Socionext/SynQuacer/AcpiTables/Mcfg.aslc
@@ -7,13 +7,7 @@
Copyright (c) 2014 - 2016, AMD Inc. All rights reserved.
Copyright (c) 2018, Linaro Limited. All rights reserved.
- This program and the accompanying materials are licensed and
- made available under the terms and conditions of the BSD License
- which accompanies this distribution. The full text of the
- license may be found at http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Socionext/SynQuacer/AcpiTables/Pptt.aslc b/Silicon/Socionext/SynQuacer/AcpiTables/Pptt.aslc
index 537166b611..e351d82b97 100644
--- a/Silicon/Socionext/SynQuacer/AcpiTables/Pptt.aslc
+++ b/Silicon/Socionext/SynQuacer/AcpiTables/Pptt.aslc
@@ -2,13 +2,7 @@
Copyright (c) 2018, Linaro Ltd. 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
- distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Socionext/SynQuacer/AcpiTables/Spcr.aslc b/Silicon/Socionext/SynQuacer/AcpiTables/Spcr.aslc
index c549a9781c..96a2d02c21 100644
--- a/Silicon/Socionext/SynQuacer/AcpiTables/Spcr.aslc
+++ b/Silicon/Socionext/SynQuacer/AcpiTables/Spcr.aslc
@@ -7,13 +7,7 @@
Copyright (c) 2014 - 2016, AMD Inc. All rights reserved.
Copyright (c) 2018, Linaro Ltd. All rights reserved.
- This program and the accompanying materials are licensed and made available
- under the terms and conditions of the BSD License which accompanies this
- distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Socionext/SynQuacer/DeviceTree/DeveloperBox.dts b/Silicon/Socionext/SynQuacer/DeviceTree/DeveloperBox.dts
index 488c51a0f7..c4bdae258c 100644
--- a/Silicon/Socionext/SynQuacer/DeviceTree/DeveloperBox.dts
+++ b/Silicon/Socionext/SynQuacer/DeviceTree/DeveloperBox.dts
@@ -1,14 +1,7 @@
/** @file
* Copyright (c) 2017, Linaro Limited. All rights reserved.
*
- * This program and the accompanying materials are licensed and made
- * available under the terms and conditions of the BSD License which
- * accompanies this distribution. The full text of the license may be
- * found at http://opensource.org/licenses/bsd-license.php
- *
- * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
- * IMPLIED.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*/
/dts-v1/;
diff --git a/Silicon/Socionext/SynQuacer/DeviceTree/DeveloperBox.inf b/Silicon/Socionext/SynQuacer/DeviceTree/DeveloperBox.inf
index a460a6d4eb..b7285726e8 100644
--- a/Silicon/Socionext/SynQuacer/DeviceTree/DeveloperBox.inf
+++ b/Silicon/Socionext/SynQuacer/DeviceTree/DeveloperBox.inf
@@ -4,13 +4,7 @@
#
# Copyright (c) 2017, Linaro Ltd. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Socionext/SynQuacer/DeviceTree/SynQuacer.dtsi b/Silicon/Socionext/SynQuacer/DeviceTree/SynQuacer.dtsi
index 003e21bd6f..8559b5b329 100644
--- a/Silicon/Socionext/SynQuacer/DeviceTree/SynQuacer.dtsi
+++ b/Silicon/Socionext/SynQuacer/DeviceTree/SynQuacer.dtsi
@@ -1,14 +1,7 @@
/** @file
* Copyright (c) 2017 - 2018, Linaro Limited. All rights reserved.
*
- * This program and the accompanying materials are licensed and made
- * available under the terms and conditions of the BSD License which
- * accompanies this distribution. The full text of the license may be
- * found at http://opensource.org/licenses/bsd-license.php
- *
- * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
- * IMPLIED.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*/
#define GIC_SPI 0
diff --git a/Silicon/Socionext/SynQuacer/DeviceTree/SynQuacerCaches.dtsi b/Silicon/Socionext/SynQuacer/DeviceTree/SynQuacerCaches.dtsi
index 1fbcd4aabf..5e896f0c47 100644
--- a/Silicon/Socionext/SynQuacer/DeviceTree/SynQuacerCaches.dtsi
+++ b/Silicon/Socionext/SynQuacer/DeviceTree/SynQuacerCaches.dtsi
@@ -1,14 +1,7 @@
/** @file
* Copyright (c) 2018, Linaro Limited. All rights reserved.
*
- * This program and the accompanying materials are licensed and made
- * available under the terms and conditions of the BSD License which
- * accompanies this distribution. The full text of the license may be
- * found at http://opensource.org/licenses/bsd-license.php
- *
- * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
- * IMPLIED.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*/
#define __L1(cpuref, l2ref) \
diff --git a/Silicon/Socionext/SynQuacer/DeviceTree/SynQuacerEvalBoard.dts b/Silicon/Socionext/SynQuacer/DeviceTree/SynQuacerEvalBoard.dts
index 0c6826f52c..f437ee4ccc 100644
--- a/Silicon/Socionext/SynQuacer/DeviceTree/SynQuacerEvalBoard.dts
+++ b/Silicon/Socionext/SynQuacer/DeviceTree/SynQuacerEvalBoard.dts
@@ -1,14 +1,7 @@
/** @file
* Copyright (c) 2017, Linaro Limited. All rights reserved.
*
- * This program and the accompanying materials are licensed and made
- * available under the terms and conditions of the BSD License which
- * accompanies this distribution. The full text of the license may be
- * found at http://opensource.org/licenses/bsd-license.php
- *
- * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
- * IMPLIED.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*/
/dts-v1/;
diff --git a/Silicon/Socionext/SynQuacer/DeviceTree/SynQuacerEvalBoard.inf b/Silicon/Socionext/SynQuacer/DeviceTree/SynQuacerEvalBoard.inf
index af9a283e67..47fdec01d9 100644
--- a/Silicon/Socionext/SynQuacer/DeviceTree/SynQuacerEvalBoard.inf
+++ b/Silicon/Socionext/SynQuacer/DeviceTree/SynQuacerEvalBoard.inf
@@ -4,13 +4,7 @@
#
# Copyright (c) 2017, Linaro Ltd. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Socionext/SynQuacer/Drivers/Fip006Dxe/Fip006Dxe.dec b/Silicon/Socionext/SynQuacer/Drivers/Fip006Dxe/Fip006Dxe.dec
index aec95bc823..1830686cf6 100644
--- a/Silicon/Socionext/SynQuacer/Drivers/Fip006Dxe/Fip006Dxe.dec
+++ b/Silicon/Socionext/SynQuacer/Drivers/Fip006Dxe/Fip006Dxe.dec
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, Socionext Inc. 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 distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Socionext/SynQuacer/Drivers/Fip006Dxe/Fip006Dxe.inf b/Silicon/Socionext/SynQuacer/Drivers/Fip006Dxe/Fip006Dxe.inf
index 603641e0a6..f91fdcfbc4 100644
--- a/Silicon/Socionext/SynQuacer/Drivers/Fip006Dxe/Fip006Dxe.inf
+++ b/Silicon/Socionext/SynQuacer/Drivers/Fip006Dxe/Fip006Dxe.inf
@@ -4,13 +4,7 @@
# Copyright (c) 2017, Socionext Inc. All rights reserved.<BR>
# Copyright (c) 2017-2018, Linaro, Ltd. 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 distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Socionext/SynQuacer/Drivers/Fip006Dxe/Fip006Reg.h b/Silicon/Socionext/SynQuacer/Drivers/Fip006Dxe/Fip006Reg.h
index 3d758dc492..da4df25a42 100644
--- a/Silicon/Socionext/SynQuacer/Drivers/Fip006Dxe/Fip006Reg.h
+++ b/Silicon/Socionext/SynQuacer/Drivers/Fip006Dxe/Fip006Reg.h
@@ -4,13 +4,7 @@
Copyright (c) 2017, Socionext Inc. All rights reserved.<BR>
Copyright (c) 2017, Linaro, Ltd. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Socionext/SynQuacer/Drivers/Fip006Dxe/Fip006StandaloneMm.inf b/Silicon/Socionext/SynQuacer/Drivers/Fip006Dxe/Fip006StandaloneMm.inf
index 2dcbfd7db8..8f4184dcbd 100644
--- a/Silicon/Socionext/SynQuacer/Drivers/Fip006Dxe/Fip006StandaloneMm.inf
+++ b/Silicon/Socionext/SynQuacer/Drivers/Fip006Dxe/Fip006StandaloneMm.inf
@@ -4,13 +4,7 @@
# Copyright (c) 2017, Socionext Inc. All rights reserved.<BR>
# Copyright (c) 2017-2018, Linaro, Ltd. 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 distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Socionext/SynQuacer/Drivers/Fip006Dxe/NorFlash.c b/Silicon/Socionext/SynQuacer/Drivers/Fip006Dxe/NorFlash.c
index d45c8d9b35..8cdaa0eeb8 100644
--- a/Silicon/Socionext/SynQuacer/Drivers/Fip006Dxe/NorFlash.c
+++ b/Silicon/Socionext/SynQuacer/Drivers/Fip006Dxe/NorFlash.c
@@ -4,13 +4,7 @@
Copyright (c) 2017, Socionext Inc. All rights reserved.<BR>
Copyright (c) 2017, Linaro, Ltd. 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
- distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Socionext/SynQuacer/Drivers/Fip006Dxe/NorFlash.h b/Silicon/Socionext/SynQuacer/Drivers/Fip006Dxe/NorFlash.h
index fa42fa303d..bade5706e6 100644
--- a/Silicon/Socionext/SynQuacer/Drivers/Fip006Dxe/NorFlash.h
+++ b/Silicon/Socionext/SynQuacer/Drivers/Fip006Dxe/NorFlash.h
@@ -4,13 +4,7 @@
Copyright (c) 2017, Socionext Inc. All rights reserved.<BR>
Copyright (c) 2017, Linaro, Ltd. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Socionext/SynQuacer/Drivers/Fip006Dxe/NorFlashDxe.c b/Silicon/Socionext/SynQuacer/Drivers/Fip006Dxe/NorFlashDxe.c
index 6c07799b22..d87b62956d 100644
--- a/Silicon/Socionext/SynQuacer/Drivers/Fip006Dxe/NorFlashDxe.c
+++ b/Silicon/Socionext/SynQuacer/Drivers/Fip006Dxe/NorFlashDxe.c
@@ -4,13 +4,7 @@
Copyright (c) 2017, Socionext Inc. All rights reserved.<BR>
Copyright (c) 2017, Linaro, Ltd. 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
- distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Socionext/SynQuacer/Drivers/Fip006Dxe/NorFlashFvb.c b/Silicon/Socionext/SynQuacer/Drivers/Fip006Dxe/NorFlashFvb.c
index 30b7442d89..387789fb97 100644
--- a/Silicon/Socionext/SynQuacer/Drivers/Fip006Dxe/NorFlashFvb.c
+++ b/Silicon/Socionext/SynQuacer/Drivers/Fip006Dxe/NorFlashFvb.c
@@ -4,13 +4,7 @@
Copyright (c) 2017, Socionext Inc. All rights reserved.<BR>
Copyright (c) 2017, Linaro, Ltd. 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
- distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
--*/
diff --git a/Silicon/Socionext/SynQuacer/Drivers/Fip006Dxe/NorFlashSmm.c b/Silicon/Socionext/SynQuacer/Drivers/Fip006Dxe/NorFlashSmm.c
index b0d636f1da..7daec948a9 100644
--- a/Silicon/Socionext/SynQuacer/Drivers/Fip006Dxe/NorFlashSmm.c
+++ b/Silicon/Socionext/SynQuacer/Drivers/Fip006Dxe/NorFlashSmm.c
@@ -4,13 +4,7 @@
Copyright (c) 2017, Socionext Inc. All rights reserved.<BR>
Copyright (c) 2017, Linaro, Ltd. 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
- distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/ComponentName.c b/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/ComponentName.c
index 2d707d3bd9..44b3daa0af 100644
--- a/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/ComponentName.c
+++ b/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/ComponentName.c
@@ -3,13 +3,7 @@
Copyright (c) 2017, Linaro Ltd. All rights reserved.
- This program and the accompanying materials
- are licensed and made available under the terms and conditions of the BSD License
- which accompanies this distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/DriverBinding.c b/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/DriverBinding.c
index f489ee80b8..9820585e0d 100644
--- a/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/DriverBinding.c
+++ b/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/DriverBinding.c
@@ -3,13 +3,7 @@
Copyright (c) 2017, Linaro Ltd. 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 distribution. The full text of the license may
- be found at http://opensource.org/licenses/bsd-license.php.
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/NetsecDxe.c b/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/NetsecDxe.c
index 1bf1b3cb8f..160bb08a46 100644
--- a/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/NetsecDxe.c
+++ b/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/NetsecDxe.c
@@ -3,13 +3,7 @@
Copyright (c) 2016 Socionext Inc. All rights reserved.<BR>
Copyright (c) 2017, Linaro, Ltd. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/NetsecDxe.dec b/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/NetsecDxe.dec
index 3e7d832e62..6b9f602938 100644
--- a/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/NetsecDxe.dec
+++ b/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/NetsecDxe.dec
@@ -3,13 +3,7 @@
# Copyright (c) 2016 - 2017, Socionext Inc. All rights reserved.<BR>
# Copyright (c) 2017, Linaro, Ltd. 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 distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/NetsecDxe.h b/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/NetsecDxe.h
index f09fb609ba..870833c8d3 100644
--- a/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/NetsecDxe.h
+++ b/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/NetsecDxe.h
@@ -3,13 +3,7 @@
Copyright (c) 2016 Socionext Inc. All rights reserved.<BR>
Copyright (c) 2017, Linaro, Ltd. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/NetsecDxe.inf b/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/NetsecDxe.inf
index 55dfc48fd5..49dd28efc6 100644
--- a/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/NetsecDxe.inf
+++ b/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/NetsecDxe.inf
@@ -3,13 +3,7 @@
# Copyright (c) 2016 - 2017, Socionext Inc. All rights reserved.<BR>
# Copyright (c) 2017, Linaro, Ltd. 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 distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/netsec_for_uefi/netsec_sdk/include/ogma_api.h b/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/netsec_for_uefi/netsec_sdk/include/ogma_api.h
index 336325109e..66f3915043 100644
--- a/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/netsec_for_uefi/netsec_sdk/include/ogma_api.h
+++ b/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/netsec_for_uefi/netsec_sdk/include/ogma_api.h
@@ -3,13 +3,7 @@
Copyright (c) 2016 - 2017, Socionext Inc. All rights reserved.<BR>
Copyright (c) 2017, Linaro, Ltd. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/netsec_for_uefi/netsec_sdk/include/ogma_basic_type.h b/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/netsec_for_uefi/netsec_sdk/include/ogma_basic_type.h
index 7c39b7c9cd..6efaad6972 100644
--- a/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/netsec_for_uefi/netsec_sdk/include/ogma_basic_type.h
+++ b/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/netsec_for_uefi/netsec_sdk/include/ogma_basic_type.h
@@ -3,13 +3,7 @@
Copyright (c) 2016 - 2017, Socionext Inc. All rights reserved.<BR>
Copyright (c) 2017, Linaro, Ltd. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/netsec_for_uefi/netsec_sdk/include/ogma_version.h b/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/netsec_for_uefi/netsec_sdk/include/ogma_version.h
index 68882b6558..c4cb0b7785 100644
--- a/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/netsec_for_uefi/netsec_sdk/include/ogma_version.h
+++ b/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/netsec_for_uefi/netsec_sdk/include/ogma_version.h
@@ -3,13 +3,7 @@
Copyright (c) 2016 - 2017, Socionext Inc. All rights reserved.<BR>
Copyright (c) 2017, Linaro, Ltd. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/netsec_for_uefi/netsec_sdk/src/ogma_basic_access.c b/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/netsec_for_uefi/netsec_sdk/src/ogma_basic_access.c
index 7b399beaed..bb630c6fc7 100644
--- a/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/netsec_for_uefi/netsec_sdk/src/ogma_basic_access.c
+++ b/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/netsec_for_uefi/netsec_sdk/src/ogma_basic_access.c
@@ -3,13 +3,7 @@
Copyright (c) 2016 - 2017, Socionext Inc. All rights reserved.<BR>
Copyright (c) 2017, Linaro, Ltd. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/netsec_for_uefi/netsec_sdk/src/ogma_basic_access.h b/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/netsec_for_uefi/netsec_sdk/src/ogma_basic_access.h
index a81b9249f4..573a10b2f1 100644
--- a/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/netsec_for_uefi/netsec_sdk/src/ogma_basic_access.h
+++ b/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/netsec_for_uefi/netsec_sdk/src/ogma_basic_access.h
@@ -3,13 +3,7 @@
Copyright (c) 2016 - 2017, Socionext Inc. All rights reserved.<BR>
Copyright (c) 2017, Linaro, Ltd. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/netsec_for_uefi/netsec_sdk/src/ogma_desc_ring_access.c b/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/netsec_for_uefi/netsec_sdk/src/ogma_desc_ring_access.c
index a38aff3ce4..49e8605f63 100644
--- a/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/netsec_for_uefi/netsec_sdk/src/ogma_desc_ring_access.c
+++ b/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/netsec_for_uefi/netsec_sdk/src/ogma_desc_ring_access.c
@@ -3,13 +3,7 @@
Copyright (c) 2016 - 2017, Socionext Inc. All rights reserved.<BR>
Copyright (c) 2017, Linaro, Ltd. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/netsec_for_uefi/netsec_sdk/src/ogma_desc_ring_access_internal.h b/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/netsec_for_uefi/netsec_sdk/src/ogma_desc_ring_access_internal.h
index 34490e2d1c..91ff93a181 100644
--- a/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/netsec_for_uefi/netsec_sdk/src/ogma_desc_ring_access_internal.h
+++ b/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/netsec_for_uefi/netsec_sdk/src/ogma_desc_ring_access_internal.h
@@ -3,13 +3,7 @@
Copyright (c) 2016 - 2017, Socionext Inc. All rights reserved.<BR>
Copyright (c) 2017, Linaro, Ltd. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/netsec_for_uefi/netsec_sdk/src/ogma_gmac_access.c b/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/netsec_for_uefi/netsec_sdk/src/ogma_gmac_access.c
index d08bb53a54..88c149c104 100644
--- a/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/netsec_for_uefi/netsec_sdk/src/ogma_gmac_access.c
+++ b/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/netsec_for_uefi/netsec_sdk/src/ogma_gmac_access.c
@@ -3,13 +3,7 @@
Copyright (c) 2016 - 2017, Socionext Inc. All rights reserved.<BR>
Copyright (c) 2017, Linaro, Ltd. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/netsec_for_uefi/netsec_sdk/src/ogma_internal.h b/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/netsec_for_uefi/netsec_sdk/src/ogma_internal.h
index e2e25c71ab..ed09a7ada8 100644
--- a/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/netsec_for_uefi/netsec_sdk/src/ogma_internal.h
+++ b/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/netsec_for_uefi/netsec_sdk/src/ogma_internal.h
@@ -3,13 +3,7 @@
Copyright (c) 2016 - 2017, Socionext Inc. All rights reserved.<BR>
Copyright (c) 2017, Linaro, Ltd. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/netsec_for_uefi/netsec_sdk/src/ogma_misc.c b/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/netsec_for_uefi/netsec_sdk/src/ogma_misc.c
index 3c54c63126..4dec66313a 100644
--- a/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/netsec_for_uefi/netsec_sdk/src/ogma_misc.c
+++ b/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/netsec_for_uefi/netsec_sdk/src/ogma_misc.c
@@ -3,13 +3,7 @@
Copyright (c) 2016 - 2017, Socionext Inc. All rights reserved.<BR>
Copyright (c) 2017, Linaro, Ltd. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/netsec_for_uefi/netsec_sdk/src/ogma_misc_internal.h b/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/netsec_for_uefi/netsec_sdk/src/ogma_misc_internal.h
index 3bbf8de57a..9d8d66ab90 100644
--- a/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/netsec_for_uefi/netsec_sdk/src/ogma_misc_internal.h
+++ b/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/netsec_for_uefi/netsec_sdk/src/ogma_misc_internal.h
@@ -3,13 +3,7 @@
Copyright (c) 2016 - 2017, Socionext Inc. All rights reserved.<BR>
Copyright (c) 2017, Linaro, Ltd. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/netsec_for_uefi/netsec_sdk/src/ogma_reg.h b/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/netsec_for_uefi/netsec_sdk/src/ogma_reg.h
index 910b37a25f..30c716352b 100644
--- a/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/netsec_for_uefi/netsec_sdk/src/ogma_reg.h
+++ b/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/netsec_for_uefi/netsec_sdk/src/ogma_reg.h
@@ -3,13 +3,7 @@
Copyright (c) 2016 - 2017, Socionext Inc. All rights reserved.<BR>
Copyright (c) 2017, Linaro, Ltd. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/netsec_for_uefi/netsec_sdk/src/ogma_reg_f_gmac_4mt.h b/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/netsec_for_uefi/netsec_sdk/src/ogma_reg_f_gmac_4mt.h
index e12b317218..3758c7e24b 100644
--- a/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/netsec_for_uefi/netsec_sdk/src/ogma_reg_f_gmac_4mt.h
+++ b/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/netsec_for_uefi/netsec_sdk/src/ogma_reg_f_gmac_4mt.h
@@ -3,13 +3,7 @@
Copyright (c) 2016 - 2017, Socionext Inc. All rights reserved.<BR>
Copyright (c) 2017, Linaro, Ltd. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/netsec_for_uefi/netsec_sdk/src/ogma_reg_netsec.h b/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/netsec_for_uefi/netsec_sdk/src/ogma_reg_netsec.h
index 457be2aa0c..6e766e84e5 100644
--- a/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/netsec_for_uefi/netsec_sdk/src/ogma_reg_netsec.h
+++ b/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/netsec_for_uefi/netsec_sdk/src/ogma_reg_netsec.h
@@ -3,13 +3,7 @@
Copyright (c) 2016 - 2017, Socionext Inc. All rights reserved.<BR>
Copyright (c) 2017, Linaro, Ltd. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/netsec_for_uefi/ogma_config.h b/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/netsec_for_uefi/ogma_config.h
index f6ec9b30ec..160ecb3fd4 100644
--- a/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/netsec_for_uefi/ogma_config.h
+++ b/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/netsec_for_uefi/ogma_config.h
@@ -3,13 +3,7 @@
Copyright (c) 2016 - 2017, Socionext Inc. All rights reserved.<BR>
Copyright (c) 2017, Linaro, Ltd. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/netsec_for_uefi/pfdep.h b/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/netsec_for_uefi/pfdep.h
index 95796b4cfe..98ffc9d2a5 100644
--- a/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/netsec_for_uefi/pfdep.h
+++ b/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/netsec_for_uefi/pfdep.h
@@ -3,13 +3,7 @@
Copyright (c) 2016 - 2017, Socionext Inc. All rights reserved.<BR>
Copyright (c) 2017, Linaro, Ltd. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/netsec_for_uefi/pfdep_uefi.c b/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/netsec_for_uefi/pfdep_uefi.c
index 0875558c08..711f27ff12 100644
--- a/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/netsec_for_uefi/pfdep_uefi.c
+++ b/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/netsec_for_uefi/pfdep_uefi.c
@@ -3,13 +3,7 @@
Copyright (c) 2016 - 2017, Socionext Inc. All rights reserved.<BR>
Copyright (c) 2017, Linaro, Ltd. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Socionext/SynQuacer/Drivers/OpteeRngDxe/OpteeRng.c b/Silicon/Socionext/SynQuacer/Drivers/OpteeRngDxe/OpteeRng.c
index e55d87ea42..51c15b1b94 100644
--- a/Silicon/Socionext/SynQuacer/Drivers/OpteeRngDxe/OpteeRng.c
+++ b/Silicon/Socionext/SynQuacer/Drivers/OpteeRngDxe/OpteeRng.c
@@ -3,13 +3,7 @@
Copyright (c) 2018, Linaro Ltd. 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 distribution. The full text of the license may
- be found at http://opensource.org/licenses/bsd-license.php.
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Socionext/SynQuacer/Drivers/OpteeRngDxe/OpteeRngDxe.inf b/Silicon/Socionext/SynQuacer/Drivers/OpteeRngDxe/OpteeRngDxe.inf
index 6fef1b3802..5ce12426d9 100644
--- a/Silicon/Socionext/SynQuacer/Drivers/OpteeRngDxe/OpteeRngDxe.inf
+++ b/Silicon/Socionext/SynQuacer/Drivers/OpteeRngDxe/OpteeRngDxe.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2018, Linaro Ltd. 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 distribution. The full text of the license may
-# be found at http://opensource.org/licenses/bsd-license.php.
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Socionext/SynQuacer/Drivers/OpteeRngDxe/OpteeRngDxe.uni b/Silicon/Socionext/SynQuacer/Drivers/OpteeRngDxe/OpteeRngDxe.uni
index de6b76bd0d..624472f948 100644
--- a/Silicon/Socionext/SynQuacer/Drivers/OpteeRngDxe/OpteeRngDxe.uni
+++ b/Silicon/Socionext/SynQuacer/Drivers/OpteeRngDxe/OpteeRngDxe.uni
@@ -3,12 +3,7 @@
//
// Copyright (c) 2018, Linaro, Ltd. 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 distribution. The full text of the license may be found at
-// http://opensource.org/licenses/bsd-license.php
-// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+// SPDX-License-Identifier: BSD-2-Clause-Patent
//
// **/
--git a/Silicon/Socionext/SynQuacer/Drivers/OpteeRngDxe/OpteeRngDxeExtra.uni b/Silicon/Socionext/SynQuacer/Drivers/OpteeRngDxe/OpteeRngDxeExtra.uni
index 05e7864f07..b371474c67 100644
--- a/Silicon/Socionext/SynQuacer/Drivers/OpteeRngDxe/OpteeRngDxeExtra.uni
+++ b/Silicon/Socionext/SynQuacer/Drivers/OpteeRngDxe/OpteeRngDxeExtra.uni
@@ -3,12 +3,7 @@
//
// Copyright (c) 2018, Linaro, Ltd. 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 distribution. The full text of the license may be found at
-// http://opensource.org/licenses/bsd-license.php
-// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+// SPDX-License-Identifier: BSD-2-Clause-Patent
//
// **/
diff --git a/Silicon/Socionext/SynQuacer/Drivers/PlatformDxe/Emmc.asl b/Silicon/Socionext/SynQuacer/Drivers/PlatformDxe/Emmc.asl
index 4e371befc7..9a50a656f0 100644
--- a/Silicon/Socionext/SynQuacer/Drivers/PlatformDxe/Emmc.asl
+++ b/Silicon/Socionext/SynQuacer/Drivers/PlatformDxe/Emmc.asl
@@ -3,13 +3,7 @@
Copyright (c) 2018, Linaro Ltd. 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
- distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Socionext/SynQuacer/Drivers/PlatformDxe/Emmc.c b/Silicon/Socionext/SynQuacer/Drivers/PlatformDxe/Emmc.c
index 47f5ccc2e7..0d0e5edad9 100644
--- a/Silicon/Socionext/SynQuacer/Drivers/PlatformDxe/Emmc.c
+++ b/Silicon/Socionext/SynQuacer/Drivers/PlatformDxe/Emmc.c
@@ -3,13 +3,7 @@
Copyright (c) 2017, Linaro, Ltd. 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
- distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include "PlatformDxe.h"
diff --git a/Silicon/Socionext/SynQuacer/Drivers/PlatformDxe/Pci.c b/Silicon/Socionext/SynQuacer/Drivers/PlatformDxe/Pci.c
index 7c69a8051a..53b8d290ed 100644
--- a/Silicon/Socionext/SynQuacer/Drivers/PlatformDxe/Pci.c
+++ b/Silicon/Socionext/SynQuacer/Drivers/PlatformDxe/Pci.c
@@ -3,13 +3,7 @@
Copyright (c) 2017, Linaro, Ltd. 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
- distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include "PlatformDxe.h"
diff --git a/Silicon/Socionext/SynQuacer/Drivers/PlatformDxe/PlatformDxe.c b/Silicon/Socionext/SynQuacer/Drivers/PlatformDxe/PlatformDxe.c
index 4ae1c5b0ff..73cc560fa8 100644
--- a/Silicon/Socionext/SynQuacer/Drivers/PlatformDxe/PlatformDxe.c
+++ b/Silicon/Socionext/SynQuacer/Drivers/PlatformDxe/PlatformDxe.c
@@ -3,13 +3,7 @@
Copyright (c) 2017, Linaro, Ltd. 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
- distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include "PlatformDxe.h"
diff --git a/Silicon/Socionext/SynQuacer/Drivers/PlatformDxe/PlatformDxe.h b/Silicon/Socionext/SynQuacer/Drivers/PlatformDxe/PlatformDxe.h
index c25b7f168a..c08659f7a7 100644
--- a/Silicon/Socionext/SynQuacer/Drivers/PlatformDxe/PlatformDxe.h
+++ b/Silicon/Socionext/SynQuacer/Drivers/PlatformDxe/PlatformDxe.h
@@ -3,13 +3,7 @@
Copyright (c) 2017, Linaro, Ltd. 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
- distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef __PLATFORM_DXE_H__
diff --git a/Silicon/Socionext/SynQuacer/Drivers/PlatformDxe/PlatformDxe.inf b/Silicon/Socionext/SynQuacer/Drivers/PlatformDxe/PlatformDxe.inf
index 5fa2b7f607..ae9f8712f0 100644
--- a/Silicon/Socionext/SynQuacer/Drivers/PlatformDxe/PlatformDxe.inf
+++ b/Silicon/Socionext/SynQuacer/Drivers/PlatformDxe/PlatformDxe.inf
@@ -4,13 +4,7 @@
#
# Copyright (c) 2017, Linaro, Ltd. 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 distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Socionext/SynQuacer/Drivers/PlatformDxe/PlatformDxeHii.uni b/Silicon/Socionext/SynQuacer/Drivers/PlatformDxe/PlatformDxeHii.uni
index 836decc870..0019939b5f 100644
--- a/Silicon/Socionext/SynQuacer/Drivers/PlatformDxe/PlatformDxeHii.uni
+++ b/Silicon/Socionext/SynQuacer/Drivers/PlatformDxe/PlatformDxeHii.uni
@@ -2,13 +2,7 @@
*
* Copyright (c) 2017 - 2018, Linaro, Ltd. All rights reserved.
*
-* This program and the accompanying materials are licensed and made available
-* under the terms and conditions of the BSD License which accompanies this
-* distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Socionext/SynQuacer/Drivers/PlatformDxe/PlatformDxeHii.vfr b/Silicon/Socionext/SynQuacer/Drivers/PlatformDxe/PlatformDxeHii.vfr
index 25b7b49a3d..6707687b27 100644
--- a/Silicon/Socionext/SynQuacer/Drivers/PlatformDxe/PlatformDxeHii.vfr
+++ b/Silicon/Socionext/SynQuacer/Drivers/PlatformDxe/PlatformDxeHii.vfr
@@ -2,13 +2,7 @@
*
* Copyright (c) 2017 - 2018, Linaro, Ltd. All rights reserved.
*
-* This program and the accompanying materials are licensed and made available
-* under the terms and conditions of the BSD License which accompanies this
-* distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Socionext/SynQuacer/Drivers/SynQuacerGpioPei/SynQuacerGpioPei.c b/Silicon/Socionext/SynQuacer/Drivers/SynQuacerGpioPei/SynQuacerGpioPei.c
index 24d08b4e58..88acef8956 100644
--- a/Silicon/Socionext/SynQuacer/Drivers/SynQuacerGpioPei/SynQuacerGpioPei.c
+++ b/Silicon/Socionext/SynQuacer/Drivers/SynQuacerGpioPei/SynQuacerGpioPei.c
@@ -2,13 +2,7 @@
Copyright (c) 2017, Linaro, Ltd. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Socionext/SynQuacer/Drivers/SynQuacerGpioPei/SynQuacerGpioPei.inf b/Silicon/Socionext/SynQuacer/Drivers/SynQuacerGpioPei/SynQuacerGpioPei.inf
index dbb5e9d4c5..0189e20084 100644
--- a/Silicon/Socionext/SynQuacer/Drivers/SynQuacerGpioPei/SynQuacerGpioPei.inf
+++ b/Silicon/Socionext/SynQuacer/Drivers/SynQuacerGpioPei/SynQuacerGpioPei.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2017, Linaro, Ltd. 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 distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#*/
diff --git a/Silicon/Socionext/SynQuacer/Drivers/SynQuacerI2cDxe/ComponentName.c b/Silicon/Socionext/SynQuacer/Drivers/SynQuacerI2cDxe/ComponentName.c
index 8d7aa41750..9e7f189c13 100644
--- a/Silicon/Socionext/SynQuacer/Drivers/SynQuacerI2cDxe/ComponentName.c
+++ b/Silicon/Socionext/SynQuacer/Drivers/SynQuacerI2cDxe/ComponentName.c
@@ -2,13 +2,7 @@
Copyright (c) 2017, Linaro Ltd. All rights reserved.
- This program and the accompanying materials
- are licensed and made available under the terms and conditions of the BSD License
- which accompanies this distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Socionext/SynQuacer/Drivers/SynQuacerI2cDxe/DriverBinding.c b/Silicon/Socionext/SynQuacer/Drivers/SynQuacerI2cDxe/DriverBinding.c
index 07bc138493..4e265aacf1 100644
--- a/Silicon/Socionext/SynQuacer/Drivers/SynQuacerI2cDxe/DriverBinding.c
+++ b/Silicon/Socionext/SynQuacer/Drivers/SynQuacerI2cDxe/DriverBinding.c
@@ -2,13 +2,7 @@
Copyright (c) 2017, Linaro Ltd. 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 distribution. The full text of the license may
- be found at http://opensource.org/licenses/bsd-license.php.
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Socionext/SynQuacer/Drivers/SynQuacerI2cDxe/SynQuacerI2cDxe.c b/Silicon/Socionext/SynQuacer/Drivers/SynQuacerI2cDxe/SynQuacerI2cDxe.c
index 415e3f0804..31f6e3072f 100644
--- a/Silicon/Socionext/SynQuacer/Drivers/SynQuacerI2cDxe/SynQuacerI2cDxe.c
+++ b/Silicon/Socionext/SynQuacer/Drivers/SynQuacerI2cDxe/SynQuacerI2cDxe.c
@@ -2,12 +2,7 @@
Copyright (c) 2017, Linaro, Ltd. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Socionext/SynQuacer/Drivers/SynQuacerI2cDxe/SynQuacerI2cDxe.h b/Silicon/Socionext/SynQuacer/Drivers/SynQuacerI2cDxe/SynQuacerI2cDxe.h
index 695a885f66..f891e4bf2f 100644
--- a/Silicon/Socionext/SynQuacer/Drivers/SynQuacerI2cDxe/SynQuacerI2cDxe.h
+++ b/Silicon/Socionext/SynQuacer/Drivers/SynQuacerI2cDxe/SynQuacerI2cDxe.h
@@ -2,12 +2,7 @@
Copyright (c) 2017, Linaro, Ltd. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Socionext/SynQuacer/Drivers/SynQuacerI2cDxe/SynQuacerI2cDxe.inf b/Silicon/Socionext/SynQuacer/Drivers/SynQuacerI2cDxe/SynQuacerI2cDxe.inf
index 325816ba0b..268a6faccf 100644
--- a/Silicon/Socionext/SynQuacer/Drivers/SynQuacerI2cDxe/SynQuacerI2cDxe.inf
+++ b/Silicon/Socionext/SynQuacer/Drivers/SynQuacerI2cDxe/SynQuacerI2cDxe.inf
@@ -2,12 +2,7 @@
#
# Copyright (c) 2017, Linaro, Ltd. 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 distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
diff --git a/Silicon/Socionext/SynQuacer/Drivers/SynQuacerPciCpuIo2Dxe/SynQuacerPciCpuIo2Dxe.c b/Silicon/Socionext/SynQuacer/Drivers/SynQuacerPciCpuIo2Dxe/SynQuacerPciCpuIo2Dxe.c
index 77ae155c6c..0379d50a9c 100644
--- a/Silicon/Socionext/SynQuacer/Drivers/SynQuacerPciCpuIo2Dxe/SynQuacerPciCpuIo2Dxe.c
+++ b/Silicon/Socionext/SynQuacer/Drivers/SynQuacerPciCpuIo2Dxe/SynQuacerPciCpuIo2Dxe.c
@@ -4,13 +4,7 @@
Copyright (c) 2009 - 2012, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2016 - 2017, Linaro Ltd. 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 distribution. The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Socionext/SynQuacer/Drivers/SynQuacerPciCpuIo2Dxe/SynQuacerPciCpuIo2Dxe.inf b/Silicon/Socionext/SynQuacer/Drivers/SynQuacerPciCpuIo2Dxe/SynQuacerPciCpuIo2Dxe.inf
index 04d418a2a0..3509bf5dc4 100644
--- a/Silicon/Socionext/SynQuacer/Drivers/SynQuacerPciCpuIo2Dxe/SynQuacerPciCpuIo2Dxe.inf
+++ b/Silicon/Socionext/SynQuacer/Drivers/SynQuacerPciCpuIo2Dxe/SynQuacerPciCpuIo2Dxe.inf
@@ -4,13 +4,7 @@
# Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>
# Copyright (c) 2016 - 2017, Linaro Ltd. 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 distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Socionext/SynQuacer/Include/Guid/SynQuacerPlatformFormSet.h b/Silicon/Socionext/SynQuacer/Include/Guid/SynQuacerPlatformFormSet.h
index 9a70bb8730..274158e16c 100644
--- a/Silicon/Socionext/SynQuacer/Include/Guid/SynQuacerPlatformFormSet.h
+++ b/Silicon/Socionext/SynQuacer/Include/Guid/SynQuacerPlatformFormSet.h
@@ -2,13 +2,7 @@
*
* Copyright (c) 2017, Linaro Limited. All rights reserved.
*
-* This program and the accompanying materials are licensed and made available
-* under the terms and conditions of the BSD License which accompanies this
-* distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Socionext/SynQuacer/Include/Platform/DramInfo.h b/Silicon/Socionext/SynQuacer/Include/Platform/DramInfo.h
index f7691bdade..3e29df8b0a 100644
--- a/Silicon/Socionext/SynQuacer/Include/Platform/DramInfo.h
+++ b/Silicon/Socionext/SynQuacer/Include/Platform/DramInfo.h
@@ -3,13 +3,7 @@
Copyright (c) 2017, Linaro Ltd. 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
- distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php.
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT
- WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Socionext/SynQuacer/Include/Platform/MemoryMap.h b/Silicon/Socionext/SynQuacer/Include/Platform/MemoryMap.h
index cff981c4f8..deb9c81e82 100644
--- a/Silicon/Socionext/SynQuacer/Include/Platform/MemoryMap.h
+++ b/Silicon/Socionext/SynQuacer/Include/Platform/MemoryMap.h
@@ -3,13 +3,7 @@
Copyright (c) 2017, Linaro Ltd. 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
- distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php.
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT
- WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Socionext/SynQuacer/Include/Platform/Pcie.h b/Silicon/Socionext/SynQuacer/Include/Platform/Pcie.h
index 798f59db2a..df51b9f90a 100644
--- a/Silicon/Socionext/SynQuacer/Include/Platform/Pcie.h
+++ b/Silicon/Socionext/SynQuacer/Include/Platform/Pcie.h
@@ -3,13 +3,7 @@
Copyright (c) 2017, Linaro Ltd. 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
- distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php.
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT
- WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Socionext/SynQuacer/Include/Platform/VarStore.h b/Silicon/Socionext/SynQuacer/Include/Platform/VarStore.h
index bb0e476fc3..6ac63e64ec 100644
--- a/Silicon/Socionext/SynQuacer/Include/Platform/VarStore.h
+++ b/Silicon/Socionext/SynQuacer/Include/Platform/VarStore.h
@@ -2,13 +2,7 @@
Copyright (c) 2017 - 2018, Linaro, Ltd. 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
- distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef __VARSTORE_H__
diff --git a/Silicon/Socionext/SynQuacer/Include/Ppi/DramInfo.h b/Silicon/Socionext/SynQuacer/Include/Ppi/DramInfo.h
index 6453e12131..c7b11a75e9 100644
--- a/Silicon/Socionext/SynQuacer/Include/Ppi/DramInfo.h
+++ b/Silicon/Socionext/SynQuacer/Include/Ppi/DramInfo.h
@@ -3,13 +3,7 @@
Copyright (c) 2017, Linaro Ltd. 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
- distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php.
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT
- WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Socionext/SynQuacer/Library/NorFlashSynQuacerLib/NorFlashSynQuacer.c b/Silicon/Socionext/SynQuacer/Library/NorFlashSynQuacerLib/NorFlashSynQuacer.c
index 1b3995d799..b2d1c39e2c 100644
--- a/Silicon/Socionext/SynQuacer/Library/NorFlashSynQuacerLib/NorFlashSynQuacer.c
+++ b/Silicon/Socionext/SynQuacer/Library/NorFlashSynQuacerLib/NorFlashSynQuacer.c
@@ -2,13 +2,7 @@
Copyright (c) 2011-2014, ARM Ltd. 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Socionext/SynQuacer/Library/NorFlashSynQuacerLib/NorFlashSynQuacerLib.inf b/Silicon/Socionext/SynQuacer/Library/NorFlashSynQuacerLib/NorFlashSynQuacerLib.inf
index 2a8fd209f5..c1ed3c4d1c 100644
--- a/Silicon/Socionext/SynQuacer/Library/NorFlashSynQuacerLib/NorFlashSynQuacerLib.inf
+++ b/Silicon/Socionext/SynQuacer/Library/NorFlashSynQuacerLib/NorFlashSynQuacerLib.inf
@@ -1,13 +1,7 @@
#/** @file
#
# Copyright (c) 2011 - 2014, ARM Ltd. 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 distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
diff --git a/Silicon/Socionext/SynQuacer/Library/SynQuacerDtbLoaderLib/SynQuacerDtbLoaderLib.c b/Silicon/Socionext/SynQuacer/Library/SynQuacerDtbLoaderLib/SynQuacerDtbLoaderLib.c
index 96090c2050..94fbb7a47b 100644
--- a/Silicon/Socionext/SynQuacer/Library/SynQuacerDtbLoaderLib/SynQuacerDtbLoaderLib.c
+++ b/Silicon/Socionext/SynQuacer/Library/SynQuacerDtbLoaderLib/SynQuacerDtbLoaderLib.c
@@ -2,13 +2,7 @@
*
* Copyright (c) 2017, Linaro, Ltd. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Socionext/SynQuacer/Library/SynQuacerDtbLoaderLib/SynQuacerDtbLoaderLib.inf b/Silicon/Socionext/SynQuacer/Library/SynQuacerDtbLoaderLib/SynQuacerDtbLoaderLib.inf
index fd21f7c376..c32db4d6f5 100644
--- a/Silicon/Socionext/SynQuacer/Library/SynQuacerDtbLoaderLib/SynQuacerDtbLoaderLib.inf
+++ b/Silicon/Socionext/SynQuacer/Library/SynQuacerDtbLoaderLib/SynQuacerDtbLoaderLib.inf
@@ -2,13 +2,7 @@
*
* Copyright (c) 2017, Linaro, Ltd. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Socionext/SynQuacer/Library/SynQuacerLib/AArch64/SynQuacerHelper.S b/Silicon/Socionext/SynQuacer/Library/SynQuacerLib/AArch64/SynQuacerHelper.S
index 65059db9c8..6a19c8b32c 100644
--- a/Silicon/Socionext/SynQuacer/Library/SynQuacerLib/AArch64/SynQuacerHelper.S
+++ b/Silicon/Socionext/SynQuacer/Library/SynQuacerLib/AArch64/SynQuacerHelper.S
@@ -3,13 +3,7 @@
* Copyright (c) 2013-2014, ARM Limited. All rights reserved.
* Copyright (c) 2017, Linaro Limited. All rights reserved.
*
- * This program and the accompanying materials
- * are licensed and made available under the terms and conditions of the BSD License
- * which accompanies this distribution. The full text of the license may be found at
- * http://opensource.org/licenses/bsd-license.php
- *
- * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*
*/
diff --git a/Silicon/Socionext/SynQuacer/Library/SynQuacerLib/Arm/SynQuacerHelper.S b/Silicon/Socionext/SynQuacer/Library/SynQuacerLib/Arm/SynQuacerHelper.S
index 81980c5803..ec4cf1da5c 100644
--- a/Silicon/Socionext/SynQuacer/Library/SynQuacerLib/Arm/SynQuacerHelper.S
+++ b/Silicon/Socionext/SynQuacer/Library/SynQuacerLib/Arm/SynQuacerHelper.S
@@ -3,13 +3,7 @@
* Copyright (c) 2013-2014, ARM Limited. All rights reserved.
* Copyright (c) 2017, Linaro Limited. All rights reserved.
*
- * This program and the accompanying materials
- * are licensed and made available under the terms and conditions of the BSD License
- * which accompanies this distribution. The full text of the license may be found at
- * http://opensource.org/licenses/bsd-license.php
- *
- * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*
*/
diff --git a/Silicon/Socionext/SynQuacer/Library/SynQuacerLib/SynQuacer.c b/Silicon/Socionext/SynQuacer/Library/SynQuacerLib/SynQuacer.c
index 6d4be4badb..a6c915b73c 100644
--- a/Silicon/Socionext/SynQuacer/Library/SynQuacerLib/SynQuacer.c
+++ b/Silicon/Socionext/SynQuacer/Library/SynQuacerLib/SynQuacer.c
@@ -3,13 +3,7 @@
* Copyright (c) 2013-2014, ARM Limited. All rights reserved.
* Copyright (c) 2017, Linaro Limited. All rights reserved.
*
- * This program and the accompanying materials
- * are licensed and made available under the terms and conditions of the BSD License
- * which accompanies this distribution. The full text of the license may be found at
- * http://opensource.org/licenses/bsd-license.php
- *
- * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ * SPDX-License-Identifier: BSD-2-Clause-Patent
*
*/
diff --git a/Silicon/Socionext/SynQuacer/Library/SynQuacerLib/SynQuacerLib.inf b/Silicon/Socionext/SynQuacer/Library/SynQuacerLib/SynQuacerLib.inf
index ad3859e3ad..db6c05c8b5 100644
--- a/Silicon/Socionext/SynQuacer/Library/SynQuacerLib/SynQuacerLib.inf
+++ b/Silicon/Socionext/SynQuacer/Library/SynQuacerLib/SynQuacerLib.inf
@@ -2,13 +2,7 @@
# Copyright (c) 2013-2014, ARM Limited. All rights reserved.
# Copyright (c) 2017, Linaro Limited. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
[Defines]
diff --git a/Silicon/Socionext/SynQuacer/Library/SynQuacerMemoryInitPeiLib/SynQuacerMemoryInitPeiLib.c b/Silicon/Socionext/SynQuacer/Library/SynQuacerMemoryInitPeiLib/SynQuacerMemoryInitPeiLib.c
index 1ec0be0fe7..3da32ea681 100644
--- a/Silicon/Socionext/SynQuacer/Library/SynQuacerMemoryInitPeiLib/SynQuacerMemoryInitPeiLib.c
+++ b/Silicon/Socionext/SynQuacer/Library/SynQuacerMemoryInitPeiLib/SynQuacerMemoryInitPeiLib.c
@@ -3,13 +3,7 @@
* Copyright (c) 2011-2015, ARM Limited. All rights reserved.
* Copyright (c) 2017, Linaro, Ltd. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Socionext/SynQuacer/Library/SynQuacerMemoryInitPeiLib/SynQuacerMemoryInitPeiLib.inf b/Silicon/Socionext/SynQuacer/Library/SynQuacerMemoryInitPeiLib/SynQuacerMemoryInitPeiLib.inf
index 6c3420a525..4d0f71ad04 100644
--- a/Silicon/Socionext/SynQuacer/Library/SynQuacerMemoryInitPeiLib/SynQuacerMemoryInitPeiLib.inf
+++ b/Silicon/Socionext/SynQuacer/Library/SynQuacerMemoryInitPeiLib/SynQuacerMemoryInitPeiLib.inf
@@ -3,13 +3,7 @@
# Copyright (c) 2011-2014, ARM Ltd. All rights reserved.<BR>
# Copyright (c) 2017, Linaro, Ltd. 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 distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
diff --git a/Silicon/Socionext/SynQuacer/Library/SynQuacerPciHostBridgeLib/SynQuacerPciHostBridgeLib.c b/Silicon/Socionext/SynQuacer/Library/SynQuacerPciHostBridgeLib/SynQuacerPciHostBridgeLib.c
index 117cf6cfd8..fd8a07bacf 100644
--- a/Silicon/Socionext/SynQuacer/Library/SynQuacerPciHostBridgeLib/SynQuacerPciHostBridgeLib.c
+++ b/Silicon/Socionext/SynQuacer/Library/SynQuacerPciHostBridgeLib/SynQuacerPciHostBridgeLib.c
@@ -3,13 +3,7 @@
Copyright (c) 2017, Linaro Ltd. 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
- distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php.
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT
- WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Socionext/SynQuacer/Library/SynQuacerPciHostBridgeLib/SynQuacerPciHostBridgeLib.inf b/Silicon/Socionext/SynQuacer/Library/SynQuacerPciHostBridgeLib/SynQuacerPciHostBridgeLib.inf
index 8b8bb5df57..32399ecc05 100644
--- a/Silicon/Socionext/SynQuacer/Library/SynQuacerPciHostBridgeLib/SynQuacerPciHostBridgeLib.inf
+++ b/Silicon/Socionext/SynQuacer/Library/SynQuacerPciHostBridgeLib/SynQuacerPciHostBridgeLib.inf
@@ -3,13 +3,7 @@
#
# Copyright (c) 2017, Linaro Ltd. 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
-# distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
-# IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#
##
diff --git a/Silicon/Socionext/SynQuacer/Library/SynQuacerPciHostBridgeLib/SynQuacerPciHostBridgeLibConstructor.c b/Silicon/Socionext/SynQuacer/Library/SynQuacerPciHostBridgeLib/SynQuacerPciHostBridgeLibConstructor.c
index 75a663e974..9d0a9741b2 100644
--- a/Silicon/Socionext/SynQuacer/Library/SynQuacerPciHostBridgeLib/SynQuacerPciHostBridgeLibConstructor.c
+++ b/Silicon/Socionext/SynQuacer/Library/SynQuacerPciHostBridgeLib/SynQuacerPciHostBridgeLibConstructor.c
@@ -3,13 +3,7 @@
Copyright (c) 2017, Linaro Ltd. 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
- distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php.
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT
- WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Socionext/SynQuacer/Library/SynQuacerPciSegmentLib/PciSegmentLib.c b/Silicon/Socionext/SynQuacer/Library/SynQuacerPciSegmentLib/PciSegmentLib.c
index 62f3b2015d..7ad02905bf 100644
--- a/Silicon/Socionext/SynQuacer/Library/SynQuacerPciSegmentLib/PciSegmentLib.c
+++ b/Silicon/Socionext/SynQuacer/Library/SynQuacerPciSegmentLib/PciSegmentLib.c
@@ -4,14 +4,7 @@
Copyright (c) 2007 - 2012, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2017, Linaro, Ltd. 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 distribution. The full
- text of the license may be found at
- http://opensource.org/licenses/bsd-license.php.
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Socionext/SynQuacer/Library/SynQuacerPciSegmentLib/SynQuacerPciSegmentLib.inf b/Silicon/Socionext/SynQuacer/Library/SynQuacerPciSegmentLib/SynQuacerPciSegmentLib.inf
index 27bfb4eb6f..9e131b66cc 100644
--- a/Silicon/Socionext/SynQuacer/Library/SynQuacerPciSegmentLib/SynQuacerPciSegmentLib.inf
+++ b/Silicon/Socionext/SynQuacer/Library/SynQuacerPciSegmentLib/SynQuacerPciSegmentLib.inf
@@ -4,12 +4,7 @@
# Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>
# Copyright (c) 2017, Linaro Ltd. 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 distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php.
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#
##
diff --git a/Silicon/Socionext/SynQuacer/Library/SynQuacerPlatformFlashAccessLib/SynQuacerPlatformFlashAccessLib.c b/Silicon/Socionext/SynQuacer/Library/SynQuacerPlatformFlashAccessLib/SynQuacerPlatformFlashAccessLib.c
index 51bf9f6245..1a654e4430 100644
--- a/Silicon/Socionext/SynQuacer/Library/SynQuacerPlatformFlashAccessLib/SynQuacerPlatformFlashAccessLib.c
+++ b/Silicon/Socionext/SynQuacer/Library/SynQuacerPlatformFlashAccessLib/SynQuacerPlatformFlashAccessLib.c
@@ -4,13 +4,7 @@
Copyright (c) 2016, Linaro, Ltd. All rights reserved.<BR>
Copyright (c) 2018, 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 distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/Silicon/Socionext/SynQuacer/Library/SynQuacerPlatformFlashAccessLib/SynQuacerPlatformFlashAccessLib.inf b/Silicon/Socionext/SynQuacer/Library/SynQuacerPlatformFlashAccessLib/SynQuacerPlatformFlashAccessLib.inf
index 4dfa11372a..04e5525336 100644
--- a/Silicon/Socionext/SynQuacer/Library/SynQuacerPlatformFlashAccessLib/SynQuacerPlatformFlashAccessLib.inf
+++ b/Silicon/Socionext/SynQuacer/Library/SynQuacerPlatformFlashAccessLib/SynQuacerPlatformFlashAccessLib.inf
@@ -2,13 +2,7 @@
# Platform flash device access library.
#
# Copyright (c) 2017, Linaro, Ltd. 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 distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Socionext/SynQuacer/Library/SynQuacerPlatformPeiLib/SynQuacerPlatformPeiLib.c b/Silicon/Socionext/SynQuacer/Library/SynQuacerPlatformPeiLib/SynQuacerPlatformPeiLib.c
index 7c529a22c6..e8412dd863 100644
--- a/Silicon/Socionext/SynQuacer/Library/SynQuacerPlatformPeiLib/SynQuacerPlatformPeiLib.c
+++ b/Silicon/Socionext/SynQuacer/Library/SynQuacerPlatformPeiLib/SynQuacerPlatformPeiLib.c
@@ -2,13 +2,7 @@
*
* Copyright (c) 2011-2014, ARM Limited. All rights reserved.
*
-* This program and the accompanying materials
-* are licensed and made available under the terms and conditions of the BSD License
-* which accompanies this distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
diff --git a/Silicon/Socionext/SynQuacer/Library/SynQuacerPlatformPeiLib/SynQuacerPlatformPeiLib.inf b/Silicon/Socionext/SynQuacer/Library/SynQuacerPlatformPeiLib/SynQuacerPlatformPeiLib.inf
index eb6a5bf9ac..425e1788cc 100644
--- a/Silicon/Socionext/SynQuacer/Library/SynQuacerPlatformPeiLib/SynQuacerPlatformPeiLib.inf
+++ b/Silicon/Socionext/SynQuacer/Library/SynQuacerPlatformPeiLib/SynQuacerPlatformPeiLib.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2017, Linaro, Ltd. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
#**/
diff --git a/Silicon/Socionext/SynQuacer/Stage2Tables/GNUmakefile b/Silicon/Socionext/SynQuacer/Stage2Tables/GNUmakefile
index 45ba4b4d8d..369a4c3c31 100644
--- a/Silicon/Socionext/SynQuacer/Stage2Tables/GNUmakefile
+++ b/Silicon/Socionext/SynQuacer/Stage2Tables/GNUmakefile
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, Linaro, Ltd. 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 distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Socionext/SynQuacer/Stage2Tables/Stage2Tables.S b/Silicon/Socionext/SynQuacer/Stage2Tables/Stage2Tables.S
index 28c7a6ac97..a7f0eb2b77 100644
--- a/Silicon/Socionext/SynQuacer/Stage2Tables/Stage2Tables.S
+++ b/Silicon/Socionext/SynQuacer/Stage2Tables/Stage2Tables.S
@@ -1,13 +1,7 @@
/** @file
Copyright (c) 2018, Linaro, Ltd. 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
- distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
/*
diff --git a/Silicon/Socionext/SynQuacer/Stage2Tables/Stage2Tables.inf b/Silicon/Socionext/SynQuacer/Stage2Tables/Stage2Tables.inf
index 3e7039d586..7b396db826 100644
--- a/Silicon/Socionext/SynQuacer/Stage2Tables/Stage2Tables.inf
+++ b/Silicon/Socionext/SynQuacer/Stage2Tables/Stage2Tables.inf
@@ -2,13 +2,7 @@
#
# Copyright (c) 2018, Linaro, Ltd. 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 distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/Silicon/Socionext/SynQuacer/SynQuacer.dec b/Silicon/Socionext/SynQuacer/SynQuacer.dec
index e58a373ecb..e7197e2319 100644
--- a/Silicon/Socionext/SynQuacer/SynQuacer.dec
+++ b/Silicon/Socionext/SynQuacer/SynQuacer.dec
@@ -1,13 +1,7 @@
#
# Copyright (c) 2017, Linaro, Ltd. All rights reserved.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
[Defines]
--
2.21.0.windows.1
^ permalink raw reply related [flat|nested] 63+ messages in thread* Re: [[edk2-platforms][PATCH V2] 00/30] Change edk2-platforms/master to BSD+Patent License
2019-05-15 23:09 [[edk2-platforms][PATCH V2] 00/30] Change edk2-platforms/master to BSD+Patent License Michael D Kinney
` (28 preceding siblings ...)
2019-05-15 23:10 ` [[edk2-platforms][PATCH V2] 29/30] Silicon/Socionext: " Michael D Kinney
@ 2019-05-17 11:09 ` Leif Lindholm
2019-05-17 21:33 ` [edk2-devel] " Michael D Kinney
30 siblings, 0 replies; 63+ messages in thread
From: Leif Lindholm @ 2019-05-17 11:09 UTC (permalink / raw)
To: Michael D Kinney
Cc: devel, Ard Biesheuvel, Thad Gillispie, Daocheng Bu, Isaac W Oram,
Maciej Piwko, Chasel Chiu, Michael Kubacki, Shifei A Lu,
Xiaohu Zhou, Ankit Sinha, Sai Chaganty
Hi Mike,
Many thanks for this.
For all of the patches you wanted my R-b on apart from the ones I have
commented on individually:
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
/
Leif
On Wed, May 15, 2019 at 04:09:41PM -0700, Michael D Kinney wrote:
> BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=1373
>
> This change is based on the following emails:
> https://lists.01.org/pipermail/edk2-devel/2019-February/036260.html
> https://lists.01.org/pipermail/edk2-devel/2018-October/030385.html
>
> RFCs with detailed process for the license change:
> V3: https://lists.01.org/pipermail/edk2-devel/2019-March/038116.html
> V2: https://lists.01.org/pipermail/edk2-devel/2019-March/037669.html
> V1: https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html
>
> The V2 branch for review for converting the edk2-platforms/master branch to
> the BSD + Patent license is available here:
>
> https://github.com/mdkinney/edk2-platforms/tree/Bug_1373_BsdPatentLicense_V2
>
> The list of commits in the series are here:
>
> https://github.com/mdkinney/edk2-platforms/commits/Bug_1373_BsdPatentLicense_V2
>
> Cc: Leif Lindholm <leif.lindholm@linaro.org>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Cc: Thad Gillispie <thad.gillispie@intel.com>
> Cc: Daocheng Bu <daocheng.bu@intel.com>
> Cc: Isaac W Oram <isaac.w.oram@intel.com>
> Cc: Maciej Piwko <maciej.piwko@intel.com>
> Cc: Chasel Chiu <chasel.chiu@intel.com>
> Cc: Michael Kubacki <michael.a.kubacki@intel.com>
> Cc: Shifei A Lu <shifei.a.lu@intel.com>
> Cc: Xiaohu Zhou <bowen.zhou@intel.com>
> Cc: Ankit Sinha <ankit.sinha@intel.com>
> Cc: Sai Chaganty <rangasai.v.chaganty@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
>
> Michael D Kinney (30):
> edk2-platforms: Add License-History.txt
> edk2-platforms: Change License.txt from 2-Clause BSD to BSD+Patent
> Platform/96Boards: Replace BSD License with BSD+Patent License
> Platform/ARM: Replace BSD License with BSD+Patent License
> Platform/AMD: Replace BSD License with BSD+Patent License
> Platform/Comcast: Replace BSD License with BSD+Patent License
> Platform/Hisilicon: Replace BSD License with BSD+Patent License
> Platform/Intel/AdvancedFeaturePkg: Replace BSD License with BSD+Patent
> License
> Platform/Intel/ClevoOpenBoardPkg: Replace BSD License with BSD+Patent
> License
> Platform/Intel/KabylakeOpenBoardPkg: Replace BSD License with
> BSD+Patent License
> Platform/Intel/MinPlatformPkg: Replace BSD License with BSD+Patent
> License
> Platform/Intel/PurleyOpenBoardPkg: Replace BSD License with BSD+Patent
> License
> Platform/LeMaker: Replace BSD License with BSD+Patent License
> Platform/Marvell: Replace BSD License with BSD+Patent License
> Platform/RaspberryPi: Replace BSD License with BSD+Patent License
> Platform/Socionext: Replace BSD License with BSD+Patent License
> Platform/SoftIron: Replace BSD License with BSD+Patent License
> Platform/SolidRun: Replace BSD License with BSD+Patent License
> Silicon/AMD: Replace BSD License with BSD+Patent License
> Silicon/Atmel: Replace BSD License with BSD+Patent License
> Silicon/Broadcom: Replace BSD License with BSD+Patent License
> Silicon/Hisilicon: Replace BSD License with BSD+Patent License
> Silicon/Intel/KabylakeSiliconPkg: Replace BSD License with BSD+Patent
> License
> Silicon/Intel/LewisburgPkg: Replace BSD License with BSD+Patent
> License
> Silicon/Intel/PurleyRcPkg: Replace BSD License with BSD+Patent License
> Silicon/Intel/PurleySktPkg: Replace BSD License with BSD+Patent
> License
> Silicon/Marvell: Replace BSD License with BSD+Patent License
> Silicon/NXP: Replace BSD License with BSD+Patent License
> Silicon/Socionext: Replace BSD License with BSD+Patent License
> edk2-platforms: Remove Contributions.txt and update Readme.md
>
> Contributions.txt | 235 --------
> License-History.txt | 542 ++++++++++++++++++
> License.txt | 70 ++-
> Platform/96Boards/96Boards.dec | 8 +-
> .../96Boards/96BoardsI2cDxe/96BoardsI2cDxe.c | 7 +-
> .../96BoardsI2cDxe/96BoardsI2cDxe.inf | 8 +-
> Platform/96Boards/Include/Guid/FormSet.h | 8 +-
> .../96Boards/Include/Protocol/LsConnector.h | 8 +-
> .../96Boards/Include/Protocol/Mezzanine.h | 8 +-
> .../96Boards/LsConnectorDxe/LsConnectorDxe.c | 8 +-
> .../96Boards/LsConnectorDxe/LsConnectorDxe.h | 8 +-
> .../LsConnectorDxe/LsConnectorDxe.inf | 9 +-
> .../LsConnectorDxe/LsConnectorHii.uni | 8 +-
> .../LsConnectorDxe/LsConnectorHii.vfr | 8 +-
> Platform/96Boards/Secure96Dxe/Secure96.asl | 9 +-
> Platform/96Boards/Secure96Dxe/Secure96.dts | 9 +-
> Platform/96Boards/Secure96Dxe/Secure96.h | 8 +-
> Platform/96Boards/Secure96Dxe/Secure96Dxe.c | 8 +-
> Platform/96Boards/Secure96Dxe/Secure96Dxe.inf | 8 +-
> Platform/AMD/License.txt | 25 -
> .../DeviceTree/OverdriveBoard.dts | 9 +-
> .../DeviceTree/OverdriveBoard.inf | 8 +-
> .../AMD/OverdriveBoard/OverdriveBoard.dsc | 8 +-
> .../AMD/OverdriveBoard/OverdriveBoard.fdf | 8 +-
> .../SystemFirmwareDescriptor.aslc | 8 +-
> .../SystemFirmwareDescriptor.inf | 8 +-
> .../SystemFirmwareDescriptorPei.c | 8 +-
> .../SystemFirmwareUpdateConfig.ini | 8 +-
> Platform/ARM/ARM.dec | 8 +-
> Platform/ARM/Drivers/BootMonFs/BootMonFs.dec | 8 +-
> Platform/ARM/Drivers/BootMonFs/BootMonFs.inf | 8 +-
> Platform/ARM/Drivers/BootMonFs/BootMonFsApi.h | 8 +-
> Platform/ARM/Drivers/BootMonFs/BootMonFsDir.c | 8 +-
> .../Drivers/BootMonFs/BootMonFsEntryPoint.c | 8 +-
> Platform/ARM/Drivers/BootMonFs/BootMonFsHw.h | 8 +-
> .../ARM/Drivers/BootMonFs/BootMonFsImages.c | 8 +-
> .../ARM/Drivers/BootMonFs/BootMonFsInternal.h | 8 +-
> .../Drivers/BootMonFs/BootMonFsOpenClose.c | 8 +-
> .../Drivers/BootMonFs/BootMonFsReadWrite.c | 8 +-
> .../Drivers/BootMonFs/BootMonFsUnsupported.c | 8 +-
> .../ARM/Drivers/FdtPlatformDxe/FdtPlatform.c | 8 +-
> .../ARM/Drivers/FdtPlatformDxe/FdtPlatform.h | 8 +-
> .../Drivers/FdtPlatformDxe/FdtPlatformDxe.dec | 8 +-
> .../Drivers/FdtPlatformDxe/FdtPlatformDxe.inf | 8 +-
> .../Drivers/FdtPlatformDxe/FdtPlatformDxe.uni | 8 +-
> .../ARM/Drivers/FdtPlatformDxe/README.txt | 8 +-
> .../ARM/Drivers/FdtPlatformDxe/ShellDumpFdt.c | 8 +-
> .../ARM/Drivers/FdtPlatformDxe/ShellSetFdt.c | 8 +-
> Platform/ARM/Include/Guid/BootMonFsFileInfo.h | 8 +-
> Platform/ARM/Include/Library/ArmShellCmdLib.h | 8 +-
> Platform/ARM/Include/Library/BdsLib.h | 8 +-
> .../JunoPkg/AcpiTables/AcpiSsdtRootPci.asl | 8 +-
> .../ARM/JunoPkg/AcpiTables/AcpiTables.inf | 8 +-
> Platform/ARM/JunoPkg/AcpiTables/Dbg2.aslc | 8 +-
> Platform/ARM/JunoPkg/AcpiTables/Dsdt.asl | 8 +-
> Platform/ARM/JunoPkg/AcpiTables/Fadt.aslc | 8 +-
> Platform/ARM/JunoPkg/AcpiTables/Gtdt.aslc | 8 +-
> Platform/ARM/JunoPkg/AcpiTables/Madt.aslc | 8 +-
> Platform/ARM/JunoPkg/AcpiTables/Spcr.aslc | 8 +-
> Platform/ARM/JunoPkg/ArmJuno.dec | 8 +-
> Platform/ARM/JunoPkg/ArmJuno.dsc | 8 +-
> Platform/ARM/JunoPkg/ArmJuno.fdf | 8 +-
> .../ConfigurationManager.dsc.inc | 8 +-
> .../ConfigurationManager.c | 8 +-
> .../ConfigurationManager.h | 8 +-
> .../ConfigurationManagerDxe.inf | 8 +-
> .../ConfigurationManagerDxe/Platform.h | 8 +-
> .../PlatformASLTablesLib/Dsdt.asl | 8 +-
> .../PlatformASLTablesLib.inf | 8 +-
> .../PlatformASLTablesLib/SsdtJunoUsb.asl | 8 +-
> .../PlatformASLTablesLib/SsdtPci.asl | 8 +-
> .../PlatformASLTablesLib/SsdtUart.asl | 8 +-
> .../JunoPkg/Drivers/ArmJunoDxe/AcpiTables.c | 8 +-
> .../JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.c | 8 +-
> .../JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf | 8 +-
> .../Drivers/ArmJunoDxe/ArmJunoDxeInternal.h | 8 +-
> Platform/ARM/JunoPkg/Include/ArmPlatform.h | 8 +-
> .../ArmJunoLib/AArch64/ArmJunoHelper.S | 8 +-
> .../Library/ArmJunoLib/Arm/ArmJunoHelper.S | 8 +-
> .../ARM/JunoPkg/Library/ArmJunoLib/ArmJuno.c | 8 +-
> .../JunoPkg/Library/ArmJunoLib/ArmJunoLib.inf | 8 +-
> .../JunoPkg/Library/ArmJunoLib/ArmJunoMem.c | 8 +-
> .../Library/ArmJunoMtlLib/ArmJunoMtlLib.c | 8 +-
> .../Library/ArmJunoMtlLib/ArmJunoMtlLib.inf | 8 +-
> .../ArmJunoMtlLib/ArmJunoMtlPrivateLib.h | 8 +-
> .../Library/HdLcdArmJunoLib/HdLcdArmJuno.c | 8 +-
> .../HdLcdArmJunoLib/HdLcdArmJunoLib.inf | 8 +-
> .../JunoPciHostBridgeLib.c | 8 +-
> .../JunoPciHostBridgeLib.inf | 8 +-
> .../JunoPciHostBridgeLib/XPressRich3.c | 8 +-
> .../JunoPciHostBridgeLib/XPressRich3.h | 8 +-
> .../Library/NorFlashJunoLib/NorFlashJuno.c | 8 +-
> .../NorFlashJunoLib/NorFlashJunoLib.inf | 8 +-
> .../SmbiosPlatformDxe/SmbiosPlatformDxe.c | 8 +-
> .../SmbiosPlatformDxe/SmbiosPlatformDxe.inf | 7 +-
> .../ArmShellCmdRunAxf/ArmShellCmdRunAxf.c | 8 +-
> .../ArmShellCmdRunAxf/ArmShellCmdRunAxf.h | 8 +-
> .../ArmShellCmdRunAxf/ArmShellCmdRunAxf.inf | 8 +-
> .../ArmShellCmdRunAxf/ArmShellCmdRunAxf.uni | 8 +-
> .../ArmShellCmdRunAxf/BootMonFsLoader.c | 8 +-
> .../ArmShellCmdRunAxf/BootMonFsLoader.h | 8 +-
> .../ARM/Library/ArmShellCmdRunAxf/ElfLoader.c | 8 +-
> .../ARM/Library/ArmShellCmdRunAxf/ElfLoader.h | 8 +-
> .../ARM/Library/ArmShellCmdRunAxf/RunAxf.c | 8 +-
> .../ARM/Library/ArmShellCmdRunAxf/elf32.h | 8 +-
> .../ARM/Library/ArmShellCmdRunAxf/elf64.h | 8 +-
> .../Library/ArmShellCmdRunAxf/elf_common.h | 8 +-
> Platform/ARM/Library/BdsLib/BdsFilePath.c | 8 +-
> Platform/ARM/Library/BdsLib/BdsHelper.c | 8 +-
> Platform/ARM/Library/BdsLib/BdsInternal.h | 8 +-
> Platform/ARM/Library/BdsLib/BdsLib.inf | 8 +-
> Platform/ARM/SgiPkg/AcpiTables/Dbg2.aslc | 8 +-
> Platform/ARM/SgiPkg/AcpiTables/Fadt.aslc | 8 +-
> Platform/ARM/SgiPkg/AcpiTables/Gtdt.aslc | 8 +-
> Platform/ARM/SgiPkg/AcpiTables/Iort.aslc | 8 +-
> Platform/ARM/SgiPkg/AcpiTables/Mcfg.aslc | 8 +-
> .../ARM/SgiPkg/AcpiTables/RdE1Edge/Dsdt.asl | 8 +-
> .../ARM/SgiPkg/AcpiTables/RdE1Edge/Madt.aslc | 8 +-
> .../SgiPkg/AcpiTables/RdE1EdgeAcpiTables.inf | 8 +-
> .../ARM/SgiPkg/AcpiTables/RdN1Edge/Dsdt.asl | 8 +-
> .../ARM/SgiPkg/AcpiTables/RdN1Edge/Madt.aslc | 8 +-
> .../SgiPkg/AcpiTables/RdN1EdgeAcpiTables.inf | 8 +-
> .../ARM/SgiPkg/AcpiTables/Sgi575/Dsdt.asl | 8 +-
> .../ARM/SgiPkg/AcpiTables/Sgi575/Madt.aslc | 8 +-
> .../SgiPkg/AcpiTables/Sgi575AcpiTables.inf | 8 +-
> Platform/ARM/SgiPkg/AcpiTables/Spcr.aslc | 8 +-
> Platform/ARM/SgiPkg/AcpiTables/Ssdt.asl | 8 +-
> .../SgiPkg/Drivers/PlatformDxe/PlatformDxe.c | 8 +-
> .../Drivers/PlatformDxe/PlatformDxe.inf | 8 +-
> .../Drivers/PlatformDxe/VirtioDevices.c | 8 +-
> .../Include/Guid/SgiVirtioDevicesFormSet.h | 8 +-
> .../ARM/SgiPkg/Include/Ppi/SgiPlatformId.h | 8 +-
> Platform/ARM/SgiPkg/Include/SgiAcpiHeader.h | 8 +-
> Platform/ARM/SgiPkg/Include/SgiPlatform.h | 8 +-
> .../Library/HdLcdArmSgiLib/HdLcdArmSgi.c | 8 +-
> .../Library/HdLcdArmSgiLib/HdLcdArmSgiLib.inf | 8 +-
> .../SgiPkg/Library/NorFlashLib/NorFlashLib.c | 8 +-
> .../Library/NorFlashLib/NorFlashLib.inf | 8 +-
> .../PciHostBridgeLib/PciHostBridgeLib.c | 8 +-
> .../PciHostBridgeLib/PciHostBridgeLib.inf | 8 +-
> .../Library/PlatformLib/AArch64/Helper.S | 8 +-
> .../SgiPkg/Library/PlatformLib/PlatformLib.c | 8 +-
> .../Library/PlatformLib/PlatformLib.inf | 8 +-
> .../Library/PlatformLib/PlatformLibMem.c | 8 +-
> .../Library/SgiPlatformPei/SgiPlatformPei.inf | 8 +-
> .../Library/SgiPlatformPei/SgiPlatformPeim.c | 8 +-
> Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc | 8 +-
> Platform/ARM/SgiPkg/PlatformStandaloneMm.fdf | 8 +-
> Platform/ARM/SgiPkg/SgiPlatform.dec | 8 +-
> Platform/ARM/SgiPkg/SgiPlatform.dsc | 8 +-
> Platform/ARM/SgiPkg/SgiPlatform.fdf | 8 +-
> .../ARM/VExpressPkg/AcpiTables/AcpiTables.inf | 8 +-
> Platform/ARM/VExpressPkg/AcpiTables/Dsdt.asl | 23 +-
> Platform/ARM/VExpressPkg/AcpiTables/Fadt.aslc | 8 +-
> .../ARM/VExpressPkg/AcpiTables/FvpPlatform.h | 8 +-
> Platform/ARM/VExpressPkg/AcpiTables/Gtdt.aslc | 8 +-
> Platform/ARM/VExpressPkg/AcpiTables/Madt.aslc | 8 +-
> Platform/ARM/VExpressPkg/AcpiTables/Spcr.aslc | 8 +-
> .../ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc | 8 +-
> .../ARM/VExpressPkg/ArmVExpress-CTA15-A7.fdf | 8 +-
> .../VExpressPkg/ArmVExpress-FVP-AArch64.dsc | 8 +-
> .../VExpressPkg/ArmVExpress-FVP-AArch64.fdf | 8 +-
> .../ArmVExpress-networking.fdf.inc | 9 +-
> Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc | 8 +-
> Platform/ARM/VExpressPkg/ArmVExpressPkg.dec | 8 +-
> .../ConfigurationManager.dsc.inc | 8 +-
> .../ConfigurationManager.c | 8 +-
> .../ConfigurationManager.h | 8 +-
> .../ConfigurationManagerDxe.inf | 8 +-
> .../ConfigurationManagerDxe/Platform.h | 8 +-
> .../PlatformASLTablesLib/Dsdt.asl | 8 +-
> .../PlatformASLTablesLib.inf | 8 +-
> .../Drivers/ArmVExpressDxe/ArmFvpDxe.c | 8 +-
> .../Drivers/ArmVExpressDxe/ArmFvpDxe.inf | 8 +-
> .../Drivers/ArmVExpressDxe/ArmHwDxe.c | 8 +-
> .../Drivers/ArmVExpressDxe/ArmHwDxe.inf | 8 +-
> .../ArmVExpressFastBoot.c | 8 +-
> .../ArmVExpressFastBootDxe.inf | 7 +-
> .../Include/Library/ArmPlatformSysConfigLib.h | 8 +-
> .../Include/Library/LcdPlatformLib.h | 8 +-
> .../Include/Platform/CTA15-A7/ArmPlatform.h | 8 +-
> .../Include/Platform/RTSM/ArmPlatform.h | 8 +-
> .../VExpressPkg/Include/VExpressMotherBoard.h | 8 +-
> .../Library/ArmMaliDpLib/ArmMaliDpLib.c | 8 +-
> .../Library/ArmMaliDpLib/ArmMaliDpLib.inf | 8 +-
> .../ArmVExpressDtPlatformDtbLoaderLib.c | 8 +-
> .../ArmVExpressDtPlatformDtbLoaderLib.inf | 8 +-
> .../ArmVExpressLibCTA15-A7/ArmVExpressLib.inf | 8 +-
> .../Library/ArmVExpressLibCTA15-A7/CTA15-A7.c | 8 +-
> .../ArmVExpressLibCTA15-A7/CTA15-A7Helper.S | 8 +-
> .../ArmVExpressLibCTA15-A7/CTA15-A7Helper.asm | 8 +-
> .../ArmVExpressLibCTA15-A7/CTA15-A7Mem.c | 8 +-
> .../ArmVExpressLibRTSM/AArch64/RTSMHelper.S | 8 +-
> .../ArmVExpressLibRTSM/Arm/RTSMHelper.S | 8 +-
> .../ArmVExpressLibRTSM/Arm/RTSMHelper.asm | 8 +-
> .../ArmVExpressLibRTSM/ArmVExpressLib.inf | 8 +-
> .../ArmVExpressLibRTSM/ArmVExpressLibSec.inf | 8 +-
> .../Library/ArmVExpressLibRTSM/RTSM.c | 8 +-
> .../Library/ArmVExpressLibRTSM/RTSMMem.c | 8 +-
> .../ArmVExpressSysConfig.c | 8 +-
> .../ArmVExpressSysConfigLib.inf | 8 +-
> .../ArmVExpressSysConfigRuntimeLib.c | 8 +-
> .../ArmVExpressSysConfigRuntimeLib.inf | 8 +-
> .../HdLcdArmVExpressLib/HdLcdArmVExpress.c | 8 +-
> .../HdLcdArmVExpressLib.inf | 8 +-
> .../NorFlashArmVExpress.c | 8 +-
> .../NorFlashArmVExpressLib.inf | 8 +-
> .../PL111LcdArmVExpress.c | 8 +-
> .../PL111LcdArmVExpressLib.inf | 8 +-
> .../Library/ResetSystemLib/ResetSystemLib.c | 8 +-
> .../Library/ResetSystemLib/ResetSystemLib.inf | 7 +-
> Platform/Comcast/Application/Dri/Dri.c | 8 +-
> Platform/Comcast/Application/Dri/Dri.inf | 8 +-
> .../Application/DriSecureBoot/DriSecureBoot.c | 8 +-
> .../DriSecureBoot/DriSecureBoot.inf | 8 +-
> .../Application/SecureBoot/SecureBoot.c | 8 +-
> .../Application/SecureBoot/SecureBoot.inf | 8 +-
> .../Library/RdkBootManagerLib/DiskIo.c | 8 +-
> .../Library/RdkBootManagerLib/HttpBoot.c | 8 +-
> .../RdkBootManagerLib/RdkBootManagerLib.dec | 8 +-
> .../RdkBootManagerLib/RdkBootManagerLib.h | 8 +-
> .../RdkBootManagerLib/RdkBootManagerLib.inf | 8 +-
> .../Library/RdkBootManagerLib/RdkFile.c | 8 +-
> .../Library/RdkBootManagerLib/SecureBoot.c | 8 +-
> Platform/Comcast/RDKQemu/RDKQemu.dsc | 8 +-
> Platform/Comcast/RDKQemu/RDKQemu.fdf | 8 +-
> .../SystemFirmwareUpdateConfig.ini | 8 +-
> Platform/Hisilicon/D03/D03.dec | 8 +-
> Platform/Hisilicon/D03/D03.dsc | 8 +-
> Platform/Hisilicon/D03/D03.fdf | 8 +-
> .../OemNicConfig2PHi1610/OemNicConfig.h | 8 +-
> .../OemNicConfig2PHi1610/OemNicConfig2P.c | 8 +-
> .../OemNicConfig2PHi1610/OemNicConfig2P.inf | 8 +-
> .../SystemFirmwareDescriptor.aslc | 8 +-
> .../SystemFirmwareDescriptor.inf | 8 +-
> .../SystemFirmwareDescriptorPei.c | 8 +-
> .../D03/EarlyConfigPeim/EarlyConfigPeimD03.c | 8 +-
> .../EarlyConfigPeim/EarlyConfigPeimD03.inf | 8 +-
> .../Hisilicon/D03/Include/Library/CpldD03.h | 8 +-
> .../DS3231RealTimeClock.h | 8 +-
> .../DS3231RealTimeClockLib.c | 8 +-
> .../DS3231RealTimeClockLib.inf | 7 +-
> .../D03/Library/FdtUpdateLib/FdtUpdateLib.c | 8 +-
> .../D03/Library/FdtUpdateLib/FdtUpdateLib.inf | 8 +-
> .../OemMiscLib2P/BoardFeature2PHi1610.c | 8 +-
> .../BoardFeature2PHi1610Strings.uni | Bin 4292 -> 3538 bytes
> .../Library/OemMiscLib2P/OemMiscLib2PHi1610.c | 8 +-
> .../OemMiscLib2P/OemMiscLib2PHi1610.inf | 8 +-
> .../Library/PlatformPciLib/PlatformPciLib.c | 8 +-
> .../Library/PlatformPciLib/PlatformPciLib.inf | 7 +-
> .../SystemFirmwareUpdateConfig.ini | 8 +-
> Platform/Hisilicon/D05/D05.dsc | 8 +-
> Platform/Hisilicon/D05/D05.fdf | 8 +-
> .../SystemFirmwareDescriptor.aslc | 8 +-
> .../SystemFirmwareDescriptor.inf | 8 +-
> .../SystemFirmwareDescriptorPei.c | 8 +-
> .../D05/EarlyConfigPeim/EarlyConfigPeimD05.c | 8 +-
> .../EarlyConfigPeim/EarlyConfigPeimD05.inf | 8 +-
> .../Library/OemMiscLibD05/BoardFeatureD05.c | 8 +-
> .../OemMiscLibD05/BoardFeatureD05Strings.uni | 8 +-
> .../D05/Library/OemMiscLibD05/OemMiscLibD05.c | 8 +-
> .../Library/OemMiscLibD05/OemMiscLibD05.inf | 8 +-
> .../Library/PlatformPciLib/PlatformPciLib.c | 8 +-
> .../Library/PlatformPciLib/PlatformPciLib.inf | 7 +-
> .../SystemFirmwareUpdateConfig.ini | 8 +-
> Platform/Hisilicon/D06/D06.dec | 8 +-
> Platform/Hisilicon/D06/D06.dsc | 8 +-
> Platform/Hisilicon/D06/D06.fdf | 8 +-
> .../OemNicConfig2PHi1620/OemNicConfig.h | 8 +-
> .../OemNicConfig2PHi1620/OemNicConfig2P.c | 8 +-
> .../OemNicConfig2PHi1620/OemNicConfig2P.inf | 8 +-
> .../SystemFirmwareDescriptor.aslc | 8 +-
> .../SystemFirmwareDescriptor.inf | 8 +-
> .../SystemFirmwareDescriptorPei.c | 8 +-
> .../D06/EarlyConfigPeim/EarlyConfigPeimD06.c | 8 +-
> .../EarlyConfigPeim/EarlyConfigPeimD06.inf | 8 +-
> .../Hisilicon/D06/Include/Library/CpldD06.h | 8 +-
> .../Library/OemMiscLibD06/BoardFeatureD06.c | 8 +-
> .../OemMiscLibD06/BoardFeatureD06Strings.uni | 8 +-
> .../D06/Library/OemMiscLibD06/OemMiscLibD06.c | 8 +-
> .../Library/OemMiscLibD06/OemMiscLibD06.inf | 8 +-
> .../D06/Library/OemNicLib/OemNicLib.c | 8 +-
> .../D06/Library/OemNicLib/OemNicLib.inf | 8 +-
> .../PciHostBridgeLib/PciHostBridgeLib.c | 8 +-
> .../PciHostBridgeLib/PciHostBridgeLib.inf | 7 +-
> Platform/Hisilicon/HiKey/HiKey.dec | 8 +-
> Platform/Hisilicon/HiKey/HiKey.dsc | 8 +-
> Platform/Hisilicon/HiKey/HiKey.fdf | 8 +-
> Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.c | 8 +-
> Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.h | 8 +-
> .../Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.inf | 8 +-
> .../HiKey/HiKeyGpioDxe/HiKeyGpioDxe.c | 8 +-
> .../HiKey/HiKeyGpioDxe/HiKeyGpioDxe.inf | 8 +-
> .../Hisilicon/HiKey/Include/ArmPlatform.h | 8 +-
> .../Hisilicon/HiKey/Library/HiKeyLib/HiKey.c | 8 +-
> .../HiKey/Library/HiKeyLib/HiKeyHelper.S | 8 +-
> .../HiKey/Library/HiKeyLib/HiKeyLib.inf | 8 +-
> .../HiKey/Library/HiKeyLib/HiKeyMem.c | 8 +-
> Platform/Hisilicon/HiKey960/HiKey960.dec | 8 +-
> Platform/Hisilicon/HiKey960/HiKey960.dsc | 8 +-
> Platform/Hisilicon/HiKey960/HiKey960.fdf | 8 +-
> .../HiKey960/HiKey960Dxe/HiKey960Dxe.c | 8 +-
> .../HiKey960/HiKey960Dxe/HiKey960Dxe.h | 8 +-
> .../HiKey960/HiKey960Dxe/HiKey960Dxe.inf | 8 +-
> .../HiKey960GpioDxe/HiKey960GpioDxe.c | 8 +-
> .../HiKey960GpioDxe/HiKey960GpioDxe.inf | 8 +-
> .../HiKey960/Library/HiKey960Lib/HiKey960.c | 8 +-
> .../Library/HiKey960Lib/HiKey960Helper.S | 8 +-
> .../Library/HiKey960Lib/HiKey960Lib.inf | 8 +-
> .../Library/HiKey960Lib/HiKey960Mem.c | 8 +-
> .../PciHostBridgeLib/PciHostBridgeLib.c | 8 +-
> .../PciHostBridgeLib/PciHostBridgeLib.inf | 8 +-
> .../AcpiDebug/AcpiDebug.asl | 8 +-
> .../AdvancedFeaturePkg/AcpiDebug/AcpiDebug.c | 8 +-
> .../AcpiDebug/AcpiDebugDxe.inf | 8 +-
> .../AcpiDebug/AcpiDebugSmm.inf | 8 +-
> .../AdvancedFeaturePkg/AdvancedFeaturePkg.dec | 8 +-
> .../AdvancedFeaturePkg/AdvancedFeaturePkg.dsc | 8 +-
> .../AdvancedFeaturePkg/Contributions.txt | 218 -------
> .../Include/Dsc/CoreAdvancedDxeInclude.dsc | 8 +-
> .../Include/Dsc/CoreAdvancedPeiInclude.dsc | 8 +-
> .../Include/Fdf/CoreAdvancedLateInclude.fdf | 8 +-
> .../Fdf/CoreAdvancedPostMemoryInclude.fdf | 8 +-
> .../Fdf/CoreAdvancedPreMemoryInclude.fdf | 8 +-
> .../AdvancedFeaturePkg/Ipmi/BmcAcpi/BmcAcpi.c | 8 +-
> .../Ipmi/BmcAcpi/BmcAcpi.inf | 8 +-
> .../Ipmi/BmcAcpi/BmcSsdt/BmcSsdt.asl | 8 +-
> .../Ipmi/BmcAcpi/BmcSsdt/IpmiOprRegions.asi | 8 +-
> .../AdvancedFeaturePkg/Ipmi/BmcElog/BmcElog.c | 8 +-
> .../Ipmi/BmcElog/BmcElog.inf | 8 +-
> .../AdvancedFeaturePkg/Ipmi/Frb/FrbDxe.c | 8 +-
> .../AdvancedFeaturePkg/Ipmi/Frb/FrbDxe.inf | 8 +-
> .../AdvancedFeaturePkg/Ipmi/Frb/FrbPei.c | 8 +-
> .../AdvancedFeaturePkg/Ipmi/Frb/FrbPei.inf | 8 +-
> .../Ipmi/Include/Library/IpmiCommandLib.h | 8 +-
> .../Include/Library/IpmiPlatformHookLib.h | 8 +-
> .../AdvancedFeaturePkg/Ipmi/IpmiFru/IpmiFru.c | 8 +-
> .../Ipmi/IpmiFru/IpmiFru.inf | 8 +-
> .../Ipmi/IpmiInit/DxeIpmiInit.c | 8 +-
> .../Ipmi/IpmiInit/DxeIpmiInit.inf | 8 +-
> .../Ipmi/IpmiInit/PeiIpmiInit.c | 8 +-
> .../Ipmi/IpmiInit/PeiIpmiInit.inf | 8 +-
> .../Library/IpmiCommandLib/IpmiCommandLib.inf | 8 +-
> .../IpmiCommandLib/IpmiCommandLibNetFnApp.c | 8 +-
> .../IpmiCommandLibNetFnChassis.c | 8 +-
> .../IpmiCommandLibNetFnStorage.c | 8 +-
> .../IpmiCommandLibNetFnTransport.c | 8 +-
> .../Ipmi/Library/IpmiLibNull/IpmiLibNull.c | 8 +-
> .../Ipmi/Library/IpmiLibNull/IpmiLibNull.inf | 8 +-
> .../IpmiPlatformHookLibNull.c | 8 +-
> .../IpmiPlatformHookLibNull.inf | 8 +-
> .../AdvancedFeaturePkg/Ipmi/OsWdt/OsWdt.c | 8 +-
> .../AdvancedFeaturePkg/Ipmi/OsWdt/OsWdt.inf | 8 +-
> .../Ipmi/SolStatus/SolStatus.c | 8 +-
> .../Ipmi/SolStatus/SolStatus.inf | 8 +-
> Platform/Intel/AdvancedFeaturePkg/License.txt | 25 -
> .../Smbios/SmbiosBasicDxe/SmbiosBasic.h | 8 +-
> .../Smbios/SmbiosBasicDxe/SmbiosBasicDxe.inf | 8 +-
> .../SmbiosBasicDxe/SmbiosBasicEntryPoint.c | 8 +-
> .../SmbiosBasicDxe/Type0BiosVendorFunction.c | 8 +-
> .../Type1SystemManufacturerFunction.c | 8 +-
> .../Type2BaseBoardManufacturerFunction.c | 8 +-
> .../Type32BootInformationFunction.c | 8 +-
> .../Type3ChassisManufacturerFunction.c | 8 +-
> .../Acpi/BoardAcpiDxe/AcpiGnvsInit.c | 8 +-
> .../Acpi/BoardAcpiDxe/BoardAcpiDxe.c | 8 +-
> .../Acpi/BoardAcpiDxe/BoardAcpiDxe.inf | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/ALS.ASL | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/AMLUPD.asl | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/CPU.asl | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/DSDT.ASL | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/Gpe.asl | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/Itss.asl | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/LPC_DEV.ASL | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/LpcB.asl | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PCI_DRC.ASL | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PciTree.asl | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/Platform.asl | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PlatformGnvs.asl | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/Video.asl | 8 +-
> .../Acpi/BoardAcpiDxe/UpdateDsdt.c | 8 +-
> .../Intel/ClevoOpenBoardPkg/Contributions.txt | 218 -------
> .../Features/PciHotPlug/PciHotPlug.c | 8 +-
> .../Features/PciHotPlug/PciHotPlug.h | 8 +-
> .../Features/PciHotPlug/PciHotPlug.inf | 8 +-
> .../Tbt/AcpiTables/Rtd3SptPcieTbt.asl | 8 +-
> .../Features/Tbt/AcpiTables/Tbt.asl | 8 +-
> .../Features/Tbt/Include/Acpi/TbtNvs.asl | 8 +-
> .../Features/Tbt/Include/Acpi/TbtNvsAreaDef.h | 8 +-
> .../Tbt/Include/Library/DxeTbtPolicyLib.h | 8 +-
> .../Tbt/Include/Library/PeiTbtPolicyLib.h | 8 +-
> .../Tbt/Include/Library/TbtCommonLib.h | 8 +-
> .../Features/Tbt/Include/Ppi/PeiTbtPolicy.h | 8 +-
> .../Include/Private/Library/PeiDTbtInitLib.h | 8 +-
> .../Private/Library/PeiTbtCommonInitLib.h | 8 +-
> .../Tbt/Include/Protocol/DxeTbtPolicy.h | 8 +-
> .../Tbt/Include/Protocol/TbtNvsArea.h | 8 +-
> .../Features/Tbt/Include/TbtBoardInfo.h | 8 +-
> .../Tbt/Include/TbtPolicyCommonDefinition.h | 8 +-
> .../Library/DxeTbtPolicyLib/DxeTbtPolicyLib.c | 8 +-
> .../DxeTbtPolicyLib/DxeTbtPolicyLib.inf | 8 +-
> .../DxeTbtPolicyLib/DxeTbtPolicyLibrary.h | 8 +-
> .../PeiDxeSmmTbtCommonLib/TbtCommonLib.c | 8 +-
> .../PeiDxeSmmTbtCommonLib/TbtCommonLib.inf | 8 +-
> .../Library/PeiTbtPolicyLib/PeiTbtPolicyLib.c | 8 +-
> .../PeiTbtPolicyLib/PeiTbtPolicyLib.inf | 8 +-
> .../PeiTbtPolicyLib/PeiTbtPolicyLibrary.h | 8 +-
> .../Private/PeiDTbtInitLib/PeiDTbtInitLib.c | 8 +-
> .../Private/PeiDTbtInitLib/PeiDTbtInitLib.inf | 8 +-
> .../Features/Tbt/TbtInit/Dxe/TbtDxe.c | 8 +-
> .../Features/Tbt/TbtInit/Dxe/TbtDxe.inf | 8 +-
> .../Features/Tbt/TbtInit/Pei/PeiTbtInit.c | 8 +-
> .../Features/Tbt/TbtInit/Pei/PeiTbtInit.inf | 8 +-
> .../Features/Tbt/TbtInit/Smm/TbtSmiHandler.c | 8 +-
> .../Features/Tbt/TbtInit/Smm/TbtSmiHandler.h | 8 +-
> .../Features/Tbt/TbtInit/Smm/TbtSmm.c | 8 +-
> .../Features/Tbt/TbtInit/Smm/TbtSmm.inf | 8 +-
> .../Include/Acpi/GlobalNvs.asl | 8 +-
> .../Include/Acpi/GlobalNvsAreaDef.h | 8 +-
> .../ClevoOpenBoardPkg/Include/IoExpander.h | 8 +-
> .../Include/Library/GpioExpanderLib.h | 8 +-
> .../Include/Library/I2cAccessLib.h | 8 +-
> .../Include/PchHsioPtssTables.h | 8 +-
> .../Include/Protocol/GlobalNvsArea.h | 8 +-
> .../Intel/ClevoOpenBoardPkg/Include/SioRegs.h | 8 +-
> .../BaseGpioExpanderLib/BaseGpioExpanderLib.c | 8 +-
> .../BaseGpioExpanderLib.inf | 8 +-
> .../Library/PeiI2cAccessLib/PeiI2cAccessLib.c | 8 +-
> .../PeiI2cAccessLib/PeiI2cAccessLib.inf | 8 +-
> .../PeiSerialPortLibSpiFlash.c | 8 +-
> .../PeiSerialPortLibSpiFlash.inf | 8 +-
> Platform/Intel/ClevoOpenBoardPkg/License.txt | 25 -
> .../PcieDeviceTable.c | 8 +-
> .../PeiFspMiscUpdUpdateLib.c | 8 +-
> .../PeiFspPolicyUpdateLib.c | 8 +-
> .../PeiPchPolicyUpdate.c | 8 +-
> .../PeiPchPolicyUpdate.h | 8 +-
> .../PeiPchPolicyUpdatePreMem.c | 8 +-
> .../PeiSaPolicyUpdate.c | 8 +-
> .../PeiSaPolicyUpdate.h | 8 +-
> .../PeiSaPolicyUpdatePreMem.c | 8 +-
> .../PeiSiliconPolicyUpdateLibFsp.inf | 8 +-
> .../ClevoOpenBoardPkg/N1xxWU/GitEdk2Clevo.bat | 8 +-
> .../N1xxWU/Include/Fdf/FlashMapInclude.fdf | 8 +-
> .../N1xxWU/Include/N1xxWUId.h | 8 +-
> .../BasePlatformHookLib/BasePlatformHookLib.c | 8 +-
> .../BasePlatformHookLib.inf | 8 +-
> .../BoardAcpiLib/DxeBoardAcpiTableLib.c | 8 +-
> .../BoardAcpiLib/DxeBoardAcpiTableLib.inf | 8 +-
> .../DxeMultiBoardAcpiSupportLib.c | 8 +-
> .../DxeMultiBoardAcpiSupportLib.inf | 8 +-
> .../BoardAcpiLib/DxeN1xxWUAcpiTableLib.c | 8 +-
> .../BoardAcpiLib/SmmBoardAcpiEnableLib.c | 8 +-
> .../BoardAcpiLib/SmmBoardAcpiEnableLib.inf | 8 +-
> .../SmmMultiBoardAcpiSupportLib.c | 8 +-
> .../SmmMultiBoardAcpiSupportLib.inf | 8 +-
> .../BoardAcpiLib/SmmN1xxWUAcpiEnableLib.c | 8 +-
> .../BoardAcpiLib/SmmSiliconAcpiEnableLib.c | 8 +-
> .../Library/BoardInitLib/N1xxWUGpioTable.c | 8 +-
> .../BoardInitLib/N1xxWUHdaVerbTables.c | 8 +-
> .../BoardInitLib/N1xxWUHsioPtssTables.c | 8 +-
> .../Library/BoardInitLib/N1xxWUSpdTable.c | 8 +-
> .../BoardInitLib/PeiBoardInitPostMemLib.c | 8 +-
> .../BoardInitLib/PeiBoardInitPostMemLib.inf | 8 +-
> .../BoardInitLib/PeiBoardInitPreMemLib.c | 8 +-
> .../BoardInitLib/PeiBoardInitPreMemLib.inf | 8 +-
> .../PeiMultiBoardInitPostMemLib.c | 8 +-
> .../PeiMultiBoardInitPostMemLib.inf | 8 +-
> .../BoardInitLib/PeiMultiBoardInitPreMemLib.c | 8 +-
> .../PeiMultiBoardInitPreMemLib.inf | 8 +-
> .../Library/BoardInitLib/PeiN1xxWUDetect.c | 8 +-
> .../Library/BoardInitLib/PeiN1xxWUInitLib.h | 8 +-
> .../BoardInitLib/PeiN1xxWUInitPostMemLib.c | 8 +-
> .../BoardInitLib/PeiN1xxWUInitPreMemLib.c | 8 +-
> .../ClevoOpenBoardPkg/N1xxWU/OpenBoardPkg.dsc | 8 +-
> .../ClevoOpenBoardPkg/N1xxWU/OpenBoardPkg.fdf | 8 +-
> .../N1xxWU/OpenBoardPkgBuildOption.dsc | 8 +-
> .../N1xxWU/OpenBoardPkgConfig.dsc | 8 +-
> .../N1xxWU/OpenBoardPkgPcd.dsc | 8 +-
> .../DxeGopPolicyInit.c | 8 +-
> .../DxeGopPolicyInit.h | 8 +-
> .../DxeSaPolicyInit.h | 8 +-
> .../DxeSaPolicyUpdate.c | 8 +-
> .../DxeSiliconPolicyUpdateLib.c | 8 +-
> .../DxeSiliconPolicyUpdateLib.inf | 8 +-
> .../Intel/ClevoOpenBoardPkg/N1xxWU/bld.bat | 8 +-
> .../Intel/ClevoOpenBoardPkg/N1xxWU/cln.bat | 8 +-
> .../ClevoOpenBoardPkg/N1xxWU/postbuild.bat | 8 +-
> .../ClevoOpenBoardPkg/N1xxWU/prebuild.bat | 8 +-
> .../Intel/ClevoOpenBoardPkg/N1xxWU/prep.bat | 8 +-
> .../Intel/ClevoOpenBoardPkg/OpenBoardPkg.dec | 8 +-
> .../Acpi/BoardAcpiDxe/AcpiGnvsInit.c | 8 +-
> .../Acpi/BoardAcpiDxe/BoardAcpiDxe.c | 8 +-
> .../Acpi/BoardAcpiDxe/BoardAcpiDxe.inf | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/ALS.ASL | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/AMLUPD.asl | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/CPU.asl | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/DSDT.ASL | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/Gpe.asl | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/Itss.asl | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/LPC_DEV.ASL | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/LpcB.asl | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PCI_DRC.ASL | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PciTree.asl | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/Platform.asl | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PlatformGnvs.asl | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/Video.asl | 8 +-
> .../Acpi/BoardAcpiDxe/UpdateDsdt.c | 8 +-
> .../KabylakeOpenBoardPkg/Contributions.txt | 218 -------
> .../Features/PciHotPlug/PciHotPlug.c | 8 +-
> .../Features/PciHotPlug/PciHotPlug.h | 8 +-
> .../Features/PciHotPlug/PciHotPlug.inf | 8 +-
> .../Tbt/AcpiTables/Rtd3SptPcieTbt.asl | 8 +-
> .../Features/Tbt/AcpiTables/Tbt.asl | 8 +-
> .../Features/Tbt/Include/Acpi/TbtNvs.asl | 8 +-
> .../Features/Tbt/Include/Acpi/TbtNvsAreaDef.h | 8 +-
> .../Tbt/Include/Library/DxeTbtPolicyLib.h | 8 +-
> .../Tbt/Include/Library/PeiTbtPolicyLib.h | 8 +-
> .../Tbt/Include/Library/TbtCommonLib.h | 8 +-
> .../Features/Tbt/Include/Ppi/PeiTbtPolicy.h | 8 +-
> .../Include/Private/Library/PeiDTbtInitLib.h | 8 +-
> .../Private/Library/PeiTbtCommonInitLib.h | 8 +-
> .../Tbt/Include/Protocol/DxeTbtPolicy.h | 8 +-
> .../Tbt/Include/Protocol/TbtNvsArea.h | 8 +-
> .../Features/Tbt/Include/TbtBoardInfo.h | 8 +-
> .../Tbt/Include/TbtPolicyCommonDefinition.h | 8 +-
> .../Library/DxeTbtPolicyLib/DxeTbtPolicyLib.c | 8 +-
> .../DxeTbtPolicyLib/DxeTbtPolicyLib.inf | 8 +-
> .../DxeTbtPolicyLib/DxeTbtPolicyLibrary.h | 8 +-
> .../PeiDxeSmmTbtCommonLib/TbtCommonLib.c | 8 +-
> .../PeiDxeSmmTbtCommonLib/TbtCommonLib.inf | 8 +-
> .../Library/PeiTbtPolicyLib/PeiTbtPolicyLib.c | 8 +-
> .../PeiTbtPolicyLib/PeiTbtPolicyLib.inf | 8 +-
> .../PeiTbtPolicyLib/PeiTbtPolicyLibrary.h | 8 +-
> .../Private/PeiDTbtInitLib/PeiDTbtInitLib.c | 8 +-
> .../Private/PeiDTbtInitLib/PeiDTbtInitLib.inf | 8 +-
> .../Features/Tbt/TbtInit/Dxe/TbtDxe.c | 8 +-
> .../Features/Tbt/TbtInit/Dxe/TbtDxe.inf | 8 +-
> .../Features/Tbt/TbtInit/Pei/PeiTbtInit.c | 8 +-
> .../Features/Tbt/TbtInit/Pei/PeiTbtInit.inf | 8 +-
> .../Features/Tbt/TbtInit/Smm/TbtSmiHandler.c | 8 +-
> .../Features/Tbt/TbtInit/Smm/TbtSmiHandler.h | 8 +-
> .../Features/Tbt/TbtInit/Smm/TbtSmm.c | 8 +-
> .../Features/Tbt/TbtInit/Smm/TbtSmm.inf | 8 +-
> .../PcieDeviceTable.c | 8 +-
> .../PeiFspMiscUpdUpdateLib.c | 8 +-
> .../PeiFspPolicyUpdateLib.c | 8 +-
> .../PeiPchPolicyUpdate.c | 8 +-
> .../PeiPchPolicyUpdate.h | 8 +-
> .../PeiPchPolicyUpdatePreMem.c | 8 +-
> .../PeiSaPolicyUpdate.c | 8 +-
> .../PeiSaPolicyUpdate.h | 8 +-
> .../PeiSaPolicyUpdatePreMem.c | 8 +-
> .../PeiSiliconPolicyUpdateLibFsp.inf | 8 +-
> .../Include/Acpi/GlobalNvs.asl | 8 +-
> .../Include/Acpi/GlobalNvsAreaDef.h | 8 +-
> .../Include/Fdf/FlashMapInclude.fdf | 8 +-
> .../KabylakeOpenBoardPkg/Include/IoExpander.h | 8 +-
> .../Include/Library/GpioExpanderLib.h | 8 +-
> .../Include/Library/I2cAccessLib.h | 8 +-
> .../Include/PchHsioPtssTables.h | 8 +-
> .../Include/Protocol/GlobalNvsArea.h | 8 +-
> .../KabylakeOpenBoardPkg/Include/SioRegs.h | 8 +-
> .../KabylakeRvp3/GitEdk2MinKabylake.bat | 8 +-
> .../KabylakeRvp3/Include/KabylakeRvp3Id.h | 8 +-
> .../BasePlatformHookLib/BasePlatformHookLib.c | 8 +-
> .../BasePlatformHookLib.inf | 8 +-
> .../BoardAcpiLib/DxeBoardAcpiTableLib.c | 8 +-
> .../BoardAcpiLib/DxeBoardAcpiTableLib.inf | 8 +-
> .../DxeKabylakeRvp3AcpiTableLib.c | 8 +-
> .../DxeMultiBoardAcpiSupportLib.c | 8 +-
> .../DxeMultiBoardAcpiSupportLib.inf | 8 +-
> .../BoardAcpiLib/SmmBoardAcpiEnableLib.c | 8 +-
> .../BoardAcpiLib/SmmBoardAcpiEnableLib.inf | 8 +-
> .../SmmKabylakeRvp3AcpiEnableLib.c | 8 +-
> .../SmmMultiBoardAcpiSupportLib.c | 8 +-
> .../SmmMultiBoardAcpiSupportLib.inf | 8 +-
> .../BoardAcpiLib/SmmSiliconAcpiEnableLib.c | 8 +-
> .../BoardInitLib/KabylakeRvp3GpioTable.c | 8 +-
> .../BoardInitLib/KabylakeRvp3HdaVerbTables.c | 8 +-
> .../BoardInitLib/KabylakeRvp3HsioPtssTables.c | 8 +-
> .../BoardInitLib/KabylakeRvp3SpdTable.c | 8 +-
> .../BoardInitLib/PeiBoardInitPostMemLib.c | 8 +-
> .../BoardInitLib/PeiBoardInitPostMemLib.inf | 8 +-
> .../BoardInitLib/PeiBoardInitPreMemLib.c | 8 +-
> .../BoardInitLib/PeiBoardInitPreMemLib.inf | 8 +-
> .../BoardInitLib/PeiKabylakeRvp3Detect.c | 8 +-
> .../BoardInitLib/PeiKabylakeRvp3InitLib.h | 8 +-
> .../PeiKabylakeRvp3InitPostMemLib.c | 8 +-
> .../PeiKabylakeRvp3InitPreMemLib.c | 8 +-
> .../PeiMultiBoardInitPostMemLib.c | 8 +-
> .../PeiMultiBoardInitPostMemLib.inf | 8 +-
> .../BoardInitLib/PeiMultiBoardInitPreMemLib.c | 8 +-
> .../PeiMultiBoardInitPreMemLib.inf | 8 +-
> .../KabylakeRvp3/OpenBoardPkg.dsc | 8 +-
> .../KabylakeRvp3/OpenBoardPkg.fdf | 8 +-
> .../KabylakeRvp3/OpenBoardPkgBuildOption.dsc | 8 +-
> .../KabylakeRvp3/OpenBoardPkgConfig.dsc | 8 +-
> .../KabylakeRvp3/OpenBoardPkgPcd.dsc | 8 +-
> .../KabylakeOpenBoardPkg/KabylakeRvp3/bld.bat | 8 +-
> .../KabylakeOpenBoardPkg/KabylakeRvp3/cln.bat | 8 +-
> .../KabylakeRvp3/postbuild.bat | 8 +-
> .../KabylakeRvp3/prebuild.bat | 8 +-
> .../KabylakeRvp3/prep.bat | 8 +-
> .../BaseGpioExpanderLib/BaseGpioExpanderLib.c | 8 +-
> .../BaseGpioExpanderLib.inf | 8 +-
> .../Library/PeiI2cAccessLib/PeiI2cAccessLib.c | 8 +-
> .../PeiI2cAccessLib/PeiI2cAccessLib.inf | 8 +-
> .../Intel/KabylakeOpenBoardPkg/License.txt | 25 -
> .../KabylakeOpenBoardPkg/OpenBoardPkg.dec | 8 +-
> .../DxeGopPolicyInit.c | 8 +-
> .../DxeGopPolicyInit.h | 8 +-
> .../DxeSaPolicyInit.h | 8 +-
> .../DxeSaPolicyUpdate.c | 8 +-
> .../DxeSiliconPolicyUpdateLib.c | 8 +-
> .../DxeSiliconPolicyUpdateLib.inf | 8 +-
> .../MinPlatformPkg/Acpi/AcpiSmm/AcpiSmm.c | 8 +-
> .../MinPlatformPkg/Acpi/AcpiSmm/AcpiSmm.h | 8 +-
> .../MinPlatformPkg/Acpi/AcpiSmm/AcpiSmm.inf | 8 +-
> .../Acpi/AcpiTables/AcpiPlatform.c | 8 +-
> .../Acpi/AcpiTables/AcpiPlatform.h | 8 +-
> .../Acpi/AcpiTables/AcpiPlatform.inf | 8 +-
> .../Acpi/AcpiTables/Facs/Facs.c | 8 +-
> .../Acpi/AcpiTables/Fadt/Fadt.c | 8 +-
> .../Acpi/AcpiTables/Hpet/Hpet.c | 8 +-
> .../Acpi/AcpiTables/Wsmt/Wsmt.c | 8 +-
> .../BoardAcpiLibNull/BoardAcpiEnableLib.c | 8 +-
> .../BoardAcpiEnableLibNull.inf | 8 +-
> .../BoardAcpiLibNull/BoardAcpiTableLib.c | 8 +-
> .../BoardAcpiTableLibNull.inf | 8 +-
> .../Library/DxeAslUpdateLib/DxeAslUpdateLib.c | 8 +-
> .../DxeAslUpdateLib/DxeAslUpdateLib.inf | 8 +-
> .../DxeBoardAcpiTableLib.c | 8 +-
> .../DxeMultiBoardAcpiSupportLib.c | 8 +-
> .../DxeMultiBoardAcpiSupportLib.inf | 8 +-
> .../SmmBoardAcpiEnableLib.c | 8 +-
> .../SmmMultiBoardAcpiSupportLib.c | 8 +-
> .../SmmMultiBoardAcpiSupportLib.inf | 8 +-
> .../MinPlatformPkg/Acpi/MinDsdt/MinDsdt.asl | 8 +-
> .../MinPlatformPkg/Acpi/MinDsdt/MinDsdt.c | 8 +-
> .../MinPlatformPkg/Acpi/MinDsdt/MinDsdt.inf | 8 +-
> .../DxePlatformBootManagerLib/BdsPlatform.c | 8 +-
> .../DxePlatformBootManagerLib/BdsPlatform.h | 8 +-
> .../DxePlatformBootManagerLib.inf | 8 +-
> .../DxePlatformBootManagerLib/MemoryTest.c | 8 +-
> .../PlatformBootOption.c | 8 +-
> .../Intel/MinPlatformPkg/Contributions.txt | 218 -------
> .../SpiFlashCommonLibNull.c | 8 +-
> .../SpiFlashCommonLibNull.inf | 8 +-
> .../Flash/SpiFvbService/Common/FvbInfo.c | 8 +-
> .../Common/SpiFvbServiceCommon.c | 8 +-
> .../Common/SpiFvbServiceCommon.h | 8 +-
> .../SpiFvbService/Smm/SpiFvbServiceSmm.c | 8 +-
> .../Flash/SpiFvbService/SpiFvbServiceSmm.inf | 8 +-
> .../DxeFspWrapperPlatformLib.inf | 8 +-
> .../DxeFspWrapperPlatformResetLib.c | 8 +-
> .../FspWrapperHobProcessLib.c | 8 +-
> .../PeiFspWrapperHobProcessLib.inf | 8 +-
> .../PeiFspWrapperPlatformLib.c | 8 +-
> .../PeiFspWrapperPlatformLib.inf | 8 +-
> .../PeiFspWrapperPlatformResetLib.c | 8 +-
> .../FspWrapperPlatformSecLib.c | 8 +-
> .../SecFspWrapperPlatformSecLib/FsptCoreUpd.h | 8 +-
> .../SecFspWrapperPlatformSecLib/Ia32/Fsp.h | 8 +-
> .../Ia32/PeiCoreEntry.S | 8 +-
> .../Ia32/PeiCoreEntry.asm | 8 +-
> .../Ia32/SecEntry.S | 8 +-
> .../Ia32/SecEntry.asm | 8 +-
> .../SecFspWrapperPlatformSecLib/Ia32/Stack.S | 8 +-
> .../Ia32/Stack.asm | 8 +-
> .../PlatformInit.c | 8 +-
> .../SecFspWrapperPlatformSecLib.inf | 8 +-
> .../SecGetPerformance.c | 8 +-
> .../SecPlatformInformation.c | 8 +-
> .../SecRamInitData.c | 8 +-
> .../SecTempRamDone.c | 8 +-
> .../SaveMemoryConfig/SaveMemoryConfig.c | 8 +-
> .../SaveMemoryConfig/SaveMemoryConfig.inf | 8 +-
> .../ExternalDeviceDmaProtection.c | 8 +-
> ...FirmwareTrustConfigurationCryptoStrength.c | 8 +-
> .../FirmwareVersionRollbackProtection.c | 8 +-
> .../HstiIbvPlatformDxe/HstiIbvPlatformDxe.c | 8 +-
> .../HstiIbvPlatformDxe/HstiIbvPlatformDxe.h | 8 +-
> .../HstiIbvPlatformDxe/HstiIbvPlatformDxe.inf | 8 +-
> .../Hsti/HstiIbvPlatformDxe/MorSupport.c | 8 +-
> .../NoTestKeyVerification.c | 8 +-
> .../HstiIbvPlatformDxe/SecureBootBypass.c | 8 +-
> .../Include/Dsc/CoreCommonLib.dsc | 8 +-
> .../Include/Dsc/CoreDxeInclude.dsc | 8 +-
> .../MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc | 8 +-
> .../Include/Dsc/CorePeiInclude.dsc | 8 +-
> .../MinPlatformPkg/Include/Dsc/CorePeiLib.dsc | 8 +-
> .../Include/Fdf/CoreOsBootInclude.fdf | 8 +-
> .../Include/Fdf/CorePostMemoryInclude.fdf | 8 +-
> .../Include/Fdf/CorePreMemoryInclude.fdf | 8 +-
> .../Include/Fdf/CoreSecurityLateInclude.fdf | 8 +-
> .../Fdf/CoreSecurityPostMemoryInclude.fdf | 8 +-
> .../Fdf/CoreSecurityPreMemoryInclude.fdf | 8 +-
> .../Include/Fdf/CoreUefiBootInclude.fdf | 8 +-
> .../Include/Fdf/RuleInclude.fdf | 8 +-
> .../Include/Guid/SmramMemoryReserve.h | 8 +-
> .../Include/HstiIbvFeatureBit.h | 8 +-
> .../Include/Library/AslUpdateLib.h | 8 +-
> .../Include/Library/BoardAcpiEnableLib.h | 8 +-
> .../Include/Library/BoardAcpiTableLib.h | 8 +-
> .../Include/Library/BoardInitLib.h | 8 +-
> .../Include/Library/CompressLib.h | 8 +-
> .../Include/Library/HobVariableLib.h | 8 +-
> .../Library/MultiBoardAcpiSupportLib.h | 8 +-
> .../Library/MultiBoardInitSupportLib.h | 8 +-
> .../MinPlatformPkg/Include/Library/PeiLib.h | 8 +-
> .../Include/Library/ReportFvLib.h | 8 +-
> .../Include/Library/SecBoardInitLib.h | 8 +-
> .../Include/Library/SiliconPolicyInitLib.h | 8 +-
> .../Include/Library/SiliconPolicyUpdateLib.h | 8 +-
> .../Include/Library/SpiFlashCommonLib.h | 8 +-
> .../Include/Library/TestPointCheckLib.h | 8 +-
> .../Include/Library/TestPointLib.h | 8 +-
> .../Include/Ppi/BaseMemoryTest.h | 8 +-
> .../Include/Ppi/PlatformMemorySize.h | 8 +-
> .../Library/CompressLib/CompressLib.c | 8 +-
> .../Library/CompressLib/CompressLib.inf | 7 +-
> .../Library/PeiHobVariableLibFce/Fce.h | 8 +-
> .../PeiHobVariableLibFce/InternalCommonLib.c | 8 +-
> .../PeiHobVariableLibFce.c | 8 +-
> .../PeiHobVariableLibFce.inf | 8 +-
> .../PeiHobVariableLibFceOptSize.c | 8 +-
> .../PeiHobVariableLibFceOptSize.inf | 8 +-
> .../Library/PeiHobVariableLibFce/Variable.h | 8 +-
> .../MinPlatformPkg/Library/PeiLib/PeiLib.c | 8 +-
> .../MinPlatformPkg/Library/PeiLib/PeiLib.inf | 8 +-
> Platform/Intel/MinPlatformPkg/License.txt | 25 -
> .../Intel/MinPlatformPkg/MinPlatformPkg.dec | 8 +-
> .../Intel/MinPlatformPkg/MinPlatformPkg.dsc | 8 +-
> .../PciHostBridgeLibSimple.c | 8 +-
> .../PciHostBridgeLibSimple.inf | 8 +-
> .../PciSegmentInfoLibSimple.c | 9 +-
> .../PciSegmentInfoLibSimple.inf | 7 +-
> .../Library/BoardInitLibNull/BoardInitLib.c | 8 +-
> .../BoardInitLibNull/BoardInitLibNull.inf | 8 +-
> .../DxeBoardInitLib.c | 8 +-
> .../DxeMultiBoardInitSupportLib.c | 8 +-
> .../DxeMultiBoardInitSupportLib.inf | 8 +-
> .../PeiBoardInitLib.c | 8 +-
> .../PeiMultiBoardInitSupportLib.c | 8 +-
> .../PeiMultiBoardInitSupportLib.inf | 8 +-
> .../Library/PeiReportFvLib/PeiReportFvLib.c | 8 +-
> .../Library/PeiReportFvLib/PeiReportFvLib.inf | 8 +-
> .../Ia32/SecBoardInit.nasm | 8 +-
> .../SecBoardInitLibNull/SecBoardInitLib.c | 8 +-
> .../SecBoardInitLibNull.inf | 8 +-
> .../SiliconPolicyInitLibNull.c | 8 +-
> .../SiliconPolicyInitLibNull.inf | 8 +-
> .../SiliconPolicyUpdateLibNull.c | 8 +-
> .../SiliconPolicyUpdateLibNull.inf | 8 +-
> .../PlatformInitDxe/PlatformInitDxe.c | 8 +-
> .../PlatformInitDxe/PlatformInitDxe.inf | 8 +-
> .../PlatformInitPei/PlatformInitPostMem.c | 8 +-
> .../PlatformInitPei/PlatformInitPostMem.inf | 8 +-
> .../PlatformInitPei/PlatformInitPreMem.c | 8 +-
> .../PlatformInitPei/PlatformInitPreMem.inf | 8 +-
> .../PlatformInitSmm/PlatformInitSmm.c | 8 +-
> .../PlatformInitSmm/PlatformInitSmm.inf | 8 +-
> .../PlatformInit/ReportFv/ReportFvPei.c | 8 +-
> .../PlatformInit/ReportFv/ReportFvPei.inf | 8 +-
> .../SiliconPolicyDxe/SiliconPolicyDxe.c | 8 +-
> .../SiliconPolicyDxe/SiliconPolicyDxe.inf | 8 +-
> .../SiliconPolicyPeiPostMem.c | 8 +-
> .../SiliconPolicyPeiPostMem.inf | 8 +-
> .../SiliconPolicyPei/SiliconPolicyPeiPreMem.c | 8 +-
> .../SiliconPolicyPeiPreMem.inf | 8 +-
> .../StallServicePei/StallServicePei.c | 8 +-
> .../StallServicePei/StallServicePei.inf | 8 +-
> .../Tcg/Tcg2PlatformDxe/Tcg2PlatformDxe.c | 8 +-
> .../Tcg/Tcg2PlatformDxe/Tcg2PlatformDxe.inf | 8 +-
> .../Tcg/Tcg2PlatformPei/Tcg2PlatformPei.c | 8 +-
> .../Tcg/Tcg2PlatformPei/Tcg2PlatformPei.inf | 8 +-
> .../Library/TestPointCheckLib/DxeCheckAcpi.c | 8 +-
> .../TestPointCheckLib/DxeCheckAcpiDmar.c | 8 +-
> .../TestPointCheckLib/DxeCheckAcpiHpet.c | 8 +-
> .../TestPointCheckLib/DxeCheckAcpiMadt.c | 8 +-
> .../TestPointCheckLib/DxeCheckAcpiMcfg.c | 8 +-
> .../TestPointCheckLib/DxeCheckAcpiTpm.c | 8 +-
> .../TestPointCheckLib/DxeCheckAcpiWsmt.c | 8 +-
> .../TestPointCheckLib/DxeCheckBootVariable.c | 8 +-
> .../DxeCheckConsoleVariable.c | 8 +-
> .../TestPointCheckLib/DxeCheckDevicePath.c | 8 +-
> .../TestPointCheckLib/DxeCheckDmaProtection.c | 8 +-
> .../Library/TestPointCheckLib/DxeCheckEsrt.c | 8 +-
> .../Library/TestPointCheckLib/DxeCheckGcd.c | 8 +-
> .../Library/TestPointCheckLib/DxeCheckHsti.c | 8 +-
> .../TestPointCheckLib/DxeCheckLoadedImage.c | 8 +-
> .../DxeCheckMemoryAttribute.c | 8 +-
> .../TestPointCheckLib/DxeCheckMemoryMap.c | 8 +-
> .../DxeCheckMemoryTypeInformation.c | 8 +-
> .../Library/TestPointCheckLib/DxeCheckPci.c | 8 +-
> .../DxeCheckPiSignedFvBoot.c | 8 +-
> .../DxeCheckSmiHandlerInstrument.c | 8 +-
> .../TestPointCheckLib/DxeCheckSmmInfo.c | 8 +-
> .../TestPointCheckLib/DxeCheckTcgMor.c | 8 +-
> .../DxeCheckTcgTrustedBoot.c | 8 +-
> .../DxeCheckUefiSecureBoot.c | 8 +-
> .../TestPointCheckLib/DxeCheckVariable.c | 8 +-
> .../TestPointCheckLib/DxeTestPointCheckLib.c | 8 +-
> .../DxeTestPointCheckLib.inf | 8 +-
> .../TestPointCheckLib/PeiCheckDmaProtection.c | 8 +-
> .../TestPointCheckLib/PeiCheckFvInfo.c | 8 +-
> .../Library/TestPointCheckLib/PeiCheckHob.c | 8 +-
> .../Library/TestPointCheckLib/PeiCheckMtrr.c | 8 +-
> .../Library/TestPointCheckLib/PeiCheckPci.c | 8 +-
> .../TestPointCheckLib/PeiCheckSmmInfo.c | 8 +-
> .../TestPointCheckLib/PeiTestPointCheckLib.c | 8 +-
> .../PeiTestPointCheckLib.inf | 8 +-
> .../TestPointCheckLib/SecCheckCpuInfo.c | 8 +-
> .../TestPointCheckLib/SecTestPointCheckLib.c | 8 +-
> .../SecTestPointCheckLib.inf | 8 +-
> .../SmmCheckCommunicationBuffer.c | 8 +-
> .../TestPointCheckLib/SmmCheckLoadedImage.c | 8 +-
> .../SmmCheckMemoryAttribute.c | 8 +-
> .../TestPointCheckLib/SmmCheckPaging.c | 8 +-
> .../Library/TestPointCheckLib/SmmCheckSmrr.c | 8 +-
> .../TestPointCheckLib/SmmTestPointCheckLib.c | 8 +-
> .../SmmTestPointCheckLib.inf | 8 +-
> .../Library/TestPointCheckLib/TestPointHelp.c | 8 +-
> .../TestPointCheckLib/TestPointInternal.h | 8 +-
> .../TestPointCheckLibNull.c | 8 +-
> .../TestPointCheckLibNull.inf | 8 +-
> .../Test/Library/TestPointLib/DxeTestPoint.c | 8 +-
> .../Test/Library/TestPointLib/DxeTestPoint.h | 8 +-
> .../Library/TestPointLib/DxeTestPointAip.c | 8 +-
> .../Library/TestPointLib/DxeTestPointLib.inf | 7 +-
> .../Test/Library/TestPointLib/PeiTestPoint.c | 8 +-
> .../Test/Library/TestPointLib/PeiTestPoint.h | 8 +-
> .../Library/TestPointLib/PeiTestPointLib.inf | 7 +-
> .../Test/Library/TestPointLib/SmmTestPoint.c | 8 +-
> .../Test/Library/TestPointLib/SmmTestPoint.h | 8 +-
> .../Library/TestPointLib/SmmTestPointAip.c | 8 +-
> .../TestPointLib/SmmTestPointCommunication.c | 8 +-
> .../Library/TestPointLib/SmmTestPointLib.inf | 7 +-
> .../Test/TestPointDumpApp/TestPointDump.c | 8 +-
> .../TestPointDumpApp/TestPointDumpApp.inf | 8 +-
> .../Test/TestPointStubDxe/TestPointStubDxe.c | 8 +-
> .../TestPointStubDxe/TestPointStubDxe.inf | 8 +-
> .../Tools/AmlGenOffset/AmlGenOffset.py | 8 +-
> .../Tools/Fsp/PatchFspBinFvsBaseAddress.py | 8 +-
> .../Tools/Help/CheckCodeBase.py | 8 +-
> .../MinPlatformPkg/Tools/ParseVar/ParseVar.py | 8 +-
> .../MinPlatformPkg/Tools/PatchFv/PatchBfv.py | 8 +-
> .../Tools/PatchFv/PatchBinFv.py | 8 +-
> .../Tools/PatchFv/RebaseBinFv.py | 8 +-
> .../Tools/PatchFv/SyncBinFvInf.py | 8 +-
> .../Acpi/BoardAcpiDxe/BoardAcpiDxe.c | 8 +-
> .../Acpi/BoardAcpiDxe/BoardAcpiDxe.h | 8 +-
> .../Acpi/BoardAcpiDxe/BoardAcpiDxe.inf | 8 +-
> .../Acpi/BoardAcpiDxe/BoardAcpiDxeDsdt.c | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt.inf | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/AMLUPD.asl | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/CommonPlatform.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/DSDT.asl | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/Gpe.asl | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/HostBus.asl | 8 +-
> .../Dsdt/IioPcieHotPlugGpeHandler.asl | 8 +-
> .../Dsdt/IioPcieRootPortHotPlug.asl | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/Itss.asl | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/Mother.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/Os.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC00.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC01.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC02.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC03.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC04.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC05.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC06.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC06Ejd.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC07.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC08.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC09.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC10.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC11.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC12.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC12Ejd.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC13.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC14.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC15.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC16.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC17.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC18.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC18Ejd.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC19.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC20.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC21.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC22.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC23.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC24.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC25.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC26.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC27.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC28.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC29.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC30.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC31.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC32.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC33.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC34.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC35.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC36.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC37.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC38.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC39.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC40.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC41.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC42.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC43.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC44.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC45.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC46.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC47.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/Pch.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PchApic.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PchEhci1.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PchEhci2.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PchGbe.asl | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PchLpc.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PchSata.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PchXhci.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PciCrs.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PciIrq.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PcieHp.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PcieHpDev.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PcieNonHpDev.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PcieSeg.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/Platform.asl | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PlatformGpe.asi | 8 +-
> .../BoardAcpiDxe/Dsdt/PlatformPciTree_WFP.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/Sck1Ejd.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/Sck2Ejd.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/Sck3Ejd.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/Uncore0.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/Uncore1.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/Uncore2.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/Uncore3.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/WFPPlatform.asl | 8 +-
> .../BoardMtOlympus/GitEdk2MinMtOlympus.bat | 8 +-
> .../BasePlatformHookLib/BasePlatformHookLib.c | 8 +-
> .../BasePlatformHookLib.inf | 8 +-
> .../BoardAcpiLib/DxeBoardAcpiTableLib.c | 8 +-
> .../BoardAcpiLib/DxeBoardAcpiTableLib.inf | 8 +-
> .../BoardAcpiLib/DxeMtOlympusAcpiTableLib.c | 8 +-
> .../BoardAcpiLib/SmmBoardAcpiEnableLib.c | 8 +-
> .../BoardAcpiLib/SmmBoardAcpiEnableLib.inf | 8 +-
> .../BoardAcpiLib/SmmMtOlympusAcpiEnableLib.c | 8 +-
> .../BoardAcpiLib/SmmSiliconAcpiEnableLib.c | 8 +-
> .../Library/BoardInitLib/AllLanesEparam.c | 8 +-
> .../Library/BoardInitLib/GpioTable.c | 8 +-
> .../Library/BoardInitLib/IioBifur.c | 8 +-
> .../BoardInitLib/PeiBoardInitPostMemLib.c | 8 +-
> .../BoardInitLib/PeiBoardInitPostMemLib.inf | 8 +-
> .../BoardInitLib/PeiBoardInitPreMemLib.c | 8 +-
> .../BoardInitLib/PeiBoardInitPreMemLib.inf | 8 +-
> .../Library/BoardInitLib/PeiMtOlympusDetect.c | 8 +-
> .../BoardInitLib/PeiMtOlympusInitLib.h | 8 +-
> .../BoardInitLib/PeiMtOlympusInitPostMemLib.c | 8 +-
> .../BoardInitLib/PeiMtOlympusInitPreMemLib.c | 8 +-
> .../Library/BoardInitLib/UsbOC.c | 8 +-
> .../BoardMtOlympus/PlatformPkg.dsc | 8 +-
> .../BoardMtOlympus/PlatformPkg.fdf | 8 +-
> .../BoardMtOlympus/PlatformPkgBuildOption.dsc | 8 +-
> .../BoardMtOlympus/PlatformPkgConfig.dsc | 8 +-
> .../BoardMtOlympus/PlatformPkgPcd.dsc | 8 +-
> .../BoardMtOlympus/StructureConfig.dsc | 8 +-
> .../PurleyOpenBoardPkg/BoardMtOlympus/bld.bat | 8 +-
> .../BoardMtOlympus/postbuild.bat | 8 +-
> .../BoardMtOlympus/prebuild.bat | 8 +-
> .../Ipmi/Library/IpmiLibKcs/IpmiLibKcs.c | 8 +-
> .../Ipmi/Library/IpmiLibKcs/IpmiLibKcs.inf | 8 +-
> .../Features/Ipmi/Library/IpmiLibKcs/KcsBmc.c | 8 +-
> .../Features/Ipmi/Library/IpmiLibKcs/KcsBmc.h | 8 +-
> .../IpmiPlatformHookLib/IpmiPlatformHookLib.c | 8 +-
> .../IpmiPlatformHookLib.inf | 8 +-
> .../Include/Acpi/GlobalNvs.asi | 8 +-
> .../Include/Acpi/GlobalNvsAreaDef.h | 8 +-
> .../Include/Guid/PchRcVariable.h | 8 +-
> .../Include/Guid/SetupVariable.h | 8 +-
> .../Include/IioBifurcationSlotTable.h | 8 +-
> .../PurleyOpenBoardPkg/Include/Platform.h | 8 +-
> .../Include/Ppi/SystemBoard.h | 8 +-
> .../Include/Protocol/PciIovPlatform.h | 8 +-
> .../PurleyOpenBoardPkg/Include/SetupTable.h | 8 +-
> .../PurleyOpenBoardPkg/Include/SioRegs.h | 8 +-
> .../DxePlatformBootManagerLib/BdsPlatform.c | 8 +-
> .../DxePlatformBootManagerLib/BdsPlatform.h | 8 +-
> .../DxePlatformBootManagerLib.inf | 8 +-
> .../DxePlatformBootManagerLib/MemoryTest.c | 8 +-
> .../PlatformBootOption.c | 8 +-
> .../Pci/PciPlatform/IoApic.h | 8 +-
> .../Pci/PciPlatform/PciIovPlatformPolicy.c | 8 +-
> .../Pci/PciPlatform/PciIovPlatformPolicy.h | 8 +-
> .../Pci/PciPlatform/PciPlatform.c | 8 +-
> .../Pci/PciPlatform/PciPlatform.h | 8 +-
> .../Pci/PciPlatform/PciPlatform.inf | 8 +-
> .../Pci/PciPlatform/PciPlatformHooks.c | 8 +-
> .../Pci/PciPlatform/PciPlatformHooks.h | 8 +-
> .../Pci/PciPlatform/PciSupportLib.c | 8 +-
> .../Pci/PciPlatform/PciSupportLib.h | 8 +-
> Platform/Intel/PurleyOpenBoardPkg/PlatPkg.dec | 8 +-
> .../Policy/IioUdsDataDxe/IioUdsDataDxe.c | 8 +-
> .../Policy/IioUdsDataDxe/IioUdsDataDxe.h | 8 +-
> .../Policy/IioUdsDataDxe/IioUdsDataDxe.inf | 8 +-
> .../SiliconPolicyInitLib.c | 8 +-
> .../SiliconPolicyInitLib.inf | 8 +-
> .../PchPolicyUpdateUsb.c | 8 +-
> .../SiliconPolicyUpdateLib.c | 8 +-
> .../SiliconPolicyUpdateLib.inf | 8 +-
> .../PlatformCpuPolicy/PlatformCpuPolicy.c | 8 +-
> .../PlatformCpuPolicy/PlatformCpuPolicy.inf | 8 +-
> .../Policy/S3NvramSave/S3NvramSave.c | 8 +-
> .../Policy/S3NvramSave/S3NvramSave.h | 8 +-
> .../Policy/S3NvramSave/S3NvramSave.inf | 8 +-
> .../Policy/SystemBoard/SystemBoardCommon.c | 8 +-
> .../Policy/SystemBoard/SystemBoardPei.c | 8 +-
> .../Policy/SystemBoard/SystemBoardPei.h | 8 +-
> .../Policy/SystemBoard/SystemBoardPei.inf | 8 +-
> Platform/LeMaker/CelloBoard/CelloBoard.dsc | 8 +-
> Platform/LeMaker/CelloBoard/CelloBoard.fdf | 8 +-
> Platform/LeMaker/License.txt | 25 -
> .../Marvell/Armada70x0Db/Armada70x0Db.fdf.inc | 8 +-
> .../Armada70x0DbBoardDescLib.c | 8 +-
> .../Armada70x0DbBoardDescLib.inf | 8 +-
> .../NonDiscoverableInitLib.c | 8 +-
> .../NonDiscoverableInitLib.h | 8 +-
> .../NonDiscoverableInitLib.inf | 8 +-
> .../Marvell/Armada80x0Db/Armada80x0Db.fdf.inc | 8 +-
> .../Armada80x0DbBoardDescLib.c | 8 +-
> .../Armada80x0DbBoardDescLib.inf | 8 +-
> .../NonDiscoverableInitLib.c | 8 +-
> .../NonDiscoverableInitLib.h | 8 +-
> .../NonDiscoverableInitLib.inf | 8 +-
> .../RaspberryPi/RPi3/AcpiTables/AcpiTables.h | 8 +-
> .../RPi3/AcpiTables/AcpiTables.inf | 8 +-
> .../RaspberryPi/RPi3/AcpiTables/Csrt.aslc | 8 +-
> .../RaspberryPi/RPi3/AcpiTables/Dbg2.aslc | 8 +-
> Platform/RaspberryPi/RPi3/AcpiTables/Dsdt.asl | 8 +-
> .../RaspberryPi/RPi3/AcpiTables/Fadt.aslc | 8 +-
> .../RaspberryPi/RPi3/AcpiTables/Gtdt.aslc | 8 +-
> .../RaspberryPi/RPi3/AcpiTables/Madt.aslc | 8 +-
> Platform/RaspberryPi/RPi3/AcpiTables/Pep.asl | 8 +-
> Platform/RaspberryPi/RPi3/AcpiTables/Pep.c | 8 +-
> Platform/RaspberryPi/RPi3/AcpiTables/Pep.h | 8 +-
> Platform/RaspberryPi/RPi3/AcpiTables/Rhpx.asl | 8 +-
> Platform/RaspberryPi/RPi3/AcpiTables/Sdhc.asl | 8 +-
> Platform/RaspberryPi/RPi3/AcpiTables/Spcr.asl | 8 +-
> Platform/RaspberryPi/RPi3/AcpiTables/Uart.asl | 8 +-
> .../ArasanMmcHostDxe/ArasanMmcHostDxe.c | 8 +-
> .../ArasanMmcHostDxe/ArasanMmcHostDxe.h | 8 +-
> .../ArasanMmcHostDxe/ArasanMmcHostDxe.inf | 8 +-
> .../RPi3/Drivers/ConfigDxe/ConfigDxe.c | 8 +-
> .../RPi3/Drivers/ConfigDxe/ConfigDxe.inf | 9 +-
> .../Drivers/ConfigDxe/ConfigDxeFormSetGuid.h | 8 +-
> .../RPi3/Drivers/ConfigDxe/ConfigDxeHii.uni | 8 +-
> .../RPi3/Drivers/ConfigDxe/ConfigDxeHii.vfr | 8 +-
> .../RPi3/Drivers/DisplayDxe/ComponentName.c | 8 +-
> .../RPi3/Drivers/DisplayDxe/DisplayDxe.c | 8 +-
> .../RPi3/Drivers/DisplayDxe/DisplayDxe.h | 8 +-
> .../RPi3/Drivers/DisplayDxe/DisplayDxe.inf | 8 +-
> .../RPi3/Drivers/DisplayDxe/Screenshot.c | 8 +-
> .../RPi3/Drivers/DwUsbHostDxe/ComponentName.c | 8 +-
> .../RPi3/Drivers/DwUsbHostDxe/DriverBinding.c | 8 +-
> .../RPi3/Drivers/DwUsbHostDxe/DwUsbHostDxe.c | 8 +-
> .../RPi3/Drivers/DwUsbHostDxe/DwUsbHostDxe.h | 8 +-
> .../Drivers/DwUsbHostDxe/DwUsbHostDxe.inf | 8 +-
> .../RPi3/Drivers/DwUsbHostDxe/DwcHw.h | 8 +-
> .../RaspberryPi/RPi3/Drivers/FdtDxe/FdtDxe.c | 8 +-
> .../RPi3/Drivers/FdtDxe/FdtDxe.inf | 8 +-
> .../GraphicsConsoleDxe/ComponentName.c | 8 +-
> .../GraphicsConsoleDxe/GraphicsConsole.c | 8 +-
> .../GraphicsConsoleDxe/GraphicsConsole.h | 8 +-
> .../GraphicsConsoleDxe/GraphicsConsoleDxe.inf | 9 +-
> .../GraphicsConsoleDxe/GraphicsConsoleDxe.uni | 8 +-
> .../GraphicsConsoleDxeExtra.uni | 8 +-
> .../RPi3/Drivers/GraphicsConsoleDxe/NewFont.c | 8 +-
> .../RPi3/Drivers/MmcDxe/ComponentName.c | 8 +-
> .../RPi3/Drivers/MmcDxe/Diagnostics.c | 8 +-
> .../RaspberryPi/RPi3/Drivers/MmcDxe/Mmc.c | 8 +-
> .../RaspberryPi/RPi3/Drivers/MmcDxe/Mmc.h | 8 +-
> .../RPi3/Drivers/MmcDxe/MmcBlockIo.c | 8 +-
> .../RPi3/Drivers/MmcDxe/MmcDebug.c | 8 +-
> .../RPi3/Drivers/MmcDxe/MmcDxe.inf | 8 +-
> .../RPi3/Drivers/MmcDxe/MmcIdentification.c | 8 +-
> .../PlatformSmbiosDxe/PlatformSmbiosDxe.c | 8 +-
> .../PlatformSmbiosDxe/PlatformSmbiosDxe.inf | 8 +-
> .../Drivers/RpiFirmwareDxe/RpiFirmwareDxe.c | 8 +-
> .../Drivers/RpiFirmwareDxe/RpiFirmwareDxe.inf | 8 +-
> .../RPi3/Drivers/SdHostDxe/SdHostDxe.c | 8 +-
> .../RPi3/Drivers/SdHostDxe/SdHostDxe.inf | 8 +-
> .../RPi3/Drivers/VarBlockServiceDxe/FileIo.c | 8 +-
> .../RPi3/Drivers/VarBlockServiceDxe/FvbInfo.c | 8 +-
> .../VarBlockServiceDxe/VarBlockService.c | 8 +-
> .../VarBlockServiceDxe/VarBlockService.h | 8 +-
> .../VarBlockServiceDxe/VarBlockServiceDxe.c | 8 +-
> .../VarBlockServiceDxe/VarBlockServiceDxe.inf | 9 +-
> .../RaspberryPi/RPi3/Include/Protocol/DwUsb.h | 8 +-
> .../RPi3/Include/Protocol/ExtendedTextOut.h | 8 +-
> .../RPi3/Include/Protocol/RpiFirmware.h | 8 +-
> .../RPi3/Include/Protocol/RpiMmcHost.h | 8 +-
> .../MemoryInitPeiLib/MemoryInitPeiLib.c | 8 +-
> .../MemoryInitPeiLib/MemoryInitPeiLib.inf | 8 +-
> .../PlatformBootManagerLib/PlatformBm.c | 8 +-
> .../PlatformBootManagerLib/PlatformBm.h | 8 +-
> .../PlatformBootManagerLib.inf | 9 +-
> .../PlatformLib/AArch64/RaspberryPiHelper.S | 8 +-
> .../RPi3/Library/PlatformLib/PlatformLib.inf | 8 +-
> .../RPi3/Library/PlatformLib/RaspberryPi.c | 8 +-
> .../RPi3/Library/PlatformLib/RaspberryPiMem.c | 8 +-
> .../PlatformUiAppLib/PlatformUiAppLib.c | 8 +-
> .../RPi3/Library/ResetLib/ResetLib.c | 8 +-
> .../RPi3/Library/ResetLib/ResetLib.inf | 8 +-
> Platform/RaspberryPi/RPi3/RPi3.dec | 9 +-
> Platform/RaspberryPi/RPi3/RPi3.dsc | 9 +-
> Platform/RaspberryPi/RPi3/RPi3.fdf | 9 +-
> .../Socionext/DeveloperBox/DeveloperBox.dsc | 8 +-
> .../DeveloperBox/DeveloperBox.dsc.inc | 8 +-
> .../Socionext/DeveloperBox/DeveloperBox.fdf | 8 +-
> .../Socionext/DeveloperBox/DeveloperBoxMm.dsc | 8 +-
> .../Socionext/DeveloperBox/DeveloperBoxMm.fdf | 8 +-
> Platform/Socionext/DeveloperBox/Logo/Logo.c | 8 +-
> Platform/Socionext/DeveloperBox/Logo/Logo.idf | 8 +-
> .../Socionext/DeveloperBox/Logo/LogoDxe.inf | 7 +-
> .../SmbiosPlatformDxe/SmbiosPlatformDxe.c | 8 +-
> .../SmbiosPlatformDxe/SmbiosPlatformDxe.inf | 7 +-
> .../SystemFirmwareDescriptor.inf | 8 +-
> .../SystemFirmwareDescriptorPei.c | 8 +-
> .../SystemFirmwareDescriptorTable.aslc | 8 +-
> .../SystemFirmwareUpdateConfig.ini | 8 +-
> .../SynQuacerEvalBoard/SynQuacerEvalBoard.dsc | 8 +-
> .../SynQuacerEvalBoard/SynQuacerEvalBoard.fdf | 8 +-
> .../SystemFirmwareDescriptor.inf | 8 +-
> .../SystemFirmwareDescriptorPei.c | 8 +-
> .../SystemFirmwareDescriptorTable.aslc | 8 +-
> .../SystemFirmwareUpdateConfig.ini | 8 +-
> Platform/SoftIron/License.txt | 25 -
> .../FdtBlob/styx-overdrive1000.dts | 9 +-
> .../Overdrive1000Board/Overdrive1000Board.dsc | 8 +-
> .../Overdrive1000Board/Overdrive1000Board.fdf | 8 +-
> .../Armada80x0McBin/Armada80x0McBin.fdf.inc | 8 +-
> .../Armada80x0McBinBoardDescLib.c | 8 +-
> .../Armada80x0McBinBoardDescLib.inf | 8 +-
> .../NonDiscoverableInitLib.c | 8 +-
> .../NonDiscoverableInitLib.h | 8 +-
> .../NonDiscoverableInitLib.inf | 8 +-
> Readme.md | 5 +
> Silicon/AMD/Styx/AmdStyx.dec | 8 +-
> .../AMD/Styx/Common/Protocol/AmdMpCoreInfo.h | 8 +-
> Silicon/AMD/Styx/Common/SocVersion.h | 8 +-
> Silicon/AMD/Styx/Common/Varstore.fdf.inc | 9 +-
> .../Drivers/AcpiPlatformDxe/AcpiPlatform.c | 8 +-
> .../Drivers/AcpiPlatformDxe/AcpiPlatform.h | 8 +-
> .../AcpiPlatformDxe/AcpiPlatformDxe.inf | 8 +-
> .../Styx/Drivers/AcpiPlatformDxe/Csrt.aslc | 8 +-
> .../Styx/Drivers/AcpiPlatformDxe/Dbg2.aslc | 8 +-
> .../AMD/Styx/Drivers/AcpiPlatformDxe/Dsdt.asl | 8 +-
> .../Styx/Drivers/AcpiPlatformDxe/Fadt.aslc | 8 +-
> .../Styx/Drivers/AcpiPlatformDxe/Gtdt.aslc | 8 +-
> .../Styx/Drivers/AcpiPlatformDxe/Iort.aslc | 8 +-
> .../Styx/Drivers/AcpiPlatformDxe/Madt.aslc | 8 +-
> .../Styx/Drivers/AcpiPlatformDxe/Mcfg.aslc | 8 +-
> .../Styx/Drivers/AcpiPlatformDxe/Pptt.aslc | 8 +-
> .../Styx/Drivers/AcpiPlatformDxe/Spcr.aslc | 8 +-
> .../Styx/Drivers/AcpiPlatformDxe/SsdtB1.asl | 8 +-
> .../Styx/Drivers/AcpiPlatformDxe/SsdtKcs.asl | 8 +-
> .../Styx/Drivers/AcpiPlatformDxe/SsdtXgbe.asl | 8 +-
> .../Styx/Drivers/PlatInitDxe/PlatInitDxe.c | 8 +-
> .../Styx/Drivers/PlatInitDxe/PlatInitDxe.inf | 8 +-
> .../Styx/Drivers/PlatInitPei/PlatInitPei.c | 8 +-
> .../Styx/Drivers/PlatInitPei/PlatInitPei.inf | 8 +-
> .../PlatformSmbiosDxe/PlatformSmbiosDxe.c | 8 +-
> .../PlatformSmbiosDxe/PlatformSmbiosDxe.inf | 8 +-
> .../AMD/Styx/Drivers/StyxRngDxe/StyxRngDxe.c | 8 +-
> .../Styx/Drivers/StyxRngDxe/StyxRngDxe.inf | 8 +-
> .../StyxSataPlatformDxe/InitController.c | 8 +-
> .../StyxSataPlatformDxe/SataRegisters.h | 8 +-
> .../StyxSataPlatformDxe.inf | 8 +-
> .../Styx/Drivers/StyxSpiFvDxe/StyxSpiFvDxe.c | 8 +-
> .../Drivers/StyxSpiFvDxe/StyxSpiFvDxe.inf | 8 +-
> .../AmdStyxHelperLib/AmdStyxHelperLib.c | 8 +-
> .../AmdStyxHelperLib/AmdStyxHelperLib.inf | 8 +-
> .../Styx/Library/AmdStyxLib/AArch64/Helper.S | 8 +-
> .../Styx/Library/AmdStyxLib/AmdStyxLib.inf | 8 +-
> .../Styx/Library/AmdStyxLib/AmdStyxLibSec.inf | 8 +-
> Silicon/AMD/Styx/Library/AmdStyxLib/Styx.c | 8 +-
> Silicon/AMD/Styx/Library/AmdStyxLib/StyxMem.c | 8 +-
> .../AmdStyxPciHostBridgeLib.c | 8 +-
> .../AmdStyxPciHostBridgeLib.inf | 8 +-
> .../Library/MemoryInitPei/MemoryInitPeiLib.c | 8 +-
> .../MemoryInitPei/MemoryInitPeiLib.inf | 8 +-
> .../RealTimeClockLib/RealTimeClockLib.c | 8 +-
> .../RealTimeClockLib/RealTimeClockLib.inf | 7 +-
> .../StyxDtbLoaderLib/StyxDtbLoaderLib.c | 8 +-
> .../StyxDtbLoaderLib/StyxDtbLoaderLib.inf | 8 +-
> .../StyxPlatformFlashAccessLib.c | 8 +-
> .../StyxPlatformFlashAccessLib.inf | 8 +-
> Silicon/AMD/Styx/License.txt | 25 -
> Silicon/Atmel/AtSha204a/AtSha204a.dec | 8 +-
> Silicon/Atmel/AtSha204a/AtSha204aDriver.c | 8 +-
> Silicon/Atmel/AtSha204a/AtSha204aDriver.h | 8 +-
> Silicon/Atmel/AtSha204a/AtSha204aDxe.inf | 8 +-
> Silicon/Atmel/AtSha204a/ComponentName.c | 8 +-
> Silicon/Atmel/AtSha204a/DriverBinding.c | 8 +-
> Silicon/Broadcom/Bcm283x/Bcm283x.dec | 9 +-
> .../Drivers/InterruptDxe/InterruptDxe.c | 8 +-
> .../Drivers/InterruptDxe/InterruptDxe.inf | 8 +-
> .../Broadcom/Bcm283x/Drivers/RngDxe/RngDxe.c | 8 +-
> .../Bcm283x/Drivers/RngDxe/RngDxe.inf | 8 +-
> .../Include/IndustryStandard/Bcm2836Gpio.h | 8 +-
> .../Include/IndustryStandard/Bcm2836SdHost.h | 8 +-
> .../Include/IndustryStandard/Bcm2836Sdio.h | 8 +-
> .../Bcm283x/Include/Library/GpioLib.h | 8 +-
> .../Bcm283x/Library/GpioLib/GpioLib.c | 8 +-
> .../Bcm283x/Library/GpioLib/GpioLib.inf | 8 +-
> .../Drivers/AcpiPlatformDxe/AcpiPlatform.c | 8 +-
> .../AcpiPlatformDxe/AcpiPlatformDxe.inf | 8 +-
> .../Drivers/AcpiPlatformDxe/EthMac.c | 8 +-
> .../Drivers/AcpiPlatformDxe/EthMac.h | 8 +-
> .../Drivers/FlashFvbDxe/FlashBlockIoDxe.c | 8 +-
> .../Drivers/FlashFvbDxe/FlashFvbDxe.c | 8 +-
> .../Drivers/FlashFvbDxe/FlashFvbDxe.h | 8 +-
> .../Drivers/FlashFvbDxe/FlashFvbDxe.inf | 8 +-
> .../HisiAcpiPlatformDxe/AcpiPlatform.c | 8 +-
> .../HisiAcpiPlatformDxe/AcpiPlatform.uni | 8 +-
> .../HisiAcpiPlatformDxe/AcpiPlatformDxe.inf | 8 +-
> .../HisiAcpiPlatformDxe/AcpiPlatformExtra.uni | 8 +-
> .../HisiAcpiPlatformDxe/UpdateAcpiTable.c | 8 +-
> .../HisiAcpiPlatformDxe/UpdateAcpiTable.h | 8 +-
> .../Drivers/NorFlashDxe/NorFlashConfig.c | 8 +-
> .../Drivers/NorFlashDxe/NorFlashDxe.c | 8 +-
> .../Drivers/NorFlashDxe/NorFlashDxe.inf | 8 +-
> .../Drivers/NorFlashDxe/NorFlashHw.c | 8 +-
> .../Drivers/NorFlashDxe/NorFlashHw.h | 8 +-
> .../Drivers/PciPlatform/PciPlatform.c | 8 +-
> .../Drivers/PciPlatform/PciPlatform.inf | 8 +-
> .../Drivers/SasPlatform/SasPlatform.c | 8 +-
> .../Drivers/SasPlatform/SasPlatform.inf | 8 +-
> Silicon/Hisilicon/Drivers/SasV1Dxe/SasV1Dxe.c | 8 +-
> .../Hisilicon/Drivers/SasV1Dxe/SasV1Dxe.inf | 8 +-
> .../Smbios/AddSmbiosType9/AddSmbiosType9.c | 8 +-
> .../Smbios/AddSmbiosType9/AddSmbiosType9.h | 8 +-
> .../Smbios/AddSmbiosType9/AddSmbiosType9.inf | 8 +-
> .../Smbios/MemorySubClassDxe/MemorySubClass.c | 8 +-
> .../Smbios/MemorySubClassDxe/MemorySubClass.h | 8 +-
> .../MemorySubClassDxe/MemorySubClassDxe.inf | 8 +-
> .../MemorySubClassStrings.uni | 8 +-
> .../ProcessorSubClassDxe/ProcessorSubClass.c | 8 +-
> .../ProcessorSubClassDxe/ProcessorSubClass.h | 8 +-
> .../ProcessorSubClassDxe.inf | 8 +-
> .../ProcessorSubClassStrings.uni | 8 +-
> .../Drivers/Smbios/SmbiosMiscDxe/SmbiosMisc.h | 8 +-
> .../SmbiosMiscDxe/SmbiosMiscDataTable.c | 8 +-
> .../Smbios/SmbiosMiscDxe/SmbiosMiscDxe.inf | 7 +-
> .../SmbiosMiscDxe/SmbiosMiscEntryPoint.c | 8 +-
> .../SmbiosMiscDxe/SmbiosMiscLibString.uni | 8 +-
> .../SmbiosMiscDxe/Type00/MiscBiosVendor.uni | 8 +-
> .../SmbiosMiscDxe/Type00/MiscBiosVendorData.c | 8 +-
> .../Type00/MiscBiosVendorFunction.c | 8 +-
> .../Type01/MiscSystemManufacturer.uni | 8 +-
> .../Type01/MiscSystemManufacturerData.c | 8 +-
> .../Type01/MiscSystemManufacturerFunction.c | 8 +-
> .../Type02/MiscBaseBoardManufacturer.uni | 8 +-
> .../Type02/MiscBaseBoardManufacturerData.c | 8 +-
> .../MiscBaseBoardManufacturerFunction.c | 8 +-
> .../Type03/MiscChassisManufacturer.uni | 8 +-
> .../Type03/MiscChassisManufacturerData.c | 8 +-
> .../Type03/MiscChassisManufacturerFunction.c | 8 +-
> .../Type09/MiscSystemSlotDesignation.uni | Bin 1592 -> 826 bytes
> .../Type09/MiscSystemSlotDesignationData.c | 8 +-
> .../MiscSystemSlotDesignationFunction.c | 8 +-
> .../MiscNumberOfInstallableLanguages.uni | 8 +-
> .../MiscNumberOfInstallableLanguagesData.c | 8 +-
> ...MiscNumberOfInstallableLanguagesFunction.c | 8 +-
> .../Type32/MiscBootInformationData.c | 8 +-
> .../Type32/MiscBootInformationFunction.c | 8 +-
> .../Type38/MiscIpmiDeviceInformationData.c | 8 +-
> .../MiscIpmiDeviceInformationFunction.c | 8 +-
> .../Drivers/SnpPlatform/SnpPlatform.c | 8 +-
> .../Drivers/SnpPlatform/SnpPlatform.inf | 8 +-
> .../Drivers/UpdateFdtDxe/UpdateFdtDxe.c | 8 +-
> .../Drivers/UpdateFdtDxe/UpdateFdtDxe.inf | 8 +-
> .../Drivers/VersionInfoPeim/VersionInfoPeim.c | 8 +-
> .../VersionInfoPeim/VersionInfoPeim.inf | 8 +-
> .../VirtualEhciPciIo/VirtualEhciPciIo.c | 8 +-
> .../VirtualEhciPciIo/VirtualEhciPciIo.inf | 8 +-
> .../Hi1610/Drivers/IoInitDxe/IoInitDxe.c | 8 +-
> .../Hi1610/Drivers/IoInitDxe/IoInitDxe.inf | 8 +-
> .../Hi1610/Drivers/PcieInit1610/PcieInit.c | 8 +-
> .../Hi1610/Drivers/PcieInit1610/PcieInit.h | 8 +-
> .../Drivers/PcieInit1610/PcieInitDxe.inf | 8 +-
> .../Hi1610/Drivers/PcieInit1610/PcieInitLib.c | 8 +-
> .../Hi1610/Drivers/PcieInit1610/PcieInitLib.h | 8 +-
> .../Drivers/PcieInit1610/PcieKernelApi.h | 8 +-
> Silicon/Hisilicon/Hi1610/Hi1610.dec | 8 +-
> .../Hi1610AcpiTables/AcpiTablesHi1610.inf | 8 +-
> .../Hi1610/Hi1610AcpiTables/D03Mcfg.aslc | 7 +-
> .../Hi1610/Hi1610AcpiTables/Dsdt/CPU.asl | 8 +-
> .../Hi1610/Hi1610AcpiTables/Dsdt/Com.asl | 8 +-
> .../Hi1610/Hi1610AcpiTables/Dsdt/D03Hns.asl | 8 +-
> .../Hi1610/Hi1610AcpiTables/Dsdt/D03Mbig.asl | 8 +-
> .../Hi1610/Hi1610AcpiTables/Dsdt/D03Pci.asl | 8 +-
> .../Hi1610/Hi1610AcpiTables/Dsdt/D03Sas.asl | 8 +-
> .../Hi1610/Hi1610AcpiTables/Dsdt/D03Usb.asl | 8 +-
> .../Hi1610AcpiTables/Dsdt/DsdtHi1610.asl | 8 +-
> .../Hi1610/Hi1610AcpiTables/Dsdt/Lpc.asl | 8 +-
> .../Hi1610/Hi1610AcpiTables/Facs.aslc | 8 +-
> .../Hi1610/Hi1610AcpiTables/Fadt.aslc | 8 +-
> .../Hi1610/Hi1610AcpiTables/Gtdt.aslc | 8 +-
> .../Hi1610/Hi1610AcpiTables/Hi1610Platform.h | 8 +-
> .../Hi1610/Hi1610AcpiTables/MadtHi1610.aslc | 8 +-
> .../Hi1610/Hi1610AcpiTables/Slit.aslc | 7 +-
> .../Hi1610/Hi1610AcpiTables/Srat.aslc | 7 +-
> .../Hisilicon/Hi1610/Include/PlatformArch.h | 8 +-
> .../Hi161xPciPlatformLib.c | 8 +-
> .../Hi161xPciPlatformLib.inf | 7 +-
> .../Hi161xPciSegmentLib.inf | 7 +-
> .../Hi161xPciSegmentLib/PciSegmentLib.c | 9 +-
> .../Hi1616/D05AcpiTables/AcpiTablesHi1616.inf | 8 +-
> .../Hi1616/D05AcpiTables/D05Mcfg.aslc | 7 +-
> .../Hi1616/D05AcpiTables/D05Slit.aslc | 7 +-
> .../Hi1616/D05AcpiTables/D05Spcr.aslc | 8 +-
> .../Hi1616/D05AcpiTables/D05Srat.aslc | 7 +-
> .../Hi1616/D05AcpiTables/Dsdt/CPU.asl | 8 +-
> .../Hi1616/D05AcpiTables/Dsdt/Com.asl | 8 +-
> .../Hi1616/D05AcpiTables/Dsdt/D05Hns.asl | 8 +-
> .../Hi1616/D05AcpiTables/Dsdt/D05I2c.asl | 8 +-
> .../Hi1616/D05AcpiTables/Dsdt/D05Mbig.asl | 8 +-
> .../Hi1616/D05AcpiTables/Dsdt/D05Pci.asl | 8 +-
> .../Hi1616/D05AcpiTables/Dsdt/D05Sas.asl | 8 +-
> .../Hi1616/D05AcpiTables/Dsdt/D05Usb.asl | 8 +-
> .../Hi1616/D05AcpiTables/Dsdt/DsdtHi1616.asl | 8 +-
> .../Hi1616/D05AcpiTables/Dsdt/Lpc.asl | 8 +-
> .../Hisilicon/Hi1616/D05AcpiTables/Facs.aslc | 8 +-
> .../Hisilicon/Hi1616/D05AcpiTables/Fadt.aslc | 8 +-
> .../Hisilicon/Hi1616/D05AcpiTables/Gtdt.aslc | 8 +-
> .../Hi1616/D05AcpiTables/Hi1616Platform.h | 8 +-
> .../Hi1616/D05AcpiTables/MadtHi1616.aslc | 8 +-
> Silicon/Hisilicon/Hi1616/Hi1616.dec | 8 +-
> .../Hisilicon/Hi1616/Include/PlatformArch.h | 8 +-
> Silicon/Hisilicon/Hi1616/Pptt/Pptt.c | 8 +-
> Silicon/Hisilicon/Hi1616/Pptt/Pptt.h | 8 +-
> Silicon/Hisilicon/Hi1616/Pptt/Pptt.inf | 8 +-
> Silicon/Hisilicon/Hi1620/Drivers/Apei/Apei.c | 8 +-
> Silicon/Hisilicon/Hi1620/Drivers/Apei/Apei.h | 8 +-
> .../Hisilicon/Hi1620/Drivers/Apei/Apei.inf | 8 +-
> .../Hisilicon/Hi1620/Drivers/Apei/Bert/Bert.c | 8 +-
> .../Hisilicon/Hi1620/Drivers/Apei/Bert/Bert.h | 8 +-
> .../Hisilicon/Hi1620/Drivers/Apei/Einj/Einj.c | 8 +-
> .../Hisilicon/Hi1620/Drivers/Apei/Einj/Einj.h | 8 +-
> .../Hi1620/Drivers/Apei/ErrorSource/Ghes.c | 8 +-
> .../Hi1620/Drivers/Apei/ErrorSource/Ghes.h | 8 +-
> .../Hisilicon/Hi1620/Drivers/Apei/Erst/Erst.c | 8 +-
> .../Hisilicon/Hi1620/Drivers/Apei/Erst/Erst.h | 8 +-
> .../Hisilicon/Hi1620/Drivers/Apei/Hest/Hest.c | 8 +-
> .../Hisilicon/Hi1620/Drivers/Apei/Hest/Hest.h | 8 +-
> .../Hi1620/Drivers/Apei/OemApeiHi1620.c | 8 +-
> .../Hi1620/Drivers/Apei/OemApeiHi1620.h | 8 +-
> .../Pl011DebugSerialPortInitDxe.c | 8 +-
> .../Pl011DebugSerialPortInitDxe.inf | 8 +-
> Silicon/Hisilicon/Hi1620/Hi1620.dec | 8 +-
> .../Hi1620AcpiTables/AcpiTablesHi1620.inf | 8 +-
> .../Hi1620/Hi1620AcpiTables/Dsdt/CPU.asl | 8 +-
> .../Hi1620/Hi1620AcpiTables/Dsdt/Com.asl | 8 +-
> .../Hi1620AcpiTables/Dsdt/DsdtHi1620.asl | 8 +-
> .../Hi1620AcpiTables/Dsdt/Hi1620Apei.asl | 8 +-
> .../Hi1620AcpiTables/Dsdt/Hi1620Ged.asl | 8 +-
> .../Hi1620AcpiTables/Dsdt/Hi1620Mbig.asl | 8 +-
> .../Hi1620AcpiTables/Dsdt/Hi1620Mctp.asl | 8 +-
> .../Hi1620AcpiTables/Dsdt/Hi1620Pci.asl | 8 +-
> .../Hi1620AcpiTables/Dsdt/Hi1620Power.asl | 8 +-
> .../Hi1620AcpiTables/Dsdt/Hi1620Rde.asl | 8 +-
> .../Hi1620AcpiTables/Dsdt/Hi1620Sec.asl | 8 +-
> .../Dsdt/Hi1620Socip4_i2c100k.asl | 8 +-
> .../Dsdt/Hi1620Socip4_i2c400k.asl | 8 +-
> .../Hi1620AcpiTables/Dsdt/LpcUart_clk.asl | 8 +-
> .../Hi1620AcpiTables/Dsdt/Pv680UncorePmu.asl | 8 +-
> .../Hi1620/Hi1620AcpiTables/Dsdt/ipmi.asl | 8 +-
> .../Hi1620/Hi1620AcpiTables/Facs.aslc | 8 +-
> .../Hi1620/Hi1620AcpiTables/Fadt.aslc | 8 +-
> .../Hi1620/Hi1620AcpiTables/Gtdt.aslc | 8 +-
> .../Hi1620/Hi1620AcpiTables/Hi1620Dbg2.aslc | 7 +-
> .../Hi1620/Hi1620AcpiTables/Hi1620Mcfg.aslc | 7 +-
> .../Hi1620/Hi1620AcpiTables/Hi1620Platform.h | 8 +-
> .../Hi1620/Hi1620AcpiTables/Hi1620Slit.aslc | 7 +-
> .../Hi1620/Hi1620AcpiTables/Hi1620Spcr.aslc | 8 +-
> .../Hi1620/Hi1620AcpiTables/Hi1620Srat.aslc | 7 +-
> .../Hi1620/Hi1620AcpiTables/MadtHi1620.aslc | 8 +-
> .../Hi1620OemConfigUiLib/MemoryConfig.hfr | 8 +-
> .../Hi1620OemConfigUiLib/MemoryConfig.uni | 8 +-
> .../Hi1620OemConfigUiLib/MiscConfig.hfr | 8 +-
> .../Hi1620OemConfigUiLib/MiscConfig.uni | 8 +-
> .../Hi1620/Hi1620OemConfigUiLib/OemConfig.c | 8 +-
> .../Hi1620/Hi1620OemConfigUiLib/OemConfig.h | 8 +-
> .../Hi1620/Hi1620OemConfigUiLib/OemConfigUi.h | 8 +-
> .../Hi1620OemConfigUiLib/OemConfigUiLib.inf | 8 +-
> .../Hi1620OemConfigUiLib/OemConfigUiLib.uni | 8 +-
> .../OemConfigUiLibStrings.uni | 8 +-
> .../Hi1620OemConfigUiLib/OemConfigVfr.vfr | 8 +-
> .../Hi1620OemConfigUiLib/PcieConfig.hfr | 8 +-
> .../PcieConfigStrings.uni | 8 +-
> .../Hi1620OemConfigUiLib/PciePortConfig.hfr | 8 +-
> .../Hi1620/Hi1620OemConfigUiLib/RasConfig.hfr | 8 +-
> .../Hi1620/Hi1620OemConfigUiLib/RasConfig.uni | 8 +-
> .../Hi1620OemConfigUiLib/iBMCConfig.hfr | 8 +-
> .../Hi1620OemConfigUiLib/iBMCConfig.uni | 8 +-
> .../Hisilicon/Hi1620/Include/PlatformArch.h | 8 +-
> .../Hi1620PciPlatformLib.c | 8 +-
> .../Hi1620PciPlatformLib.inf | 7 +-
> Silicon/Hisilicon/Hi1620/Pptt/Pptt.c | 8 +-
> Silicon/Hisilicon/Hi1620/Pptt/Pptt.h | 8 +-
> Silicon/Hisilicon/Hi1620/Pptt/Pptt.inf | 8 +-
> Silicon/Hisilicon/Hi3660/Hi3660.dec | 8 +-
> Silicon/Hisilicon/Hi3660/Include/Hi3660.h | 8 +-
> Silicon/Hisilicon/Hi6220/Hi6220.dec | 8 +-
> Silicon/Hisilicon/Hi6220/Include/Hi6220.h | 8 +-
> .../Hisilicon/Hi6220/Include/Hi6220RegsPeri.h | 8 +-
> Silicon/Hisilicon/HisiPkg.dec | 8 +-
> Silicon/Hisilicon/Hisilicon.dsc.inc | 8 +-
> Silicon/Hisilicon/Hisilicon.fdf.inc | 8 +-
> .../Hisilicon/Include/Guid/MemoryMapData.h | 8 +-
> .../Include/Guid/VersionInfoHobGuid.h | 8 +-
> .../Hisilicon/Include/Library/AcpiNextLib.h | 8 +-
> .../Include/Library/BmcConfigBootLib.h | 8 +-
> Silicon/Hisilicon/Include/Library/CpldIoLib.h | 8 +-
> .../Hisilicon/Include/Library/FdtUpdateLib.h | 8 +-
> .../Hisilicon/Include/Library/HwMemInitLib.h | 8 +-
> Silicon/Hisilicon/Include/Library/I2CLib.h | 8 +-
> .../Hisilicon/Include/Library/OemConfigData.h | 8 +-
> .../Hisilicon/Include/Library/OemDevicePath.h | 8 +-
> .../Hisilicon/Include/Library/OemMiscLib.h | 8 +-
> Silicon/Hisilicon/Include/Library/OemNicLib.h | 8 +-
> .../Include/Library/OemSetVirtualMapDesc.h | 8 +-
> .../Include/Library/PlatformPciLib.h | 8 +-
> .../Include/Protocol/HisiBoardNicProtocol.h | 8 +-
> .../Protocol/HisiPlatformSasProtocol.h | 8 +-
> .../Include/Protocol/HisiSpiFlashProtocol.h | 8 +-
> .../Include/Protocol/IpmiInterfaceProtocol.h | 8 +-
> .../Include/Protocol/NorFlashProtocol.h | 8 +-
> .../Include/Protocol/PlatformSasProtocol.h | 8 +-
> .../Include/Protocol/SnpPlatformProtocol.h | 8 +-
> .../Include/Regs/HisiPcieV1RegOffset.h | 8 +-
> .../ArmPlatformLibHisilicon/AArch64/Helper.S | 8 +-
> .../ArmPlatformLibHisilicon/ArmPlatformLib.c | 8 +-
> .../ArmPlatformLib.inf | 8 +-
> .../ArmPlatformLibMem.c | 8 +-
> .../ArmPlatformLibSec.inf | 8 +-
> .../BmcConfigBootLib/BmcConfigBootLib.c | 8 +-
> .../BmcConfigBootLib/BmcConfigBootLib.inf | 8 +-
> .../Hisilicon/Library/CpldIoLib/CpldIoLib.c | 8 +-
> .../Hisilicon/Library/CpldIoLib/CpldIoLib.inf | 8 +-
> .../Library/CpldIoLib/CpldIoLibRuntime.c | 8 +-
> .../Library/CpldIoLib/CpldIoLibRuntime.inf | 8 +-
> .../DS3231RealTimeClock.h | 8 +-
> .../DS3231RealTimeClockLib.c | 8 +-
> .../DS3231RealTimeClockLib.inf | 7 +-
> .../Dw8250SerialPortLib/Dw8250SerialPortLib.c | 8 +-
> .../Dw8250SerialPortLib/Dw8250SerialPortLib.h | 8 +-
> .../Dw8250SerialPortLib.inf | 8 +-
> .../Dw8250SerialPortRuntimeLib.c | 8 +-
> .../Dw8250SerialPortRuntimeLib.h | 8 +-
> .../Dw8250SerialPortRuntimeLib.inf | 8 +-
> Silicon/Hisilicon/Library/I2CLib/I2CHw.h | 8 +-
> Silicon/Hisilicon/Library/I2CLib/I2CLib.c | 8 +-
> Silicon/Hisilicon/Library/I2CLib/I2CLib.inf | 8 +-
> .../Hisilicon/Library/I2CLib/I2CLibCommon.c | 8 +-
> .../Hisilicon/Library/I2CLib/I2CLibInternal.h | 8 +-
> .../Hisilicon/Library/I2CLib/I2CLibRuntime.c | 8 +-
> .../Library/I2CLib/I2CLibRuntime.inf | 8 +-
> .../M41T83RealTimeClock.h | 8 +-
> .../M41T83RealTimeClockLib.c | 8 +-
> .../M41T83RealTimeClockLib.inf | 8 +-
> .../PlatformBootManagerLib/PlatformBm.c | 8 +-
> .../PlatformBootManagerLib/PlatformBm.h | 8 +-
> .../PlatformBootManagerLib.inf | 9 +-
> .../PlatformFlashAccessLibDxe.c | 8 +-
> .../PlatformFlashAccessLibDxe.inf | 8 +-
> .../PlatformIntelBdsLib/IntelBdsPlatform.c | 8 +-
> .../PlatformIntelBdsLib/IntelBdsPlatform.h | 8 +-
> .../IntelBdsPlatformCommon.c | 8 +-
> .../IntelBdsPlatformCommon.h | 8 +-
> .../PlatformIntelBdsLib.inf | 9 +-
> .../RealTimeClockLib.c | 8 +-
> .../RealTimeClockLib.inf | 8 +-
> .../KabylakeSiliconPkg/Contributions.txt | 218 -------
> .../Cpu/Include/ConfigBlock/CpuConfig.h | 8 +-
> .../Include/ConfigBlock/CpuConfigFspData.h | 8 +-
> .../ConfigBlock/CpuConfigLibPreMemConfig.h | 8 +-
> .../ConfigBlock/CpuOverclockingConfig.h | 8 +-
> .../Include/ConfigBlock/CpuPidTestConfig.h | 8 +-
> .../ConfigBlock/CpuPowerMgmtBasicConfig.h | 8 +-
> .../ConfigBlock/CpuPowerMgmtCustomConfig.h | 8 +-
> .../ConfigBlock/CpuPowerMgmtPsysConfig.h | 8 +-
> .../ConfigBlock/CpuPowerMgmtTestConfig.h | 8 +-
> .../ConfigBlock/CpuPowerMgmtVrConfig.h | 8 +-
> .../Cpu/Include/ConfigBlock/CpuTestConfig.h | 8 +-
> .../Cpu/Include/CpuAccess.h | 8 +-
> .../Cpu/Include/CpuDataStruct.h | 8 +-
> .../Cpu/Include/CpuPolicyCommon.h | 8 +-
> .../Cpu/Include/CpuPowerMgmt.h | 8 +-
> .../KabylakeSiliconPkg/Cpu/Include/CpuRegs.h | 8 +-
> .../Cpu/Include/Library/CpuMailboxLib.h | 8 +-
> .../Cpu/Include/Library/CpuPlatformLib.h | 8 +-
> .../Cpu/Include/Library/CpuPolicyLib.h | 8 +-
> .../Cpu/Include/Library/CpuPolicyLibPreMem.h | 8 +-
> .../Cpu/Include/Protocol/CpuGlobalNvsArea.h | 8 +-
> .../Cpu/Include/Protocol/CpuInfo.h | 8 +-
> .../Cpu/IncludePrivate/CpuInitDataHob.h | 8 +-
> .../Cpu/IncludePrivate/CpuPrivateData.h | 8 +-
> .../Cpu/IncludePrivate/Library/CpuCommonLib.h | 8 +-
> .../Cpu/IncludePrivate/PowerMgmtNvsStruct.h | 8 +-
> .../BaseCpuMailboxLibNull.c | 8 +-
> .../BaseCpuMailboxLibNull.inf | 8 +-
> .../Library/PeiCpuPolicyLib/CpuPrintPolicy.c | 8 +-
> .../Library/PeiCpuPolicyLib/PeiCpuPolicyLib.c | 8 +-
> .../PeiCpuPolicyLib/PeiCpuPolicyLib.inf | 8 +-
> .../PeiCpuPolicyLib/PeiCpuPolicyLibrary.h | 8 +-
> .../PeiCpuPolicyLibPreMem/CpuPrintPolicy.c | 8 +-
> .../PeiCpuPolicyLibPreMem/PeiCpuPolicyLib.c | 8 +-
> .../PeiCpuPolicyLibPreMem.inf | 8 +-
> .../PeiCpuPolicyLibrary.h | 8 +-
> .../CpuPlatformLibrary.c | 8 +-
> .../CpuPlatformLibrary.h | 8 +-
> .../PeiDxeSmmCpuPlatformLib.inf | 8 +-
> .../PeiDxeSmmCpuCommonLib/CpuCommonLib.c | 8 +-
> .../PeiDxeSmmCpuCommonLib.inf | 8 +-
> .../Hsti/Dxe/BootFirmwareMediaProtection.c | 8 +-
> .../Hsti/Dxe/DebugModeDisabled.c | 8 +-
> .../Hsti/Dxe/HardwareRootedBootIntegrity.c | 8 +-
> .../Hsti/Dxe/HstiSiliconDxe.c | 8 +-
> .../Hsti/Dxe/HstiSiliconDxe.h | 8 +-
> .../Hsti/Dxe/HstiSiliconDxe.inf | 8 +-
> .../Hsti/Dxe/IntegratedDeviceDmaProtection.c | 8 +-
> .../Hsti/Dxe/MeasuredBootEnforcement.c | 8 +-
> .../Hsti/Dxe/MpServiceHelp.c | 8 +-
> .../Hsti/Dxe/SecureCpuConfiguration.c | 8 +-
> .../SecureIntegratedGraphicsConfiguration.c | 8 +-
> .../Hsti/Dxe/SecureMemoryMapConfiguration.c | 8 +-
> .../Hsti/Dxe/SecurePCHConfiguration.c | 8 +-
> .../Hsti/Dxe/SecureSystemAgentConfiguration.c | 8 +-
> .../Hsti/Dxe/SignedFirmwareUpdate.c | 8 +-
> .../KabylakeSiliconPkg/Include/ConfigBlock.h | 8 +-
> .../Include/HstiFeatureBit.h | 8 +-
> .../Include/Library/AslUpdateLib.h | 8 +-
> .../Include/Library/ConfigBlockLib.h | 8 +-
> .../Include/Library/MmPciLib.h | 8 +-
> .../Include/Library/PeiSiPolicyUpdateLib.h | 8 +-
> .../Include/Library/SiConfigBlockLib.h | 8 +-
> .../Include/Library/SiPolicyLib.h | 8 +-
> .../Include/Library/SiliconInitLib.h | 8 +-
> .../KabylakeSiliconPkg/Include/PcieRegs.h | 8 +-
> .../Include/Ppi/SiInitPpi.h | 8 +-
> .../KabylakeSiliconPkg/Include/Ppi/SiPolicy.h | 8 +-
> .../Include/Protocol/SiPolicyProtocol.h | 8 +-
> .../Include/SiPolicyStruct.h | 8 +-
> .../IncludePrivate/Library/PcieInitLib.h | 8 +-
> .../IncludePrivate/SiConfigHob.h | 8 +-
> .../KabylakeSiliconBuild.bat | 8 +-
> .../KabylakeSiliconPkg/KabylakeSiliconPkg.dsc | 8 +-
> .../KabylakeSiliconPrivate.dec | 8 +-
> .../BaseConfigBlockLib/BaseConfigBlockLib.c | 8 +-
> .../BaseConfigBlockLib/BaseConfigBlockLib.inf | 8 +-
> .../BaseSiConfigBlockLib.c | 8 +-
> .../BaseSiConfigBlockLib.inf | 8 +-
> .../Library/DxeAslUpdateLib/DxeAslUpdateLib.c | 8 +-
> .../DxeAslUpdateLib/DxeAslUpdateLib.inf | 8 +-
> .../DxeAslUpdateLibNull/DxeAslUpdateLibNull.c | 8 +-
> .../DxeAslUpdateLibNull.inf | 8 +-
> .../DxeSiliconPolicyInitLib/DxePolicyInit.c | 8 +-
> .../DxeSiliconPolicyInitLib/DxeSaPolicyInit.h | 8 +-
> .../DxeSiliconPolicyInitLib.inf | 8 +-
> .../PeiDxeSmmMmPciLib/PeiDxeSmmMmPciLib.c | 8 +-
> .../PeiDxeSmmMmPciLib/PeiDxeSmmMmPciLib.inf | 8 +-
> .../Library/PeiSiPolicyLib/PeiSiPolicyLib.c | 8 +-
> .../Library/PeiSiPolicyLib/PeiSiPolicyLib.inf | 8 +-
> .../PeiSiPolicyLib/PeiSiPolicyLibPreMem.c | 8 +-
> .../PeiSiPolicyLib/PeiSiPolicyLibrary.h | 8 +-
> .../Library/PeiSiPolicyLib/SiPrintPolicy.c | 8 +-
> .../PeiSiliconPolicyInitLib/PeiPolicyInit.c | 8 +-
> .../PeiSiliconPolicyInitLib/PeiPolicyInit.h | 8 +-
> .../PeiPolicyInitPreMem.c | 8 +-
> .../PeiSiliconPolicyInitLib/PeiSiPolicyInit.h | 8 +-
> .../PeiSiliconPolicyInitLib.inf | 8 +-
> ...iPostMemSiliconPolicyInitLibDependency.inf | 8 +-
> ...eiPreMemSiliconPolicyInitLibDependency.inf | 8 +-
> .../PeiSiliconPolicyInitLibDependency.c | 8 +-
> .../PeiFspCpuPolicyInitLib.c | 8 +-
> .../PeiFspMePolicyInitLib.c | 8 +-
> .../PeiFspMiscUpdInitLib.c | 8 +-
> .../PeiFspPchPolicyInitLib.c | 8 +-
> .../PeiFspPolicyInitLib.c | 8 +-
> .../PeiFspPolicyInitLib.h | 8 +-
> .../PeiFspSaPolicyInitLib.c | 8 +-
> .../PeiFspSiPolicyInitLib.c | 8 +-
> .../PeiPolicyInit.c | 8 +-
> .../PeiPolicyInit.h | 8 +-
> .../PeiPolicyInitLib.h | 8 +-
> .../PeiPolicyInitPreMem.c | 8 +-
> .../PeiSiPolicyInit.h | 8 +-
> .../PeiSiliconPolicyInitLibFsp.inf | 8 +-
> .../Library/SiliconInitLib/SiliconInit.c | 8 +-
> .../Library/SiliconInitLib/SiliconInitLib.inf | 8 +-
> .../SiliconInitLib/SiliconInitPreMem.c | 8 +-
> Silicon/Intel/KabylakeSiliconPkg/License.txt | 25 -
> .../Me/Include/ConfigBlock/MePeiConfig.h | 8 +-
> .../Me/Include/Library/PeiMePolicyLib.h | 8 +-
> .../KabylakeSiliconPkg/Me/Include/MeChipset.h | 8 +-
> .../Me/Include/MePolicyCommon.h | 8 +-
> .../Library/PeiMePolicyLib/PeiMePolicyLib.c | 8 +-
> .../Library/PeiMePolicyLib/PeiMePolicyLib.inf | 8 +-
> .../PeiMePolicyLib/PeiMePolicyLibrary.h | 8 +-
> .../Pch/AcpiTables/Dsdt/GpioAcpiDefines.h | 8 +-
> .../Pch/AcpiTables/Dsdt/GpioLib.asl | 8 +-
> .../Pch/AcpiTables/Dsdt/GpioLibObjects.asl | 8 +-
> .../Pch/AcpiTables/Dsdt/IrqLink.asl | 8 +-
> .../Pch/AcpiTables/Dsdt/Pch.asl | 8 +-
> .../Pch/AcpiTables/Dsdt/PchAcpiTables.inf | 8 +-
> .../Pch/AcpiTables/Dsdt/PchHda.asl | 8 +-
> .../Pch/AcpiTables/Dsdt/PchHeci.asl | 8 +-
> .../Pch/AcpiTables/Dsdt/PchIsh.asl | 8 +-
> .../Pch/AcpiTables/Dsdt/PchNvs.asl | 8 +-
> .../Pch/AcpiTables/Dsdt/PchPcie.asl | 8 +-
> .../Pch/AcpiTables/Dsdt/PchRstPcieStorage.asl | 8 +-
> .../Pch/AcpiTables/Dsdt/PchSata.asl | 8 +-
> .../Pch/AcpiTables/Dsdt/PchScs.asl | 8 +-
> .../Pch/AcpiTables/Dsdt/PchSerialIo.asl | 8 +-
> .../Pch/AcpiTables/Dsdt/PchXdci.asl | 8 +-
> .../Pch/AcpiTables/Dsdt/PchXhci.asl | 8 +-
> .../Pch/AcpiTables/Dsdt/TraceHubDebug.asl | 8 +-
> .../Pch/AcpiTables/Dsdt/usbsbd.asl | 8 +-
> .../Pch/Include/ConfigBlock/Cio2Config.h | 8 +-
> .../Pch/Include/ConfigBlock/DciConfig.h | 8 +-
> .../Pch/Include/ConfigBlock/DmiConfig.h | 8 +-
> .../Pch/Include/ConfigBlock/EspiConfig.h | 8 +-
> .../ConfigBlock/FlashProtectionConfig.h | 8 +-
> .../Pch/Include/ConfigBlock/HdAudioConfig.h | 8 +-
> .../Pch/Include/ConfigBlock/HpetConfig.h | 8 +-
> .../Pch/Include/ConfigBlock/HsioConfig.h | 8 +-
> .../Pch/Include/ConfigBlock/HsioPcieConfig.h | 8 +-
> .../Pch/Include/ConfigBlock/HsioSataConfig.h | 8 +-
> .../Pch/Include/ConfigBlock/InterruptConfig.h | 8 +-
> .../Pch/Include/ConfigBlock/IoApicConfig.h | 8 +-
> .../Pch/Include/ConfigBlock/IshConfig.h | 8 +-
> .../Pch/Include/ConfigBlock/LanConfig.h | 8 +-
> .../Pch/Include/ConfigBlock/LockDownConfig.h | 8 +-
> .../Pch/Include/ConfigBlock/LpcConfig.h | 8 +-
> .../Pch/Include/ConfigBlock/P2sbConfig.h | 8 +-
> .../Include/ConfigBlock/PchGeneralConfig.h | 8 +-
> .../Pch/Include/ConfigBlock/PcieRpConfig.h | 8 +-
> .../Pch/Include/ConfigBlock/PmConfig.h | 8 +-
> .../Pch/Include/ConfigBlock/Port61Config.h | 8 +-
> .../Pch/Include/ConfigBlock/SataConfig.h | 8 +-
> .../Pch/Include/ConfigBlock/ScsConfig.h | 8 +-
> .../Pch/Include/ConfigBlock/SerialIoConfig.h | 8 +-
> .../Pch/Include/ConfigBlock/SerialIrqConfig.h | 8 +-
> .../Pch/Include/ConfigBlock/SmbusConfig.h | 8 +-
> .../Pch/Include/ConfigBlock/SpiConfig.h | 8 +-
> .../Pch/Include/ConfigBlock/ThermalConfig.h | 8 +-
> .../Pch/Include/ConfigBlock/TraceHubConfig.h | 8 +-
> .../Pch/Include/ConfigBlock/UsbConfig.h | 8 +-
> .../Pch/Include/ConfigBlock/WatchDogConfig.h | 8 +-
> .../Pch/Include/GpioConfig.h | 8 +-
> .../Pch/Include/GpioPinsSklH.h | 8 +-
> .../Pch/Include/GpioPinsSklLp.h | 8 +-
> .../Pch/Include/Library/GpioLib.h | 8 +-
> .../Pch/Include/Library/GpioNativeLib.h | 8 +-
> .../Pch/Include/Library/OcWdtLib.h | 8 +-
> .../Pch/Include/Library/PchCycleDecodingLib.h | 8 +-
> .../Pch/Include/Library/PchEspiLib.h | 8 +-
> .../Pch/Include/Library/PchGbeLib.h | 8 +-
> .../Pch/Include/Library/PchHsioLib.h | 8 +-
> .../Pch/Include/Library/PchInfoLib.h | 8 +-
> .../Pch/Include/Library/PchP2sbLib.h | 8 +-
> .../Pch/Include/Library/PchPcieRpLib.h | 8 +-
> .../Pch/Include/Library/PchPcrLib.h | 8 +-
> .../Pch/Include/Library/PchPmcLib.h | 8 +-
> .../Pch/Include/Library/PchPolicyLib.h | 8 +-
> .../Pch/Include/Library/PchPsfLib.h | 8 +-
> .../Pch/Include/Library/PchResetLib.h | 8 +-
> .../Pch/Include/Library/PchSbiAccessLib.h | 8 +-
> .../Pch/Include/Library/PchSerialIoLib.h | 8 +-
> .../Pch/Include/Library/PchSerialIoUartLib.h | 8 +-
> .../Pch/Include/Library/PchSmmControlLib.h | 8 +-
> .../Pch/Include/Library/PchWdtCommonLib.h | 8 +-
> .../Pch/Include/Library/SecPchLib.h | 8 +-
> .../Pch/Include/Library/SpiFlashCommonLib.h | 8 +-
> .../Pch/Include/Library/SpiLib.h | 8 +-
> .../Pch/Include/Library/TraceHubInitLib.h | 8 +-
> .../Pch/Include/PchAccess.h | 8 +-
> .../Pch/Include/PchLimits.h | 8 +-
> .../Pch/Include/PchPcieStorageDetectHob.h | 8 +-
> .../Pch/Include/PchPolicyCommon.h | 8 +-
> .../Pch/Include/PchPreMemPolicyCommon.h | 8 +-
> .../Pch/Include/PchReservedResources.h | 8 +-
> .../Pch/Include/PchResetPlatformSpecific.h | 8 +-
> .../Pch/Include/Ppi/PchReset.h | 8 +-
> .../KabylakeSiliconPkg/Pch/Include/Ppi/Spi.h | 8 +-
> .../KabylakeSiliconPkg/Pch/Include/Ppi/Wdt.h | 8 +-
> .../Pch/Include/Protocol/PchAcpiSmiDispatch.h | 8 +-
> .../Pch/Include/Protocol/PchEmmcTuning.h | 8 +-
> .../Pch/Include/Protocol/PchEspiSmiDispatch.h | 8 +-
> .../Protocol/PchGpioUnlockSmiDispatch.h | 8 +-
> .../Pch/Include/Protocol/PchInfo.h | 8 +-
> .../Pch/Include/Protocol/PchPcieSmiDispatch.h | 8 +-
> .../Pch/Include/Protocol/PchReset.h | 8 +-
> .../Pch/Include/Protocol/PchSmiDispatch.h | 8 +-
> .../Include/Protocol/PchSmmIoTrapControl.h | 8 +-
> .../Protocol/PchSmmPeriodicTimerControl.h | 8 +-
> .../Pch/Include/Protocol/PchTcoSmiDispatch.h | 8 +-
> .../Pch/Include/Protocol/SerialGpio.h | 8 +-
> .../Pch/Include/Protocol/Spi.h | 8 +-
> .../Pch/Include/Protocol/Wdt.h | 8 +-
> .../Pch/Include/Register/PchRegsCam.h | 8 +-
> .../Pch/Include/Register/PchRegsDci.h | 8 +-
> .../Pch/Include/Register/PchRegsDmi.h | 8 +-
> .../Pch/Include/Register/PchRegsFia.h | 8 +-
> .../Pch/Include/Register/PchRegsGpio.h | 8 +-
> .../Pch/Include/Register/PchRegsHda.h | 8 +-
> .../Pch/Include/Register/PchRegsHsio.h | 8 +-
> .../Pch/Include/Register/PchRegsIsh.h | 8 +-
> .../Pch/Include/Register/PchRegsItss.h | 8 +-
> .../Pch/Include/Register/PchRegsLan.h | 8 +-
> .../Pch/Include/Register/PchRegsLpc.h | 8 +-
> .../Pch/Include/Register/PchRegsP2sb.h | 8 +-
> .../Pch/Include/Register/PchRegsPcie.h | 8 +-
> .../Pch/Include/Register/PchRegsPcr.h | 8 +-
> .../Pch/Include/Register/PchRegsPmc.h | 8 +-
> .../Pch/Include/Register/PchRegsPsf.h | 8 +-
> .../Pch/Include/Register/PchRegsPsth.h | 8 +-
> .../Pch/Include/Register/PchRegsSata.h | 8 +-
> .../Pch/Include/Register/PchRegsScs.h | 8 +-
> .../Pch/Include/Register/PchRegsSerialIo.h | 8 +-
> .../Pch/Include/Register/PchRegsSmbus.h | 8 +-
> .../Pch/Include/Register/PchRegsSpi.h | 8 +-
> .../Pch/Include/Register/PchRegsThermal.h | 8 +-
> .../Pch/Include/Register/PchRegsTraceHub.h | 8 +-
> .../Pch/Include/Register/PchRegsUsb.h | 8 +-
> .../IncludePrivate/Library/DxePchHdaNhlt.h | 8 +-
> .../IncludePrivate/Library/GpioPrivateLib.h | 8 +-
> .../Library/I2cMasterCommonLib.h | 8 +-
> .../Pch/IncludePrivate/Library/PchHdaLib.h | 8 +-
> .../IncludePrivate/Library/PchInitCommonLib.h | 8 +-
> .../Library/PchPciExpressHelpersLib.h | 8 +-
> .../IncludePrivate/Library/PchPsfPrivateLib.h | 8 +-
> .../Library/PchSmbusCommonLib.h | 8 +-
> .../IncludePrivate/Library/PchSpiCommonLib.h | 8 +-
> .../IncludePrivate/Library/PeiI2cMasterLib.h | 8 +-
> .../IncludePrivate/Library/RstPrivateLib.h | 8 +-
> .../Pch/IncludePrivate/PchConfigHob.h | 8 +-
> .../Pch/IncludePrivate/PchHdaEndpoints.h | 8 +-
> .../Pch/IncludePrivate/Protocol/PchNvs.h | 8 +-
> .../Pch/IncludePrivate/Protocol/PchNvsArea.h | 8 +-
> .../Pch/IncludePrivate/Protocol/PcieIoTrap.h | 8 +-
> .../BaseResetSystemLib/BaseResetSystemLib.c | 8 +-
> .../BaseResetSystemLib/BaseResetSystemLib.inf | 8 +-
> .../Pch/Library/BaseSmbusLib/BaseSmbusLib.c | 8 +-
> .../Pch/Library/BaseSmbusLib/BaseSmbusLib.inf | 8 +-
> .../DxeResetSystemLib/DxeResetSystemLib.c | 8 +-
> .../DxeResetSystemLib/DxeResetSystemLib.inf | 8 +-
> .../DxeRuntimeResetSystemLib.c | 8 +-
> .../DxeRuntimeResetSystemLib.inf | 8 +-
> .../Pch/Library/PeiDxeSmmGpioLib/GpioInit.c | 8 +-
> .../Pch/Library/PeiDxeSmmGpioLib/GpioLib.c | 8 +-
> .../Library/PeiDxeSmmGpioLib/GpioLibrary.h | 8 +-
> .../Library/PeiDxeSmmGpioLib/GpioNativeLib.c | 8 +-
> .../Library/PeiDxeSmmGpioLib/PchSklGpioData.c | 8 +-
> .../PeiDxeSmmGpioLib/PeiDxeSmmGpioLib.inf | 8 +-
> .../PchCycleDecodingLib.c | 8 +-
> .../PeiDxeSmmPchCycleDecodingLib.inf | 8 +-
> .../Library/PeiDxeSmmPchGbeLib/PchGbeLib.c | 8 +-
> .../PeiDxeSmmPchGbeLib/PeiDxeSmmPchGbeLib.inf | 8 +-
> .../Library/PeiDxeSmmPchHsioLib/PchHsioLib.c | 8 +-
> .../PeiDxeSmmPchHsioLib.inf | 8 +-
> .../Library/PeiDxeSmmPchInfoLib/PchInfoLib.c | 8 +-
> .../PeiDxeSmmPchInfoLib/PchInfoStrLib.c | 8 +-
> .../PeiDxeSmmPchInfoLib.inf | 8 +-
> .../Library/PeiDxeSmmPchP2sbLib/PchP2sbLib.c | 8 +-
> .../PeiDxeSmmPchP2sbLib.inf | 8 +-
> .../PeiDxeSmmPchPcieRpLib/PchPcieRpLib.c | 8 +-
> .../PeiDxeSmmPchPcieRpLib.inf | 8 +-
> .../Library/PeiDxeSmmPchPcrLib/PchPcrLib.c | 8 +-
> .../PeiDxeSmmPchPcrLib/PeiDxeSmmPchPcrLib.inf | 8 +-
> .../Library/PeiDxeSmmPchPmcLib/PchPmcLib.c | 8 +-
> .../PeiDxeSmmPchPmcLib/PeiDxeSmmPchPmcLib.inf | 8 +-
> .../Library/PeiDxeSmmPchPsfLib/PchPsfLib.c | 8 +-
> .../PeiDxeSmmPchPsfLib/PeiDxeSmmPchPsfLib.inf | 8 +-
> .../PchSbiAccessLib.c | 8 +-
> .../PeiDxeSmmPchSbiAccessLib.inf | 8 +-
> .../PeiDxeSmmPchSerialIoLib.c | 8 +-
> .../PeiDxeSmmPchSerialIoLib.inf | 8 +-
> .../PeiDxeSmmPchWdtCommonLib.inf | 8 +-
> .../PeiDxeSmmPchWdtCommonLib/WdtCommon.c | 8 +-
> .../Pch/Library/PeiOcWdtLib/PeiOcWdtLib.c | 8 +-
> .../Pch/Library/PeiOcWdtLib/PeiOcWdtLib.inf | 8 +-
> .../Library/PeiOcWdtLibNull/PeiOcWdtLibNull.c | 8 +-
> .../PeiOcWdtLibNull/PeiOcWdtLibNull.inf | 8 +-
> .../PeiPchPolicyLib/PchPreMemPrintPolicy.c | 8 +-
> .../Library/PeiPchPolicyLib/PchPrintPolicy.c | 8 +-
> .../PeiPchPolicyLib/PchSamplePolicyLib.c | 8 +-
> .../PchSamplePreMemPolicyLib.c | 8 +-
> .../Library/PeiPchPolicyLib/PeiPchPolicyLib.c | 8 +-
> .../PeiPchPolicyLib/PeiPchPolicyLib.inf | 8 +-
> .../PeiPchPolicyLib/PeiPchPolicyLibrary.h | 8 +-
> .../PeiPchPolicyLib/PeiPchPreMemPolicyLib.c | 8 +-
> .../Pch/Library/PeiPchResetLib/PchReset.c | 8 +-
> .../Library/PeiPchResetLib/PeiPchResetLib.inf | 8 +-
> .../PeiResetSystemLib/PeiResetSystemLib.c | 8 +-
> .../PeiResetSystemLib/PeiResetSystemLib.inf | 8 +-
> .../PeiResetSystemLibFsp.inf | 8 +-
> .../Pch/Library/PeiSpiLib/PeiSpiLib.c | 8 +-
> .../Pch/Library/PeiSpiLib/PeiSpiLib.inf | 8 +-
> .../SmmSpiFlashCommonLib.inf | 8 +-
> .../SmmSpiFlashCommonLib/SpiFlashCommon.c | 8 +-
> .../SpiFlashCommonSmmLib.c | 8 +-
> .../BasePchSpiCommonLib.inf | 8 +-
> .../BasePchSpiCommonLib/SpiCommon.c | 8 +-
> .../DxePchHdaLib/DxePchHdaLib.inf | 8 +-
> .../DxePchHdaLib/PchHdaEndpoints.c | 8 +-
> .../LibraryPrivate/DxePchHdaLib/PchHdaLib.c | 8 +-
> .../DxePchHdaLib/PchHdaNhltConfig.c | 8 +-
> .../I2cMasterCommonLib.c | 8 +-
> .../PeiDxeI2cMasterCommonLib.inf | 8 +-
> .../GpioNativePrivateLib.c | 8 +-
> .../PeiDxeSmmGpioPrivateLib/GpioPrivateLib.c | 8 +-
> .../PchSklGpioPrivateData.c | 8 +-
> .../PeiDxeSmmGpioPrivateLib.inf | 8 +-
> .../PeiDxeSmmPchInitCommonLib/PchInitCommon.c | 8 +-
> .../PeiDxeSmmPchInitCommonLib/PchRpfn.c | 8 +-
> .../PeiDxeSmmPchInitCommonLib.inf | 8 +-
> .../PchPciExpressHelpersLibrary.c | 8 +-
> .../PchPciExpressHelpersLibrary.h | 8 +-
> .../PeiDxeSmmPchPciExpressHelpersLib.inf | 8 +-
> .../PchPsfPrivateLib.c | 8 +-
> .../PeiDxeSmmPchPsfPrivateLib.inf | 8 +-
> .../PeiDxeSmmPchSmbusCommonLib/PchSmbusExec.c | 8 +-
> .../PeiDxeSmmPchSmbusCommonLib.inf | 8 +-
> .../PeiDxeSmmRstPrivateLib.c | 8 +-
> .../PeiDxeSmmRstPrivateLib.inf | 8 +-
> .../Pch/PchInit/Dxe/PchAcpi.c | 8 +-
> .../Pch/PchInit/Dxe/PchCio2Acpi.c | 8 +-
> .../Pch/PchInit/Dxe/PchHdaAcpi.c | 8 +-
> .../Pch/PchInit/Dxe/PchInit.c | 8 +-
> .../Pch/PchInit/Dxe/PchInit.h | 8 +-
> .../Pch/PchInit/Dxe/PchInitDxe.c | 8 +-
> .../Pch/PchInit/Dxe/PchInitDxe.inf | 8 +-
> .../Pch/PchInit/Dxe/PchInitDxeFsp.inf | 8 +-
> .../Pch/PchInit/Dxe/PchInitFsp.c | 8 +-
> .../Pch/PchInit/Dxe/PchRstPcieStorage.c | 8 +-
> .../Pch/PchInit/Dxe/PchSata.c | 8 +-
> .../Pch/PchInit/Dxe/PchScs.c | 8 +-
> .../Pch/PchInit/Dxe/PchSerialIo.c | 8 +-
> .../Pch/PchInit/Dxe/PchSerialIoDxe.c | 8 +-
> .../Pch/PchInit/Smm/PchBiosWriteProtect.c | 8 +-
> .../Pch/PchInit/Smm/PchGpioSxIsolationSmm.c | 8 +-
> .../Pch/PchInit/Smm/PchInitSmm.c | 8 +-
> .../Pch/PchInit/Smm/PchInitSmm.h | 8 +-
> .../Pch/PchInit/Smm/PchInitSmm.inf | 8 +-
> .../Pch/PchInit/Smm/PchLanSxSmm.c | 8 +-
> .../Pch/PchInit/Smm/PchPcieSmm.c | 8 +-
> .../Pch/PchInit/Smm/PchPort61hSmm.c | 8 +-
> .../Pch/PchInit/Smm/PchSpiAsync.c | 8 +-
> .../Pch/PchInit/Smm/PchXhciSxSmm.c | 8 +-
> .../Pch/PchSmiDispatcher/Smm/IoTrap.c | 8 +-
> .../Pch/PchSmiDispatcher/Smm/IoTrap.h | 8 +-
> .../Pch/PchSmiDispatcher/Smm/PchSmiDispatch.c | 8 +-
> .../PchSmiDispatcher/Smm/PchSmiDispatcher.inf | 8 +-
> .../Pch/PchSmiDispatcher/Smm/PchSmm.h | 8 +-
> .../Pch/PchSmiDispatcher/Smm/PchSmmCore.c | 8 +-
> .../Pch/PchSmiDispatcher/Smm/PchSmmEspi.c | 8 +-
> .../Pch/PchSmiDispatcher/Smm/PchSmmEspi.h | 8 +-
> .../Pch/PchSmiDispatcher/Smm/PchSmmGpi.c | 8 +-
> .../Pch/PchSmiDispatcher/Smm/PchSmmHelpers.c | 8 +-
> .../Pch/PchSmiDispatcher/Smm/PchSmmHelpers.h | 8 +-
> .../Smm/PchSmmPeriodicTimer.c | 8 +-
> .../PchSmiDispatcher/Smm/PchSmmPowerButton.c | 8 +-
> .../Pch/PchSmiDispatcher/Smm/PchSmmSw.c | 8 +-
> .../Pch/PchSmiDispatcher/Smm/PchSmmSx.c | 8 +-
> .../Pch/PchSmiDispatcher/Smm/PchSmmUsb.c | 8 +-
> .../Pch/PchSmiDispatcher/Smm/PchxSmmHelpers.c | 8 +-
> .../Pch/PchSmiDispatcher/Smm/PchxSmmHelpers.h | 8 +-
> .../Pch/SmmControl/RuntimeDxe/SmmControl.inf | 8 +-
> .../SmmControl/RuntimeDxe/SmmControlDriver.c | 8 +-
> .../SmmControl/RuntimeDxe/SmmControlDriver.h | 8 +-
> .../KabylakeSiliconPkg/Pch/Spi/Smm/PchSpi.c | 8 +-
> .../KabylakeSiliconPkg/Pch/Spi/Smm/PchSpi.h | 8 +-
> .../Pch/Spi/Smm/PchSpiSmm.inf | 8 +-
> .../Include/Library/SecPlatformLib.h | 8 +-
> .../Include/Guid/DataHubStatusCodeRecord.h | 8 +-
> .../Include/Guid/SmramMemoryReserve.h | 8 +-
> .../Include/Protocol/DataHub.h | 8 +-
> .../Include/Protocol/Legacy8259.h | 8 +-
> .../Include/Protocol/LegacyBios.h | 8 +-
> .../Include/Protocol/LegacyInterrupt.h | 8 +-
> .../MdeModulePkg/Include/Guid/AcpiS3Context.h | 9 +-
> .../Include/Guid/ConsoleOutDevice.h | 8 +-
> .../Include/Guid/MemoryTypeInformation.h | 8 +-
> .../Include/Library/ResetSystemLib.h | 8 +-
> .../MdeModulePkg/Include/Ppi/SmmAccess.h | 9 +-
> .../MdeModulePkg/Include/Ppi/SmmControl.h | 9 +-
> .../Include/Protocol/SmmVariable.h | 8 +-
> .../SampleCode/Pch/AcpiTables/Dsdt/PchSmb.asl | 8 +-
> Silicon/Intel/KabylakeSiliconPkg/SiPkg.dec | 8 +-
> .../KabylakeSiliconPkg/SiPkgBuildOption.dsc | 8 +-
> .../KabylakeSiliconPkg/SiPkgCommonLib.dsc | 8 +-
> Silicon/Intel/KabylakeSiliconPkg/SiPkgDxe.dsc | 8 +-
> .../Intel/KabylakeSiliconPkg/SiPkgDxeLib.dsc | 8 +-
> Silicon/Intel/KabylakeSiliconPkg/SiPkgPei.dsc | 8 +-
> .../Intel/KabylakeSiliconPkg/SiPkgPeiLib.dsc | 8 +-
> .../SystemAgent/AcpiTables/Dmar/Dmar.aslc | 8 +-
> .../SystemAgent/AcpiTables/Dmar/Dmar.h | 8 +-
> .../SystemAgent/AcpiTables/HostBus.asl | 8 +-
> .../SystemAgent/AcpiTables/SaAcpiTables.inf | 8 +-
> .../SystemAgent/AcpiTables/SaSsdt/Igfx.asl | 8 +-
> .../AcpiTables/SaSsdt/IgfxCommon.asl | 8 +-
> .../SystemAgent/AcpiTables/SaSsdt/IgfxDsm.asl | 8 +-
> .../AcpiTables/SaSsdt/IgfxOpGbda.asl | 8 +-
> .../AcpiTables/SaSsdt/IgfxOpRn.asl | 8 +-
> .../AcpiTables/SaSsdt/IgfxOpSbcb.asl | 8 +-
> .../SystemAgent/AcpiTables/SaSsdt/Sa.asl | 8 +-
> .../SystemAgent/AcpiTables/SaSsdt/SaNvs.asl | 8 +-
> .../SystemAgent/AcpiTables/SaSsdt/SaSsdt.asl | 8 +-
> .../SystemAgent/AcpiTables/SaSsdt/SaSsdt.inf | 8 +-
> .../Include/ConfigBlock/GraphicsDxeConfig.h | 8 +-
> .../Include/ConfigBlock/GraphicsPeiConfig.h | 8 +-
> .../Include/ConfigBlock/MemoryConfig.h | 8 +-
> .../Include/ConfigBlock/MiscDxeConfig.h | 8 +-
> .../ConfigBlock/SaMiscPeiPreMemConfig.h | 8 +-
> .../Include/ConfigBlock/VtdConfig.h | 8 +-
> .../SystemAgent/Include/DmaRemappingTable.h | 8 +-
> .../Include/Library/DxeSaPolicyLib.h | 8 +-
> .../Include/Library/PeiSaPolicyLib.h | 8 +-
> .../Include/Library/SaPlatformLib.h | 8 +-
> .../SystemAgent/Include/MemInfoHob.h | 8 +-
> .../SystemAgent/Include/Protocol/GopPolicy.h | 8 +-
> .../Include/Protocol/IgdOpRegion.h | 8 +-
> .../SystemAgent/Include/Protocol/MemInfo.h | 8 +-
> .../Include/Protocol/SaGlobalNvsArea.h | 8 +-
> .../SystemAgent/Include/Protocol/SaNvs.h | 8 +-
> .../SystemAgent/Include/Protocol/SaPolicy.h | 8 +-
> .../SystemAgent/Include/SaAccess.h | 8 +-
> .../SystemAgent/Include/SaPolicyCommon.h | 8 +-
> .../SystemAgent/Include/SaRegs.h | 8 +-
> .../SystemAgent/IncludePrivate/SaConfigHob.h | 8 +-
> .../Library/DxeSaPolicyLib/DxeSaPolicyLib.c | 8 +-
> .../Library/DxeSaPolicyLib/DxeSaPolicyLib.inf | 8 +-
> .../DxeSaPolicyLib/DxeSaPolicyLibrary.h | 8 +-
> .../PeiDxeSmmSaPlatformLib.inf | 8 +-
> .../SaPlatformLibrary.c | 8 +-
> .../SaPlatformLibrary.h | 8 +-
> .../PeiSaPolicyLib/Ia32/MrcOemPlatform.S | 8 +-
> .../PeiSaPolicyLib/Ia32/MrcOemPlatform.asm | 8 +-
> .../PeiSaPolicyLib/Ia32/MrcOemPlatform.nasm | 8 +-
> .../Library/PeiSaPolicyLib/MrcOemPlatform.c | 8 +-
> .../Library/PeiSaPolicyLib/MrcOemPlatform.h | 8 +-
> .../Library/PeiSaPolicyLib/PeiSaPolicyLib.c | 8 +-
> .../Library/PeiSaPolicyLib/PeiSaPolicyLib.inf | 8 +-
> .../PeiSaPolicyLib/PeiSaPolicyLibSample.c | 8 +-
> .../PeiSaPolicyLib/PeiSaPolicyLibrary.h | 8 +-
> .../Library/PeiSaPolicyLib/SaPrintPolicy.c | 8 +-
> .../MemoryInit/Include/MrcCommonTypes.h | 8 +-
> .../MemoryInit/Include/MrcInterface.h | 8 +-
> .../MemoryInit/Include/MrcRmtData.h | 8 +-
> .../MemoryInit/Include/MrcSpdData.h | 8 +-
> .../SystemAgent/MemoryInit/Include/MrcTypes.h | 8 +-
> .../SystemAgent/SaInit/Dxe/GraphicsInit.c | 8 +-
> .../SystemAgent/SaInit/Dxe/GraphicsInit.h | 8 +-
> .../SystemAgent/SaInit/Dxe/IgdOpRegion.c | 8 +-
> .../SystemAgent/SaInit/Dxe/IgdOpRegion.h | 8 +-
> .../SystemAgent/SaInit/Dxe/SaAcpi.c | 8 +-
> .../SystemAgent/SaInit/Dxe/SaInit.h | 8 +-
> .../SystemAgent/SaInit/Dxe/SaInitDxe.c | 8 +-
> .../SystemAgent/SaInit/Dxe/SaInitDxe.h | 8 +-
> .../SystemAgent/SaInit/Dxe/SaInitDxe.inf | 8 +-
> .../SystemAgent/SaInit/Dxe/VTd.c | 8 +-
> .../SystemAgent/SaInit/Dxe/VTd.h | 8 +-
> .../SystemAgent/SmmAccess/Dxe/SmmAccess.inf | 8 +-
> .../SmmAccess/Dxe/SmmAccessDriver.c | 8 +-
> .../SmmAccess/Dxe/SmmAccessDriver.h | 8 +-
> .../AcpiTables/Dsdt/GpioDefine.asl | 8 +-
> .../LewisburgPkg/AcpiTables/Dsdt/GpioLib.asl | 8 +-
> .../LewisburgPkg/AcpiTables/Dsdt/IrqLink.asl | 8 +-
> .../LewisburgPkg/AcpiTables/Dsdt/Pch.asl | 8 +-
> .../AcpiTables/Dsdt/PchAcpiTables.inf | 8 +-
> .../LewisburgPkg/AcpiTables/Dsdt/PchHda.asl | 8 +-
> .../LewisburgPkg/AcpiTables/Dsdt/PchHeci.asl | 8 +-
> .../LewisburgPkg/AcpiTables/Dsdt/PchIsh.asl | 8 +-
> .../LewisburgPkg/AcpiTables/Dsdt/PchNvs.asl | 8 +-
> .../LewisburgPkg/AcpiTables/Dsdt/PchPcie.asl | 8 +-
> .../AcpiTables/Dsdt/PchRstPcieStorage.asl | 8 +-
> .../LewisburgPkg/AcpiTables/Dsdt/PchSata.asl | 8 +-
> .../LewisburgPkg/AcpiTables/Dsdt/PchScs.asl | 8 +-
> .../AcpiTables/Dsdt/PchSerialIo.asl | 8 +-
> .../LewisburgPkg/AcpiTables/Dsdt/PchXdci.asl | 8 +-
> .../LewisburgPkg/AcpiTables/Dsdt/PchXhci.asl | 8 +-
> .../LewisburgPkg/AcpiTables/Dsdt/RP01_ADR.asl | 8 +-
> .../LewisburgPkg/AcpiTables/Dsdt/RP02_ADR.asl | 8 +-
> .../LewisburgPkg/AcpiTables/Dsdt/RP03_ADR.asl | 8 +-
> .../LewisburgPkg/AcpiTables/Dsdt/RP04_ADR.asl | 8 +-
> .../LewisburgPkg/AcpiTables/Dsdt/RP05_ADR.asl | 8 +-
> .../LewisburgPkg/AcpiTables/Dsdt/RP06_ADR.asl | 8 +-
> .../LewisburgPkg/AcpiTables/Dsdt/RP07_ADR.asl | 8 +-
> .../LewisburgPkg/AcpiTables/Dsdt/RP08_ADR.asl | 8 +-
> .../LewisburgPkg/AcpiTables/Dsdt/RP09_ADR.asl | 8 +-
> .../LewisburgPkg/AcpiTables/Dsdt/RP10_ADR.asl | 8 +-
> .../LewisburgPkg/AcpiTables/Dsdt/RP11_ADR.asl | 8 +-
> .../LewisburgPkg/AcpiTables/Dsdt/RP12_ADR.asl | 8 +-
> .../LewisburgPkg/AcpiTables/Dsdt/RP13_ADR.asl | 8 +-
> .../LewisburgPkg/AcpiTables/Dsdt/RP14_ADR.asl | 8 +-
> .../LewisburgPkg/AcpiTables/Dsdt/RP15_ADR.asl | 8 +-
> .../LewisburgPkg/AcpiTables/Dsdt/RP16_ADR.asl | 8 +-
> .../LewisburgPkg/AcpiTables/Dsdt/RP17_ADR.asl | 8 +-
> .../LewisburgPkg/AcpiTables/Dsdt/RP18_ADR.asl | 8 +-
> .../LewisburgPkg/AcpiTables/Dsdt/RP19_ADR.asl | 8 +-
> .../LewisburgPkg/AcpiTables/Dsdt/RP20_ADR.asl | 8 +-
> .../AcpiTables/Dsdt/TraceHubDebug.asl | 8 +-
> .../LewisburgPkg/AcpiTables/Dsdt/usbsbd.asl | 8 +-
> .../Intel/LewisburgPkg/Include/GpioConfig.h | 8 +-
> .../Intel/LewisburgPkg/Include/GpioPinsSklH.h | 8 +-
> .../LewisburgPkg/Include/GpioPinsSklLp.h | 8 +-
> .../LewisburgPkg/Include/Library/GpioLib.h | 8 +-
> .../Include/Library/GpioNativeLib.h | 8 +-
> .../Include/Library/PchCycleDecodingLib.h | 8 +-
> .../LewisburgPkg/Include/Library/PchGbeLib.h | 8 +-
> .../LewisburgPkg/Include/Library/PchInfoLib.h | 8 +-
> .../LewisburgPkg/Include/Library/PchP2sbLib.h | 8 +-
> .../LewisburgPkg/Include/Library/PchPcrLib.h | 8 +-
> .../LewisburgPkg/Include/Library/PchPmcLib.h | 8 +-
> .../Include/Library/PchPolicyLib.h | 8 +-
> .../Include/Library/PchSbiAccessLib.h | 8 +-
> .../Include/Library/PchSerialIoLib.h | 8 +-
> .../Include/Library/SpiFlashCommonLib.h | 8 +-
> .../Intel/LewisburgPkg/Include/PchAccess.h | 8 +-
> .../Intel/LewisburgPkg/Include/PchLimits.h | 8 +-
> .../LewisburgPkg/Include/PchPolicyCommon.h | 8 +-
> .../Include/PchReservedResources.h | 8 +-
> Silicon/Intel/LewisburgPkg/Include/PcieRegs.h | 8 +-
> .../Include/Ppi/PchPcieDeviceTable.h | 8 +-
> .../LewisburgPkg/Include/Ppi/PchPolicy.h | 8 +-
> .../Intel/LewisburgPkg/Include/Ppi/PchReset.h | 8 +-
> Silicon/Intel/LewisburgPkg/Include/Ppi/Spi.h | 8 +-
> .../LewisburgPkg/Include/Protocol/PchReset.h | 8 +-
> .../Intel/LewisburgPkg/Include/Protocol/Spi.h | 8 +-
> .../Include/Register/PchRegsDci.h | 8 +-
> .../Include/Register/PchRegsDmi.h | 8 +-
> .../Include/Register/PchRegsEva.h | 8 +-
> .../Include/Register/PchRegsFia.h | 8 +-
> .../Include/Register/PchRegsGpio.h | 8 +-
> .../Include/Register/PchRegsHda.h | 8 +-
> .../Include/Register/PchRegsHsio.h | 8 +-
> .../Include/Register/PchRegsIsh.h | 8 +-
> .../Include/Register/PchRegsItss.h | 8 +-
> .../Include/Register/PchRegsLan.h | 8 +-
> .../Include/Register/PchRegsLpc.h | 8 +-
> .../Include/Register/PchRegsP2sb.h | 8 +-
> .../Include/Register/PchRegsPcie.h | 8 +-
> .../Include/Register/PchRegsPcr.h | 8 +-
> .../Include/Register/PchRegsPmc.h | 8 +-
> .../Include/Register/PchRegsPsf.h | 8 +-
> .../Include/Register/PchRegsPsth.h | 8 +-
> .../Include/Register/PchRegsSata.h | 8 +-
> .../Include/Register/PchRegsScs.h | 8 +-
> .../Include/Register/PchRegsSerialIo.h | 8 +-
> .../Include/Register/PchRegsSmbus.h | 8 +-
> .../Include/Register/PchRegsSpi.h | 8 +-
> .../Include/Register/PchRegsThermal.h | 8 +-
> .../Include/Register/PchRegsTraceHub.h | 8 +-
> .../Include/Register/PchRegsUsb.h | 8 +-
> Silicon/Intel/LewisburgPkg/Include/SaRegs.h | 8 +-
> .../Library/PchResetCommonLib.h | 8 +-
> .../LewisburgPkg/IncludePrivate/PchHHsioAx.h | 8 +-
> .../LewisburgPkg/IncludePrivate/PchHHsioBx.h | 8 +-
> .../LewisburgPkg/IncludePrivate/PchHHsioDx.h | 8 +-
> .../LewisburgPkg/IncludePrivate/PchHsio.h | 8 +-
> .../IncludePrivate/PchLbgHsioAx.h | 8 +-
> .../IncludePrivate/PchLbgHsioBx.h | 8 +-
> .../IncludePrivate/PchLbgHsioBxD.h | 8 +-
> .../IncludePrivate/PchLbgHsioBxD_Ext.h | 8 +-
> .../IncludePrivate/PchLbgHsioBx_Ext.h | 8 +-
> .../IncludePrivate/PchLbgHsioSx.h | 8 +-
> .../IncludePrivate/PchLbgHsioSx_Ext.h | 8 +-
> .../LewisburgPkg/IncludePrivate/PchLpHsioBx.h | 8 +-
> .../LewisburgPkg/IncludePrivate/PchLpHsioCx.h | 8 +-
> .../IncludePrivate/PchPolicyHob.h | 8 +-
> .../DxeRuntimeResetSystemLib.inf | 8 +-
> .../DxeRuntimeResetSystemLib/PchReset.c | 8 +-
> .../DxeRuntimeResetSystemLib/PchReset.h | 8 +-
> .../Library/PeiDxeSmmGpioLib/GpioInit.c | 8 +-
> .../Library/PeiDxeSmmGpioLib/GpioLib.c | 8 +-
> .../Library/PeiDxeSmmGpioLib/GpioLibrary.h | 8 +-
> .../Library/PeiDxeSmmGpioLib/GpioNativeLib.c | 8 +-
> .../Library/PeiDxeSmmGpioLib/PchSklGpioData.c | 8 +-
> .../PeiDxeSmmGpioLib/PeiDxeSmmGpioLib.inf | 8 +-
> .../PchCycleDecodingLib.c | 8 +-
> .../PeiDxeSmmPchCycleDecodingLib.inf | 8 +-
> .../Library/PeiDxeSmmPchGbeLib/PchGbeLib.c | 8 +-
> .../PeiDxeSmmPchGbeLib/PeiDxeSmmPchGbeLib.inf | 8 +-
> .../Library/PeiDxeSmmPchInfoLib/PchInfoLib.c | 8 +-
> .../PeiDxeSmmPchInfoLib/PchInfoStrLib.c | 8 +-
> .../PeiDxeSmmPchInfoLib.inf | 8 +-
> .../Library/PeiDxeSmmPchP2sbLib/PchP2sbLib.c | 8 +-
> .../PeiDxeSmmPchP2sbLib.inf | 8 +-
> .../Library/PeiDxeSmmPchPcrLib/PchPcrLib.c | 8 +-
> .../PeiDxeSmmPchPcrLib/PeiDxeSmmPchPcrLib.inf | 8 +-
> .../Library/PeiDxeSmmPchPmcLib/PchPmcLib.c | 8 +-
> .../PeiDxeSmmPchPmcLib/PeiDxeSmmPchPmcLib.inf | 8 +-
> .../PchSbiAccessLib.c | 8 +-
> .../PeiDxeSmmPchSbiAccessLib.inf | 8 +-
> .../Library/PeiPchPolicyLib/PchPrintPolicy.c | 8 +-
> .../Library/PeiPchPolicyLib/PeiPchPolicyLib.c | 8 +-
> .../PeiPchPolicyLib/PeiPchPolicyLib.inf | 8 +-
> .../PeiPchPolicyLib/PeiPchPolicyLibrary.h | 8 +-
> .../Library/PeiPchPolicyLib/Rvp3PolicyLib.c | 8 +-
> .../SmmSpiFlashCommonLib.inf | 8 +-
> .../SmmSpiFlashCommonLib/SpiFlashCommon.c | 8 +-
> .../SpiFlashCommonSmmLib.c | 8 +-
> .../BasePchResetCommonLib.inf | 8 +-
> .../BasePchResetCommonLib/PchResetCommon.c | 8 +-
> Silicon/Intel/LewisburgPkg/PchCommonLib.dsc | 8 +-
> Silicon/Intel/LewisburgPkg/PchDxeLib.dsc | 8 +-
> Silicon/Intel/LewisburgPkg/PchPeiLib.dsc | 8 +-
> Silicon/Intel/LewisburgPkg/PchRcPkg.dec | 8 +-
> .../Include/Library/CsrToPcieAddress.h | 8 +-
> .../Include/Library/MmPciBaseLib.h | 8 +-
> .../PurleyRcPkg/Include/Library/PcieAddress.h | 8 +-
> .../Include/Library/PciePlatformHookLib.h | 8 +-
> .../Include/Library/UsraAccessApi.h | 8 +-
> Silicon/Intel/PurleyRcPkg/Include/MaxSocket.h | 8 +-
> .../Include/Ppi/SiliconRegAccess.h | 8 +-
> .../Include/Protocol/SiliconRegAccess.h | 8 +-
> .../PurleyRcPkg/Include/UsraAccessType.h | 8 +-
> .../Chip/Skx/Include/Iio/IioConfig.h | 8 +-
> .../Chip/Skx/Include/Iio/IioPlatformData.h | 8 +-
> .../Chip/Skx/Include/Iio/IioRegs.h | 8 +-
> .../Skx/Include/Iio/IioSetupDefinitions.h | 8 +-
> .../Chip/Skx/Include/KtiDisc.h | 8 +-
> .../Chip/Skx/Include/KtiHost.h | 8 +-
> .../Chip/Skx/Include/KtiSi.h | 8 +-
> .../Chip/Skx/Include/Protocol/CpuCsrAccess.h | 8 +-
> .../Chip/Skx/Include/Setup/IioUniversalData.h | 8 +-
> .../BaseMemoryCoreLib/Core/Include/CpuHost.h | 8 +-
> .../Core/Include/CsrToPcieAddress.h | 8 +-
> .../Core/Include/DataTypes.h | 8 +-
> .../BaseMemoryCoreLib/Core/Include/MemHost.h | 8 +-
> .../Core/Include/MemHostChipCommon.h | 8 +-
> .../BaseMemoryCoreLib/Core/Include/MemRegs.h | 8 +-
> .../Core/Include/MrcCommonTypes.h | 8 +-
> .../Core/Include/PcieAddress.h | 8 +-
> .../BaseMemoryCoreLib/Core/Include/Printf.h | 8 +-
> .../BaseMemoryCoreLib/Core/Include/SysHost.h | 8 +-
> .../Core/Include/SysHostChipCommon.h | 8 +-
> .../BaseMemoryCoreLib/Core/Include/SysRegs.h | 8 +-
> .../Core/Include/UsbDebugPort.h | 8 +-
> .../Platform/Purley/Include/MemDefaults.h | 8 +-
> .../Platform/Purley/Include/MemPlatform.h | 8 +-
> .../Platform/Purley/Include/PlatformHost.h | 8 +-
> .../CsrToPcieLibNull/BaseCsrToPcieLibNull.inf | 8 +-
> .../Library/CsrToPcieLibNull/CsrToPcieLib.c | 8 +-
> .../Library/DxeMmPciBaseLib/DxeMmPciBaseLib.c | 8 +-
> .../DxeMmPciBaseLib/DxeMmPciBaseLib.inf | 8 +-
> .../Library/DxeMmPciBaseLib/SmmMmPciBaseLib.c | 8 +-
> .../DxeMmPciBaseLib/SmmMmPciBaseLib.inf | 8 +-
> .../Library/MmPciBaseLib/MmPciBaseLib.c | 8 +-
> .../Library/MmPciBaseLib/MmPciBaseLib.inf | 8 +-
> .../Library/PcieAddressLib/PcieAddressLib.c | 8 +-
> .../Library/PcieAddressLib/PcieAddressLib.inf | 8 +-
> .../Library/UsraAccessLib/CsrAccess.c | 8 +-
> .../Library/UsraAccessLib/PcieAccess.c | 8 +-
> .../Library/UsraAccessLib/UsraAccessLib.c | 8 +-
> .../Library/UsraAccessLib/UsraAccessLib.h | 8 +-
> .../Library/UsraAccessLib/UsraAccessLib.inf | 8 +-
> Silicon/Intel/PurleyRcPkg/RcCommonLib.dsc | 8 +-
> Silicon/Intel/PurleyRcPkg/RcDxeLib.dsc | 8 +-
> Silicon/Intel/PurleyRcPkg/RcPeiLib.dsc | 8 +-
> Silicon/Intel/PurleyRcPkg/RcPkg.dec | 8 +-
> .../Iio/Include/Protocol/IioSystem.h | 8 +-
> .../Include/Guid/MemoryConfigData.h | 8 +-
> .../PurleySktPkg/Include/Guid/MemoryMapData.h | 8 +-
> .../Include/Guid/PartialMirrorGuid.h | 8 +-
> .../Include/Guid/SmramMemoryReserve.h | 8 +-
> .../Include/Guid/SocketCommonRcVariable.h | 8 +-
> .../Include/Guid/SocketIioVariable.h | 8 +-
> .../Include/Guid/SocketMemoryVariable.h | 8 +-
> .../Include/Guid/SocketMpLinkVariable.h | 8 +-
> .../Include/Guid/SocketPciResourceData.h | 8 +-
> .../Guid/SocketPowermanagementVariable.h | 8 +-
> .../Guid/SocketProcessorCoreVariable.h | 8 +-
> .../Include/Guid/SocketVariable.h | 8 +-
> .../PurleySktPkg/Include/Library/CpuPpmLib.h | 8 +-
> .../PurleySktPkg/Include/Protocol/IioUds.h | 8 +-
> .../Include/Protocol/PciCallback.h | 8 +-
> .../Include/SocketConfiguration.h | 8 +-
> .../Include/UncoreCommonIncludes.h | 8 +-
> .../Library/CsrToPcieLib/CpuCsrAccessDefine.h | 8 +-
> .../Library/CsrToPcieLib/CsrToPcieDxeLib.inf | 8 +-
> .../Library/CsrToPcieLib/CsrToPcieLib.c | 8 +-
> .../Library/CsrToPcieLib/CsrToPciePeiLib.inf | 8 +-
> .../Library/PcieAddressLib/PcieAddressLib.c | 8 +-
> .../Library/PcieAddressLib/PcieAddressLib.inf | 8 +-
> .../Chip/Common/CpuPciAccessCommon.c | 8 +-
> .../Chip/Include/CpuCsrAccessDefine.h | 8 +-
> .../ProcMemInit/Chip/Include/CpuPciAccess.h | 8 +-
> .../Chip/Include/CpuPciAccessCommon.h | 8 +-
> .../IA32FamilyCpuPkg/IA32FamilyCpuPkg.dec | 8 +-
> .../Include/Library/CpuConfigLib.h | 8 +-
> .../Include/Protocol/IntelCpuPcdsSetDone.h | 8 +-
> Silicon/Intel/PurleySktPkg/SktCommonLib.dsc | 8 +-
> Silicon/Intel/PurleySktPkg/SktDxeLib.dsc | 8 +-
> Silicon/Intel/PurleySktPkg/SktPeiLib.dsc | 8 +-
> Silicon/Intel/PurleySktPkg/SocketPkg.dec | 8 +-
> .../Armada7k8k/AcpiTables/AcpiHeader.h | 8 +-
> .../Armada7k8k/AcpiTables/Armada70x0Db.inf | 8 +-
> .../AcpiTables/Armada70x0Db/Dsdt.asl | 8 +-
> .../Armada7k8k/AcpiTables/Armada80x0Db.inf | 8 +-
> .../AcpiTables/Armada80x0Db/Dsdt.asl | 8 +-
> .../Armada7k8k/AcpiTables/Armada80x0McBin.inf | 8 +-
> .../AcpiTables/Armada80x0McBin/Dsdt.asl | 8 +-
> .../Marvell/Armada7k8k/AcpiTables/Fadt.aslc | 8 +-
> .../Marvell/Armada7k8k/AcpiTables/Gtdt.aslc | 8 +-
> .../Armada7k8k/AcpiTables/IcuInterrupts.h | 8 +-
> .../Marvell/Armada7k8k/AcpiTables/Madt.aslc | 8 +-
> .../Marvell/Armada7k8k/AcpiTables/Pptt.aslc | 8 +-
> .../Marvell/Armada7k8k/AcpiTables/Spcr.aslc | 8 +-
> Silicon/Marvell/Armada7k8k/Armada7k8k.fdf | 8 +-
> .../Marvell/Armada7k8k/Armada7k8kCapsule.fdf | 8 +-
> .../Armada7k8k/DeviceTree/Armada70x0Db.inf | 8 +-
> .../Armada7k8k/DeviceTree/Armada80x0Db.inf | 8 +-
> .../Armada7k8k/DeviceTree/Armada80x0McBin.inf | 8 +-
> .../Armada7k8kRngDxe/Armada7k8kRngDxe.c | 8 +-
> .../Armada7k8kRngDxe/Armada7k8kRngDxe.inf | 8 +-
> .../Drivers/PlatInitDxe/PlatInitDxe.c | 8 +-
> .../Drivers/PlatInitDxe/PlatInitDxe.inf | 8 +-
> .../PlatformFlashAccessLib.c | 8 +-
> .../PlatformFlashAccessLib.inf | 8 +-
> .../SystemFirmwareDescriptor.aslc | 8 +-
> .../SystemFirmwareDescriptor.inf | 8 +-
> .../SystemFirmwareDescriptorPei.c | 8 +-
> .../SystemFirmwareUpdateConfig.ini | 8 +-
> .../Armada7k8kLib/AArch64/ArmPlatformHelper.S | 5 +-
> .../Armada7k8kLib/ARM/ArmPlatformHelper.S | 5 +-
> .../Library/Armada7k8kLib/Armada7k8kLib.c | 8 +-
> .../Armada7k8kMemoryInitPeiLib.c | 8 +-
> .../Armada7k8kMemoryInitPeiLib.inf | 8 +-
> .../Armada7k8kSoCDescLib.c | 8 +-
> .../Armada7k8kSoCDescLib.h | 8 +-
> .../Armada7k8kSoCDescLib.inf | 8 +-
> .../RealTimeClockLib/RealTimeClockLib.c | 8 +-
> .../RealTimeClockLib/RealTimeClockLib.inf | 7 +-
> .../Drivers/Gpio/MvGpioDxe/MvGpioDxe.c | 8 +-
> .../Drivers/Gpio/MvGpioDxe/MvGpioDxe.h | 8 +-
> .../Drivers/Gpio/MvGpioDxe/MvGpioDxe.inf | 8 +-
> .../Drivers/Gpio/MvPca95xxDxe/MvPca95xxDxe.c | 8 +-
> .../Drivers/Gpio/MvPca95xxDxe/MvPca95xxDxe.h | 8 +-
> .../Gpio/MvPca95xxDxe/MvPca95xxDxe.inf | 8 +-
> .../Drivers/SdMmc/XenonDxe/XenonDxe.inf | 7 +-
> .../Drivers/SdMmc/XenonDxe/XenonPciHci.c | 8 +-
> .../Drivers/SdMmc/XenonDxe/XenonPciHci.h | 8 +-
> .../Marvell/Drivers/Spi/MvFvbDxe/MvFvbDxe.c | 8 +-
> .../Marvell/Drivers/Spi/MvFvbDxe/MvFvbDxe.h | 8 +-
> .../Marvell/Include/IndustryStandard/MvSmc.h | 8 +-
> .../Include/Library/ArmadaBoardDescLib.h | 8 +-
> .../Marvell/Include/Library/ArmadaIcuLib.h | 8 +-
> .../Include/Library/ArmadaSoCDescLib.h | 8 +-
> Silicon/Marvell/Include/Library/MvGpioLib.h | 8 +-
> .../Include/Library/NonDiscoverableInitLib.h | 8 +-
> Silicon/Marvell/Include/Protocol/MvI2c.h | 8 +-
> Silicon/Marvell/Library/IcuLib/IcuLib.c | 8 +-
> Silicon/Marvell/Library/IcuLib/IcuLib.h | 8 +-
> Silicon/Marvell/Library/IcuLib/IcuLib.inf | 8 +-
> Silicon/Marvell/Library/MvGpioLib/MvGpioLib.c | 8 +-
> .../Marvell/Library/MvGpioLib/MvGpioLib.inf | 8 +-
> .../Pcf8563RealTimeClockLib.c | 8 +-
> .../Pcf8563RealTimeClockLib.dec | 7 +-
> .../Pcf8563RealTimeClockLib.inf | 7 +-
> Silicon/Openmoko/ChaosKeyDxe/ChaosKeyDriver.c | 8 +-
> Silicon/Openmoko/ChaosKeyDxe/ChaosKeyDriver.h | 8 +-
> Silicon/Openmoko/ChaosKeyDxe/ChaosKeyDxe.inf | 8 +-
> Silicon/Openmoko/ChaosKeyDxe/ComponentName.c | 8 +-
> Silicon/Openmoko/ChaosKeyDxe/DriverBinding.c | 8 +-
> Silicon/Openmoko/Openmoko.dsc | 8 +-
> Silicon/Socionext/SynQuacer/Acpi.dsc.inc | 8 +-
> .../SynQuacer/AcpiTables/AcpiSsdtRootPci.asl | 8 +-
> .../SynQuacer/AcpiTables/AcpiTables.h | 8 +-
> .../SynQuacer/AcpiTables/AcpiTables.inf | 8 +-
> .../Socionext/SynQuacer/AcpiTables/Dsdt.asl | 8 +-
> .../Socionext/SynQuacer/AcpiTables/Fadt.aslc | 8 +-
> .../Socionext/SynQuacer/AcpiTables/Gtdt.aslc | 8 +-
> .../Socionext/SynQuacer/AcpiTables/Iort.aslc | 8 +-
> .../Socionext/SynQuacer/AcpiTables/Madt.aslc | 8 +-
> .../Socionext/SynQuacer/AcpiTables/Mcfg.aslc | 8 +-
> .../Socionext/SynQuacer/AcpiTables/Pptt.aslc | 8 +-
> .../Socionext/SynQuacer/AcpiTables/Spcr.aslc | 8 +-
> .../SynQuacer/DeviceTree/DeveloperBox.dts | 9 +-
> .../SynQuacer/DeviceTree/DeveloperBox.inf | 8 +-
> .../SynQuacer/DeviceTree/SynQuacer.dtsi | 9 +-
> .../SynQuacer/DeviceTree/SynQuacerCaches.dtsi | 9 +-
> .../DeviceTree/SynQuacerEvalBoard.dts | 9 +-
> .../DeviceTree/SynQuacerEvalBoard.inf | 8 +-
> .../SynQuacer/Drivers/Fip006Dxe/Fip006Dxe.dec | 8 +-
> .../SynQuacer/Drivers/Fip006Dxe/Fip006Dxe.inf | 8 +-
> .../SynQuacer/Drivers/Fip006Dxe/Fip006Reg.h | 8 +-
> .../Drivers/Fip006Dxe/Fip006StandaloneMm.inf | 8 +-
> .../SynQuacer/Drivers/Fip006Dxe/NorFlash.c | 8 +-
> .../SynQuacer/Drivers/Fip006Dxe/NorFlash.h | 8 +-
> .../SynQuacer/Drivers/Fip006Dxe/NorFlashDxe.c | 8 +-
> .../SynQuacer/Drivers/Fip006Dxe/NorFlashFvb.c | 8 +-
> .../SynQuacer/Drivers/Fip006Dxe/NorFlashSmm.c | 8 +-
> .../Drivers/Net/NetsecDxe/ComponentName.c | 8 +-
> .../Drivers/Net/NetsecDxe/DriverBinding.c | 8 +-
> .../Drivers/Net/NetsecDxe/NetsecDxe.c | 8 +-
> .../Drivers/Net/NetsecDxe/NetsecDxe.dec | 8 +-
> .../Drivers/Net/NetsecDxe/NetsecDxe.h | 8 +-
> .../Drivers/Net/NetsecDxe/NetsecDxe.inf | 8 +-
> .../netsec_sdk/include/ogma_api.h | 8 +-
> .../netsec_sdk/include/ogma_basic_type.h | 8 +-
> .../netsec_sdk/include/ogma_version.h | 8 +-
> .../netsec_sdk/src/ogma_basic_access.c | 8 +-
> .../netsec_sdk/src/ogma_basic_access.h | 8 +-
> .../netsec_sdk/src/ogma_desc_ring_access.c | 8 +-
> .../src/ogma_desc_ring_access_internal.h | 8 +-
> .../netsec_sdk/src/ogma_gmac_access.c | 8 +-
> .../netsec_sdk/src/ogma_internal.h | 8 +-
> .../netsec_sdk/src/ogma_misc.c | 8 +-
> .../netsec_sdk/src/ogma_misc_internal.h | 8 +-
> .../netsec_for_uefi/netsec_sdk/src/ogma_reg.h | 8 +-
> .../netsec_sdk/src/ogma_reg_f_gmac_4mt.h | 8 +-
> .../netsec_sdk/src/ogma_reg_netsec.h | 8 +-
> .../NetsecDxe/netsec_for_uefi/ogma_config.h | 8 +-
> .../Net/NetsecDxe/netsec_for_uefi/pfdep.h | 8 +-
> .../NetsecDxe/netsec_for_uefi/pfdep_uefi.c | 8 +-
> .../SynQuacer/Drivers/OpteeRngDxe/OpteeRng.c | 8 +-
> .../Drivers/OpteeRngDxe/OpteeRngDxe.inf | 8 +-
> .../Drivers/OpteeRngDxe/OpteeRngDxe.uni | 7 +-
> .../Drivers/OpteeRngDxe/OpteeRngDxeExtra.uni | 7 +-
> .../SynQuacer/Drivers/PlatformDxe/Emmc.asl | 8 +-
> .../SynQuacer/Drivers/PlatformDxe/Emmc.c | 8 +-
> .../SynQuacer/Drivers/PlatformDxe/Pci.c | 8 +-
> .../Drivers/PlatformDxe/PlatformDxe.c | 8 +-
> .../Drivers/PlatformDxe/PlatformDxe.h | 8 +-
> .../Drivers/PlatformDxe/PlatformDxe.inf | 8 +-
> .../Drivers/PlatformDxe/PlatformDxeHii.uni | 8 +-
> .../Drivers/PlatformDxe/PlatformDxeHii.vfr | 8 +-
> .../SynQuacerGpioPei/SynQuacerGpioPei.c | 8 +-
> .../SynQuacerGpioPei/SynQuacerGpioPei.inf | 8 +-
> .../Drivers/SynQuacerI2cDxe/ComponentName.c | 8 +-
> .../Drivers/SynQuacerI2cDxe/DriverBinding.c | 8 +-
> .../Drivers/SynQuacerI2cDxe/SynQuacerI2cDxe.c | 7 +-
> .../Drivers/SynQuacerI2cDxe/SynQuacerI2cDxe.h | 7 +-
> .../SynQuacerI2cDxe/SynQuacerI2cDxe.inf | 7 +-
> .../SynQuacerPciCpuIo2Dxe.c | 8 +-
> .../SynQuacerPciCpuIo2Dxe.inf | 8 +-
> .../Include/Guid/SynQuacerPlatformFormSet.h | 8 +-
> .../SynQuacer/Include/Platform/DramInfo.h | 8 +-
> .../SynQuacer/Include/Platform/MemoryMap.h | 8 +-
> .../SynQuacer/Include/Platform/Pcie.h | 8 +-
> .../SynQuacer/Include/Platform/VarStore.h | 8 +-
> .../SynQuacer/Include/Ppi/DramInfo.h | 8 +-
> .../NorFlashSynQuacerLib/NorFlashSynQuacer.c | 8 +-
> .../NorFlashSynQuacerLib.inf | 8 +-
> .../SynQuacerDtbLoaderLib.c | 8 +-
> .../SynQuacerDtbLoaderLib.inf | 8 +-
> .../SynQuacerLib/AArch64/SynQuacerHelper.S | 8 +-
> .../SynQuacerLib/Arm/SynQuacerHelper.S | 8 +-
> .../Library/SynQuacerLib/SynQuacer.c | 8 +-
> .../Library/SynQuacerLib/SynQuacerLib.inf | 8 +-
> .../SynQuacerMemoryInitPeiLib.c | 8 +-
> .../SynQuacerMemoryInitPeiLib.inf | 8 +-
> .../SynQuacerPciHostBridgeLib.c | 8 +-
> .../SynQuacerPciHostBridgeLib.inf | 8 +-
> .../SynQuacerPciHostBridgeLibConstructor.c | 8 +-
> .../SynQuacerPciSegmentLib/PciSegmentLib.c | 9 +-
> .../SynQuacerPciSegmentLib.inf | 7 +-
> .../SynQuacerPlatformFlashAccessLib.c | 8 +-
> .../SynQuacerPlatformFlashAccessLib.inf | 8 +-
> .../SynQuacerPlatformPeiLib.c | 8 +-
> .../SynQuacerPlatformPeiLib.inf | 8 +-
> .../SynQuacer/Stage2Tables/GNUmakefile | 8 +-
> .../SynQuacer/Stage2Tables/Stage2Tables.S | 8 +-
> .../SynQuacer/Stage2Tables/Stage2Tables.inf | 8 +-
> Silicon/Socionext/SynQuacer/SynQuacer.dec | 8 +-
> 2382 files changed, 2967 insertions(+), 18091 deletions(-)
> delete mode 100644 Contributions.txt
> create mode 100644 License-History.txt
> delete mode 100644 Platform/AMD/License.txt
> delete mode 100644 Platform/Intel/AdvancedFeaturePkg/Contributions.txt
> delete mode 100644 Platform/Intel/AdvancedFeaturePkg/License.txt
> delete mode 100644 Platform/Intel/ClevoOpenBoardPkg/Contributions.txt
> delete mode 100644 Platform/Intel/ClevoOpenBoardPkg/License.txt
> delete mode 100644 Platform/Intel/KabylakeOpenBoardPkg/Contributions.txt
> delete mode 100644 Platform/Intel/KabylakeOpenBoardPkg/License.txt
> delete mode 100644 Platform/Intel/MinPlatformPkg/Contributions.txt
> delete mode 100644 Platform/Intel/MinPlatformPkg/License.txt
> delete mode 100644 Platform/LeMaker/License.txt
> delete mode 100644 Platform/SoftIron/License.txt
> delete mode 100644 Silicon/AMD/Styx/License.txt
> delete mode 100644 Silicon/Intel/KabylakeSiliconPkg/Contributions.txt
> delete mode 100644 Silicon/Intel/KabylakeSiliconPkg/License.txt
>
> --
> 2.21.0.windows.1
>
^ permalink raw reply [flat|nested] 63+ messages in thread* Re: [edk2-devel] [[edk2-platforms][PATCH V2] 00/30] Change edk2-platforms/master to BSD+Patent License
2019-05-15 23:09 [[edk2-platforms][PATCH V2] 00/30] Change edk2-platforms/master to BSD+Patent License Michael D Kinney
` (29 preceding siblings ...)
2019-05-17 11:09 ` [[edk2-platforms][PATCH V2] 00/30] Change edk2-platforms/master to " Leif Lindholm
@ 2019-05-17 21:33 ` Michael D Kinney
30 siblings, 0 replies; 63+ messages in thread
From: Michael D Kinney @ 2019-05-17 21:33 UTC (permalink / raw)
To: devel@edk2.groups.io, Kinney, Michael D
Cc: Leif Lindholm, Ard Biesheuvel, Gillispie, Thad, Bu, Daocheng,
Oram, Isaac W, Piwko, Maciej, Chiu, Chasel, Kubacki, Michael A,
Lu, Shifei A, Zhou, Bowen, Sinha, Ankit, Chaganty, Rangasai V
Thank you to all reviewers of this series.
Pushed commit range: 54230280bb..009ff27e0b
Mike
> -----Original Message-----
> From: devel@edk2.groups.io
> [mailto:devel@edk2.groups.io] On Behalf Of Michael D
> Kinney
> Sent: Wednesday, May 15, 2019 4:10 PM
> To: devel@edk2.groups.io
> Cc: Leif Lindholm <leif.lindholm@linaro.org>; Ard
> Biesheuvel <ard.biesheuvel@linaro.org>; Gillispie, Thad
> <thad.gillispie@intel.com>; Bu, Daocheng
> <daocheng.bu@intel.com>; Oram, Isaac W
> <isaac.w.oram@intel.com>; Piwko, Maciej
> <maciej.piwko@intel.com>; Chiu, Chasel
> <chasel.chiu@intel.com>; Kubacki, Michael A
> <michael.a.kubacki@intel.com>; Lu, Shifei A
> <shifei.a.lu@intel.com>; Zhou, Bowen
> <bowen.zhou@intel.com>; Sinha, Ankit
> <ankit.sinha@intel.com>; Chaganty, Rangasai V
> <rangasai.v.chaganty@intel.com>
> Subject: [edk2-devel] [[edk2-platforms][PATCH V2]
> 00/30] Change edk2-platforms/master to BSD+Patent
> License
>
> BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=1373
>
> This change is based on the following emails:
> https://lists.01.org/pipermail/edk2-devel/2019-
> February/036260.html
> https://lists.01.org/pipermail/edk2-devel/2018-
> October/030385.html
>
> RFCs with detailed process for the license change:
> V3: https://lists.01.org/pipermail/edk2-devel/2019-
> March/038116.html
> V2: https://lists.01.org/pipermail/edk2-devel/2019-
> March/037669.html
> V1: https://lists.01.org/pipermail/edk2-devel/2019-
> March/037500.html
>
> The V2 branch for review for converting the edk2-
> platforms/master branch to
> the BSD + Patent license is available here:
>
> https://github.com/mdkinney/edk2-
> platforms/tree/Bug_1373_BsdPatentLicense_V2
>
> The list of commits in the series are here:
>
> https://github.com/mdkinney/edk2-
> platforms/commits/Bug_1373_BsdPatentLicense_V2
>
> Cc: Leif Lindholm <leif.lindholm@linaro.org>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Cc: Thad Gillispie <thad.gillispie@intel.com>
> Cc: Daocheng Bu <daocheng.bu@intel.com>
> Cc: Isaac W Oram <isaac.w.oram@intel.com>
> Cc: Maciej Piwko <maciej.piwko@intel.com>
> Cc: Chasel Chiu <chasel.chiu@intel.com>
> Cc: Michael Kubacki <michael.a.kubacki@intel.com>
> Cc: Shifei A Lu <shifei.a.lu@intel.com>
> Cc: Xiaohu Zhou <bowen.zhou@intel.com>
> Cc: Ankit Sinha <ankit.sinha@intel.com>
> Cc: Sai Chaganty <rangasai.v.chaganty@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Michael D Kinney
> <michael.d.kinney@intel.com>
>
> Michael D Kinney (30):
> edk2-platforms: Add License-History.txt
> edk2-platforms: Change License.txt from 2-Clause BSD
> to BSD+Patent
> Platform/96Boards: Replace BSD License with
> BSD+Patent License
> Platform/ARM: Replace BSD License with BSD+Patent
> License
> Platform/AMD: Replace BSD License with BSD+Patent
> License
> Platform/Comcast: Replace BSD License with BSD+Patent
> License
> Platform/Hisilicon: Replace BSD License with
> BSD+Patent License
> Platform/Intel/AdvancedFeaturePkg: Replace BSD
> License with BSD+Patent
> License
> Platform/Intel/ClevoOpenBoardPkg: Replace BSD License
> with BSD+Patent
> License
> Platform/Intel/KabylakeOpenBoardPkg: Replace BSD
> License with
> BSD+Patent License
> Platform/Intel/MinPlatformPkg: Replace BSD License
> with BSD+Patent
> License
> Platform/Intel/PurleyOpenBoardPkg: Replace BSD
> License with BSD+Patent
> License
> Platform/LeMaker: Replace BSD License with BSD+Patent
> License
> Platform/Marvell: Replace BSD License with BSD+Patent
> License
> Platform/RaspberryPi: Replace BSD License with
> BSD+Patent License
> Platform/Socionext: Replace BSD License with
> BSD+Patent License
> Platform/SoftIron: Replace BSD License with
> BSD+Patent License
> Platform/SolidRun: Replace BSD License with
> BSD+Patent License
> Silicon/AMD: Replace BSD License with BSD+Patent
> License
> Silicon/Atmel: Replace BSD License with BSD+Patent
> License
> Silicon/Broadcom: Replace BSD License with BSD+Patent
> License
> Silicon/Hisilicon: Replace BSD License with
> BSD+Patent License
> Silicon/Intel/KabylakeSiliconPkg: Replace BSD License
> with BSD+Patent
> License
> Silicon/Intel/LewisburgPkg: Replace BSD License with
> BSD+Patent
> License
> Silicon/Intel/PurleyRcPkg: Replace BSD License with
> BSD+Patent License
> Silicon/Intel/PurleySktPkg: Replace BSD License with
> BSD+Patent
> License
> Silicon/Marvell: Replace BSD License with BSD+Patent
> License
> Silicon/NXP: Replace BSD License with BSD+Patent
> License
> Silicon/Socionext: Replace BSD License with
> BSD+Patent License
> edk2-platforms: Remove Contributions.txt and update
> Readme.md
>
> Contributions.txt | 235 --
> ------
> License-History.txt | 542
> ++++++++++++++++++
> License.txt | 70
> ++-
> Platform/96Boards/96Boards.dec | 8 +-
> .../96Boards/96BoardsI2cDxe/96BoardsI2cDxe.c | 7 +-
> .../96BoardsI2cDxe/96BoardsI2cDxe.inf | 8 +-
> Platform/96Boards/Include/Guid/FormSet.h | 8 +-
> .../96Boards/Include/Protocol/LsConnector.h | 8 +-
> .../96Boards/Include/Protocol/Mezzanine.h | 8 +-
> .../96Boards/LsConnectorDxe/LsConnectorDxe.c | 8 +-
> .../96Boards/LsConnectorDxe/LsConnectorDxe.h | 8 +-
> .../LsConnectorDxe/LsConnectorDxe.inf | 9 +-
> .../LsConnectorDxe/LsConnectorHii.uni | 8 +-
> .../LsConnectorDxe/LsConnectorHii.vfr | 8 +-
> Platform/96Boards/Secure96Dxe/Secure96.asl | 9 +-
> Platform/96Boards/Secure96Dxe/Secure96.dts | 9 +-
> Platform/96Boards/Secure96Dxe/Secure96.h | 8 +-
> Platform/96Boards/Secure96Dxe/Secure96Dxe.c | 8 +-
> Platform/96Boards/Secure96Dxe/Secure96Dxe.inf | 8 +-
> Platform/AMD/License.txt | 25 -
> .../DeviceTree/OverdriveBoard.dts | 9 +-
> .../DeviceTree/OverdriveBoard.inf | 8 +-
> .../AMD/OverdriveBoard/OverdriveBoard.dsc | 8 +-
> .../AMD/OverdriveBoard/OverdriveBoard.fdf | 8 +-
> .../SystemFirmwareDescriptor.aslc | 8 +-
> .../SystemFirmwareDescriptor.inf | 8 +-
> .../SystemFirmwareDescriptorPei.c | 8 +-
> .../SystemFirmwareUpdateConfig.ini | 8 +-
> Platform/ARM/ARM.dec | 8 +-
> Platform/ARM/Drivers/BootMonFs/BootMonFs.dec | 8 +-
> Platform/ARM/Drivers/BootMonFs/BootMonFs.inf | 8 +-
> Platform/ARM/Drivers/BootMonFs/BootMonFsApi.h | 8 +-
> Platform/ARM/Drivers/BootMonFs/BootMonFsDir.c | 8 +-
> .../Drivers/BootMonFs/BootMonFsEntryPoint.c | 8 +-
> Platform/ARM/Drivers/BootMonFs/BootMonFsHw.h | 8 +-
> .../ARM/Drivers/BootMonFs/BootMonFsImages.c | 8 +-
> .../ARM/Drivers/BootMonFs/BootMonFsInternal.h | 8 +-
> .../Drivers/BootMonFs/BootMonFsOpenClose.c | 8 +-
> .../Drivers/BootMonFs/BootMonFsReadWrite.c | 8 +-
> .../Drivers/BootMonFs/BootMonFsUnsupported.c | 8 +-
> .../ARM/Drivers/FdtPlatformDxe/FdtPlatform.c | 8 +-
> .../ARM/Drivers/FdtPlatformDxe/FdtPlatform.h | 8 +-
> .../Drivers/FdtPlatformDxe/FdtPlatformDxe.dec | 8 +-
> .../Drivers/FdtPlatformDxe/FdtPlatformDxe.inf | 8 +-
> .../Drivers/FdtPlatformDxe/FdtPlatformDxe.uni | 8 +-
> .../ARM/Drivers/FdtPlatformDxe/README.txt | 8 +-
> .../ARM/Drivers/FdtPlatformDxe/ShellDumpFdt.c | 8 +-
> .../ARM/Drivers/FdtPlatformDxe/ShellSetFdt.c | 8 +-
> Platform/ARM/Include/Guid/BootMonFsFileInfo.h | 8 +-
> Platform/ARM/Include/Library/ArmShellCmdLib.h | 8 +-
> Platform/ARM/Include/Library/BdsLib.h | 8 +-
> .../JunoPkg/AcpiTables/AcpiSsdtRootPci.asl | 8 +-
> .../ARM/JunoPkg/AcpiTables/AcpiTables.inf | 8 +-
> Platform/ARM/JunoPkg/AcpiTables/Dbg2.aslc | 8 +-
> Platform/ARM/JunoPkg/AcpiTables/Dsdt.asl | 8 +-
> Platform/ARM/JunoPkg/AcpiTables/Fadt.aslc | 8 +-
> Platform/ARM/JunoPkg/AcpiTables/Gtdt.aslc | 8 +-
> Platform/ARM/JunoPkg/AcpiTables/Madt.aslc | 8 +-
> Platform/ARM/JunoPkg/AcpiTables/Spcr.aslc | 8 +-
> Platform/ARM/JunoPkg/ArmJuno.dec | 8 +-
> Platform/ARM/JunoPkg/ArmJuno.dsc | 8 +-
> Platform/ARM/JunoPkg/ArmJuno.fdf | 8 +-
> .../ConfigurationManager.dsc.inc | 8 +-
> .../ConfigurationManager.c | 8 +-
> .../ConfigurationManager.h | 8 +-
> .../ConfigurationManagerDxe.inf | 8 +-
> .../ConfigurationManagerDxe/Platform.h | 8 +-
> .../PlatformASLTablesLib/Dsdt.asl | 8 +-
> .../PlatformASLTablesLib.inf | 8 +-
> .../PlatformASLTablesLib/SsdtJunoUsb.asl | 8 +-
> .../PlatformASLTablesLib/SsdtPci.asl | 8 +-
> .../PlatformASLTablesLib/SsdtUart.asl | 8 +-
> .../JunoPkg/Drivers/ArmJunoDxe/AcpiTables.c | 8 +-
> .../JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.c | 8 +-
> .../JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf | 8 +-
> .../Drivers/ArmJunoDxe/ArmJunoDxeInternal.h | 8 +-
> Platform/ARM/JunoPkg/Include/ArmPlatform.h | 8 +-
> .../ArmJunoLib/AArch64/ArmJunoHelper.S | 8 +-
> .../Library/ArmJunoLib/Arm/ArmJunoHelper.S | 8 +-
> .../ARM/JunoPkg/Library/ArmJunoLib/ArmJuno.c | 8 +-
> .../JunoPkg/Library/ArmJunoLib/ArmJunoLib.inf | 8 +-
> .../JunoPkg/Library/ArmJunoLib/ArmJunoMem.c | 8 +-
> .../Library/ArmJunoMtlLib/ArmJunoMtlLib.c | 8 +-
> .../Library/ArmJunoMtlLib/ArmJunoMtlLib.inf | 8 +-
> .../ArmJunoMtlLib/ArmJunoMtlPrivateLib.h | 8 +-
> .../Library/HdLcdArmJunoLib/HdLcdArmJuno.c | 8 +-
> .../HdLcdArmJunoLib/HdLcdArmJunoLib.inf | 8 +-
> .../JunoPciHostBridgeLib.c | 8 +-
> .../JunoPciHostBridgeLib.inf | 8 +-
> .../JunoPciHostBridgeLib/XPressRich3.c | 8 +-
> .../JunoPciHostBridgeLib/XPressRich3.h | 8 +-
> .../Library/NorFlashJunoLib/NorFlashJuno.c | 8 +-
> .../NorFlashJunoLib/NorFlashJunoLib.inf | 8 +-
> .../SmbiosPlatformDxe/SmbiosPlatformDxe.c | 8 +-
> .../SmbiosPlatformDxe/SmbiosPlatformDxe.inf | 7 +-
> .../ArmShellCmdRunAxf/ArmShellCmdRunAxf.c | 8 +-
> .../ArmShellCmdRunAxf/ArmShellCmdRunAxf.h | 8 +-
> .../ArmShellCmdRunAxf/ArmShellCmdRunAxf.inf | 8 +-
> .../ArmShellCmdRunAxf/ArmShellCmdRunAxf.uni | 8 +-
> .../ArmShellCmdRunAxf/BootMonFsLoader.c | 8 +-
> .../ArmShellCmdRunAxf/BootMonFsLoader.h | 8 +-
> .../ARM/Library/ArmShellCmdRunAxf/ElfLoader.c | 8 +-
> .../ARM/Library/ArmShellCmdRunAxf/ElfLoader.h | 8 +-
> .../ARM/Library/ArmShellCmdRunAxf/RunAxf.c | 8 +-
> .../ARM/Library/ArmShellCmdRunAxf/elf32.h | 8 +-
> .../ARM/Library/ArmShellCmdRunAxf/elf64.h | 8 +-
> .../Library/ArmShellCmdRunAxf/elf_common.h | 8 +-
> Platform/ARM/Library/BdsLib/BdsFilePath.c | 8 +-
> Platform/ARM/Library/BdsLib/BdsHelper.c | 8 +-
> Platform/ARM/Library/BdsLib/BdsInternal.h | 8 +-
> Platform/ARM/Library/BdsLib/BdsLib.inf | 8 +-
> Platform/ARM/SgiPkg/AcpiTables/Dbg2.aslc | 8 +-
> Platform/ARM/SgiPkg/AcpiTables/Fadt.aslc | 8 +-
> Platform/ARM/SgiPkg/AcpiTables/Gtdt.aslc | 8 +-
> Platform/ARM/SgiPkg/AcpiTables/Iort.aslc | 8 +-
> Platform/ARM/SgiPkg/AcpiTables/Mcfg.aslc | 8 +-
> .../ARM/SgiPkg/AcpiTables/RdE1Edge/Dsdt.asl | 8 +-
> .../ARM/SgiPkg/AcpiTables/RdE1Edge/Madt.aslc | 8 +-
> .../SgiPkg/AcpiTables/RdE1EdgeAcpiTables.inf | 8 +-
> .../ARM/SgiPkg/AcpiTables/RdN1Edge/Dsdt.asl | 8 +-
> .../ARM/SgiPkg/AcpiTables/RdN1Edge/Madt.aslc | 8 +-
> .../SgiPkg/AcpiTables/RdN1EdgeAcpiTables.inf | 8 +-
> .../ARM/SgiPkg/AcpiTables/Sgi575/Dsdt.asl | 8 +-
> .../ARM/SgiPkg/AcpiTables/Sgi575/Madt.aslc | 8 +-
> .../SgiPkg/AcpiTables/Sgi575AcpiTables.inf | 8 +-
> Platform/ARM/SgiPkg/AcpiTables/Spcr.aslc | 8 +-
> Platform/ARM/SgiPkg/AcpiTables/Ssdt.asl | 8 +-
> .../SgiPkg/Drivers/PlatformDxe/PlatformDxe.c | 8 +-
> .../Drivers/PlatformDxe/PlatformDxe.inf | 8 +-
> .../Drivers/PlatformDxe/VirtioDevices.c | 8 +-
> .../Include/Guid/SgiVirtioDevicesFormSet.h | 8 +-
> .../ARM/SgiPkg/Include/Ppi/SgiPlatformId.h | 8 +-
> Platform/ARM/SgiPkg/Include/SgiAcpiHeader.h | 8 +-
> Platform/ARM/SgiPkg/Include/SgiPlatform.h | 8 +-
> .../Library/HdLcdArmSgiLib/HdLcdArmSgi.c | 8 +-
> .../Library/HdLcdArmSgiLib/HdLcdArmSgiLib.inf | 8 +-
> .../SgiPkg/Library/NorFlashLib/NorFlashLib.c | 8 +-
> .../Library/NorFlashLib/NorFlashLib.inf | 8 +-
> .../PciHostBridgeLib/PciHostBridgeLib.c | 8 +-
> .../PciHostBridgeLib/PciHostBridgeLib.inf | 8 +-
> .../Library/PlatformLib/AArch64/Helper.S | 8 +-
> .../SgiPkg/Library/PlatformLib/PlatformLib.c | 8 +-
> .../Library/PlatformLib/PlatformLib.inf | 8 +-
> .../Library/PlatformLib/PlatformLibMem.c | 8 +-
> .../Library/SgiPlatformPei/SgiPlatformPei.inf | 8 +-
> .../Library/SgiPlatformPei/SgiPlatformPeim.c | 8 +-
> Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc | 8 +-
> Platform/ARM/SgiPkg/PlatformStandaloneMm.fdf | 8 +-
> Platform/ARM/SgiPkg/SgiPlatform.dec | 8 +-
> Platform/ARM/SgiPkg/SgiPlatform.dsc | 8 +-
> Platform/ARM/SgiPkg/SgiPlatform.fdf | 8 +-
> .../ARM/VExpressPkg/AcpiTables/AcpiTables.inf | 8 +-
> Platform/ARM/VExpressPkg/AcpiTables/Dsdt.asl | 23 +-
> Platform/ARM/VExpressPkg/AcpiTables/Fadt.aslc | 8 +-
> .../ARM/VExpressPkg/AcpiTables/FvpPlatform.h | 8 +-
> Platform/ARM/VExpressPkg/AcpiTables/Gtdt.aslc | 8 +-
> Platform/ARM/VExpressPkg/AcpiTables/Madt.aslc | 8 +-
> Platform/ARM/VExpressPkg/AcpiTables/Spcr.aslc | 8 +-
> .../ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc | 8 +-
> .../ARM/VExpressPkg/ArmVExpress-CTA15-A7.fdf | 8 +-
> .../VExpressPkg/ArmVExpress-FVP-AArch64.dsc | 8 +-
> .../VExpressPkg/ArmVExpress-FVP-AArch64.fdf | 8 +-
> .../ArmVExpress-networking.fdf.inc | 9 +-
> Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc | 8 +-
> Platform/ARM/VExpressPkg/ArmVExpressPkg.dec | 8 +-
> .../ConfigurationManager.dsc.inc | 8 +-
> .../ConfigurationManager.c | 8 +-
> .../ConfigurationManager.h | 8 +-
> .../ConfigurationManagerDxe.inf | 8 +-
> .../ConfigurationManagerDxe/Platform.h | 8 +-
> .../PlatformASLTablesLib/Dsdt.asl | 8 +-
> .../PlatformASLTablesLib.inf | 8 +-
> .../Drivers/ArmVExpressDxe/ArmFvpDxe.c | 8 +-
> .../Drivers/ArmVExpressDxe/ArmFvpDxe.inf | 8 +-
> .../Drivers/ArmVExpressDxe/ArmHwDxe.c | 8 +-
> .../Drivers/ArmVExpressDxe/ArmHwDxe.inf | 8 +-
> .../ArmVExpressFastBoot.c | 8 +-
> .../ArmVExpressFastBootDxe.inf | 7 +-
> .../Include/Library/ArmPlatformSysConfigLib.h | 8 +-
> .../Include/Library/LcdPlatformLib.h | 8 +-
> .../Include/Platform/CTA15-A7/ArmPlatform.h | 8 +-
> .../Include/Platform/RTSM/ArmPlatform.h | 8 +-
> .../VExpressPkg/Include/VExpressMotherBoard.h | 8 +-
> .../Library/ArmMaliDpLib/ArmMaliDpLib.c | 8 +-
> .../Library/ArmMaliDpLib/ArmMaliDpLib.inf | 8 +-
> .../ArmVExpressDtPlatformDtbLoaderLib.c | 8 +-
> .../ArmVExpressDtPlatformDtbLoaderLib.inf | 8 +-
> .../ArmVExpressLibCTA15-A7/ArmVExpressLib.inf | 8 +-
> .../Library/ArmVExpressLibCTA15-A7/CTA15-A7.c | 8 +-
> .../ArmVExpressLibCTA15-A7/CTA15-A7Helper.S | 8 +-
> .../ArmVExpressLibCTA15-A7/CTA15-A7Helper.asm | 8 +-
> .../ArmVExpressLibCTA15-A7/CTA15-A7Mem.c | 8 +-
> .../ArmVExpressLibRTSM/AArch64/RTSMHelper.S | 8 +-
> .../ArmVExpressLibRTSM/Arm/RTSMHelper.S | 8 +-
> .../ArmVExpressLibRTSM/Arm/RTSMHelper.asm | 8 +-
> .../ArmVExpressLibRTSM/ArmVExpressLib.inf | 8 +-
> .../ArmVExpressLibRTSM/ArmVExpressLibSec.inf | 8 +-
> .../Library/ArmVExpressLibRTSM/RTSM.c | 8 +-
> .../Library/ArmVExpressLibRTSM/RTSMMem.c | 8 +-
> .../ArmVExpressSysConfig.c | 8 +-
> .../ArmVExpressSysConfigLib.inf | 8 +-
> .../ArmVExpressSysConfigRuntimeLib.c | 8 +-
> .../ArmVExpressSysConfigRuntimeLib.inf | 8 +-
> .../HdLcdArmVExpressLib/HdLcdArmVExpress.c | 8 +-
> .../HdLcdArmVExpressLib.inf | 8 +-
> .../NorFlashArmVExpress.c | 8 +-
> .../NorFlashArmVExpressLib.inf | 8 +-
> .../PL111LcdArmVExpress.c | 8 +-
> .../PL111LcdArmVExpressLib.inf | 8 +-
> .../Library/ResetSystemLib/ResetSystemLib.c | 8 +-
> .../Library/ResetSystemLib/ResetSystemLib.inf | 7 +-
> Platform/Comcast/Application/Dri/Dri.c | 8 +-
> Platform/Comcast/Application/Dri/Dri.inf | 8 +-
> .../Application/DriSecureBoot/DriSecureBoot.c | 8 +-
> .../DriSecureBoot/DriSecureBoot.inf | 8 +-
> .../Application/SecureBoot/SecureBoot.c | 8 +-
> .../Application/SecureBoot/SecureBoot.inf | 8 +-
> .../Library/RdkBootManagerLib/DiskIo.c | 8 +-
> .../Library/RdkBootManagerLib/HttpBoot.c | 8 +-
> .../RdkBootManagerLib/RdkBootManagerLib.dec | 8 +-
> .../RdkBootManagerLib/RdkBootManagerLib.h | 8 +-
> .../RdkBootManagerLib/RdkBootManagerLib.inf | 8 +-
> .../Library/RdkBootManagerLib/RdkFile.c | 8 +-
> .../Library/RdkBootManagerLib/SecureBoot.c | 8 +-
> Platform/Comcast/RDKQemu/RDKQemu.dsc | 8 +-
> Platform/Comcast/RDKQemu/RDKQemu.fdf | 8 +-
> .../SystemFirmwareUpdateConfig.ini | 8 +-
> Platform/Hisilicon/D03/D03.dec | 8 +-
> Platform/Hisilicon/D03/D03.dsc | 8 +-
> Platform/Hisilicon/D03/D03.fdf | 8 +-
> .../OemNicConfig2PHi1610/OemNicConfig.h | 8 +-
> .../OemNicConfig2PHi1610/OemNicConfig2P.c | 8 +-
> .../OemNicConfig2PHi1610/OemNicConfig2P.inf | 8 +-
> .../SystemFirmwareDescriptor.aslc | 8 +-
> .../SystemFirmwareDescriptor.inf | 8 +-
> .../SystemFirmwareDescriptorPei.c | 8 +-
> .../D03/EarlyConfigPeim/EarlyConfigPeimD03.c | 8 +-
> .../EarlyConfigPeim/EarlyConfigPeimD03.inf | 8 +-
> .../Hisilicon/D03/Include/Library/CpldD03.h | 8 +-
> .../DS3231RealTimeClock.h | 8 +-
> .../DS3231RealTimeClockLib.c | 8 +-
> .../DS3231RealTimeClockLib.inf | 7 +-
> .../D03/Library/FdtUpdateLib/FdtUpdateLib.c | 8 +-
> .../D03/Library/FdtUpdateLib/FdtUpdateLib.inf | 8 +-
> .../OemMiscLib2P/BoardFeature2PHi1610.c | 8 +-
> .../BoardFeature2PHi1610Strings.uni | Bin
> 4292 -> 3538 bytes
> .../Library/OemMiscLib2P/OemMiscLib2PHi1610.c | 8 +-
> .../OemMiscLib2P/OemMiscLib2PHi1610.inf | 8 +-
> .../Library/PlatformPciLib/PlatformPciLib.c | 8 +-
> .../Library/PlatformPciLib/PlatformPciLib.inf | 7 +-
> .../SystemFirmwareUpdateConfig.ini | 8 +-
> Platform/Hisilicon/D05/D05.dsc | 8 +-
> Platform/Hisilicon/D05/D05.fdf | 8 +-
> .../SystemFirmwareDescriptor.aslc | 8 +-
> .../SystemFirmwareDescriptor.inf | 8 +-
> .../SystemFirmwareDescriptorPei.c | 8 +-
> .../D05/EarlyConfigPeim/EarlyConfigPeimD05.c | 8 +-
> .../EarlyConfigPeim/EarlyConfigPeimD05.inf | 8 +-
> .../Library/OemMiscLibD05/BoardFeatureD05.c | 8 +-
> .../OemMiscLibD05/BoardFeatureD05Strings.uni | 8 +-
> .../D05/Library/OemMiscLibD05/OemMiscLibD05.c | 8 +-
> .../Library/OemMiscLibD05/OemMiscLibD05.inf | 8 +-
> .../Library/PlatformPciLib/PlatformPciLib.c | 8 +-
> .../Library/PlatformPciLib/PlatformPciLib.inf | 7 +-
> .../SystemFirmwareUpdateConfig.ini | 8 +-
> Platform/Hisilicon/D06/D06.dec | 8 +-
> Platform/Hisilicon/D06/D06.dsc | 8 +-
> Platform/Hisilicon/D06/D06.fdf | 8 +-
> .../OemNicConfig2PHi1620/OemNicConfig.h | 8 +-
> .../OemNicConfig2PHi1620/OemNicConfig2P.c | 8 +-
> .../OemNicConfig2PHi1620/OemNicConfig2P.inf | 8 +-
> .../SystemFirmwareDescriptor.aslc | 8 +-
> .../SystemFirmwareDescriptor.inf | 8 +-
> .../SystemFirmwareDescriptorPei.c | 8 +-
> .../D06/EarlyConfigPeim/EarlyConfigPeimD06.c | 8 +-
> .../EarlyConfigPeim/EarlyConfigPeimD06.inf | 8 +-
> .../Hisilicon/D06/Include/Library/CpldD06.h | 8 +-
> .../Library/OemMiscLibD06/BoardFeatureD06.c | 8 +-
> .../OemMiscLibD06/BoardFeatureD06Strings.uni | 8 +-
> .../D06/Library/OemMiscLibD06/OemMiscLibD06.c | 8 +-
> .../Library/OemMiscLibD06/OemMiscLibD06.inf | 8 +-
> .../D06/Library/OemNicLib/OemNicLib.c | 8 +-
> .../D06/Library/OemNicLib/OemNicLib.inf | 8 +-
> .../PciHostBridgeLib/PciHostBridgeLib.c | 8 +-
> .../PciHostBridgeLib/PciHostBridgeLib.inf | 7 +-
> Platform/Hisilicon/HiKey/HiKey.dec | 8 +-
> Platform/Hisilicon/HiKey/HiKey.dsc | 8 +-
> Platform/Hisilicon/HiKey/HiKey.fdf | 8 +-
> Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.c | 8 +-
> Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.h | 8 +-
> .../Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.inf | 8 +-
> .../HiKey/HiKeyGpioDxe/HiKeyGpioDxe.c | 8 +-
> .../HiKey/HiKeyGpioDxe/HiKeyGpioDxe.inf | 8 +-
> .../Hisilicon/HiKey/Include/ArmPlatform.h | 8 +-
> .../Hisilicon/HiKey/Library/HiKeyLib/HiKey.c | 8 +-
> .../HiKey/Library/HiKeyLib/HiKeyHelper.S | 8 +-
> .../HiKey/Library/HiKeyLib/HiKeyLib.inf | 8 +-
> .../HiKey/Library/HiKeyLib/HiKeyMem.c | 8 +-
> Platform/Hisilicon/HiKey960/HiKey960.dec | 8 +-
> Platform/Hisilicon/HiKey960/HiKey960.dsc | 8 +-
> Platform/Hisilicon/HiKey960/HiKey960.fdf | 8 +-
> .../HiKey960/HiKey960Dxe/HiKey960Dxe.c | 8 +-
> .../HiKey960/HiKey960Dxe/HiKey960Dxe.h | 8 +-
> .../HiKey960/HiKey960Dxe/HiKey960Dxe.inf | 8 +-
> .../HiKey960GpioDxe/HiKey960GpioDxe.c | 8 +-
> .../HiKey960GpioDxe/HiKey960GpioDxe.inf | 8 +-
> .../HiKey960/Library/HiKey960Lib/HiKey960.c | 8 +-
> .../Library/HiKey960Lib/HiKey960Helper.S | 8 +-
> .../Library/HiKey960Lib/HiKey960Lib.inf | 8 +-
> .../Library/HiKey960Lib/HiKey960Mem.c | 8 +-
> .../PciHostBridgeLib/PciHostBridgeLib.c | 8 +-
> .../PciHostBridgeLib/PciHostBridgeLib.inf | 8 +-
> .../AcpiDebug/AcpiDebug.asl | 8 +-
> .../AdvancedFeaturePkg/AcpiDebug/AcpiDebug.c | 8 +-
> .../AcpiDebug/AcpiDebugDxe.inf | 8 +-
> .../AcpiDebug/AcpiDebugSmm.inf | 8 +-
> .../AdvancedFeaturePkg/AdvancedFeaturePkg.dec | 8 +-
> .../AdvancedFeaturePkg/AdvancedFeaturePkg.dsc | 8 +-
> .../AdvancedFeaturePkg/Contributions.txt | 218 --
> -----
> .../Include/Dsc/CoreAdvancedDxeInclude.dsc | 8 +-
> .../Include/Dsc/CoreAdvancedPeiInclude.dsc | 8 +-
> .../Include/Fdf/CoreAdvancedLateInclude.fdf | 8 +-
> .../Fdf/CoreAdvancedPostMemoryInclude.fdf | 8 +-
> .../Fdf/CoreAdvancedPreMemoryInclude.fdf | 8 +-
> .../AdvancedFeaturePkg/Ipmi/BmcAcpi/BmcAcpi.c | 8 +-
> .../Ipmi/BmcAcpi/BmcAcpi.inf | 8 +-
> .../Ipmi/BmcAcpi/BmcSsdt/BmcSsdt.asl | 8 +-
> .../Ipmi/BmcAcpi/BmcSsdt/IpmiOprRegions.asi | 8 +-
> .../AdvancedFeaturePkg/Ipmi/BmcElog/BmcElog.c | 8 +-
> .../Ipmi/BmcElog/BmcElog.inf | 8 +-
> .../AdvancedFeaturePkg/Ipmi/Frb/FrbDxe.c | 8 +-
> .../AdvancedFeaturePkg/Ipmi/Frb/FrbDxe.inf | 8 +-
> .../AdvancedFeaturePkg/Ipmi/Frb/FrbPei.c | 8 +-
> .../AdvancedFeaturePkg/Ipmi/Frb/FrbPei.inf | 8 +-
> .../Ipmi/Include/Library/IpmiCommandLib.h | 8 +-
> .../Include/Library/IpmiPlatformHookLib.h | 8 +-
> .../AdvancedFeaturePkg/Ipmi/IpmiFru/IpmiFru.c | 8 +-
> .../Ipmi/IpmiFru/IpmiFru.inf | 8 +-
> .../Ipmi/IpmiInit/DxeIpmiInit.c | 8 +-
> .../Ipmi/IpmiInit/DxeIpmiInit.inf | 8 +-
> .../Ipmi/IpmiInit/PeiIpmiInit.c | 8 +-
> .../Ipmi/IpmiInit/PeiIpmiInit.inf | 8 +-
> .../Library/IpmiCommandLib/IpmiCommandLib.inf | 8 +-
> .../IpmiCommandLib/IpmiCommandLibNetFnApp.c | 8 +-
> .../IpmiCommandLibNetFnChassis.c | 8 +-
> .../IpmiCommandLibNetFnStorage.c | 8 +-
> .../IpmiCommandLibNetFnTransport.c | 8 +-
> .../Ipmi/Library/IpmiLibNull/IpmiLibNull.c | 8 +-
> .../Ipmi/Library/IpmiLibNull/IpmiLibNull.inf | 8 +-
> .../IpmiPlatformHookLibNull.c | 8 +-
> .../IpmiPlatformHookLibNull.inf | 8 +-
> .../AdvancedFeaturePkg/Ipmi/OsWdt/OsWdt.c | 8 +-
> .../AdvancedFeaturePkg/Ipmi/OsWdt/OsWdt.inf | 8 +-
> .../Ipmi/SolStatus/SolStatus.c | 8 +-
> .../Ipmi/SolStatus/SolStatus.inf | 8 +-
> Platform/Intel/AdvancedFeaturePkg/License.txt | 25 -
> .../Smbios/SmbiosBasicDxe/SmbiosBasic.h | 8 +-
> .../Smbios/SmbiosBasicDxe/SmbiosBasicDxe.inf | 8 +-
> .../SmbiosBasicDxe/SmbiosBasicEntryPoint.c | 8 +-
> .../SmbiosBasicDxe/Type0BiosVendorFunction.c | 8 +-
> .../Type1SystemManufacturerFunction.c | 8 +-
> .../Type2BaseBoardManufacturerFunction.c | 8 +-
> .../Type32BootInformationFunction.c | 8 +-
> .../Type3ChassisManufacturerFunction.c | 8 +-
> .../Acpi/BoardAcpiDxe/AcpiGnvsInit.c | 8 +-
> .../Acpi/BoardAcpiDxe/BoardAcpiDxe.c | 8 +-
> .../Acpi/BoardAcpiDxe/BoardAcpiDxe.inf | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/ALS.ASL | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/AMLUPD.asl | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/CPU.asl | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/DSDT.ASL | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/Gpe.asl | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/Itss.asl | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/LPC_DEV.ASL | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/LpcB.asl | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PCI_DRC.ASL | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PciTree.asl | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/Platform.asl | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PlatformGnvs.asl | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/Video.asl | 8 +-
> .../Acpi/BoardAcpiDxe/UpdateDsdt.c | 8 +-
> .../Intel/ClevoOpenBoardPkg/Contributions.txt | 218 --
> -----
> .../Features/PciHotPlug/PciHotPlug.c | 8 +-
> .../Features/PciHotPlug/PciHotPlug.h | 8 +-
> .../Features/PciHotPlug/PciHotPlug.inf | 8 +-
> .../Tbt/AcpiTables/Rtd3SptPcieTbt.asl | 8 +-
> .../Features/Tbt/AcpiTables/Tbt.asl | 8 +-
> .../Features/Tbt/Include/Acpi/TbtNvs.asl | 8 +-
> .../Features/Tbt/Include/Acpi/TbtNvsAreaDef.h | 8 +-
> .../Tbt/Include/Library/DxeTbtPolicyLib.h | 8 +-
> .../Tbt/Include/Library/PeiTbtPolicyLib.h | 8 +-
> .../Tbt/Include/Library/TbtCommonLib.h | 8 +-
> .../Features/Tbt/Include/Ppi/PeiTbtPolicy.h | 8 +-
> .../Include/Private/Library/PeiDTbtInitLib.h | 8 +-
> .../Private/Library/PeiTbtCommonInitLib.h | 8 +-
> .../Tbt/Include/Protocol/DxeTbtPolicy.h | 8 +-
> .../Tbt/Include/Protocol/TbtNvsArea.h | 8 +-
> .../Features/Tbt/Include/TbtBoardInfo.h | 8 +-
> .../Tbt/Include/TbtPolicyCommonDefinition.h | 8 +-
> .../Library/DxeTbtPolicyLib/DxeTbtPolicyLib.c | 8 +-
> .../DxeTbtPolicyLib/DxeTbtPolicyLib.inf | 8 +-
> .../DxeTbtPolicyLib/DxeTbtPolicyLibrary.h | 8 +-
> .../PeiDxeSmmTbtCommonLib/TbtCommonLib.c | 8 +-
> .../PeiDxeSmmTbtCommonLib/TbtCommonLib.inf | 8 +-
> .../Library/PeiTbtPolicyLib/PeiTbtPolicyLib.c | 8 +-
> .../PeiTbtPolicyLib/PeiTbtPolicyLib.inf | 8 +-
> .../PeiTbtPolicyLib/PeiTbtPolicyLibrary.h | 8 +-
> .../Private/PeiDTbtInitLib/PeiDTbtInitLib.c | 8 +-
> .../Private/PeiDTbtInitLib/PeiDTbtInitLib.inf | 8 +-
> .../Features/Tbt/TbtInit/Dxe/TbtDxe.c | 8 +-
> .../Features/Tbt/TbtInit/Dxe/TbtDxe.inf | 8 +-
> .../Features/Tbt/TbtInit/Pei/PeiTbtInit.c | 8 +-
> .../Features/Tbt/TbtInit/Pei/PeiTbtInit.inf | 8 +-
> .../Features/Tbt/TbtInit/Smm/TbtSmiHandler.c | 8 +-
> .../Features/Tbt/TbtInit/Smm/TbtSmiHandler.h | 8 +-
> .../Features/Tbt/TbtInit/Smm/TbtSmm.c | 8 +-
> .../Features/Tbt/TbtInit/Smm/TbtSmm.inf | 8 +-
> .../Include/Acpi/GlobalNvs.asl | 8 +-
> .../Include/Acpi/GlobalNvsAreaDef.h | 8 +-
> .../ClevoOpenBoardPkg/Include/IoExpander.h | 8 +-
> .../Include/Library/GpioExpanderLib.h | 8 +-
> .../Include/Library/I2cAccessLib.h | 8 +-
> .../Include/PchHsioPtssTables.h | 8 +-
> .../Include/Protocol/GlobalNvsArea.h | 8 +-
> .../Intel/ClevoOpenBoardPkg/Include/SioRegs.h | 8 +-
> .../BaseGpioExpanderLib/BaseGpioExpanderLib.c | 8 +-
> .../BaseGpioExpanderLib.inf | 8 +-
> .../Library/PeiI2cAccessLib/PeiI2cAccessLib.c | 8 +-
> .../PeiI2cAccessLib/PeiI2cAccessLib.inf | 8 +-
> .../PeiSerialPortLibSpiFlash.c | 8 +-
> .../PeiSerialPortLibSpiFlash.inf | 8 +-
> Platform/Intel/ClevoOpenBoardPkg/License.txt | 25 -
> .../PcieDeviceTable.c | 8 +-
> .../PeiFspMiscUpdUpdateLib.c | 8 +-
> .../PeiFspPolicyUpdateLib.c | 8 +-
> .../PeiPchPolicyUpdate.c | 8 +-
> .../PeiPchPolicyUpdate.h | 8 +-
> .../PeiPchPolicyUpdatePreMem.c | 8 +-
> .../PeiSaPolicyUpdate.c | 8 +-
> .../PeiSaPolicyUpdate.h | 8 +-
> .../PeiSaPolicyUpdatePreMem.c | 8 +-
> .../PeiSiliconPolicyUpdateLibFsp.inf | 8 +-
> .../ClevoOpenBoardPkg/N1xxWU/GitEdk2Clevo.bat | 8 +-
> .../N1xxWU/Include/Fdf/FlashMapInclude.fdf | 8 +-
> .../N1xxWU/Include/N1xxWUId.h | 8 +-
> .../BasePlatformHookLib/BasePlatformHookLib.c | 8 +-
> .../BasePlatformHookLib.inf | 8 +-
> .../BoardAcpiLib/DxeBoardAcpiTableLib.c | 8 +-
> .../BoardAcpiLib/DxeBoardAcpiTableLib.inf | 8 +-
> .../DxeMultiBoardAcpiSupportLib.c | 8 +-
> .../DxeMultiBoardAcpiSupportLib.inf | 8 +-
> .../BoardAcpiLib/DxeN1xxWUAcpiTableLib.c | 8 +-
> .../BoardAcpiLib/SmmBoardAcpiEnableLib.c | 8 +-
> .../BoardAcpiLib/SmmBoardAcpiEnableLib.inf | 8 +-
> .../SmmMultiBoardAcpiSupportLib.c | 8 +-
> .../SmmMultiBoardAcpiSupportLib.inf | 8 +-
> .../BoardAcpiLib/SmmN1xxWUAcpiEnableLib.c | 8 +-
> .../BoardAcpiLib/SmmSiliconAcpiEnableLib.c | 8 +-
> .../Library/BoardInitLib/N1xxWUGpioTable.c | 8 +-
> .../BoardInitLib/N1xxWUHdaVerbTables.c | 8 +-
> .../BoardInitLib/N1xxWUHsioPtssTables.c | 8 +-
> .../Library/BoardInitLib/N1xxWUSpdTable.c | 8 +-
> .../BoardInitLib/PeiBoardInitPostMemLib.c | 8 +-
> .../BoardInitLib/PeiBoardInitPostMemLib.inf | 8 +-
> .../BoardInitLib/PeiBoardInitPreMemLib.c | 8 +-
> .../BoardInitLib/PeiBoardInitPreMemLib.inf | 8 +-
> .../PeiMultiBoardInitPostMemLib.c | 8 +-
> .../PeiMultiBoardInitPostMemLib.inf | 8 +-
> .../BoardInitLib/PeiMultiBoardInitPreMemLib.c | 8 +-
> .../PeiMultiBoardInitPreMemLib.inf | 8 +-
> .../Library/BoardInitLib/PeiN1xxWUDetect.c | 8 +-
> .../Library/BoardInitLib/PeiN1xxWUInitLib.h | 8 +-
> .../BoardInitLib/PeiN1xxWUInitPostMemLib.c | 8 +-
> .../BoardInitLib/PeiN1xxWUInitPreMemLib.c | 8 +-
> .../ClevoOpenBoardPkg/N1xxWU/OpenBoardPkg.dsc | 8 +-
> .../ClevoOpenBoardPkg/N1xxWU/OpenBoardPkg.fdf | 8 +-
> .../N1xxWU/OpenBoardPkgBuildOption.dsc | 8 +-
> .../N1xxWU/OpenBoardPkgConfig.dsc | 8 +-
> .../N1xxWU/OpenBoardPkgPcd.dsc | 8 +-
> .../DxeGopPolicyInit.c | 8 +-
> .../DxeGopPolicyInit.h | 8 +-
> .../DxeSaPolicyInit.h | 8 +-
> .../DxeSaPolicyUpdate.c | 8 +-
> .../DxeSiliconPolicyUpdateLib.c | 8 +-
> .../DxeSiliconPolicyUpdateLib.inf | 8 +-
> .../Intel/ClevoOpenBoardPkg/N1xxWU/bld.bat | 8 +-
> .../Intel/ClevoOpenBoardPkg/N1xxWU/cln.bat | 8 +-
> .../ClevoOpenBoardPkg/N1xxWU/postbuild.bat | 8 +-
> .../ClevoOpenBoardPkg/N1xxWU/prebuild.bat | 8 +-
> .../Intel/ClevoOpenBoardPkg/N1xxWU/prep.bat | 8 +-
> .../Intel/ClevoOpenBoardPkg/OpenBoardPkg.dec | 8 +-
> .../Acpi/BoardAcpiDxe/AcpiGnvsInit.c | 8 +-
> .../Acpi/BoardAcpiDxe/BoardAcpiDxe.c | 8 +-
> .../Acpi/BoardAcpiDxe/BoardAcpiDxe.inf | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/ALS.ASL | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/AMLUPD.asl | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/CPU.asl | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/DSDT.ASL | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/Gpe.asl | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/Itss.asl | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/LPC_DEV.ASL | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/LpcB.asl | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PCI_DRC.ASL | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PciTree.asl | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/Platform.asl | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PlatformGnvs.asl | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/Video.asl | 8 +-
> .../Acpi/BoardAcpiDxe/UpdateDsdt.c | 8 +-
> .../KabylakeOpenBoardPkg/Contributions.txt | 218 --
> -----
> .../Features/PciHotPlug/PciHotPlug.c | 8 +-
> .../Features/PciHotPlug/PciHotPlug.h | 8 +-
> .../Features/PciHotPlug/PciHotPlug.inf | 8 +-
> .../Tbt/AcpiTables/Rtd3SptPcieTbt.asl | 8 +-
> .../Features/Tbt/AcpiTables/Tbt.asl | 8 +-
> .../Features/Tbt/Include/Acpi/TbtNvs.asl | 8 +-
> .../Features/Tbt/Include/Acpi/TbtNvsAreaDef.h | 8 +-
> .../Tbt/Include/Library/DxeTbtPolicyLib.h | 8 +-
> .../Tbt/Include/Library/PeiTbtPolicyLib.h | 8 +-
> .../Tbt/Include/Library/TbtCommonLib.h | 8 +-
> .../Features/Tbt/Include/Ppi/PeiTbtPolicy.h | 8 +-
> .../Include/Private/Library/PeiDTbtInitLib.h | 8 +-
> .../Private/Library/PeiTbtCommonInitLib.h | 8 +-
> .../Tbt/Include/Protocol/DxeTbtPolicy.h | 8 +-
> .../Tbt/Include/Protocol/TbtNvsArea.h | 8 +-
> .../Features/Tbt/Include/TbtBoardInfo.h | 8 +-
> .../Tbt/Include/TbtPolicyCommonDefinition.h | 8 +-
> .../Library/DxeTbtPolicyLib/DxeTbtPolicyLib.c | 8 +-
> .../DxeTbtPolicyLib/DxeTbtPolicyLib.inf | 8 +-
> .../DxeTbtPolicyLib/DxeTbtPolicyLibrary.h | 8 +-
> .../PeiDxeSmmTbtCommonLib/TbtCommonLib.c | 8 +-
> .../PeiDxeSmmTbtCommonLib/TbtCommonLib.inf | 8 +-
> .../Library/PeiTbtPolicyLib/PeiTbtPolicyLib.c | 8 +-
> .../PeiTbtPolicyLib/PeiTbtPolicyLib.inf | 8 +-
> .../PeiTbtPolicyLib/PeiTbtPolicyLibrary.h | 8 +-
> .../Private/PeiDTbtInitLib/PeiDTbtInitLib.c | 8 +-
> .../Private/PeiDTbtInitLib/PeiDTbtInitLib.inf | 8 +-
> .../Features/Tbt/TbtInit/Dxe/TbtDxe.c | 8 +-
> .../Features/Tbt/TbtInit/Dxe/TbtDxe.inf | 8 +-
> .../Features/Tbt/TbtInit/Pei/PeiTbtInit.c | 8 +-
> .../Features/Tbt/TbtInit/Pei/PeiTbtInit.inf | 8 +-
> .../Features/Tbt/TbtInit/Smm/TbtSmiHandler.c | 8 +-
> .../Features/Tbt/TbtInit/Smm/TbtSmiHandler.h | 8 +-
> .../Features/Tbt/TbtInit/Smm/TbtSmm.c | 8 +-
> .../Features/Tbt/TbtInit/Smm/TbtSmm.inf | 8 +-
> .../PcieDeviceTable.c | 8 +-
> .../PeiFspMiscUpdUpdateLib.c | 8 +-
> .../PeiFspPolicyUpdateLib.c | 8 +-
> .../PeiPchPolicyUpdate.c | 8 +-
> .../PeiPchPolicyUpdate.h | 8 +-
> .../PeiPchPolicyUpdatePreMem.c | 8 +-
> .../PeiSaPolicyUpdate.c | 8 +-
> .../PeiSaPolicyUpdate.h | 8 +-
> .../PeiSaPolicyUpdatePreMem.c | 8 +-
> .../PeiSiliconPolicyUpdateLibFsp.inf | 8 +-
> .../Include/Acpi/GlobalNvs.asl | 8 +-
> .../Include/Acpi/GlobalNvsAreaDef.h | 8 +-
> .../Include/Fdf/FlashMapInclude.fdf | 8 +-
> .../KabylakeOpenBoardPkg/Include/IoExpander.h | 8 +-
> .../Include/Library/GpioExpanderLib.h | 8 +-
> .../Include/Library/I2cAccessLib.h | 8 +-
> .../Include/PchHsioPtssTables.h | 8 +-
> .../Include/Protocol/GlobalNvsArea.h | 8 +-
> .../KabylakeOpenBoardPkg/Include/SioRegs.h | 8 +-
> .../KabylakeRvp3/GitEdk2MinKabylake.bat | 8 +-
> .../KabylakeRvp3/Include/KabylakeRvp3Id.h | 8 +-
> .../BasePlatformHookLib/BasePlatformHookLib.c | 8 +-
> .../BasePlatformHookLib.inf | 8 +-
> .../BoardAcpiLib/DxeBoardAcpiTableLib.c | 8 +-
> .../BoardAcpiLib/DxeBoardAcpiTableLib.inf | 8 +-
> .../DxeKabylakeRvp3AcpiTableLib.c | 8 +-
> .../DxeMultiBoardAcpiSupportLib.c | 8 +-
> .../DxeMultiBoardAcpiSupportLib.inf | 8 +-
> .../BoardAcpiLib/SmmBoardAcpiEnableLib.c | 8 +-
> .../BoardAcpiLib/SmmBoardAcpiEnableLib.inf | 8 +-
> .../SmmKabylakeRvp3AcpiEnableLib.c | 8 +-
> .../SmmMultiBoardAcpiSupportLib.c | 8 +-
> .../SmmMultiBoardAcpiSupportLib.inf | 8 +-
> .../BoardAcpiLib/SmmSiliconAcpiEnableLib.c | 8 +-
> .../BoardInitLib/KabylakeRvp3GpioTable.c | 8 +-
> .../BoardInitLib/KabylakeRvp3HdaVerbTables.c | 8 +-
> .../BoardInitLib/KabylakeRvp3HsioPtssTables.c | 8 +-
> .../BoardInitLib/KabylakeRvp3SpdTable.c | 8 +-
> .../BoardInitLib/PeiBoardInitPostMemLib.c | 8 +-
> .../BoardInitLib/PeiBoardInitPostMemLib.inf | 8 +-
> .../BoardInitLib/PeiBoardInitPreMemLib.c | 8 +-
> .../BoardInitLib/PeiBoardInitPreMemLib.inf | 8 +-
> .../BoardInitLib/PeiKabylakeRvp3Detect.c | 8 +-
> .../BoardInitLib/PeiKabylakeRvp3InitLib.h | 8 +-
> .../PeiKabylakeRvp3InitPostMemLib.c | 8 +-
> .../PeiKabylakeRvp3InitPreMemLib.c | 8 +-
> .../PeiMultiBoardInitPostMemLib.c | 8 +-
> .../PeiMultiBoardInitPostMemLib.inf | 8 +-
> .../BoardInitLib/PeiMultiBoardInitPreMemLib.c | 8 +-
> .../PeiMultiBoardInitPreMemLib.inf | 8 +-
> .../KabylakeRvp3/OpenBoardPkg.dsc | 8 +-
> .../KabylakeRvp3/OpenBoardPkg.fdf | 8 +-
> .../KabylakeRvp3/OpenBoardPkgBuildOption.dsc | 8 +-
> .../KabylakeRvp3/OpenBoardPkgConfig.dsc | 8 +-
> .../KabylakeRvp3/OpenBoardPkgPcd.dsc | 8 +-
> .../KabylakeOpenBoardPkg/KabylakeRvp3/bld.bat | 8 +-
> .../KabylakeOpenBoardPkg/KabylakeRvp3/cln.bat | 8 +-
> .../KabylakeRvp3/postbuild.bat | 8 +-
> .../KabylakeRvp3/prebuild.bat | 8 +-
> .../KabylakeRvp3/prep.bat | 8 +-
> .../BaseGpioExpanderLib/BaseGpioExpanderLib.c | 8 +-
> .../BaseGpioExpanderLib.inf | 8 +-
> .../Library/PeiI2cAccessLib/PeiI2cAccessLib.c | 8 +-
> .../PeiI2cAccessLib/PeiI2cAccessLib.inf | 8 +-
> .../Intel/KabylakeOpenBoardPkg/License.txt | 25 -
> .../KabylakeOpenBoardPkg/OpenBoardPkg.dec | 8 +-
> .../DxeGopPolicyInit.c | 8 +-
> .../DxeGopPolicyInit.h | 8 +-
> .../DxeSaPolicyInit.h | 8 +-
> .../DxeSaPolicyUpdate.c | 8 +-
> .../DxeSiliconPolicyUpdateLib.c | 8 +-
> .../DxeSiliconPolicyUpdateLib.inf | 8 +-
> .../MinPlatformPkg/Acpi/AcpiSmm/AcpiSmm.c | 8 +-
> .../MinPlatformPkg/Acpi/AcpiSmm/AcpiSmm.h | 8 +-
> .../MinPlatformPkg/Acpi/AcpiSmm/AcpiSmm.inf | 8 +-
> .../Acpi/AcpiTables/AcpiPlatform.c | 8 +-
> .../Acpi/AcpiTables/AcpiPlatform.h | 8 +-
> .../Acpi/AcpiTables/AcpiPlatform.inf | 8 +-
> .../Acpi/AcpiTables/Facs/Facs.c | 8 +-
> .../Acpi/AcpiTables/Fadt/Fadt.c | 8 +-
> .../Acpi/AcpiTables/Hpet/Hpet.c | 8 +-
> .../Acpi/AcpiTables/Wsmt/Wsmt.c | 8 +-
> .../BoardAcpiLibNull/BoardAcpiEnableLib.c | 8 +-
> .../BoardAcpiEnableLibNull.inf | 8 +-
> .../BoardAcpiLibNull/BoardAcpiTableLib.c | 8 +-
> .../BoardAcpiTableLibNull.inf | 8 +-
> .../Library/DxeAslUpdateLib/DxeAslUpdateLib.c | 8 +-
> .../DxeAslUpdateLib/DxeAslUpdateLib.inf | 8 +-
> .../DxeBoardAcpiTableLib.c | 8 +-
> .../DxeMultiBoardAcpiSupportLib.c | 8 +-
> .../DxeMultiBoardAcpiSupportLib.inf | 8 +-
> .../SmmBoardAcpiEnableLib.c | 8 +-
> .../SmmMultiBoardAcpiSupportLib.c | 8 +-
> .../SmmMultiBoardAcpiSupportLib.inf | 8 +-
> .../MinPlatformPkg/Acpi/MinDsdt/MinDsdt.asl | 8 +-
> .../MinPlatformPkg/Acpi/MinDsdt/MinDsdt.c | 8 +-
> .../MinPlatformPkg/Acpi/MinDsdt/MinDsdt.inf | 8 +-
> .../DxePlatformBootManagerLib/BdsPlatform.c | 8 +-
> .../DxePlatformBootManagerLib/BdsPlatform.h | 8 +-
> .../DxePlatformBootManagerLib.inf | 8 +-
> .../DxePlatformBootManagerLib/MemoryTest.c | 8 +-
> .../PlatformBootOption.c | 8 +-
> .../Intel/MinPlatformPkg/Contributions.txt | 218 --
> -----
> .../SpiFlashCommonLibNull.c | 8 +-
> .../SpiFlashCommonLibNull.inf | 8 +-
> .../Flash/SpiFvbService/Common/FvbInfo.c | 8 +-
> .../Common/SpiFvbServiceCommon.c | 8 +-
> .../Common/SpiFvbServiceCommon.h | 8 +-
> .../SpiFvbService/Smm/SpiFvbServiceSmm.c | 8 +-
> .../Flash/SpiFvbService/SpiFvbServiceSmm.inf | 8 +-
> .../DxeFspWrapperPlatformLib.inf | 8 +-
> .../DxeFspWrapperPlatformResetLib.c | 8 +-
> .../FspWrapperHobProcessLib.c | 8 +-
> .../PeiFspWrapperHobProcessLib.inf | 8 +-
> .../PeiFspWrapperPlatformLib.c | 8 +-
> .../PeiFspWrapperPlatformLib.inf | 8 +-
> .../PeiFspWrapperPlatformResetLib.c | 8 +-
> .../FspWrapperPlatformSecLib.c | 8 +-
> .../SecFspWrapperPlatformSecLib/FsptCoreUpd.h | 8 +-
> .../SecFspWrapperPlatformSecLib/Ia32/Fsp.h | 8 +-
> .../Ia32/PeiCoreEntry.S | 8 +-
> .../Ia32/PeiCoreEntry.asm | 8 +-
> .../Ia32/SecEntry.S | 8 +-
> .../Ia32/SecEntry.asm | 8 +-
> .../SecFspWrapperPlatformSecLib/Ia32/Stack.S | 8 +-
> .../Ia32/Stack.asm | 8 +-
> .../PlatformInit.c | 8 +-
> .../SecFspWrapperPlatformSecLib.inf | 8 +-
> .../SecGetPerformance.c | 8 +-
> .../SecPlatformInformation.c | 8 +-
> .../SecRamInitData.c | 8 +-
> .../SecTempRamDone.c | 8 +-
> .../SaveMemoryConfig/SaveMemoryConfig.c | 8 +-
> .../SaveMemoryConfig/SaveMemoryConfig.inf | 8 +-
> .../ExternalDeviceDmaProtection.c | 8 +-
> ...FirmwareTrustConfigurationCryptoStrength.c | 8 +-
> .../FirmwareVersionRollbackProtection.c | 8 +-
> .../HstiIbvPlatformDxe/HstiIbvPlatformDxe.c | 8 +-
> .../HstiIbvPlatformDxe/HstiIbvPlatformDxe.h | 8 +-
> .../HstiIbvPlatformDxe/HstiIbvPlatformDxe.inf | 8 +-
> .../Hsti/HstiIbvPlatformDxe/MorSupport.c | 8 +-
> .../NoTestKeyVerification.c | 8 +-
> .../HstiIbvPlatformDxe/SecureBootBypass.c | 8 +-
> .../Include/Dsc/CoreCommonLib.dsc | 8 +-
> .../Include/Dsc/CoreDxeInclude.dsc | 8 +-
> .../MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc | 8 +-
> .../Include/Dsc/CorePeiInclude.dsc | 8 +-
> .../MinPlatformPkg/Include/Dsc/CorePeiLib.dsc | 8 +-
> .../Include/Fdf/CoreOsBootInclude.fdf | 8 +-
> .../Include/Fdf/CorePostMemoryInclude.fdf | 8 +-
> .../Include/Fdf/CorePreMemoryInclude.fdf | 8 +-
> .../Include/Fdf/CoreSecurityLateInclude.fdf | 8 +-
> .../Fdf/CoreSecurityPostMemoryInclude.fdf | 8 +-
> .../Fdf/CoreSecurityPreMemoryInclude.fdf | 8 +-
> .../Include/Fdf/CoreUefiBootInclude.fdf | 8 +-
> .../Include/Fdf/RuleInclude.fdf | 8 +-
> .../Include/Guid/SmramMemoryReserve.h | 8 +-
> .../Include/HstiIbvFeatureBit.h | 8 +-
> .../Include/Library/AslUpdateLib.h | 8 +-
> .../Include/Library/BoardAcpiEnableLib.h | 8 +-
> .../Include/Library/BoardAcpiTableLib.h | 8 +-
> .../Include/Library/BoardInitLib.h | 8 +-
> .../Include/Library/CompressLib.h | 8 +-
> .../Include/Library/HobVariableLib.h | 8 +-
> .../Library/MultiBoardAcpiSupportLib.h | 8 +-
> .../Library/MultiBoardInitSupportLib.h | 8 +-
> .../MinPlatformPkg/Include/Library/PeiLib.h | 8 +-
> .../Include/Library/ReportFvLib.h | 8 +-
> .../Include/Library/SecBoardInitLib.h | 8 +-
> .../Include/Library/SiliconPolicyInitLib.h | 8 +-
> .../Include/Library/SiliconPolicyUpdateLib.h | 8 +-
> .../Include/Library/SpiFlashCommonLib.h | 8 +-
> .../Include/Library/TestPointCheckLib.h | 8 +-
> .../Include/Library/TestPointLib.h | 8 +-
> .../Include/Ppi/BaseMemoryTest.h | 8 +-
> .../Include/Ppi/PlatformMemorySize.h | 8 +-
> .../Library/CompressLib/CompressLib.c | 8 +-
> .../Library/CompressLib/CompressLib.inf | 7 +-
> .../Library/PeiHobVariableLibFce/Fce.h | 8 +-
> .../PeiHobVariableLibFce/InternalCommonLib.c | 8 +-
> .../PeiHobVariableLibFce.c | 8 +-
> .../PeiHobVariableLibFce.inf | 8 +-
> .../PeiHobVariableLibFceOptSize.c | 8 +-
> .../PeiHobVariableLibFceOptSize.inf | 8 +-
> .../Library/PeiHobVariableLibFce/Variable.h | 8 +-
> .../MinPlatformPkg/Library/PeiLib/PeiLib.c | 8 +-
> .../MinPlatformPkg/Library/PeiLib/PeiLib.inf | 8 +-
> Platform/Intel/MinPlatformPkg/License.txt | 25 -
> .../Intel/MinPlatformPkg/MinPlatformPkg.dec | 8 +-
> .../Intel/MinPlatformPkg/MinPlatformPkg.dsc | 8 +-
> .../PciHostBridgeLibSimple.c | 8 +-
> .../PciHostBridgeLibSimple.inf | 8 +-
> .../PciSegmentInfoLibSimple.c | 9 +-
> .../PciSegmentInfoLibSimple.inf | 7 +-
> .../Library/BoardInitLibNull/BoardInitLib.c | 8 +-
> .../BoardInitLibNull/BoardInitLibNull.inf | 8 +-
> .../DxeBoardInitLib.c | 8 +-
> .../DxeMultiBoardInitSupportLib.c | 8 +-
> .../DxeMultiBoardInitSupportLib.inf | 8 +-
> .../PeiBoardInitLib.c | 8 +-
> .../PeiMultiBoardInitSupportLib.c | 8 +-
> .../PeiMultiBoardInitSupportLib.inf | 8 +-
> .../Library/PeiReportFvLib/PeiReportFvLib.c | 8 +-
> .../Library/PeiReportFvLib/PeiReportFvLib.inf | 8 +-
> .../Ia32/SecBoardInit.nasm | 8 +-
> .../SecBoardInitLibNull/SecBoardInitLib.c | 8 +-
> .../SecBoardInitLibNull.inf | 8 +-
> .../SiliconPolicyInitLibNull.c | 8 +-
> .../SiliconPolicyInitLibNull.inf | 8 +-
> .../SiliconPolicyUpdateLibNull.c | 8 +-
> .../SiliconPolicyUpdateLibNull.inf | 8 +-
> .../PlatformInitDxe/PlatformInitDxe.c | 8 +-
> .../PlatformInitDxe/PlatformInitDxe.inf | 8 +-
> .../PlatformInitPei/PlatformInitPostMem.c | 8 +-
> .../PlatformInitPei/PlatformInitPostMem.inf | 8 +-
> .../PlatformInitPei/PlatformInitPreMem.c | 8 +-
> .../PlatformInitPei/PlatformInitPreMem.inf | 8 +-
> .../PlatformInitSmm/PlatformInitSmm.c | 8 +-
> .../PlatformInitSmm/PlatformInitSmm.inf | 8 +-
> .../PlatformInit/ReportFv/ReportFvPei.c | 8 +-
> .../PlatformInit/ReportFv/ReportFvPei.inf | 8 +-
> .../SiliconPolicyDxe/SiliconPolicyDxe.c | 8 +-
> .../SiliconPolicyDxe/SiliconPolicyDxe.inf | 8 +-
> .../SiliconPolicyPeiPostMem.c | 8 +-
> .../SiliconPolicyPeiPostMem.inf | 8 +-
> .../SiliconPolicyPei/SiliconPolicyPeiPreMem.c | 8 +-
> .../SiliconPolicyPeiPreMem.inf | 8 +-
> .../StallServicePei/StallServicePei.c | 8 +-
> .../StallServicePei/StallServicePei.inf | 8 +-
> .../Tcg/Tcg2PlatformDxe/Tcg2PlatformDxe.c | 8 +-
> .../Tcg/Tcg2PlatformDxe/Tcg2PlatformDxe.inf | 8 +-
> .../Tcg/Tcg2PlatformPei/Tcg2PlatformPei.c | 8 +-
> .../Tcg/Tcg2PlatformPei/Tcg2PlatformPei.inf | 8 +-
> .../Library/TestPointCheckLib/DxeCheckAcpi.c | 8 +-
> .../TestPointCheckLib/DxeCheckAcpiDmar.c | 8 +-
> .../TestPointCheckLib/DxeCheckAcpiHpet.c | 8 +-
> .../TestPointCheckLib/DxeCheckAcpiMadt.c | 8 +-
> .../TestPointCheckLib/DxeCheckAcpiMcfg.c | 8 +-
> .../TestPointCheckLib/DxeCheckAcpiTpm.c | 8 +-
> .../TestPointCheckLib/DxeCheckAcpiWsmt.c | 8 +-
> .../TestPointCheckLib/DxeCheckBootVariable.c | 8 +-
> .../DxeCheckConsoleVariable.c | 8 +-
> .../TestPointCheckLib/DxeCheckDevicePath.c | 8 +-
> .../TestPointCheckLib/DxeCheckDmaProtection.c | 8 +-
> .../Library/TestPointCheckLib/DxeCheckEsrt.c | 8 +-
> .../Library/TestPointCheckLib/DxeCheckGcd.c | 8 +-
> .../Library/TestPointCheckLib/DxeCheckHsti.c | 8 +-
> .../TestPointCheckLib/DxeCheckLoadedImage.c | 8 +-
> .../DxeCheckMemoryAttribute.c | 8 +-
> .../TestPointCheckLib/DxeCheckMemoryMap.c | 8 +-
> .../DxeCheckMemoryTypeInformation.c | 8 +-
> .../Library/TestPointCheckLib/DxeCheckPci.c | 8 +-
> .../DxeCheckPiSignedFvBoot.c | 8 +-
> .../DxeCheckSmiHandlerInstrument.c | 8 +-
> .../TestPointCheckLib/DxeCheckSmmInfo.c | 8 +-
> .../TestPointCheckLib/DxeCheckTcgMor.c | 8 +-
> .../DxeCheckTcgTrustedBoot.c | 8 +-
> .../DxeCheckUefiSecureBoot.c | 8 +-
> .../TestPointCheckLib/DxeCheckVariable.c | 8 +-
> .../TestPointCheckLib/DxeTestPointCheckLib.c | 8 +-
> .../DxeTestPointCheckLib.inf | 8 +-
> .../TestPointCheckLib/PeiCheckDmaProtection.c | 8 +-
> .../TestPointCheckLib/PeiCheckFvInfo.c | 8 +-
> .../Library/TestPointCheckLib/PeiCheckHob.c | 8 +-
> .../Library/TestPointCheckLib/PeiCheckMtrr.c | 8 +-
> .../Library/TestPointCheckLib/PeiCheckPci.c | 8 +-
> .../TestPointCheckLib/PeiCheckSmmInfo.c | 8 +-
> .../TestPointCheckLib/PeiTestPointCheckLib.c | 8 +-
> .../PeiTestPointCheckLib.inf | 8 +-
> .../TestPointCheckLib/SecCheckCpuInfo.c | 8 +-
> .../TestPointCheckLib/SecTestPointCheckLib.c | 8 +-
> .../SecTestPointCheckLib.inf | 8 +-
> .../SmmCheckCommunicationBuffer.c | 8 +-
> .../TestPointCheckLib/SmmCheckLoadedImage.c | 8 +-
> .../SmmCheckMemoryAttribute.c | 8 +-
> .../TestPointCheckLib/SmmCheckPaging.c | 8 +-
> .../Library/TestPointCheckLib/SmmCheckSmrr.c | 8 +-
> .../TestPointCheckLib/SmmTestPointCheckLib.c | 8 +-
> .../SmmTestPointCheckLib.inf | 8 +-
> .../Library/TestPointCheckLib/TestPointHelp.c | 8 +-
> .../TestPointCheckLib/TestPointInternal.h | 8 +-
> .../TestPointCheckLibNull.c | 8 +-
> .../TestPointCheckLibNull.inf | 8 +-
> .../Test/Library/TestPointLib/DxeTestPoint.c | 8 +-
> .../Test/Library/TestPointLib/DxeTestPoint.h | 8 +-
> .../Library/TestPointLib/DxeTestPointAip.c | 8 +-
> .../Library/TestPointLib/DxeTestPointLib.inf | 7 +-
> .../Test/Library/TestPointLib/PeiTestPoint.c | 8 +-
> .../Test/Library/TestPointLib/PeiTestPoint.h | 8 +-
> .../Library/TestPointLib/PeiTestPointLib.inf | 7 +-
> .../Test/Library/TestPointLib/SmmTestPoint.c | 8 +-
> .../Test/Library/TestPointLib/SmmTestPoint.h | 8 +-
> .../Library/TestPointLib/SmmTestPointAip.c | 8 +-
> .../TestPointLib/SmmTestPointCommunication.c | 8 +-
> .../Library/TestPointLib/SmmTestPointLib.inf | 7 +-
> .../Test/TestPointDumpApp/TestPointDump.c | 8 +-
> .../TestPointDumpApp/TestPointDumpApp.inf | 8 +-
> .../Test/TestPointStubDxe/TestPointStubDxe.c | 8 +-
> .../TestPointStubDxe/TestPointStubDxe.inf | 8 +-
> .../Tools/AmlGenOffset/AmlGenOffset.py | 8 +-
> .../Tools/Fsp/PatchFspBinFvsBaseAddress.py | 8 +-
> .../Tools/Help/CheckCodeBase.py | 8 +-
> .../MinPlatformPkg/Tools/ParseVar/ParseVar.py | 8 +-
> .../MinPlatformPkg/Tools/PatchFv/PatchBfv.py | 8 +-
> .../Tools/PatchFv/PatchBinFv.py | 8 +-
> .../Tools/PatchFv/RebaseBinFv.py | 8 +-
> .../Tools/PatchFv/SyncBinFvInf.py | 8 +-
> .../Acpi/BoardAcpiDxe/BoardAcpiDxe.c | 8 +-
> .../Acpi/BoardAcpiDxe/BoardAcpiDxe.h | 8 +-
> .../Acpi/BoardAcpiDxe/BoardAcpiDxe.inf | 8 +-
> .../Acpi/BoardAcpiDxe/BoardAcpiDxeDsdt.c | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt.inf | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/AMLUPD.asl | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/CommonPlatform.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/DSDT.asl | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/Gpe.asl | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/HostBus.asl | 8 +-
> .../Dsdt/IioPcieHotPlugGpeHandler.asl | 8 +-
> .../Dsdt/IioPcieRootPortHotPlug.asl | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/Itss.asl | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/Mother.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/Os.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC00.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC01.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC02.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC03.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC04.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC05.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC06.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC06Ejd.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC07.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC08.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC09.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC10.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC11.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC12.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC12Ejd.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC13.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC14.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC15.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC16.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC17.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC18.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC18Ejd.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC19.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC20.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC21.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC22.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC23.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC24.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC25.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC26.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC27.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC28.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC29.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC30.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC31.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC32.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC33.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC34.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC35.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC36.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC37.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC38.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC39.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC40.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC41.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC42.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC43.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC44.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC45.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC46.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PC47.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/Pch.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PchApic.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PchEhci1.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PchEhci2.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PchGbe.asl | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PchLpc.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PchSata.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PchXhci.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PciCrs.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PciIrq.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PcieHp.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PcieHpDev.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PcieNonHpDev.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PcieSeg.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/Platform.asl | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/PlatformGpe.asi | 8 +-
> .../BoardAcpiDxe/Dsdt/PlatformPciTree_WFP.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/Sck1Ejd.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/Sck2Ejd.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/Sck3Ejd.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/Uncore0.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/Uncore1.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/Uncore2.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/Uncore3.asi | 8 +-
> .../Acpi/BoardAcpiDxe/Dsdt/WFPPlatform.asl | 8 +-
> .../BoardMtOlympus/GitEdk2MinMtOlympus.bat | 8 +-
> .../BasePlatformHookLib/BasePlatformHookLib.c | 8 +-
> .../BasePlatformHookLib.inf | 8 +-
> .../BoardAcpiLib/DxeBoardAcpiTableLib.c | 8 +-
> .../BoardAcpiLib/DxeBoardAcpiTableLib.inf | 8 +-
> .../BoardAcpiLib/DxeMtOlympusAcpiTableLib.c | 8 +-
> .../BoardAcpiLib/SmmBoardAcpiEnableLib.c | 8 +-
> .../BoardAcpiLib/SmmBoardAcpiEnableLib.inf | 8 +-
> .../BoardAcpiLib/SmmMtOlympusAcpiEnableLib.c | 8 +-
> .../BoardAcpiLib/SmmSiliconAcpiEnableLib.c | 8 +-
> .../Library/BoardInitLib/AllLanesEparam.c | 8 +-
> .../Library/BoardInitLib/GpioTable.c | 8 +-
> .../Library/BoardInitLib/IioBifur.c | 8 +-
> .../BoardInitLib/PeiBoardInitPostMemLib.c | 8 +-
> .../BoardInitLib/PeiBoardInitPostMemLib.inf | 8 +-
> .../BoardInitLib/PeiBoardInitPreMemLib.c | 8 +-
> .../BoardInitLib/PeiBoardInitPreMemLib.inf | 8 +-
> .../Library/BoardInitLib/PeiMtOlympusDetect.c | 8 +-
> .../BoardInitLib/PeiMtOlympusInitLib.h | 8 +-
> .../BoardInitLib/PeiMtOlympusInitPostMemLib.c | 8 +-
> .../BoardInitLib/PeiMtOlympusInitPreMemLib.c | 8 +-
> .../Library/BoardInitLib/UsbOC.c | 8 +-
> .../BoardMtOlympus/PlatformPkg.dsc | 8 +-
> .../BoardMtOlympus/PlatformPkg.fdf | 8 +-
> .../BoardMtOlympus/PlatformPkgBuildOption.dsc | 8 +-
> .../BoardMtOlympus/PlatformPkgConfig.dsc | 8 +-
> .../BoardMtOlympus/PlatformPkgPcd.dsc | 8 +-
> .../BoardMtOlympus/StructureConfig.dsc | 8 +-
> .../PurleyOpenBoardPkg/BoardMtOlympus/bld.bat | 8 +-
> .../BoardMtOlympus/postbuild.bat | 8 +-
> .../BoardMtOlympus/prebuild.bat | 8 +-
> .../Ipmi/Library/IpmiLibKcs/IpmiLibKcs.c | 8 +-
> .../Ipmi/Library/IpmiLibKcs/IpmiLibKcs.inf | 8 +-
> .../Features/Ipmi/Library/IpmiLibKcs/KcsBmc.c | 8 +-
> .../Features/Ipmi/Library/IpmiLibKcs/KcsBmc.h | 8 +-
> .../IpmiPlatformHookLib/IpmiPlatformHookLib.c | 8 +-
> .../IpmiPlatformHookLib.inf | 8 +-
> .../Include/Acpi/GlobalNvs.asi | 8 +-
> .../Include/Acpi/GlobalNvsAreaDef.h | 8 +-
> .../Include/Guid/PchRcVariable.h | 8 +-
> .../Include/Guid/SetupVariable.h | 8 +-
> .../Include/IioBifurcationSlotTable.h | 8 +-
> .../PurleyOpenBoardPkg/Include/Platform.h | 8 +-
> .../Include/Ppi/SystemBoard.h | 8 +-
> .../Include/Protocol/PciIovPlatform.h | 8 +-
> .../PurleyOpenBoardPkg/Include/SetupTable.h | 8 +-
> .../PurleyOpenBoardPkg/Include/SioRegs.h | 8 +-
> .../DxePlatformBootManagerLib/BdsPlatform.c | 8 +-
> .../DxePlatformBootManagerLib/BdsPlatform.h | 8 +-
> .../DxePlatformBootManagerLib.inf | 8 +-
> .../DxePlatformBootManagerLib/MemoryTest.c | 8 +-
> .../PlatformBootOption.c | 8 +-
> .../Pci/PciPlatform/IoApic.h | 8 +-
> .../Pci/PciPlatform/PciIovPlatformPolicy.c | 8 +-
> .../Pci/PciPlatform/PciIovPlatformPolicy.h | 8 +-
> .../Pci/PciPlatform/PciPlatform.c | 8 +-
> .../Pci/PciPlatform/PciPlatform.h | 8 +-
> .../Pci/PciPlatform/PciPlatform.inf | 8 +-
> .../Pci/PciPlatform/PciPlatformHooks.c | 8 +-
> .../Pci/PciPlatform/PciPlatformHooks.h | 8 +-
> .../Pci/PciPlatform/PciSupportLib.c | 8 +-
> .../Pci/PciPlatform/PciSupportLib.h | 8 +-
> Platform/Intel/PurleyOpenBoardPkg/PlatPkg.dec | 8 +-
> .../Policy/IioUdsDataDxe/IioUdsDataDxe.c | 8 +-
> .../Policy/IioUdsDataDxe/IioUdsDataDxe.h | 8 +-
> .../Policy/IioUdsDataDxe/IioUdsDataDxe.inf | 8 +-
> .../SiliconPolicyInitLib.c | 8 +-
> .../SiliconPolicyInitLib.inf | 8 +-
> .../PchPolicyUpdateUsb.c | 8 +-
> .../SiliconPolicyUpdateLib.c | 8 +-
> .../SiliconPolicyUpdateLib.inf | 8 +-
> .../PlatformCpuPolicy/PlatformCpuPolicy.c | 8 +-
> .../PlatformCpuPolicy/PlatformCpuPolicy.inf | 8 +-
> .../Policy/S3NvramSave/S3NvramSave.c | 8 +-
> .../Policy/S3NvramSave/S3NvramSave.h | 8 +-
> .../Policy/S3NvramSave/S3NvramSave.inf | 8 +-
> .../Policy/SystemBoard/SystemBoardCommon.c | 8 +-
> .../Policy/SystemBoard/SystemBoardPei.c | 8 +-
> .../Policy/SystemBoard/SystemBoardPei.h | 8 +-
> .../Policy/SystemBoard/SystemBoardPei.inf | 8 +-
> Platform/LeMaker/CelloBoard/CelloBoard.dsc | 8 +-
> Platform/LeMaker/CelloBoard/CelloBoard.fdf | 8 +-
> Platform/LeMaker/License.txt | 25 -
> .../Marvell/Armada70x0Db/Armada70x0Db.fdf.inc | 8 +-
> .../Armada70x0DbBoardDescLib.c | 8 +-
> .../Armada70x0DbBoardDescLib.inf | 8 +-
> .../NonDiscoverableInitLib.c | 8 +-
> .../NonDiscoverableInitLib.h | 8 +-
> .../NonDiscoverableInitLib.inf | 8 +-
> .../Marvell/Armada80x0Db/Armada80x0Db.fdf.inc | 8 +-
> .../Armada80x0DbBoardDescLib.c | 8 +-
> .../Armada80x0DbBoardDescLib.inf | 8 +-
> .../NonDiscoverableInitLib.c | 8 +-
> .../NonDiscoverableInitLib.h | 8 +-
> .../NonDiscoverableInitLib.inf | 8 +-
> .../RaspberryPi/RPi3/AcpiTables/AcpiTables.h | 8 +-
> .../RPi3/AcpiTables/AcpiTables.inf | 8 +-
> .../RaspberryPi/RPi3/AcpiTables/Csrt.aslc | 8 +-
> .../RaspberryPi/RPi3/AcpiTables/Dbg2.aslc | 8 +-
> Platform/RaspberryPi/RPi3/AcpiTables/Dsdt.asl | 8 +-
> .../RaspberryPi/RPi3/AcpiTables/Fadt.aslc | 8 +-
> .../RaspberryPi/RPi3/AcpiTables/Gtdt.aslc | 8 +-
> .../RaspberryPi/RPi3/AcpiTables/Madt.aslc | 8 +-
> Platform/RaspberryPi/RPi3/AcpiTables/Pep.asl | 8 +-
> Platform/RaspberryPi/RPi3/AcpiTables/Pep.c | 8 +-
> Platform/RaspberryPi/RPi3/AcpiTables/Pep.h | 8 +-
> Platform/RaspberryPi/RPi3/AcpiTables/Rhpx.asl | 8 +-
> Platform/RaspberryPi/RPi3/AcpiTables/Sdhc.asl | 8 +-
> Platform/RaspberryPi/RPi3/AcpiTables/Spcr.asl | 8 +-
> Platform/RaspberryPi/RPi3/AcpiTables/Uart.asl | 8 +-
> .../ArasanMmcHostDxe/ArasanMmcHostDxe.c | 8 +-
> .../ArasanMmcHostDxe/ArasanMmcHostDxe.h | 8 +-
> .../ArasanMmcHostDxe/ArasanMmcHostDxe.inf | 8 +-
> .../RPi3/Drivers/ConfigDxe/ConfigDxe.c | 8 +-
> .../RPi3/Drivers/ConfigDxe/ConfigDxe.inf | 9 +-
> .../Drivers/ConfigDxe/ConfigDxeFormSetGuid.h | 8 +-
> .../RPi3/Drivers/ConfigDxe/ConfigDxeHii.uni | 8 +-
> .../RPi3/Drivers/ConfigDxe/ConfigDxeHii.vfr | 8 +-
> .../RPi3/Drivers/DisplayDxe/ComponentName.c | 8 +-
> .../RPi3/Drivers/DisplayDxe/DisplayDxe.c | 8 +-
> .../RPi3/Drivers/DisplayDxe/DisplayDxe.h | 8 +-
> .../RPi3/Drivers/DisplayDxe/DisplayDxe.inf | 8 +-
> .../RPi3/Drivers/DisplayDxe/Screenshot.c | 8 +-
> .../RPi3/Drivers/DwUsbHostDxe/ComponentName.c | 8 +-
> .../RPi3/Drivers/DwUsbHostDxe/DriverBinding.c | 8 +-
> .../RPi3/Drivers/DwUsbHostDxe/DwUsbHostDxe.c | 8 +-
> .../RPi3/Drivers/DwUsbHostDxe/DwUsbHostDxe.h | 8 +-
> .../Drivers/DwUsbHostDxe/DwUsbHostDxe.inf | 8 +-
> .../RPi3/Drivers/DwUsbHostDxe/DwcHw.h | 8 +-
> .../RaspberryPi/RPi3/Drivers/FdtDxe/FdtDxe.c | 8 +-
> .../RPi3/Drivers/FdtDxe/FdtDxe.inf | 8 +-
> .../GraphicsConsoleDxe/ComponentName.c | 8 +-
> .../GraphicsConsoleDxe/GraphicsConsole.c | 8 +-
> .../GraphicsConsoleDxe/GraphicsConsole.h | 8 +-
> .../GraphicsConsoleDxe/GraphicsConsoleDxe.inf | 9 +-
> .../GraphicsConsoleDxe/GraphicsConsoleDxe.uni | 8 +-
> .../GraphicsConsoleDxeExtra.uni | 8 +-
> .../RPi3/Drivers/GraphicsConsoleDxe/NewFont.c | 8 +-
> .../RPi3/Drivers/MmcDxe/ComponentName.c | 8 +-
> .../RPi3/Drivers/MmcDxe/Diagnostics.c | 8 +-
> .../RaspberryPi/RPi3/Drivers/MmcDxe/Mmc.c | 8 +-
> .../RaspberryPi/RPi3/Drivers/MmcDxe/Mmc.h | 8 +-
> .../RPi3/Drivers/MmcDxe/MmcBlockIo.c | 8 +-
> .../RPi3/Drivers/MmcDxe/MmcDebug.c | 8 +-
> .../RPi3/Drivers/MmcDxe/MmcDxe.inf | 8 +-
> .../RPi3/Drivers/MmcDxe/MmcIdentification.c | 8 +-
> .../PlatformSmbiosDxe/PlatformSmbiosDxe.c | 8 +-
> .../PlatformSmbiosDxe/PlatformSmbiosDxe.inf | 8 +-
> .../Drivers/RpiFirmwareDxe/RpiFirmwareDxe.c | 8 +-
> .../Drivers/RpiFirmwareDxe/RpiFirmwareDxe.inf | 8 +-
> .../RPi3/Drivers/SdHostDxe/SdHostDxe.c | 8 +-
> .../RPi3/Drivers/SdHostDxe/SdHostDxe.inf | 8 +-
> .../RPi3/Drivers/VarBlockServiceDxe/FileIo.c | 8 +-
> .../RPi3/Drivers/VarBlockServiceDxe/FvbInfo.c | 8 +-
> .../VarBlockServiceDxe/VarBlockService.c | 8 +-
> .../VarBlockServiceDxe/VarBlockService.h | 8 +-
> .../VarBlockServiceDxe/VarBlockServiceDxe.c | 8 +-
> .../VarBlockServiceDxe/VarBlockServiceDxe.inf | 9 +-
> .../RaspberryPi/RPi3/Include/Protocol/DwUsb.h | 8 +-
> .../RPi3/Include/Protocol/ExtendedTextOut.h | 8 +-
> .../RPi3/Include/Protocol/RpiFirmware.h | 8 +-
> .../RPi3/Include/Protocol/RpiMmcHost.h | 8 +-
> .../MemoryInitPeiLib/MemoryInitPeiLib.c | 8 +-
> .../MemoryInitPeiLib/MemoryInitPeiLib.inf | 8 +-
> .../PlatformBootManagerLib/PlatformBm.c | 8 +-
> .../PlatformBootManagerLib/PlatformBm.h | 8 +-
> .../PlatformBootManagerLib.inf | 9 +-
> .../PlatformLib/AArch64/RaspberryPiHelper.S | 8 +-
> .../RPi3/Library/PlatformLib/PlatformLib.inf | 8 +-
> .../RPi3/Library/PlatformLib/RaspberryPi.c | 8 +-
> .../RPi3/Library/PlatformLib/RaspberryPiMem.c | 8 +-
> .../PlatformUiAppLib/PlatformUiAppLib.c | 8 +-
> .../RPi3/Library/ResetLib/ResetLib.c | 8 +-
> .../RPi3/Library/ResetLib/ResetLib.inf | 8 +-
> Platform/RaspberryPi/RPi3/RPi3.dec | 9 +-
> Platform/RaspberryPi/RPi3/RPi3.dsc | 9 +-
> Platform/RaspberryPi/RPi3/RPi3.fdf | 9 +-
> .../Socionext/DeveloperBox/DeveloperBox.dsc | 8 +-
> .../DeveloperBox/DeveloperBox.dsc.inc | 8 +-
> .../Socionext/DeveloperBox/DeveloperBox.fdf | 8 +-
> .../Socionext/DeveloperBox/DeveloperBoxMm.dsc | 8 +-
> .../Socionext/DeveloperBox/DeveloperBoxMm.fdf | 8 +-
> Platform/Socionext/DeveloperBox/Logo/Logo.c | 8 +-
> Platform/Socionext/DeveloperBox/Logo/Logo.idf | 8 +-
> .../Socionext/DeveloperBox/Logo/LogoDxe.inf | 7 +-
> .../SmbiosPlatformDxe/SmbiosPlatformDxe.c | 8 +-
> .../SmbiosPlatformDxe/SmbiosPlatformDxe.inf | 7 +-
> .../SystemFirmwareDescriptor.inf | 8 +-
> .../SystemFirmwareDescriptorPei.c | 8 +-
> .../SystemFirmwareDescriptorTable.aslc | 8 +-
> .../SystemFirmwareUpdateConfig.ini | 8 +-
> .../SynQuacerEvalBoard/SynQuacerEvalBoard.dsc | 8 +-
> .../SynQuacerEvalBoard/SynQuacerEvalBoard.fdf | 8 +-
> .../SystemFirmwareDescriptor.inf | 8 +-
> .../SystemFirmwareDescriptorPei.c | 8 +-
> .../SystemFirmwareDescriptorTable.aslc | 8 +-
> .../SystemFirmwareUpdateConfig.ini | 8 +-
> Platform/SoftIron/License.txt | 25 -
> .../FdtBlob/styx-overdrive1000.dts | 9 +-
> .../Overdrive1000Board/Overdrive1000Board.dsc | 8 +-
> .../Overdrive1000Board/Overdrive1000Board.fdf | 8 +-
> .../Armada80x0McBin/Armada80x0McBin.fdf.inc | 8 +-
> .../Armada80x0McBinBoardDescLib.c | 8 +-
> .../Armada80x0McBinBoardDescLib.inf | 8 +-
> .../NonDiscoverableInitLib.c | 8 +-
> .../NonDiscoverableInitLib.h | 8 +-
> .../NonDiscoverableInitLib.inf | 8 +-
> Readme.md | 5 +
> Silicon/AMD/Styx/AmdStyx.dec | 8 +-
> .../AMD/Styx/Common/Protocol/AmdMpCoreInfo.h | 8 +-
> Silicon/AMD/Styx/Common/SocVersion.h | 8 +-
> Silicon/AMD/Styx/Common/Varstore.fdf.inc | 9 +-
> .../Drivers/AcpiPlatformDxe/AcpiPlatform.c | 8 +-
> .../Drivers/AcpiPlatformDxe/AcpiPlatform.h | 8 +-
> .../AcpiPlatformDxe/AcpiPlatformDxe.inf | 8 +-
> .../Styx/Drivers/AcpiPlatformDxe/Csrt.aslc | 8 +-
> .../Styx/Drivers/AcpiPlatformDxe/Dbg2.aslc | 8 +-
> .../AMD/Styx/Drivers/AcpiPlatformDxe/Dsdt.asl | 8 +-
> .../Styx/Drivers/AcpiPlatformDxe/Fadt.aslc | 8 +-
> .../Styx/Drivers/AcpiPlatformDxe/Gtdt.aslc | 8 +-
> .../Styx/Drivers/AcpiPlatformDxe/Iort.aslc | 8 +-
> .../Styx/Drivers/AcpiPlatformDxe/Madt.aslc | 8 +-
> .../Styx/Drivers/AcpiPlatformDxe/Mcfg.aslc | 8 +-
> .../Styx/Drivers/AcpiPlatformDxe/Pptt.aslc | 8 +-
> .../Styx/Drivers/AcpiPlatformDxe/Spcr.aslc | 8 +-
> .../Styx/Drivers/AcpiPlatformDxe/SsdtB1.asl | 8 +-
> .../Styx/Drivers/AcpiPlatformDxe/SsdtKcs.asl | 8 +-
> .../Styx/Drivers/AcpiPlatformDxe/SsdtXgbe.asl | 8 +-
> .../Styx/Drivers/PlatInitDxe/PlatInitDxe.c | 8 +-
> .../Styx/Drivers/PlatInitDxe/PlatInitDxe.inf | 8 +-
> .../Styx/Drivers/PlatInitPei/PlatInitPei.c | 8 +-
> .../Styx/Drivers/PlatInitPei/PlatInitPei.inf | 8 +-
> .../PlatformSmbiosDxe/PlatformSmbiosDxe.c | 8 +-
> .../PlatformSmbiosDxe/PlatformSmbiosDxe.inf | 8 +-
> .../AMD/Styx/Drivers/StyxRngDxe/StyxRngDxe.c | 8 +-
> .../Styx/Drivers/StyxRngDxe/StyxRngDxe.inf | 8 +-
> .../StyxSataPlatformDxe/InitController.c | 8 +-
> .../StyxSataPlatformDxe/SataRegisters.h | 8 +-
> .../StyxSataPlatformDxe.inf | 8 +-
> .../Styx/Drivers/StyxSpiFvDxe/StyxSpiFvDxe.c | 8 +-
> .../Drivers/StyxSpiFvDxe/StyxSpiFvDxe.inf | 8 +-
> .../AmdStyxHelperLib/AmdStyxHelperLib.c | 8 +-
> .../AmdStyxHelperLib/AmdStyxHelperLib.inf | 8 +-
> .../Styx/Library/AmdStyxLib/AArch64/Helper.S | 8 +-
> .../Styx/Library/AmdStyxLib/AmdStyxLib.inf | 8 +-
> .../Styx/Library/AmdStyxLib/AmdStyxLibSec.inf | 8 +-
> Silicon/AMD/Styx/Library/AmdStyxLib/Styx.c | 8 +-
> Silicon/AMD/Styx/Library/AmdStyxLib/StyxMem.c | 8 +-
> .../AmdStyxPciHostBridgeLib.c | 8 +-
> .../AmdStyxPciHostBridgeLib.inf | 8 +-
> .../Library/MemoryInitPei/MemoryInitPeiLib.c | 8 +-
> .../MemoryInitPei/MemoryInitPeiLib.inf | 8 +-
> .../RealTimeClockLib/RealTimeClockLib.c | 8 +-
> .../RealTimeClockLib/RealTimeClockLib.inf | 7 +-
> .../StyxDtbLoaderLib/StyxDtbLoaderLib.c | 8 +-
> .../StyxDtbLoaderLib/StyxDtbLoaderLib.inf | 8 +-
> .../StyxPlatformFlashAccessLib.c | 8 +-
> .../StyxPlatformFlashAccessLib.inf | 8 +-
> Silicon/AMD/Styx/License.txt | 25 -
> Silicon/Atmel/AtSha204a/AtSha204a.dec | 8 +-
> Silicon/Atmel/AtSha204a/AtSha204aDriver.c | 8 +-
> Silicon/Atmel/AtSha204a/AtSha204aDriver.h | 8 +-
> Silicon/Atmel/AtSha204a/AtSha204aDxe.inf | 8 +-
> Silicon/Atmel/AtSha204a/ComponentName.c | 8 +-
> Silicon/Atmel/AtSha204a/DriverBinding.c | 8 +-
> Silicon/Broadcom/Bcm283x/Bcm283x.dec | 9 +-
> .../Drivers/InterruptDxe/InterruptDxe.c | 8 +-
> .../Drivers/InterruptDxe/InterruptDxe.inf | 8 +-
> .../Broadcom/Bcm283x/Drivers/RngDxe/RngDxe.c | 8 +-
> .../Bcm283x/Drivers/RngDxe/RngDxe.inf | 8 +-
> .../Include/IndustryStandard/Bcm2836Gpio.h | 8 +-
> .../Include/IndustryStandard/Bcm2836SdHost.h | 8 +-
> .../Include/IndustryStandard/Bcm2836Sdio.h | 8 +-
> .../Bcm283x/Include/Library/GpioLib.h | 8 +-
> .../Bcm283x/Library/GpioLib/GpioLib.c | 8 +-
> .../Bcm283x/Library/GpioLib/GpioLib.inf | 8 +-
> .../Drivers/AcpiPlatformDxe/AcpiPlatform.c | 8 +-
> .../AcpiPlatformDxe/AcpiPlatformDxe.inf | 8 +-
> .../Drivers/AcpiPlatformDxe/EthMac.c | 8 +-
> .../Drivers/AcpiPlatformDxe/EthMac.h | 8 +-
> .../Drivers/FlashFvbDxe/FlashBlockIoDxe.c | 8 +-
> .../Drivers/FlashFvbDxe/FlashFvbDxe.c | 8 +-
> .../Drivers/FlashFvbDxe/FlashFvbDxe.h | 8 +-
> .../Drivers/FlashFvbDxe/FlashFvbDxe.inf | 8 +-
> .../HisiAcpiPlatformDxe/AcpiPlatform.c | 8 +-
> .../HisiAcpiPlatformDxe/AcpiPlatform.uni | 8 +-
> .../HisiAcpiPlatformDxe/AcpiPlatformDxe.inf | 8 +-
> .../HisiAcpiPlatformDxe/AcpiPlatformExtra.uni | 8 +-
> .../HisiAcpiPlatformDxe/UpdateAcpiTable.c | 8 +-
> .../HisiAcpiPlatformDxe/UpdateAcpiTable.h | 8 +-
> .../Drivers/NorFlashDxe/NorFlashConfig.c | 8 +-
> .../Drivers/NorFlashDxe/NorFlashDxe.c | 8 +-
> .../Drivers/NorFlashDxe/NorFlashDxe.inf | 8 +-
> .../Drivers/NorFlashDxe/NorFlashHw.c | 8 +-
> .../Drivers/NorFlashDxe/NorFlashHw.h | 8 +-
> .../Drivers/PciPlatform/PciPlatform.c | 8 +-
> .../Drivers/PciPlatform/PciPlatform.inf | 8 +-
> .../Drivers/SasPlatform/SasPlatform.c | 8 +-
> .../Drivers/SasPlatform/SasPlatform.inf | 8 +-
> Silicon/Hisilicon/Drivers/SasV1Dxe/SasV1Dxe.c | 8 +-
> .../Hisilicon/Drivers/SasV1Dxe/SasV1Dxe.inf | 8 +-
> .../Smbios/AddSmbiosType9/AddSmbiosType9.c | 8 +-
> .../Smbios/AddSmbiosType9/AddSmbiosType9.h | 8 +-
> .../Smbios/AddSmbiosType9/AddSmbiosType9.inf | 8 +-
> .../Smbios/MemorySubClassDxe/MemorySubClass.c | 8 +-
> .../Smbios/MemorySubClassDxe/MemorySubClass.h | 8 +-
> .../MemorySubClassDxe/MemorySubClassDxe.inf | 8 +-
> .../MemorySubClassStrings.uni | 8 +-
> .../ProcessorSubClassDxe/ProcessorSubClass.c | 8 +-
> .../ProcessorSubClassDxe/ProcessorSubClass.h | 8 +-
> .../ProcessorSubClassDxe.inf | 8 +-
> .../ProcessorSubClassStrings.uni | 8 +-
> .../Drivers/Smbios/SmbiosMiscDxe/SmbiosMisc.h | 8 +-
> .../SmbiosMiscDxe/SmbiosMiscDataTable.c | 8 +-
> .../Smbios/SmbiosMiscDxe/SmbiosMiscDxe.inf | 7 +-
> .../SmbiosMiscDxe/SmbiosMiscEntryPoint.c | 8 +-
> .../SmbiosMiscDxe/SmbiosMiscLibString.uni | 8 +-
> .../SmbiosMiscDxe/Type00/MiscBiosVendor.uni | 8 +-
> .../SmbiosMiscDxe/Type00/MiscBiosVendorData.c | 8 +-
> .../Type00/MiscBiosVendorFunction.c | 8 +-
> .../Type01/MiscSystemManufacturer.uni | 8 +-
> .../Type01/MiscSystemManufacturerData.c | 8 +-
> .../Type01/MiscSystemManufacturerFunction.c | 8 +-
> .../Type02/MiscBaseBoardManufacturer.uni | 8 +-
> .../Type02/MiscBaseBoardManufacturerData.c | 8 +-
> .../MiscBaseBoardManufacturerFunction.c | 8 +-
> .../Type03/MiscChassisManufacturer.uni | 8 +-
> .../Type03/MiscChassisManufacturerData.c | 8 +-
> .../Type03/MiscChassisManufacturerFunction.c | 8 +-
> .../Type09/MiscSystemSlotDesignation.uni | Bin
> 1592 -> 826 bytes
> .../Type09/MiscSystemSlotDesignationData.c | 8 +-
> .../MiscSystemSlotDesignationFunction.c | 8 +-
> .../MiscNumberOfInstallableLanguages.uni | 8 +-
> .../MiscNumberOfInstallableLanguagesData.c | 8 +-
> ...MiscNumberOfInstallableLanguagesFunction.c | 8 +-
> .../Type32/MiscBootInformationData.c | 8 +-
> .../Type32/MiscBootInformationFunction.c | 8 +-
> .../Type38/MiscIpmiDeviceInformationData.c | 8 +-
> .../MiscIpmiDeviceInformationFunction.c | 8 +-
> .../Drivers/SnpPlatform/SnpPlatform.c | 8 +-
> .../Drivers/SnpPlatform/SnpPlatform.inf | 8 +-
> .../Drivers/UpdateFdtDxe/UpdateFdtDxe.c | 8 +-
> .../Drivers/UpdateFdtDxe/UpdateFdtDxe.inf | 8 +-
> .../Drivers/VersionInfoPeim/VersionInfoPeim.c | 8 +-
> .../VersionInfoPeim/VersionInfoPeim.inf | 8 +-
> .../VirtualEhciPciIo/VirtualEhciPciIo.c | 8 +-
> .../VirtualEhciPciIo/VirtualEhciPciIo.inf | 8 +-
> .../Hi1610/Drivers/IoInitDxe/IoInitDxe.c | 8 +-
> .../Hi1610/Drivers/IoInitDxe/IoInitDxe.inf | 8 +-
> .../Hi1610/Drivers/PcieInit1610/PcieInit.c | 8 +-
> .../Hi1610/Drivers/PcieInit1610/PcieInit.h | 8 +-
> .../Drivers/PcieInit1610/PcieInitDxe.inf | 8 +-
> .../Hi1610/Drivers/PcieInit1610/PcieInitLib.c | 8 +-
> .../Hi1610/Drivers/PcieInit1610/PcieInitLib.h | 8 +-
> .../Drivers/PcieInit1610/PcieKernelApi.h | 8 +-
> Silicon/Hisilicon/Hi1610/Hi1610.dec | 8 +-
> .../Hi1610AcpiTables/AcpiTablesHi1610.inf | 8 +-
> .../Hi1610/Hi1610AcpiTables/D03Mcfg.aslc | 7 +-
> .../Hi1610/Hi1610AcpiTables/Dsdt/CPU.asl | 8 +-
> .../Hi1610/Hi1610AcpiTables/Dsdt/Com.asl | 8 +-
> .../Hi1610/Hi1610AcpiTables/Dsdt/D03Hns.asl | 8 +-
> .../Hi1610/Hi1610AcpiTables/Dsdt/D03Mbig.asl | 8 +-
> .../Hi1610/Hi1610AcpiTables/Dsdt/D03Pci.asl | 8 +-
> .../Hi1610/Hi1610AcpiTables/Dsdt/D03Sas.asl | 8 +-
> .../Hi1610/Hi1610AcpiTables/Dsdt/D03Usb.asl | 8 +-
> .../Hi1610AcpiTables/Dsdt/DsdtHi1610.asl | 8 +-
> .../Hi1610/Hi1610AcpiTables/Dsdt/Lpc.asl | 8 +-
> .../Hi1610/Hi1610AcpiTables/Facs.aslc | 8 +-
> .../Hi1610/Hi1610AcpiTables/Fadt.aslc | 8 +-
> .../Hi1610/Hi1610AcpiTables/Gtdt.aslc | 8 +-
> .../Hi1610/Hi1610AcpiTables/Hi1610Platform.h | 8 +-
> .../Hi1610/Hi1610AcpiTables/MadtHi1610.aslc | 8 +-
> .../Hi1610/Hi1610AcpiTables/Slit.aslc | 7 +-
> .../Hi1610/Hi1610AcpiTables/Srat.aslc | 7 +-
> .../Hisilicon/Hi1610/Include/PlatformArch.h | 8 +-
> .../Hi161xPciPlatformLib.c | 8 +-
> .../Hi161xPciPlatformLib.inf | 7 +-
> .../Hi161xPciSegmentLib.inf | 7 +-
> .../Hi161xPciSegmentLib/PciSegmentLib.c | 9 +-
> .../Hi1616/D05AcpiTables/AcpiTablesHi1616.inf | 8 +-
> .../Hi1616/D05AcpiTables/D05Mcfg.aslc | 7 +-
> .../Hi1616/D05AcpiTables/D05Slit.aslc | 7 +-
> .../Hi1616/D05AcpiTables/D05Spcr.aslc | 8 +-
> .../Hi1616/D05AcpiTables/D05Srat.aslc | 7 +-
> .../Hi1616/D05AcpiTables/Dsdt/CPU.asl | 8 +-
> .../Hi1616/D05AcpiTables/Dsdt/Com.asl | 8 +-
> .../Hi1616/D05AcpiTables/Dsdt/D05Hns.asl | 8 +-
> .../Hi1616/D05AcpiTables/Dsdt/D05I2c.asl | 8 +-
> .../Hi1616/D05AcpiTables/Dsdt/D05Mbig.asl | 8 +-
> .../Hi1616/D05AcpiTables/Dsdt/D05Pci.asl | 8 +-
> .../Hi1616/D05AcpiTables/Dsdt/D05Sas.asl | 8 +-
> .../Hi1616/D05AcpiTables/Dsdt/D05Usb.asl | 8 +-
> .../Hi1616/D05AcpiTables/Dsdt/DsdtHi1616.asl | 8 +-
> .../Hi1616/D05AcpiTables/Dsdt/Lpc.asl | 8 +-
> .../Hisilicon/Hi1616/D05AcpiTables/Facs.aslc | 8 +-
> .../Hisilicon/Hi1616/D05AcpiTables/Fadt.aslc | 8 +-
> .../Hisilicon/Hi1616/D05AcpiTables/Gtdt.aslc | 8 +-
> .../Hi1616/D05AcpiTables/Hi1616Platform.h | 8 +-
> .../Hi1616/D05AcpiTables/MadtHi1616.aslc | 8 +-
> Silicon/Hisilicon/Hi1616/Hi1616.dec | 8 +-
> .../Hisilicon/Hi1616/Include/PlatformArch.h | 8 +-
> Silicon/Hisilicon/Hi1616/Pptt/Pptt.c | 8 +-
> Silicon/Hisilicon/Hi1616/Pptt/Pptt.h | 8 +-
> Silicon/Hisilicon/Hi1616/Pptt/Pptt.inf | 8 +-
> Silicon/Hisilicon/Hi1620/Drivers/Apei/Apei.c | 8 +-
> Silicon/Hisilicon/Hi1620/Drivers/Apei/Apei.h | 8 +-
> .../Hisilicon/Hi1620/Drivers/Apei/Apei.inf | 8 +-
> .../Hisilicon/Hi1620/Drivers/Apei/Bert/Bert.c | 8 +-
> .../Hisilicon/Hi1620/Drivers/Apei/Bert/Bert.h | 8 +-
> .../Hisilicon/Hi1620/Drivers/Apei/Einj/Einj.c | 8 +-
> .../Hisilicon/Hi1620/Drivers/Apei/Einj/Einj.h | 8 +-
> .../Hi1620/Drivers/Apei/ErrorSource/Ghes.c | 8 +-
> .../Hi1620/Drivers/Apei/ErrorSource/Ghes.h | 8 +-
> .../Hisilicon/Hi1620/Drivers/Apei/Erst/Erst.c | 8 +-
> .../Hisilicon/Hi1620/Drivers/Apei/Erst/Erst.h | 8 +-
> .../Hisilicon/Hi1620/Drivers/Apei/Hest/Hest.c | 8 +-
> .../Hisilicon/Hi1620/Drivers/Apei/Hest/Hest.h | 8 +-
> .../Hi1620/Drivers/Apei/OemApeiHi1620.c | 8 +-
> .../Hi1620/Drivers/Apei/OemApeiHi1620.h | 8 +-
> .../Pl011DebugSerialPortInitDxe.c | 8 +-
> .../Pl011DebugSerialPortInitDxe.inf | 8 +-
> Silicon/Hisilicon/Hi1620/Hi1620.dec | 8 +-
> .../Hi1620AcpiTables/AcpiTablesHi1620.inf | 8 +-
> .../Hi1620/Hi1620AcpiTables/Dsdt/CPU.asl | 8 +-
> .../Hi1620/Hi1620AcpiTables/Dsdt/Com.asl | 8 +-
> .../Hi1620AcpiTables/Dsdt/DsdtHi1620.asl | 8 +-
> .../Hi1620AcpiTables/Dsdt/Hi1620Apei.asl | 8 +-
> .../Hi1620AcpiTables/Dsdt/Hi1620Ged.asl | 8 +-
> .../Hi1620AcpiTables/Dsdt/Hi1620Mbig.asl | 8 +-
> .../Hi1620AcpiTables/Dsdt/Hi1620Mctp.asl | 8 +-
> .../Hi1620AcpiTables/Dsdt/Hi1620Pci.asl | 8 +-
> .../Hi1620AcpiTables/Dsdt/Hi1620Power.asl | 8 +-
> .../Hi1620AcpiTables/Dsdt/Hi1620Rde.asl | 8 +-
> .../Hi1620AcpiTables/Dsdt/Hi1620Sec.asl | 8 +-
> .../Dsdt/Hi1620Socip4_i2c100k.asl | 8 +-
> .../Dsdt/Hi1620Socip4_i2c400k.asl | 8 +-
> .../Hi1620AcpiTables/Dsdt/LpcUart_clk.asl | 8 +-
> .../Hi1620AcpiTables/Dsdt/Pv680UncorePmu.asl | 8 +-
> .../Hi1620/Hi1620AcpiTables/Dsdt/ipmi.asl | 8 +-
> .../Hi1620/Hi1620AcpiTables/Facs.aslc | 8 +-
> .../Hi1620/Hi1620AcpiTables/Fadt.aslc | 8 +-
> .../Hi1620/Hi1620AcpiTables/Gtdt.aslc | 8 +-
> .../Hi1620/Hi1620AcpiTables/Hi1620Dbg2.aslc | 7 +-
> .../Hi1620/Hi1620AcpiTables/Hi1620Mcfg.aslc | 7 +-
> .../Hi1620/Hi1620AcpiTables/Hi1620Platform.h | 8 +-
> .../Hi1620/Hi1620AcpiTables/Hi1620Slit.aslc | 7 +-
> .../Hi1620/Hi1620AcpiTables/Hi1620Spcr.aslc | 8 +-
> .../Hi1620/Hi1620AcpiTables/Hi1620Srat.aslc | 7 +-
> .../Hi1620/Hi1620AcpiTables/MadtHi1620.aslc | 8 +-
> .../Hi1620OemConfigUiLib/MemoryConfig.hfr | 8 +-
> .../Hi1620OemConfigUiLib/MemoryConfig.uni | 8 +-
> .../Hi1620OemConfigUiLib/MiscConfig.hfr | 8 +-
> .../Hi1620OemConfigUiLib/MiscConfig.uni | 8 +-
> .../Hi1620/Hi1620OemConfigUiLib/OemConfig.c | 8 +-
> .../Hi1620/Hi1620OemConfigUiLib/OemConfig.h | 8 +-
> .../Hi1620/Hi1620OemConfigUiLib/OemConfigUi.h | 8 +-
> .../Hi1620OemConfigUiLib/OemConfigUiLib.inf | 8 +-
> .../Hi1620OemConfigUiLib/OemConfigUiLib.uni | 8 +-
> .../OemConfigUiLibStrings.uni | 8 +-
> .../Hi1620OemConfigUiLib/OemConfigVfr.vfr | 8 +-
> .../Hi1620OemConfigUiLib/PcieConfig.hfr | 8 +-
> .../PcieConfigStrings.uni | 8 +-
> .../Hi1620OemConfigUiLib/PciePortConfig.hfr | 8 +-
> .../Hi1620/Hi1620OemConfigUiLib/RasConfig.hfr | 8 +-
> .../Hi1620/Hi1620OemConfigUiLib/RasConfig.uni | 8 +-
> .../Hi1620OemConfigUiLib/iBMCConfig.hfr | 8 +-
> .../Hi1620OemConfigUiLib/iBMCConfig.uni | 8 +-
> .../Hisilicon/Hi1620/Include/PlatformArch.h | 8 +-
> .../Hi1620PciPlatformLib.c | 8 +-
> .../Hi1620PciPlatformLib.inf | 7 +-
> Silicon/Hisilicon/Hi1620/Pptt/Pptt.c | 8 +-
> Silicon/Hisilicon/Hi1620/Pptt/Pptt.h | 8 +-
> Silicon/Hisilicon/Hi1620/Pptt/Pptt.inf | 8 +-
> Silicon/Hisilicon/Hi3660/Hi3660.dec | 8 +-
> Silicon/Hisilicon/Hi3660/Include/Hi3660.h | 8 +-
> Silicon/Hisilicon/Hi6220/Hi6220.dec | 8 +-
> Silicon/Hisilicon/Hi6220/Include/Hi6220.h | 8 +-
> .../Hisilicon/Hi6220/Include/Hi6220RegsPeri.h | 8 +-
> Silicon/Hisilicon/HisiPkg.dec | 8 +-
> Silicon/Hisilicon/Hisilicon.dsc.inc | 8 +-
> Silicon/Hisilicon/Hisilicon.fdf.inc | 8 +-
> .../Hisilicon/Include/Guid/MemoryMapData.h | 8 +-
> .../Include/Guid/VersionInfoHobGuid.h | 8 +-
> .../Hisilicon/Include/Library/AcpiNextLib.h | 8 +-
> .../Include/Library/BmcConfigBootLib.h | 8 +-
> Silicon/Hisilicon/Include/Library/CpldIoLib.h | 8 +-
> .../Hisilicon/Include/Library/FdtUpdateLib.h | 8 +-
> .../Hisilicon/Include/Library/HwMemInitLib.h | 8 +-
> Silicon/Hisilicon/Include/Library/I2CLib.h | 8 +-
> .../Hisilicon/Include/Library/OemConfigData.h | 8 +-
> .../Hisilicon/Include/Library/OemDevicePath.h | 8 +-
> .../Hisilicon/Include/Library/OemMiscLib.h | 8 +-
> Silicon/Hisilicon/Include/Library/OemNicLib.h | 8 +-
> .../Include/Library/OemSetVirtualMapDesc.h | 8 +-
> .../Include/Library/PlatformPciLib.h | 8 +-
> .../Include/Protocol/HisiBoardNicProtocol.h | 8 +-
> .../Protocol/HisiPlatformSasProtocol.h | 8 +-
> .../Include/Protocol/HisiSpiFlashProtocol.h | 8 +-
> .../Include/Protocol/IpmiInterfaceProtocol.h | 8 +-
> .../Include/Protocol/NorFlashProtocol.h | 8 +-
> .../Include/Protocol/PlatformSasProtocol.h | 8 +-
> .../Include/Protocol/SnpPlatformProtocol.h | 8 +-
> .../Include/Regs/HisiPcieV1RegOffset.h | 8 +-
> .../ArmPlatformLibHisilicon/AArch64/Helper.S | 8 +-
> .../ArmPlatformLibHisilicon/ArmPlatformLib.c | 8 +-
> .../ArmPlatformLib.inf | 8 +-
> .../ArmPlatformLibMem.c | 8 +-
> .../ArmPlatformLibSec.inf | 8 +-
> .../BmcConfigBootLib/BmcConfigBootLib.c | 8 +-
> .../BmcConfigBootLib/BmcConfigBootLib.inf | 8 +-
> .../Hisilicon/Library/CpldIoLib/CpldIoLib.c | 8 +-
> .../Hisilicon/Library/CpldIoLib/CpldIoLib.inf | 8 +-
> .../Library/CpldIoLib/CpldIoLibRuntime.c | 8 +-
> .../Library/CpldIoLib/CpldIoLibRuntime.inf | 8 +-
> .../DS3231RealTimeClock.h | 8 +-
> .../DS3231RealTimeClockLib.c | 8 +-
> .../DS3231RealTimeClockLib.inf | 7 +-
> .../Dw8250SerialPortLib/Dw8250SerialPortLib.c | 8 +-
> .../Dw8250SerialPortLib/Dw8250SerialPortLib.h | 8 +-
> .../Dw8250SerialPortLib.inf | 8 +-
> .../Dw8250SerialPortRuntimeLib.c | 8 +-
> .../Dw8250SerialPortRuntimeLib.h | 8 +-
> .../Dw8250SerialPortRuntimeLib.inf | 8 +-
> Silicon/Hisilicon/Library/I2CLib/I2CHw.h | 8 +-
> Silicon/Hisilicon/Library/I2CLib/I2CLib.c | 8 +-
> Silicon/Hisilicon/Library/I2CLib/I2CLib.inf | 8 +-
> .../Hisilicon/Library/I2CLib/I2CLibCommon.c | 8 +-
> .../Hisilicon/Library/I2CLib/I2CLibInternal.h | 8 +-
> .../Hisilicon/Library/I2CLib/I2CLibRuntime.c | 8 +-
> .../Library/I2CLib/I2CLibRuntime.inf | 8 +-
> .../M41T83RealTimeClock.h | 8 +-
> .../M41T83RealTimeClockLib.c | 8 +-
> .../M41T83RealTimeClockLib.inf | 8 +-
> .../PlatformBootManagerLib/PlatformBm.c | 8 +-
> .../PlatformBootManagerLib/PlatformBm.h | 8 +-
> .../PlatformBootManagerLib.inf | 9 +-
> .../PlatformFlashAccessLibDxe.c | 8 +-
> .../PlatformFlashAccessLibDxe.inf | 8 +-
> .../PlatformIntelBdsLib/IntelBdsPlatform.c | 8 +-
> .../PlatformIntelBdsLib/IntelBdsPlatform.h | 8 +-
> .../IntelBdsPlatformCommon.c | 8 +-
> .../IntelBdsPlatformCommon.h | 8 +-
> .../PlatformIntelBdsLib.inf | 9 +-
> .../RealTimeClockLib.c | 8 +-
> .../RealTimeClockLib.inf | 8 +-
> .../KabylakeSiliconPkg/Contributions.txt | 218 --
> -----
> .../Cpu/Include/ConfigBlock/CpuConfig.h | 8 +-
> .../Include/ConfigBlock/CpuConfigFspData.h | 8 +-
> .../ConfigBlock/CpuConfigLibPreMemConfig.h | 8 +-
> .../ConfigBlock/CpuOverclockingConfig.h | 8 +-
> .../Include/ConfigBlock/CpuPidTestConfig.h | 8 +-
> .../ConfigBlock/CpuPowerMgmtBasicConfig.h | 8 +-
> .../ConfigBlock/CpuPowerMgmtCustomConfig.h | 8 +-
> .../ConfigBlock/CpuPowerMgmtPsysConfig.h | 8 +-
> .../ConfigBlock/CpuPowerMgmtTestConfig.h | 8 +-
> .../ConfigBlock/CpuPowerMgmtVrConfig.h | 8 +-
> .../Cpu/Include/ConfigBlock/CpuTestConfig.h | 8 +-
> .../Cpu/Include/CpuAccess.h | 8 +-
> .../Cpu/Include/CpuDataStruct.h | 8 +-
> .../Cpu/Include/CpuPolicyCommon.h | 8 +-
> .../Cpu/Include/CpuPowerMgmt.h | 8 +-
> .../KabylakeSiliconPkg/Cpu/Include/CpuRegs.h | 8 +-
> .../Cpu/Include/Library/CpuMailboxLib.h | 8 +-
> .../Cpu/Include/Library/CpuPlatformLib.h | 8 +-
> .../Cpu/Include/Library/CpuPolicyLib.h | 8 +-
> .../Cpu/Include/Library/CpuPolicyLibPreMem.h | 8 +-
> .../Cpu/Include/Protocol/CpuGlobalNvsArea.h | 8 +-
> .../Cpu/Include/Protocol/CpuInfo.h | 8 +-
> .../Cpu/IncludePrivate/CpuInitDataHob.h | 8 +-
> .../Cpu/IncludePrivate/CpuPrivateData.h | 8 +-
> .../Cpu/IncludePrivate/Library/CpuCommonLib.h | 8 +-
> .../Cpu/IncludePrivate/PowerMgmtNvsStruct.h | 8 +-
> .../BaseCpuMailboxLibNull.c | 8 +-
> .../BaseCpuMailboxLibNull.inf | 8 +-
> .../Library/PeiCpuPolicyLib/CpuPrintPolicy.c | 8 +-
> .../Library/PeiCpuPolicyLib/PeiCpuPolicyLib.c | 8 +-
> .../PeiCpuPolicyLib/PeiCpuPolicyLib.inf | 8 +-
> .../PeiCpuPolicyLib/PeiCpuPolicyLibrary.h | 8 +-
> .../PeiCpuPolicyLibPreMem/CpuPrintPolicy.c | 8 +-
> .../PeiCpuPolicyLibPreMem/PeiCpuPolicyLib.c | 8 +-
> .../PeiCpuPolicyLibPreMem.inf | 8 +-
> .../PeiCpuPolicyLibrary.h | 8 +-
> .../CpuPlatformLibrary.c | 8 +-
> .../CpuPlatformLibrary.h | 8 +-
> .../PeiDxeSmmCpuPlatformLib.inf | 8 +-
> .../PeiDxeSmmCpuCommonLib/CpuCommonLib.c | 8 +-
> .../PeiDxeSmmCpuCommonLib.inf | 8 +-
> .../Hsti/Dxe/BootFirmwareMediaProtection.c | 8 +-
> .../Hsti/Dxe/DebugModeDisabled.c | 8 +-
> .../Hsti/Dxe/HardwareRootedBootIntegrity.c | 8 +-
> .../Hsti/Dxe/HstiSiliconDxe.c | 8 +-
> .../Hsti/Dxe/HstiSiliconDxe.h | 8 +-
> .../Hsti/Dxe/HstiSiliconDxe.inf | 8 +-
> .../Hsti/Dxe/IntegratedDeviceDmaProtection.c | 8 +-
> .../Hsti/Dxe/MeasuredBootEnforcement.c | 8 +-
> .../Hsti/Dxe/MpServiceHelp.c | 8 +-
> .../Hsti/Dxe/SecureCpuConfiguration.c | 8 +-
> .../SecureIntegratedGraphicsConfiguration.c | 8 +-
> .../Hsti/Dxe/SecureMemoryMapConfiguration.c | 8 +-
> .../Hsti/Dxe/SecurePCHConfiguration.c | 8 +-
> .../Hsti/Dxe/SecureSystemAgentConfiguration.c | 8 +-
> .../Hsti/Dxe/SignedFirmwareUpdate.c | 8 +-
> .../KabylakeSiliconPkg/Include/ConfigBlock.h | 8 +-
> .../Include/HstiFeatureBit.h | 8 +-
> .../Include/Library/AslUpdateLib.h | 8 +-
> .../Include/Library/ConfigBlockLib.h | 8 +-
> .../Include/Library/MmPciLib.h | 8 +-
> .../Include/Library/PeiSiPolicyUpdateLib.h | 8 +-
> .../Include/Library/SiConfigBlockLib.h | 8 +-
> .../Include/Library/SiPolicyLib.h | 8 +-
> .../Include/Library/SiliconInitLib.h | 8 +-
> .../KabylakeSiliconPkg/Include/PcieRegs.h | 8 +-
> .../Include/Ppi/SiInitPpi.h | 8 +-
> .../KabylakeSiliconPkg/Include/Ppi/SiPolicy.h | 8 +-
> .../Include/Protocol/SiPolicyProtocol.h | 8 +-
> .../Include/SiPolicyStruct.h | 8 +-
> .../IncludePrivate/Library/PcieInitLib.h | 8 +-
> .../IncludePrivate/SiConfigHob.h | 8 +-
> .../KabylakeSiliconBuild.bat | 8 +-
> .../KabylakeSiliconPkg/KabylakeSiliconPkg.dsc | 8 +-
> .../KabylakeSiliconPrivate.dec | 8 +-
> .../BaseConfigBlockLib/BaseConfigBlockLib.c | 8 +-
> .../BaseConfigBlockLib/BaseConfigBlockLib.inf | 8 +-
> .../BaseSiConfigBlockLib.c | 8 +-
> .../BaseSiConfigBlockLib.inf | 8 +-
> .../Library/DxeAslUpdateLib/DxeAslUpdateLib.c | 8 +-
> .../DxeAslUpdateLib/DxeAslUpdateLib.inf | 8 +-
> .../DxeAslUpdateLibNull/DxeAslUpdateLibNull.c | 8 +-
> .../DxeAslUpdateLibNull.inf | 8 +-
> .../DxeSiliconPolicyInitLib/DxePolicyInit.c | 8 +-
> .../DxeSiliconPolicyInitLib/DxeSaPolicyInit.h | 8 +-
> .../DxeSiliconPolicyInitLib.inf | 8 +-
> .../PeiDxeSmmMmPciLib/PeiDxeSmmMmPciLib.c | 8 +-
> .../PeiDxeSmmMmPciLib/PeiDxeSmmMmPciLib.inf | 8 +-
> .../Library/PeiSiPolicyLib/PeiSiPolicyLib.c | 8 +-
> .../Library/PeiSiPolicyLib/PeiSiPolicyLib.inf | 8 +-
> .../PeiSiPolicyLib/PeiSiPolicyLibPreMem.c | 8 +-
> .../PeiSiPolicyLib/PeiSiPolicyLibrary.h | 8 +-
> .../Library/PeiSiPolicyLib/SiPrintPolicy.c | 8 +-
> .../PeiSiliconPolicyInitLib/PeiPolicyInit.c | 8 +-
> .../PeiSiliconPolicyInitLib/PeiPolicyInit.h | 8 +-
> .../PeiPolicyInitPreMem.c | 8 +-
> .../PeiSiliconPolicyInitLib/PeiSiPolicyInit.h | 8 +-
> .../PeiSiliconPolicyInitLib.inf | 8 +-
> ...iPostMemSiliconPolicyInitLibDependency.inf | 8 +-
> ...eiPreMemSiliconPolicyInitLibDependency.inf | 8 +-
> .../PeiSiliconPolicyInitLibDependency.c | 8 +-
> .../PeiFspCpuPolicyInitLib.c | 8 +-
> .../PeiFspMePolicyInitLib.c | 8 +-
> .../PeiFspMiscUpdInitLib.c | 8 +-
> .../PeiFspPchPolicyInitLib.c | 8 +-
> .../PeiFspPolicyInitLib.c | 8 +-
> .../PeiFspPolicyInitLib.h | 8 +-
> .../PeiFspSaPolicyInitLib.c | 8 +-
> .../PeiFspSiPolicyInitLib.c | 8 +-
> .../PeiPolicyInit.c | 8 +-
> .../PeiPolicyInit.h | 8 +-
> .../PeiPolicyInitLib.h | 8 +-
> .../PeiPolicyInitPreMem.c | 8 +-
> .../PeiSiPolicyInit.h | 8 +-
> .../PeiSiliconPolicyInitLibFsp.inf | 8 +-
> .../Library/SiliconInitLib/SiliconInit.c | 8 +-
> .../Library/SiliconInitLib/SiliconInitLib.inf | 8 +-
> .../SiliconInitLib/SiliconInitPreMem.c | 8 +-
> Silicon/Intel/KabylakeSiliconPkg/License.txt | 25 -
> .../Me/Include/ConfigBlock/MePeiConfig.h | 8 +-
> .../Me/Include/Library/PeiMePolicyLib.h | 8 +-
> .../KabylakeSiliconPkg/Me/Include/MeChipset.h | 8 +-
> .../Me/Include/MePolicyCommon.h | 8 +-
> .../Library/PeiMePolicyLib/PeiMePolicyLib.c | 8 +-
> .../Library/PeiMePolicyLib/PeiMePolicyLib.inf | 8 +-
> .../PeiMePolicyLib/PeiMePolicyLibrary.h | 8 +-
> .../Pch/AcpiTables/Dsdt/GpioAcpiDefines.h | 8 +-
> .../Pch/AcpiTables/Dsdt/GpioLib.asl | 8 +-
> .../Pch/AcpiTables/Dsdt/GpioLibObjects.asl | 8 +-
> .../Pch/AcpiTables/Dsdt/IrqLink.asl | 8 +-
> .../Pch/AcpiTables/Dsdt/Pch.asl | 8 +-
> .../Pch/AcpiTables/Dsdt/PchAcpiTables.inf | 8 +-
> .../Pch/AcpiTables/Dsdt/PchHda.asl | 8 +-
> .../Pch/AcpiTables/Dsdt/PchHeci.asl | 8 +-
> .../Pch/AcpiTables/Dsdt/PchIsh.asl | 8 +-
> .../Pch/AcpiTables/Dsdt/PchNvs.asl | 8 +-
> .../Pch/AcpiTables/Dsdt/PchPcie.asl | 8 +-
> .../Pch/AcpiTables/Dsdt/PchRstPcieStorage.asl | 8 +-
> .../Pch/AcpiTables/Dsdt/PchSata.asl | 8 +-
> .../Pch/AcpiTables/Dsdt/PchScs.asl | 8 +-
> .../Pch/AcpiTables/Dsdt/PchSerialIo.asl | 8 +-
> .../Pch/AcpiTables/Dsdt/PchXdci.asl | 8 +-
> .../Pch/AcpiTables/Dsdt/PchXhci.asl | 8 +-
> .../Pch/AcpiTables/Dsdt/TraceHubDebug.asl | 8 +-
> .../Pch/AcpiTables/Dsdt/usbsbd.asl | 8 +-
> .../Pch/Include/ConfigBlock/Cio2Config.h | 8 +-
> .../Pch/Include/ConfigBlock/DciConfig.h | 8 +-
> .../Pch/Include/ConfigBlock/DmiConfig.h | 8 +-
> .../Pch/Include/ConfigBlock/EspiConfig.h | 8 +-
> .../ConfigBlock/FlashProtectionConfig.h | 8 +-
> .../Pch/Include/ConfigBlock/HdAudioConfig.h | 8 +-
> .../Pch/Include/ConfigBlock/HpetConfig.h | 8 +-
> .../Pch/Include/ConfigBlock/HsioConfig.h | 8 +-
> .../Pch/Include/ConfigBlock/HsioPcieConfig.h | 8 +-
> .../Pch/Include/ConfigBlock/HsioSataConfig.h | 8 +-
> .../Pch/Include/ConfigBlock/InterruptConfig.h | 8 +-
> .../Pch/Include/ConfigBlock/IoApicConfig.h | 8 +-
> .../Pch/Include/ConfigBlock/IshConfig.h | 8 +-
> .../Pch/Include/ConfigBlock/LanConfig.h | 8 +-
> .../Pch/Include/ConfigBlock/LockDownConfig.h | 8 +-
> .../Pch/Include/ConfigBlock/LpcConfig.h | 8 +-
> .../Pch/Include/ConfigBlock/P2sbConfig.h | 8 +-
> .../Include/ConfigBlock/PchGeneralConfig.h | 8 +-
> .../Pch/Include/ConfigBlock/PcieRpConfig.h | 8 +-
> .../Pch/Include/ConfigBlock/PmConfig.h | 8 +-
> .../Pch/Include/ConfigBlock/Port61Config.h | 8 +-
> .../Pch/Include/ConfigBlock/SataConfig.h | 8 +-
> .../Pch/Include/ConfigBlock/ScsConfig.h | 8 +-
> .../Pch/Include/ConfigBlock/SerialIoConfig.h | 8 +-
> .../Pch/Include/ConfigBlock/SerialIrqConfig.h | 8 +-
> .../Pch/Include/ConfigBlock/SmbusConfig.h | 8 +-
> .../Pch/Include/ConfigBlock/SpiConfig.h | 8 +-
> .../Pch/Include/ConfigBlock/ThermalConfig.h | 8 +-
> .../Pch/Include/ConfigBlock/TraceHubConfig.h | 8 +-
> .../Pch/Include/ConfigBlock/UsbConfig.h | 8 +-
> .../Pch/Include/ConfigBlock/WatchDogConfig.h | 8 +-
> .../Pch/Include/GpioConfig.h | 8 +-
> .../Pch/Include/GpioPinsSklH.h | 8 +-
> .../Pch/Include/GpioPinsSklLp.h | 8 +-
> .../Pch/Include/Library/GpioLib.h | 8 +-
> .../Pch/Include/Library/GpioNativeLib.h | 8 +-
> .../Pch/Include/Library/OcWdtLib.h | 8 +-
> .../Pch/Include/Library/PchCycleDecodingLib.h | 8 +-
> .../Pch/Include/Library/PchEspiLib.h | 8 +-
> .../Pch/Include/Library/PchGbeLib.h | 8 +-
> .../Pch/Include/Library/PchHsioLib.h | 8 +-
> .../Pch/Include/Library/PchInfoLib.h | 8 +-
> .../Pch/Include/Library/PchP2sbLib.h | 8 +-
> .../Pch/Include/Library/PchPcieRpLib.h | 8 +-
> .../Pch/Include/Library/PchPcrLib.h | 8 +-
> .../Pch/Include/Library/PchPmcLib.h | 8 +-
> .../Pch/Include/Library/PchPolicyLib.h | 8 +-
> .../Pch/Include/Library/PchPsfLib.h | 8 +-
> .../Pch/Include/Library/PchResetLib.h | 8 +-
> .../Pch/Include/Library/PchSbiAccessLib.h | 8 +-
> .../Pch/Include/Library/PchSerialIoLib.h | 8 +-
> .../Pch/Include/Library/PchSerialIoUartLib.h | 8 +-
> .../Pch/Include/Library/PchSmmControlLib.h | 8 +-
> .../Pch/Include/Library/PchWdtCommonLib.h | 8 +-
> .../Pch/Include/Library/SecPchLib.h | 8 +-
> .../Pch/Include/Library/SpiFlashCommonLib.h | 8 +-
> .../Pch/Include/Library/SpiLib.h | 8 +-
> .../Pch/Include/Library/TraceHubInitLib.h | 8 +-
> .../Pch/Include/PchAccess.h | 8 +-
> .../Pch/Include/PchLimits.h | 8 +-
> .../Pch/Include/PchPcieStorageDetectHob.h | 8 +-
> .../Pch/Include/PchPolicyCommon.h | 8 +-
> .../Pch/Include/PchPreMemPolicyCommon.h | 8 +-
> .../Pch/Include/PchReservedResources.h | 8 +-
> .../Pch/Include/PchResetPlatformSpecific.h | 8 +-
> .../Pch/Include/Ppi/PchReset.h | 8 +-
> .../KabylakeSiliconPkg/Pch/Include/Ppi/Spi.h | 8 +-
> .../KabylakeSiliconPkg/Pch/Include/Ppi/Wdt.h | 8 +-
> .../Pch/Include/Protocol/PchAcpiSmiDispatch.h | 8 +-
> .../Pch/Include/Protocol/PchEmmcTuning.h | 8 +-
> .../Pch/Include/Protocol/PchEspiSmiDispatch.h | 8 +-
> .../Protocol/PchGpioUnlockSmiDispatch.h | 8 +-
> .../Pch/Include/Protocol/PchInfo.h | 8 +-
> .../Pch/Include/Protocol/PchPcieSmiDispatch.h | 8 +-
> .../Pch/Include/Protocol/PchReset.h | 8 +-
> .../Pch/Include/Protocol/PchSmiDispatch.h | 8 +-
> .../Include/Protocol/PchSmmIoTrapControl.h | 8 +-
> .../Protocol/PchSmmPeriodicTimerControl.h | 8 +-
> .../Pch/Include/Protocol/PchTcoSmiDispatch.h | 8 +-
> .../Pch/Include/Protocol/SerialGpio.h | 8 +-
> .../Pch/Include/Protocol/Spi.h | 8 +-
> .../Pch/Include/Protocol/Wdt.h | 8 +-
> .../Pch/Include/Register/PchRegsCam.h | 8 +-
> .../Pch/Include/Register/PchRegsDci.h | 8 +-
> .../Pch/Include/Register/PchRegsDmi.h | 8 +-
> .../Pch/Include/Register/PchRegsFia.h | 8 +-
> .../Pch/Include/Register/PchRegsGpio.h | 8 +-
> .../Pch/Include/Register/PchRegsHda.h | 8 +-
> .../Pch/Include/Register/PchRegsHsio.h | 8 +-
> .../Pch/Include/Register/PchRegsIsh.h | 8 +-
> .../Pch/Include/Register/PchRegsItss.h | 8 +-
> .../Pch/Include/Register/PchRegsLan.h | 8 +-
> .../Pch/Include/Register/PchRegsLpc.h | 8 +-
> .../Pch/Include/Register/PchRegsP2sb.h | 8 +-
> .../Pch/Include/Register/PchRegsPcie.h | 8 +-
> .../Pch/Include/Register/PchRegsPcr.h | 8 +-
> .../Pch/Include/Register/PchRegsPmc.h | 8 +-
> .../Pch/Include/Register/PchRegsPsf.h | 8 +-
> .../Pch/Include/Register/PchRegsPsth.h | 8 +-
> .../Pch/Include/Register/PchRegsSata.h | 8 +-
> .../Pch/Include/Register/PchRegsScs.h | 8 +-
> .../Pch/Include/Register/PchRegsSerialIo.h | 8 +-
> .../Pch/Include/Register/PchRegsSmbus.h | 8 +-
> .../Pch/Include/Register/PchRegsSpi.h | 8 +-
> .../Pch/Include/Register/PchRegsThermal.h | 8 +-
> .../Pch/Include/Register/PchRegsTraceHub.h | 8 +-
> .../Pch/Include/Register/PchRegsUsb.h | 8 +-
> .../IncludePrivate/Library/DxePchHdaNhlt.h | 8 +-
> .../IncludePrivate/Library/GpioPrivateLib.h | 8 +-
> .../Library/I2cMasterCommonLib.h | 8 +-
> .../Pch/IncludePrivate/Library/PchHdaLib.h | 8 +-
> .../IncludePrivate/Library/PchInitCommonLib.h | 8 +-
> .../Library/PchPciExpressHelpersLib.h | 8 +-
> .../IncludePrivate/Library/PchPsfPrivateLib.h | 8 +-
> .../Library/PchSmbusCommonLib.h | 8 +-
> .../IncludePrivate/Library/PchSpiCommonLib.h | 8 +-
> .../IncludePrivate/Library/PeiI2cMasterLib.h | 8 +-
> .../IncludePrivate/Library/RstPrivateLib.h | 8 +-
> .../Pch/IncludePrivate/PchConfigHob.h | 8 +-
> .../Pch/IncludePrivate/PchHdaEndpoints.h | 8 +-
> .../Pch/IncludePrivate/Protocol/PchNvs.h | 8 +-
> .../Pch/IncludePrivate/Protocol/PchNvsArea.h | 8 +-
> .../Pch/IncludePrivate/Protocol/PcieIoTrap.h | 8 +-
> .../BaseResetSystemLib/BaseResetSystemLib.c | 8 +-
> .../BaseResetSystemLib/BaseResetSystemLib.inf | 8 +-
> .../Pch/Library/BaseSmbusLib/BaseSmbusLib.c | 8 +-
> .../Pch/Library/BaseSmbusLib/BaseSmbusLib.inf | 8 +-
> .../DxeResetSystemLib/DxeResetSystemLib.c | 8 +-
> .../DxeResetSystemLib/DxeResetSystemLib.inf | 8 +-
> .../DxeRuntimeResetSystemLib.c | 8 +-
> .../DxeRuntimeResetSystemLib.inf | 8 +-
> .../Pch/Library/PeiDxeSmmGpioLib/GpioInit.c | 8 +-
> .../Pch/Library/PeiDxeSmmGpioLib/GpioLib.c | 8 +-
> .../Library/PeiDxeSmmGpioLib/GpioLibrary.h | 8 +-
> .../Library/PeiDxeSmmGpioLib/GpioNativeLib.c | 8 +-
> .../Library/PeiDxeSmmGpioLib/PchSklGpioData.c | 8 +-
> .../PeiDxeSmmGpioLib/PeiDxeSmmGpioLib.inf | 8 +-
> .../PchCycleDecodingLib.c | 8 +-
> .../PeiDxeSmmPchCycleDecodingLib.inf | 8 +-
> .../Library/PeiDxeSmmPchGbeLib/PchGbeLib.c | 8 +-
> .../PeiDxeSmmPchGbeLib/PeiDxeSmmPchGbeLib.inf | 8 +-
> .../Library/PeiDxeSmmPchHsioLib/PchHsioLib.c | 8 +-
> .../PeiDxeSmmPchHsioLib.inf | 8 +-
> .../Library/PeiDxeSmmPchInfoLib/PchInfoLib.c | 8 +-
> .../PeiDxeSmmPchInfoLib/PchInfoStrLib.c | 8 +-
> .../PeiDxeSmmPchInfoLib.inf | 8 +-
> .../Library/PeiDxeSmmPchP2sbLib/PchP2sbLib.c | 8 +-
> .../PeiDxeSmmPchP2sbLib.inf | 8 +-
> .../PeiDxeSmmPchPcieRpLib/PchPcieRpLib.c | 8 +-
> .../PeiDxeSmmPchPcieRpLib.inf | 8 +-
> .../Library/PeiDxeSmmPchPcrLib/PchPcrLib.c | 8 +-
> .../PeiDxeSmmPchPcrLib/PeiDxeSmmPchPcrLib.inf | 8 +-
> .../Library/PeiDxeSmmPchPmcLib/PchPmcLib.c | 8 +-
> .../PeiDxeSmmPchPmcLib/PeiDxeSmmPchPmcLib.inf | 8 +-
> .../Library/PeiDxeSmmPchPsfLib/PchPsfLib.c | 8 +-
> .../PeiDxeSmmPchPsfLib/PeiDxeSmmPchPsfLib.inf | 8 +-
> .../PchSbiAccessLib.c | 8 +-
> .../PeiDxeSmmPchSbiAccessLib.inf | 8 +-
> .../PeiDxeSmmPchSerialIoLib.c | 8 +-
> .../PeiDxeSmmPchSerialIoLib.inf | 8 +-
> .../PeiDxeSmmPchWdtCommonLib.inf | 8 +-
> .../PeiDxeSmmPchWdtCommonLib/WdtCommon.c | 8 +-
> .../Pch/Library/PeiOcWdtLib/PeiOcWdtLib.c | 8 +-
> .../Pch/Library/PeiOcWdtLib/PeiOcWdtLib.inf | 8 +-
> .../Library/PeiOcWdtLibNull/PeiOcWdtLibNull.c | 8 +-
> .../PeiOcWdtLibNull/PeiOcWdtLibNull.inf | 8 +-
> .../PeiPchPolicyLib/PchPreMemPrintPolicy.c | 8 +-
> .../Library/PeiPchPolicyLib/PchPrintPolicy.c | 8 +-
> .../PeiPchPolicyLib/PchSamplePolicyLib.c | 8 +-
> .../PchSamplePreMemPolicyLib.c | 8 +-
> .../Library/PeiPchPolicyLib/PeiPchPolicyLib.c | 8 +-
> .../PeiPchPolicyLib/PeiPchPolicyLib.inf | 8 +-
> .../PeiPchPolicyLib/PeiPchPolicyLibrary.h | 8 +-
> .../PeiPchPolicyLib/PeiPchPreMemPolicyLib.c | 8 +-
> .../Pch/Library/PeiPchResetLib/PchReset.c | 8 +-
> .../Library/PeiPchResetLib/PeiPchResetLib.inf | 8 +-
> .../PeiResetSystemLib/PeiResetSystemLib.c | 8 +-
> .../PeiResetSystemLib/PeiResetSystemLib.inf | 8 +-
> .../PeiResetSystemLibFsp.inf | 8 +-
> .../Pch/Library/PeiSpiLib/PeiSpiLib.c | 8 +-
> .../Pch/Library/PeiSpiLib/PeiSpiLib.inf | 8 +-
> .../SmmSpiFlashCommonLib.inf | 8 +-
> .../SmmSpiFlashCommonLib/SpiFlashCommon.c | 8 +-
> .../SpiFlashCommonSmmLib.c | 8 +-
> .../BasePchSpiCommonLib.inf | 8 +-
> .../BasePchSpiCommonLib/SpiCommon.c | 8 +-
> .../DxePchHdaLib/DxePchHdaLib.inf | 8 +-
> .../DxePchHdaLib/PchHdaEndpoints.c | 8 +-
> .../LibraryPrivate/DxePchHdaLib/PchHdaLib.c | 8 +-
> .../DxePchHdaLib/PchHdaNhltConfig.c | 8 +-
> .../I2cMasterCommonLib.c | 8 +-
> .../PeiDxeI2cMasterCommonLib.inf | 8 +-
> .../GpioNativePrivateLib.c | 8 +-
> .../PeiDxeSmmGpioPrivateLib/GpioPrivateLib.c | 8 +-
> .../PchSklGpioPrivateData.c | 8 +-
> .../PeiDxeSmmGpioPrivateLib.inf | 8 +-
> .../PeiDxeSmmPchInitCommonLib/PchInitCommon.c | 8 +-
> .../PeiDxeSmmPchInitCommonLib/PchRpfn.c | 8 +-
> .../PeiDxeSmmPchInitCommonLib.inf | 8 +-
> .../PchPciExpressHelpersLibrary.c | 8 +-
> .../PchPciExpressHelpersLibrary.h | 8 +-
> .../PeiDxeSmmPchPciExpressHelpersLib.inf | 8 +-
> .../PchPsfPrivateLib.c | 8 +-
> .../PeiDxeSmmPchPsfPrivateLib.inf | 8 +-
> .../PeiDxeSmmPchSmbusCommonLib/PchSmbusExec.c | 8 +-
> .../PeiDxeSmmPchSmbusCommonLib.inf | 8 +-
> .../PeiDxeSmmRstPrivateLib.c | 8 +-
> .../PeiDxeSmmRstPrivateLib.inf | 8 +-
> .../Pch/PchInit/Dxe/PchAcpi.c | 8 +-
> .../Pch/PchInit/Dxe/PchCio2Acpi.c | 8 +-
> .../Pch/PchInit/Dxe/PchHdaAcpi.c | 8 +-
> .../Pch/PchInit/Dxe/PchInit.c | 8 +-
> .../Pch/PchInit/Dxe/PchInit.h | 8 +-
> .../Pch/PchInit/Dxe/PchInitDxe.c | 8 +-
> .../Pch/PchInit/Dxe/PchInitDxe.inf | 8 +-
> .../Pch/PchInit/Dxe/PchInitDxeFsp.inf | 8 +-
> .../Pch/PchInit/Dxe/PchInitFsp.c | 8 +-
> .../Pch/PchInit/Dxe/PchRstPcieStorage.c | 8 +-
> .../Pch/PchInit/Dxe/PchSata.c | 8 +-
> .../Pch/PchInit/Dxe/PchScs.c | 8 +-
> .../Pch/PchInit/Dxe/PchSerialIo.c | 8 +-
> .../Pch/PchInit/Dxe/PchSerialIoDxe.c | 8 +-
> .../Pch/PchInit/Smm/PchBiosWriteProtect.c | 8 +-
> .../Pch/PchInit/Smm/PchGpioSxIsolationSmm.c | 8 +-
> .../Pch/PchInit/Smm/PchInitSmm.c | 8 +-
> .../Pch/PchInit/Smm/PchInitSmm.h | 8 +-
> .../Pch/PchInit/Smm/PchInitSmm.inf | 8 +-
> .../Pch/PchInit/Smm/PchLanSxSmm.c | 8 +-
> .../Pch/PchInit/Smm/PchPcieSmm.c | 8 +-
> .../Pch/PchInit/Smm/PchPort61hSmm.c | 8 +-
> .../Pch/PchInit/Smm/PchSpiAsync.c | 8 +-
> .../Pch/PchInit/Smm/PchXhciSxSmm.c | 8 +-
> .../Pch/PchSmiDispatcher/Smm/IoTrap.c | 8 +-
> .../Pch/PchSmiDispatcher/Smm/IoTrap.h | 8 +-
> .../Pch/PchSmiDispatcher/Smm/PchSmiDispatch.c | 8 +-
> .../PchSmiDispatcher/Smm/PchSmiDispatcher.inf | 8 +-
> .../Pch/PchSmiDispatcher/Smm/PchSmm.h | 8 +-
> .../Pch/PchSmiDispatcher/Smm/PchSmmCore.c | 8 +-
> .../Pch/PchSmiDispatcher/Smm/PchSmmEspi.c | 8 +-
> .../Pch/PchSmiDispatcher/Smm/PchSmmEspi.h | 8 +-
> .../Pch/PchSmiDispatcher/Smm/PchSmmGpi.c | 8 +-
> .../Pch/PchSmiDispatcher/Smm/PchSmmHelpers.c | 8 +-
> .../Pch/PchSmiDispatcher/Smm/PchSmmHelpers.h | 8 +-
> .../Smm/PchSmmPeriodicTimer.c | 8 +-
> .../PchSmiDispatcher/Smm/PchSmmPowerButton.c | 8 +-
> .../Pch/PchSmiDispatcher/Smm/PchSmmSw.c | 8 +-
> .../Pch/PchSmiDispatcher/Smm/PchSmmSx.c | 8 +-
> .../Pch/PchSmiDispatcher/Smm/PchSmmUsb.c | 8 +-
> .../Pch/PchSmiDispatcher/Smm/PchxSmmHelpers.c | 8 +-
> .../Pch/PchSmiDispatcher/Smm/PchxSmmHelpers.h | 8 +-
> .../Pch/SmmControl/RuntimeDxe/SmmControl.inf | 8 +-
> .../SmmControl/RuntimeDxe/SmmControlDriver.c | 8 +-
> .../SmmControl/RuntimeDxe/SmmControlDriver.h | 8 +-
> .../KabylakeSiliconPkg/Pch/Spi/Smm/PchSpi.c | 8 +-
> .../KabylakeSiliconPkg/Pch/Spi/Smm/PchSpi.h | 8 +-
> .../Pch/Spi/Smm/PchSpiSmm.inf | 8 +-
> .../Include/Library/SecPlatformLib.h | 8 +-
> .../Include/Guid/DataHubStatusCodeRecord.h | 8 +-
> .../Include/Guid/SmramMemoryReserve.h | 8 +-
> .../Include/Protocol/DataHub.h | 8 +-
> .../Include/Protocol/Legacy8259.h | 8 +-
> .../Include/Protocol/LegacyBios.h | 8 +-
> .../Include/Protocol/LegacyInterrupt.h | 8 +-
> .../MdeModulePkg/Include/Guid/AcpiS3Context.h | 9 +-
> .../Include/Guid/ConsoleOutDevice.h | 8 +-
> .../Include/Guid/MemoryTypeInformation.h | 8 +-
> .../Include/Library/ResetSystemLib.h | 8 +-
> .../MdeModulePkg/Include/Ppi/SmmAccess.h | 9 +-
> .../MdeModulePkg/Include/Ppi/SmmControl.h | 9 +-
> .../Include/Protocol/SmmVariable.h | 8 +-
> .../SampleCode/Pch/AcpiTables/Dsdt/PchSmb.asl | 8 +-
> Silicon/Intel/KabylakeSiliconPkg/SiPkg.dec | 8 +-
> .../KabylakeSiliconPkg/SiPkgBuildOption.dsc | 8 +-
> .../KabylakeSiliconPkg/SiPkgCommonLib.dsc | 8 +-
> Silicon/Intel/KabylakeSiliconPkg/SiPkgDxe.dsc | 8 +-
> .../Intel/KabylakeSiliconPkg/SiPkgDxeLib.dsc | 8 +-
> Silicon/Intel/KabylakeSiliconPkg/SiPkgPei.dsc | 8 +-
> .../Intel/KabylakeSiliconPkg/SiPkgPeiLib.dsc | 8 +-
> .../SystemAgent/AcpiTables/Dmar/Dmar.aslc | 8 +-
> .../SystemAgent/AcpiTables/Dmar/Dmar.h | 8 +-
> .../SystemAgent/AcpiTables/HostBus.asl | 8 +-
> .../SystemAgent/AcpiTables/SaAcpiTables.inf | 8 +-
> .../SystemAgent/AcpiTables/SaSsdt/Igfx.asl | 8 +-
> .../AcpiTables/SaSsdt/IgfxCommon.asl | 8 +-
> .../SystemAgent/AcpiTables/SaSsdt/IgfxDsm.asl | 8 +-
> .../AcpiTables/SaSsdt/IgfxOpGbda.asl | 8 +-
> .../AcpiTables/SaSsdt/IgfxOpRn.asl | 8 +-
> .../AcpiTables/SaSsdt/IgfxOpSbcb.asl | 8 +-
> .../SystemAgent/AcpiTables/SaSsdt/Sa.asl | 8 +-
> .../SystemAgent/AcpiTables/SaSsdt/SaNvs.asl | 8 +-
> .../SystemAgent/AcpiTables/SaSsdt/SaSsdt.asl | 8 +-
> .../SystemAgent/AcpiTables/SaSsdt/SaSsdt.inf | 8 +-
> .../Include/ConfigBlock/GraphicsDxeConfig.h | 8 +-
> .../Include/ConfigBlock/GraphicsPeiConfig.h | 8 +-
> .../Include/ConfigBlock/MemoryConfig.h | 8 +-
> .../Include/ConfigBlock/MiscDxeConfig.h | 8 +-
> .../ConfigBlock/SaMiscPeiPreMemConfig.h | 8 +-
> .../Include/ConfigBlock/VtdConfig.h | 8 +-
> .../SystemAgent/Include/DmaRemappingTable.h | 8 +-
> .../Include/Library/DxeSaPolicyLib.h | 8 +-
> .../Include/Library/PeiSaPolicyLib.h | 8 +-
> .../Include/Library/SaPlatformLib.h | 8 +-
> .../SystemAgent/Include/MemInfoHob.h | 8 +-
> .../SystemAgent/Include/Protocol/GopPolicy.h | 8 +-
> .../Include/Protocol/IgdOpRegion.h | 8 +-
> .../SystemAgent/Include/Protocol/MemInfo.h | 8 +-
> .../Include/Protocol/SaGlobalNvsArea.h | 8 +-
> .../SystemAgent/Include/Protocol/SaNvs.h | 8 +-
> .../SystemAgent/Include/Protocol/SaPolicy.h | 8 +-
> .../SystemAgent/Include/SaAccess.h | 8 +-
> .../SystemAgent/Include/SaPolicyCommon.h | 8 +-
> .../SystemAgent/Include/SaRegs.h | 8 +-
> .../SystemAgent/IncludePrivate/SaConfigHob.h | 8 +-
> .../Library/DxeSaPolicyLib/DxeSaPolicyLib.c | 8 +-
> .../Library/DxeSaPolicyLib/DxeSaPolicyLib.inf | 8 +-
> .../DxeSaPolicyLib/DxeSaPolicyLibrary.h | 8 +-
> .../PeiDxeSmmSaPlatformLib.inf | 8 +-
> .../SaPlatformLibrary.c | 8 +-
> .../SaPlatformLibrary.h | 8 +-
> .../PeiSaPolicyLib/Ia32/MrcOemPlatform.S | 8 +-
> .../PeiSaPolicyLib/Ia32/MrcOemPlatform.asm | 8 +-
> .../PeiSaPolicyLib/Ia32/MrcOemPlatform.nasm | 8 +-
> .../Library/PeiSaPolicyLib/MrcOemPlatform.c | 8 +-
> .../Library/PeiSaPolicyLib/MrcOemPlatform.h | 8 +-
> .../Library/PeiSaPolicyLib/PeiSaPolicyLib.c | 8 +-
> .../Library/PeiSaPolicyLib/PeiSaPolicyLib.inf | 8 +-
> .../PeiSaPolicyLib/PeiSaPolicyLibSample.c | 8 +-
> .../PeiSaPolicyLib/PeiSaPolicyLibrary.h | 8 +-
> .../Library/PeiSaPolicyLib/SaPrintPolicy.c | 8 +-
> .../MemoryInit/Include/MrcCommonTypes.h | 8 +-
> .../MemoryInit/Include/MrcInterface.h | 8 +-
> .../MemoryInit/Include/MrcRmtData.h | 8 +-
> .../MemoryInit/Include/MrcSpdData.h | 8 +-
> .../SystemAgent/MemoryInit/Include/MrcTypes.h | 8 +-
> .../SystemAgent/SaInit/Dxe/GraphicsInit.c | 8 +-
> .../SystemAgent/SaInit/Dxe/GraphicsInit.h | 8 +-
> .../SystemAgent/SaInit/Dxe/IgdOpRegion.c | 8 +-
> .../SystemAgent/SaInit/Dxe/IgdOpRegion.h | 8 +-
> .../SystemAgent/SaInit/Dxe/SaAcpi.c | 8 +-
> .../SystemAgent/SaInit/Dxe/SaInit.h | 8 +-
> .../SystemAgent/SaInit/Dxe/SaInitDxe.c | 8 +-
> .../SystemAgent/SaInit/Dxe/SaInitDxe.h | 8 +-
> .../SystemAgent/SaInit/Dxe/SaInitDxe.inf | 8 +-
> .../SystemAgent/SaInit/Dxe/VTd.c | 8 +-
> .../SystemAgent/SaInit/Dxe/VTd.h | 8 +-
> .../SystemAgent/SmmAccess/Dxe/SmmAccess.inf | 8 +-
> .../SmmAccess/Dxe/SmmAccessDriver.c | 8 +-
> .../SmmAccess/Dxe/SmmAccessDriver.h | 8 +-
> .../AcpiTables/Dsdt/GpioDefine.asl | 8 +-
> .../LewisburgPkg/AcpiTables/Dsdt/GpioLib.asl | 8 +-
> .../LewisburgPkg/AcpiTables/Dsdt/IrqLink.asl | 8 +-
> .../LewisburgPkg/AcpiTables/Dsdt/Pch.asl | 8 +-
> .../AcpiTables/Dsdt/PchAcpiTables.inf | 8 +-
> .../LewisburgPkg/AcpiTables/Dsdt/PchHda.asl | 8 +-
> .../LewisburgPkg/AcpiTables/Dsdt/PchHeci.asl | 8 +-
> .../LewisburgPkg/AcpiTables/Dsdt/PchIsh.asl | 8 +-
> .../LewisburgPkg/AcpiTables/Dsdt/PchNvs.asl | 8 +-
> .../LewisburgPkg/AcpiTables/Dsdt/PchPcie.asl | 8 +-
> .../AcpiTables/Dsdt/PchRstPcieStorage.asl | 8 +-
> .../LewisburgPkg/AcpiTables/Dsdt/PchSata.asl | 8 +-
> .../LewisburgPkg/AcpiTables/Dsdt/PchScs.asl | 8 +-
> .../AcpiTables/Dsdt/PchSerialIo.asl | 8 +-
> .../LewisburgPkg/AcpiTables/Dsdt/PchXdci.asl | 8 +-
> .../LewisburgPkg/AcpiTables/Dsdt/PchXhci.asl | 8 +-
> .../LewisburgPkg/AcpiTables/Dsdt/RP01_ADR.asl | 8 +-
> .../LewisburgPkg/AcpiTables/Dsdt/RP02_ADR.asl | 8 +-
> .../LewisburgPkg/AcpiTables/Dsdt/RP03_ADR.asl | 8 +-
> .../LewisburgPkg/AcpiTables/Dsdt/RP04_ADR.asl | 8 +-
> .../LewisburgPkg/AcpiTables/Dsdt/RP05_ADR.asl | 8 +-
> .../LewisburgPkg/AcpiTables/Dsdt/RP06_ADR.asl | 8 +-
> .../LewisburgPkg/AcpiTables/Dsdt/RP07_ADR.asl | 8 +-
> .../LewisburgPkg/AcpiTables/Dsdt/RP08_ADR.asl | 8 +-
> .../LewisburgPkg/AcpiTables/Dsdt/RP09_ADR.asl | 8 +-
> .../LewisburgPkg/AcpiTables/Dsdt/RP10_ADR.asl | 8 +-
> .../LewisburgPkg/AcpiTables/Dsdt/RP11_ADR.asl | 8 +-
> .../LewisburgPkg/AcpiTables/Dsdt/RP12_ADR.asl | 8 +-
> .../LewisburgPkg/AcpiTables/Dsdt/RP13_ADR.asl | 8 +-
> .../LewisburgPkg/AcpiTables/Dsdt/RP14_ADR.asl | 8 +-
> .../LewisburgPkg/AcpiTables/Dsdt/RP15_ADR.asl | 8 +-
> .../LewisburgPkg/AcpiTables/Dsdt/RP16_ADR.asl | 8 +-
> .../LewisburgPkg/AcpiTables/Dsdt/RP17_ADR.asl | 8 +-
> .../LewisburgPkg/AcpiTables/Dsdt/RP18_ADR.asl | 8 +-
> .../LewisburgPkg/AcpiTables/Dsdt/RP19_ADR.asl | 8 +-
> .../LewisburgPkg/AcpiTables/Dsdt/RP20_ADR.asl | 8 +-
> .../AcpiTables/Dsdt/TraceHubDebug.asl | 8 +-
> .../LewisburgPkg/AcpiTables/Dsdt/usbsbd.asl | 8 +-
> .../Intel/LewisburgPkg/Include/GpioConfig.h | 8 +-
> .../Intel/LewisburgPkg/Include/GpioPinsSklH.h | 8 +-
> .../LewisburgPkg/Include/GpioPinsSklLp.h | 8 +-
> .../LewisburgPkg/Include/Library/GpioLib.h | 8 +-
> .../Include/Library/GpioNativeLib.h | 8 +-
> .../Include/Library/PchCycleDecodingLib.h | 8 +-
> .../LewisburgPkg/Include/Library/PchGbeLib.h | 8 +-
> .../LewisburgPkg/Include/Library/PchInfoLib.h | 8 +-
> .../LewisburgPkg/Include/Library/PchP2sbLib.h | 8 +-
> .../LewisburgPkg/Include/Library/PchPcrLib.h | 8 +-
> .../LewisburgPkg/Include/Library/PchPmcLib.h | 8 +-
> .../Include/Library/PchPolicyLib.h | 8 +-
> .../Include/Library/PchSbiAccessLib.h | 8 +-
> .../Include/Library/PchSerialIoLib.h | 8 +-
> .../Include/Library/SpiFlashCommonLib.h | 8 +-
> .../Intel/LewisburgPkg/Include/PchAccess.h | 8 +-
> .../Intel/LewisburgPkg/Include/PchLimits.h | 8 +-
> .../LewisburgPkg/Include/PchPolicyCommon.h | 8 +-
> .../Include/PchReservedResources.h | 8 +-
> Silicon/Intel/LewisburgPkg/Include/PcieRegs.h | 8 +-
> .../Include/Ppi/PchPcieDeviceTable.h | 8 +-
> .../LewisburgPkg/Include/Ppi/PchPolicy.h | 8 +-
> .../Intel/LewisburgPkg/Include/Ppi/PchReset.h | 8 +-
> Silicon/Intel/LewisburgPkg/Include/Ppi/Spi.h | 8 +-
> .../LewisburgPkg/Include/Protocol/PchReset.h | 8 +-
> .../Intel/LewisburgPkg/Include/Protocol/Spi.h | 8 +-
> .../Include/Register/PchRegsDci.h | 8 +-
> .../Include/Register/PchRegsDmi.h | 8 +-
> .../Include/Register/PchRegsEva.h | 8 +-
> .../Include/Register/PchRegsFia.h | 8 +-
> .../Include/Register/PchRegsGpio.h | 8 +-
> .../Include/Register/PchRegsHda.h | 8 +-
> .../Include/Register/PchRegsHsio.h | 8 +-
> .../Include/Register/PchRegsIsh.h | 8 +-
> .../Include/Register/PchRegsItss.h | 8 +-
> .../Include/Register/PchRegsLan.h | 8 +-
> .../Include/Register/PchRegsLpc.h | 8 +-
> .../Include/Register/PchRegsP2sb.h | 8 +-
> .../Include/Register/PchRegsPcie.h | 8 +-
> .../Include/Register/PchRegsPcr.h | 8 +-
> .../Include/Register/PchRegsPmc.h | 8 +-
> .../Include/Register/PchRegsPsf.h | 8 +-
> .../Include/Register/PchRegsPsth.h | 8 +-
> .../Include/Register/PchRegsSata.h | 8 +-
> .../Include/Register/PchRegsScs.h | 8 +-
> .../Include/Register/PchRegsSerialIo.h | 8 +-
> .../Include/Register/PchRegsSmbus.h | 8 +-
> .../Include/Register/PchRegsSpi.h | 8 +-
> .../Include/Register/PchRegsThermal.h | 8 +-
> .../Include/Register/PchRegsTraceHub.h | 8 +-
> .../Include/Register/PchRegsUsb.h | 8 +-
> Silicon/Intel/LewisburgPkg/Include/SaRegs.h | 8 +-
> .../Library/PchResetCommonLib.h | 8 +-
> .../LewisburgPkg/IncludePrivate/PchHHsioAx.h | 8 +-
> .../LewisburgPkg/IncludePrivate/PchHHsioBx.h | 8 +-
> .../LewisburgPkg/IncludePrivate/PchHHsioDx.h | 8 +-
> .../LewisburgPkg/IncludePrivate/PchHsio.h | 8 +-
> .../IncludePrivate/PchLbgHsioAx.h | 8 +-
> .../IncludePrivate/PchLbgHsioBx.h | 8 +-
> .../IncludePrivate/PchLbgHsioBxD.h | 8 +-
> .../IncludePrivate/PchLbgHsioBxD_Ext.h | 8 +-
> .../IncludePrivate/PchLbgHsioBx_Ext.h | 8 +-
> .../IncludePrivate/PchLbgHsioSx.h | 8 +-
> .../IncludePrivate/PchLbgHsioSx_Ext.h | 8 +-
> .../LewisburgPkg/IncludePrivate/PchLpHsioBx.h | 8 +-
> .../LewisburgPkg/IncludePrivate/PchLpHsioCx.h | 8 +-
> .../IncludePrivate/PchPolicyHob.h | 8 +-
> .../DxeRuntimeResetSystemLib.inf | 8 +-
> .../DxeRuntimeResetSystemLib/PchReset.c | 8 +-
> .../DxeRuntimeResetSystemLib/PchReset.h | 8 +-
> .../Library/PeiDxeSmmGpioLib/GpioInit.c | 8 +-
> .../Library/PeiDxeSmmGpioLib/GpioLib.c | 8 +-
> .../Library/PeiDxeSmmGpioLib/GpioLibrary.h | 8 +-
> .../Library/PeiDxeSmmGpioLib/GpioNativeLib.c | 8 +-
> .../Library/PeiDxeSmmGpioLib/PchSklGpioData.c | 8 +-
> .../PeiDxeSmmGpioLib/PeiDxeSmmGpioLib.inf | 8 +-
> .../PchCycleDecodingLib.c | 8 +-
> .../PeiDxeSmmPchCycleDecodingLib.inf | 8 +-
> .../Library/PeiDxeSmmPchGbeLib/PchGbeLib.c | 8 +-
> .../PeiDxeSmmPchGbeLib/PeiDxeSmmPchGbeLib.inf | 8 +-
> .../Library/PeiDxeSmmPchInfoLib/PchInfoLib.c | 8 +-
> .../PeiDxeSmmPchInfoLib/PchInfoStrLib.c | 8 +-
> .../PeiDxeSmmPchInfoLib.inf | 8 +-
> .../Library/PeiDxeSmmPchP2sbLib/PchP2sbLib.c | 8 +-
> .../PeiDxeSmmPchP2sbLib.inf | 8 +-
> .../Library/PeiDxeSmmPchPcrLib/PchPcrLib.c | 8 +-
> .../PeiDxeSmmPchPcrLib/PeiDxeSmmPchPcrLib.inf | 8 +-
> .../Library/PeiDxeSmmPchPmcLib/PchPmcLib.c | 8 +-
> .../PeiDxeSmmPchPmcLib/PeiDxeSmmPchPmcLib.inf | 8 +-
> .../PchSbiAccessLib.c | 8 +-
> .../PeiDxeSmmPchSbiAccessLib.inf | 8 +-
> .../Library/PeiPchPolicyLib/PchPrintPolicy.c | 8 +-
> .../Library/PeiPchPolicyLib/PeiPchPolicyLib.c | 8 +-
> .../PeiPchPolicyLib/PeiPchPolicyLib.inf | 8 +-
> .../PeiPchPolicyLib/PeiPchPolicyLibrary.h | 8 +-
> .../Library/PeiPchPolicyLib/Rvp3PolicyLib.c | 8 +-
> .../SmmSpiFlashCommonLib.inf | 8 +-
> .../SmmSpiFlashCommonLib/SpiFlashCommon.c | 8 +-
> .../SpiFlashCommonSmmLib.c | 8 +-
> .../BasePchResetCommonLib.inf | 8 +-
> .../BasePchResetCommonLib/PchResetCommon.c | 8 +-
> Silicon/Intel/LewisburgPkg/PchCommonLib.dsc | 8 +-
> Silicon/Intel/LewisburgPkg/PchDxeLib.dsc | 8 +-
> Silicon/Intel/LewisburgPkg/PchPeiLib.dsc | 8 +-
> Silicon/Intel/LewisburgPkg/PchRcPkg.dec | 8 +-
> .../Include/Library/CsrToPcieAddress.h | 8 +-
> .../Include/Library/MmPciBaseLib.h | 8 +-
> .../PurleyRcPkg/Include/Library/PcieAddress.h | 8 +-
> .../Include/Library/PciePlatformHookLib.h | 8 +-
> .../Include/Library/UsraAccessApi.h | 8 +-
> Silicon/Intel/PurleyRcPkg/Include/MaxSocket.h | 8 +-
> .../Include/Ppi/SiliconRegAccess.h | 8 +-
> .../Include/Protocol/SiliconRegAccess.h | 8 +-
> .../PurleyRcPkg/Include/UsraAccessType.h | 8 +-
> .../Chip/Skx/Include/Iio/IioConfig.h | 8 +-
> .../Chip/Skx/Include/Iio/IioPlatformData.h | 8 +-
> .../Chip/Skx/Include/Iio/IioRegs.h | 8 +-
> .../Skx/Include/Iio/IioSetupDefinitions.h | 8 +-
> .../Chip/Skx/Include/KtiDisc.h | 8 +-
> .../Chip/Skx/Include/KtiHost.h | 8 +-
> .../Chip/Skx/Include/KtiSi.h | 8 +-
> .../Chip/Skx/Include/Protocol/CpuCsrAccess.h | 8 +-
> .../Chip/Skx/Include/Setup/IioUniversalData.h | 8 +-
> .../BaseMemoryCoreLib/Core/Include/CpuHost.h | 8 +-
> .../Core/Include/CsrToPcieAddress.h | 8 +-
> .../Core/Include/DataTypes.h | 8 +-
> .../BaseMemoryCoreLib/Core/Include/MemHost.h | 8 +-
> .../Core/Include/MemHostChipCommon.h | 8 +-
> .../BaseMemoryCoreLib/Core/Include/MemRegs.h | 8 +-
> .../Core/Include/MrcCommonTypes.h | 8 +-
> .../Core/Include/PcieAddress.h | 8 +-
> .../BaseMemoryCoreLib/Core/Include/Printf.h | 8 +-
> .../BaseMemoryCoreLib/Core/Include/SysHost.h | 8 +-
> .../Core/Include/SysHostChipCommon.h | 8 +-
> .../BaseMemoryCoreLib/Core/Include/SysRegs.h | 8 +-
> .../Core/Include/UsbDebugPort.h | 8 +-
> .../Platform/Purley/Include/MemDefaults.h | 8 +-
> .../Platform/Purley/Include/MemPlatform.h | 8 +-
> .../Platform/Purley/Include/PlatformHost.h | 8 +-
> .../CsrToPcieLibNull/BaseCsrToPcieLibNull.inf | 8 +-
> .../Library/CsrToPcieLibNull/CsrToPcieLib.c | 8 +-
> .../Library/DxeMmPciBaseLib/DxeMmPciBaseLib.c | 8 +-
> .../DxeMmPciBaseLib/DxeMmPciBaseLib.inf | 8 +-
> .../Library/DxeMmPciBaseLib/SmmMmPciBaseLib.c | 8 +-
> .../DxeMmPciBaseLib/SmmMmPciBaseLib.inf | 8 +-
> .../Library/MmPciBaseLib/MmPciBaseLib.c | 8 +-
> .../Library/MmPciBaseLib/MmPciBaseLib.inf | 8 +-
> .../Library/PcieAddressLib/PcieAddressLib.c | 8 +-
> .../Library/PcieAddressLib/PcieAddressLib.inf | 8 +-
> .../Library/UsraAccessLib/CsrAccess.c | 8 +-
> .../Library/UsraAccessLib/PcieAccess.c | 8 +-
> .../Library/UsraAccessLib/UsraAccessLib.c | 8 +-
> .../Library/UsraAccessLib/UsraAccessLib.h | 8 +-
> .../Library/UsraAccessLib/UsraAccessLib.inf | 8 +-
> Silicon/Intel/PurleyRcPkg/RcCommonLib.dsc | 8 +-
> Silicon/Intel/PurleyRcPkg/RcDxeLib.dsc | 8 +-
> Silicon/Intel/PurleyRcPkg/RcPeiLib.dsc | 8 +-
> Silicon/Intel/PurleyRcPkg/RcPkg.dec | 8 +-
> .../Iio/Include/Protocol/IioSystem.h | 8 +-
> .../Include/Guid/MemoryConfigData.h | 8 +-
> .../PurleySktPkg/Include/Guid/MemoryMapData.h | 8 +-
> .../Include/Guid/PartialMirrorGuid.h | 8 +-
> .../Include/Guid/SmramMemoryReserve.h | 8 +-
> .../Include/Guid/SocketCommonRcVariable.h | 8 +-
> .../Include/Guid/SocketIioVariable.h | 8 +-
> .../Include/Guid/SocketMemoryVariable.h | 8 +-
> .../Include/Guid/SocketMpLinkVariable.h | 8 +-
> .../Include/Guid/SocketPciResourceData.h | 8 +-
> .../Guid/SocketPowermanagementVariable.h | 8 +-
> .../Guid/SocketProcessorCoreVariable.h | 8 +-
> .../Include/Guid/SocketVariable.h | 8 +-
> .../PurleySktPkg/Include/Library/CpuPpmLib.h | 8 +-
> .../PurleySktPkg/Include/Protocol/IioUds.h | 8 +-
> .../Include/Protocol/PciCallback.h | 8 +-
> .../Include/SocketConfiguration.h | 8 +-
> .../Include/UncoreCommonIncludes.h | 8 +-
> .../Library/CsrToPcieLib/CpuCsrAccessDefine.h | 8 +-
> .../Library/CsrToPcieLib/CsrToPcieDxeLib.inf | 8 +-
> .../Library/CsrToPcieLib/CsrToPcieLib.c | 8 +-
> .../Library/CsrToPcieLib/CsrToPciePeiLib.inf | 8 +-
> .../Library/PcieAddressLib/PcieAddressLib.c | 8 +-
> .../Library/PcieAddressLib/PcieAddressLib.inf | 8 +-
> .../Chip/Common/CpuPciAccessCommon.c | 8 +-
> .../Chip/Include/CpuCsrAccessDefine.h | 8 +-
> .../ProcMemInit/Chip/Include/CpuPciAccess.h | 8 +-
> .../Chip/Include/CpuPciAccessCommon.h | 8 +-
> .../IA32FamilyCpuPkg/IA32FamilyCpuPkg.dec | 8 +-
> .../Include/Library/CpuConfigLib.h | 8 +-
> .../Include/Protocol/IntelCpuPcdsSetDone.h | 8 +-
> Silicon/Intel/PurleySktPkg/SktCommonLib.dsc | 8 +-
> Silicon/Intel/PurleySktPkg/SktDxeLib.dsc | 8 +-
> Silicon/Intel/PurleySktPkg/SktPeiLib.dsc | 8 +-
> Silicon/Intel/PurleySktPkg/SocketPkg.dec | 8 +-
> .../Armada7k8k/AcpiTables/AcpiHeader.h | 8 +-
> .../Armada7k8k/AcpiTables/Armada70x0Db.inf | 8 +-
> .../AcpiTables/Armada70x0Db/Dsdt.asl | 8 +-
> .../Armada7k8k/AcpiTables/Armada80x0Db.inf | 8 +-
> .../AcpiTables/Armada80x0Db/Dsdt.asl | 8 +-
> .../Armada7k8k/AcpiTables/Armada80x0McBin.inf | 8 +-
> .../AcpiTables/Armada80x0McBin/Dsdt.asl | 8 +-
> .../Marvell/Armada7k8k/AcpiTables/Fadt.aslc | 8 +-
> .../Marvell/Armada7k8k/AcpiTables/Gtdt.aslc | 8 +-
> .../Armada7k8k/AcpiTables/IcuInterrupts.h | 8 +-
> .../Marvell/Armada7k8k/AcpiTables/Madt.aslc | 8 +-
> .../Marvell/Armada7k8k/AcpiTables/Pptt.aslc | 8 +-
> .../Marvell/Armada7k8k/AcpiTables/Spcr.aslc | 8 +-
> Silicon/Marvell/Armada7k8k/Armada7k8k.fdf | 8 +-
> .../Marvell/Armada7k8k/Armada7k8kCapsule.fdf | 8 +-
> .../Armada7k8k/DeviceTree/Armada70x0Db.inf | 8 +-
> .../Armada7k8k/DeviceTree/Armada80x0Db.inf | 8 +-
> .../Armada7k8k/DeviceTree/Armada80x0McBin.inf | 8 +-
> .../Armada7k8kRngDxe/Armada7k8kRngDxe.c | 8 +-
> .../Armada7k8kRngDxe/Armada7k8kRngDxe.inf | 8 +-
> .../Drivers/PlatInitDxe/PlatInitDxe.c | 8 +-
> .../Drivers/PlatInitDxe/PlatInitDxe.inf | 8 +-
> .../PlatformFlashAccessLib.c | 8 +-
> .../PlatformFlashAccessLib.inf | 8 +-
> .../SystemFirmwareDescriptor.aslc | 8 +-
> .../SystemFirmwareDescriptor.inf | 8 +-
> .../SystemFirmwareDescriptorPei.c | 8 +-
> .../SystemFirmwareUpdateConfig.ini | 8 +-
> .../Armada7k8kLib/AArch64/ArmPlatformHelper.S | 5 +-
> .../Armada7k8kLib/ARM/ArmPlatformHelper.S | 5 +-
> .../Library/Armada7k8kLib/Armada7k8kLib.c | 8 +-
> .../Armada7k8kMemoryInitPeiLib.c | 8 +-
> .../Armada7k8kMemoryInitPeiLib.inf | 8 +-
> .../Armada7k8kSoCDescLib.c | 8 +-
> .../Armada7k8kSoCDescLib.h | 8 +-
> .../Armada7k8kSoCDescLib.inf | 8 +-
> .../RealTimeClockLib/RealTimeClockLib.c | 8 +-
> .../RealTimeClockLib/RealTimeClockLib.inf | 7 +-
> .../Drivers/Gpio/MvGpioDxe/MvGpioDxe.c | 8 +-
> .../Drivers/Gpio/MvGpioDxe/MvGpioDxe.h | 8 +-
> .../Drivers/Gpio/MvGpioDxe/MvGpioDxe.inf | 8 +-
> .../Drivers/Gpio/MvPca95xxDxe/MvPca95xxDxe.c | 8 +-
> .../Drivers/Gpio/MvPca95xxDxe/MvPca95xxDxe.h | 8 +-
> .../Gpio/MvPca95xxDxe/MvPca95xxDxe.inf | 8 +-
> .../Drivers/SdMmc/XenonDxe/XenonDxe.inf | 7 +-
> .../Drivers/SdMmc/XenonDxe/XenonPciHci.c | 8 +-
> .../Drivers/SdMmc/XenonDxe/XenonPciHci.h | 8 +-
> .../Marvell/Drivers/Spi/MvFvbDxe/MvFvbDxe.c | 8 +-
> .../Marvell/Drivers/Spi/MvFvbDxe/MvFvbDxe.h | 8 +-
> .../Marvell/Include/IndustryStandard/MvSmc.h | 8 +-
> .../Include/Library/ArmadaBoardDescLib.h | 8 +-
> .../Marvell/Include/Library/ArmadaIcuLib.h | 8 +-
> .../Include/Library/ArmadaSoCDescLib.h | 8 +-
> Silicon/Marvell/Include/Library/MvGpioLib.h | 8 +-
> .../Include/Library/NonDiscoverableInitLib.h | 8 +-
> Silicon/Marvell/Include/Protocol/MvI2c.h | 8 +-
> Silicon/Marvell/Library/IcuLib/IcuLib.c | 8 +-
> Silicon/Marvell/Library/IcuLib/IcuLib.h | 8 +-
> Silicon/Marvell/Library/IcuLib/IcuLib.inf | 8 +-
> Silicon/Marvell/Library/MvGpioLib/MvGpioLib.c | 8 +-
> .../Marvell/Library/MvGpioLib/MvGpioLib.inf | 8 +-
> .../Pcf8563RealTimeClockLib.c | 8 +-
> .../Pcf8563RealTimeClockLib.dec | 7 +-
> .../Pcf8563RealTimeClockLib.inf | 7 +-
> Silicon/Openmoko/ChaosKeyDxe/ChaosKeyDriver.c | 8 +-
> Silicon/Openmoko/ChaosKeyDxe/ChaosKeyDriver.h | 8 +-
> Silicon/Openmoko/ChaosKeyDxe/ChaosKeyDxe.inf | 8 +-
> Silicon/Openmoko/ChaosKeyDxe/ComponentName.c | 8 +-
> Silicon/Openmoko/ChaosKeyDxe/DriverBinding.c | 8 +-
> Silicon/Openmoko/Openmoko.dsc | 8 +-
> Silicon/Socionext/SynQuacer/Acpi.dsc.inc | 8 +-
> .../SynQuacer/AcpiTables/AcpiSsdtRootPci.asl | 8 +-
> .../SynQuacer/AcpiTables/AcpiTables.h | 8 +-
> .../SynQuacer/AcpiTables/AcpiTables.inf | 8 +-
> .../Socionext/SynQuacer/AcpiTables/Dsdt.asl | 8 +-
> .../Socionext/SynQuacer/AcpiTables/Fadt.aslc | 8 +-
> .../Socionext/SynQuacer/AcpiTables/Gtdt.aslc | 8 +-
> .../Socionext/SynQuacer/AcpiTables/Iort.aslc | 8 +-
> .../Socionext/SynQuacer/AcpiTables/Madt.aslc | 8 +-
> .../Socionext/SynQuacer/AcpiTables/Mcfg.aslc | 8 +-
> .../Socionext/SynQuacer/AcpiTables/Pptt.aslc | 8 +-
> .../Socionext/SynQuacer/AcpiTables/Spcr.aslc | 8 +-
> .../SynQuacer/DeviceTree/DeveloperBox.dts | 9 +-
> .../SynQuacer/DeviceTree/DeveloperBox.inf | 8 +-
> .../SynQuacer/DeviceTree/SynQuacer.dtsi | 9 +-
> .../SynQuacer/DeviceTree/SynQuacerCaches.dtsi | 9 +-
> .../DeviceTree/SynQuacerEvalBoard.dts | 9 +-
> .../DeviceTree/SynQuacerEvalBoard.inf | 8 +-
> .../SynQuacer/Drivers/Fip006Dxe/Fip006Dxe.dec | 8 +-
> .../SynQuacer/Drivers/Fip006Dxe/Fip006Dxe.inf | 8 +-
> .../SynQuacer/Drivers/Fip006Dxe/Fip006Reg.h | 8 +-
> .../Drivers/Fip006Dxe/Fip006StandaloneMm.inf | 8 +-
> .../SynQuacer/Drivers/Fip006Dxe/NorFlash.c | 8 +-
> .../SynQuacer/Drivers/Fip006Dxe/NorFlash.h | 8 +-
> .../SynQuacer/Drivers/Fip006Dxe/NorFlashDxe.c | 8 +-
> .../SynQuacer/Drivers/Fip006Dxe/NorFlashFvb.c | 8 +-
> .../SynQuacer/Drivers/Fip006Dxe/NorFlashSmm.c | 8 +-
> .../Drivers/Net/NetsecDxe/ComponentName.c | 8 +-
> .../Drivers/Net/NetsecDxe/DriverBinding.c | 8 +-
> .../Drivers/Net/NetsecDxe/NetsecDxe.c | 8 +-
> .../Drivers/Net/NetsecDxe/NetsecDxe.dec | 8 +-
> .../Drivers/Net/NetsecDxe/NetsecDxe.h | 8 +-
> .../Drivers/Net/NetsecDxe/NetsecDxe.inf | 8 +-
> .../netsec_sdk/include/ogma_api.h | 8 +-
> .../netsec_sdk/include/ogma_basic_type.h | 8 +-
> .../netsec_sdk/include/ogma_version.h | 8 +-
> .../netsec_sdk/src/ogma_basic_access.c | 8 +-
> .../netsec_sdk/src/ogma_basic_access.h | 8 +-
> .../netsec_sdk/src/ogma_desc_ring_access.c | 8 +-
> .../src/ogma_desc_ring_access_internal.h | 8 +-
> .../netsec_sdk/src/ogma_gmac_access.c | 8 +-
> .../netsec_sdk/src/ogma_internal.h | 8 +-
> .../netsec_sdk/src/ogma_misc.c | 8 +-
> .../netsec_sdk/src/ogma_misc_internal.h | 8 +-
> .../netsec_for_uefi/netsec_sdk/src/ogma_reg.h | 8 +-
> .../netsec_sdk/src/ogma_reg_f_gmac_4mt.h | 8 +-
> .../netsec_sdk/src/ogma_reg_netsec.h | 8 +-
> .../NetsecDxe/netsec_for_uefi/ogma_config.h | 8 +-
> .../Net/NetsecDxe/netsec_for_uefi/pfdep.h | 8 +-
> .../NetsecDxe/netsec_for_uefi/pfdep_uefi.c | 8 +-
> .../SynQuacer/Drivers/OpteeRngDxe/OpteeRng.c | 8 +-
> .../Drivers/OpteeRngDxe/OpteeRngDxe.inf | 8 +-
> .../Drivers/OpteeRngDxe/OpteeRngDxe.uni | 7 +-
> .../Drivers/OpteeRngDxe/OpteeRngDxeExtra.uni | 7 +-
> .../SynQuacer/Drivers/PlatformDxe/Emmc.asl | 8 +-
> .../SynQuacer/Drivers/PlatformDxe/Emmc.c | 8 +-
> .../SynQuacer/Drivers/PlatformDxe/Pci.c | 8 +-
> .../Drivers/PlatformDxe/PlatformDxe.c | 8 +-
> .../Drivers/PlatformDxe/PlatformDxe.h | 8 +-
> .../Drivers/PlatformDxe/PlatformDxe.inf | 8 +-
> .../Drivers/PlatformDxe/PlatformDxeHii.uni | 8 +-
> .../Drivers/PlatformDxe/PlatformDxeHii.vfr | 8 +-
> .../SynQuacerGpioPei/SynQuacerGpioPei.c | 8 +-
> .../SynQuacerGpioPei/SynQuacerGpioPei.inf | 8 +-
> .../Drivers/SynQuacerI2cDxe/ComponentName.c | 8 +-
> .../Drivers/SynQuacerI2cDxe/DriverBinding.c | 8 +-
> .../Drivers/SynQuacerI2cDxe/SynQuacerI2cDxe.c | 7 +-
> .../Drivers/SynQuacerI2cDxe/SynQuacerI2cDxe.h | 7 +-
> .../SynQuacerI2cDxe/SynQuacerI2cDxe.inf | 7 +-
> .../SynQuacerPciCpuIo2Dxe.c | 8 +-
> .../SynQuacerPciCpuIo2Dxe.inf | 8 +-
> .../Include/Guid/SynQuacerPlatformFormSet.h | 8 +-
> .../SynQuacer/Include/Platform/DramInfo.h | 8 +-
> .../SynQuacer/Include/Platform/MemoryMap.h | 8 +-
> .../SynQuacer/Include/Platform/Pcie.h | 8 +-
> .../SynQuacer/Include/Platform/VarStore.h | 8 +-
> .../SynQuacer/Include/Ppi/DramInfo.h | 8 +-
> .../NorFlashSynQuacerLib/NorFlashSynQuacer.c | 8 +-
> .../NorFlashSynQuacerLib.inf | 8 +-
> .../SynQuacerDtbLoaderLib.c | 8 +-
> .../SynQuacerDtbLoaderLib.inf | 8 +-
> .../SynQuacerLib/AArch64/SynQuacerHelper.S | 8 +-
> .../SynQuacerLib/Arm/SynQuacerHelper.S | 8 +-
> .../Library/SynQuacerLib/SynQuacer.c | 8 +-
> .../Library/SynQuacerLib/SynQuacerLib.inf | 8 +-
> .../SynQuacerMemoryInitPeiLib.c | 8 +-
> .../SynQuacerMemoryInitPeiLib.inf | 8 +-
> .../SynQuacerPciHostBridgeLib.c | 8 +-
> .../SynQuacerPciHostBridgeLib.inf | 8 +-
> .../SynQuacerPciHostBridgeLibConstructor.c | 8 +-
> .../SynQuacerPciSegmentLib/PciSegmentLib.c | 9 +-
> .../SynQuacerPciSegmentLib.inf | 7 +-
> .../SynQuacerPlatformFlashAccessLib.c | 8 +-
> .../SynQuacerPlatformFlashAccessLib.inf | 8 +-
> .../SynQuacerPlatformPeiLib.c | 8 +-
> .../SynQuacerPlatformPeiLib.inf | 8 +-
> .../SynQuacer/Stage2Tables/GNUmakefile | 8 +-
> .../SynQuacer/Stage2Tables/Stage2Tables.S | 8 +-
> .../SynQuacer/Stage2Tables/Stage2Tables.inf | 8 +-
> Silicon/Socionext/SynQuacer/SynQuacer.dec | 8 +-
> 2382 files changed, 2967 insertions(+), 18091
> deletions(-)
> delete mode 100644 Contributions.txt
> create mode 100644 License-History.txt
> delete mode 100644 Platform/AMD/License.txt
> delete mode 100644
> Platform/Intel/AdvancedFeaturePkg/Contributions.txt
> delete mode 100644
> Platform/Intel/AdvancedFeaturePkg/License.txt
> delete mode 100644
> Platform/Intel/ClevoOpenBoardPkg/Contributions.txt
> delete mode 100644
> Platform/Intel/ClevoOpenBoardPkg/License.txt
> delete mode 100644
> Platform/Intel/KabylakeOpenBoardPkg/Contributions.txt
> delete mode 100644
> Platform/Intel/KabylakeOpenBoardPkg/License.txt
> delete mode 100644
> Platform/Intel/MinPlatformPkg/Contributions.txt
> delete mode 100644
> Platform/Intel/MinPlatformPkg/License.txt
> delete mode 100644 Platform/LeMaker/License.txt
> delete mode 100644 Platform/SoftIron/License.txt
> delete mode 100644 Silicon/AMD/Styx/License.txt
> delete mode 100644
> Silicon/Intel/KabylakeSiliconPkg/Contributions.txt
> delete mode 100644
> Silicon/Intel/KabylakeSiliconPkg/License.txt
>
> --
> 2.21.0.windows.1
>
>
>
^ permalink raw reply [flat|nested] 63+ messages in thread