From 86094561f67467814043a8863601ba5e84d9ebca Mon Sep 17 00:00:00 2001 From: Michael D Kinney Date: Wed, 3 Apr 2019 16:07:12 -0700 Subject: StandaloneMmPkg: 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 Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Michael D Kinney Reviewed-by: Jiewen Yao --- StandaloneMmPkg/Include/Guid/MmCoreData.h | 8 +------- StandaloneMmPkg/Include/Guid/MmFvDispatch.h | 8 +------- StandaloneMmPkg/Include/Guid/MmramMemoryReserve.h | 8 +------- StandaloneMmPkg/Include/Guid/MpInformation.h | 8 +------- 4 files changed, 4 insertions(+), 28 deletions(-) (limited to 'StandaloneMmPkg/Include/Guid') diff --git a/StandaloneMmPkg/Include/Guid/MmCoreData.h b/StandaloneMmPkg/Include/Guid/MmCoreData.h index a1168f95f7..8bd80e0519 100644 --- a/StandaloneMmPkg/Include/Guid/MmCoreData.h +++ b/StandaloneMmPkg/Include/Guid/MmCoreData.h @@ -3,13 +3,7 @@ Copyright (c) 2015, Intel Corporation. All rights reserved.
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 that accompanies this distribution. -The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php. - -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. +SPDX-License-Identifier: BSD-2-Clause-Patent **/ diff --git a/StandaloneMmPkg/Include/Guid/MmFvDispatch.h b/StandaloneMmPkg/Include/Guid/MmFvDispatch.h index d141d40d8d..643f6e65f9 100644 --- a/StandaloneMmPkg/Include/Guid/MmFvDispatch.h +++ b/StandaloneMmPkg/Include/Guid/MmFvDispatch.h @@ -4,13 +4,7 @@ Copyright (c) 2015, Intel Corporation. All rights reserved.
Copyright (c) 2016 - 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 that accompanies this distribution. -The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php. - -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. +SPDX-License-Identifier: BSD-2-Clause-Patent **/ diff --git a/StandaloneMmPkg/Include/Guid/MmramMemoryReserve.h b/StandaloneMmPkg/Include/Guid/MmramMemoryReserve.h index 15818b5a8a..898865ae6e 100644 --- a/StandaloneMmPkg/Include/Guid/MmramMemoryReserve.h +++ b/StandaloneMmPkg/Include/Guid/MmramMemoryReserve.h @@ -11,13 +11,7 @@ Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.
Copyright (c) 2016 - 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 that accompanies this distribution. -The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php. - -THE PROGRAM IS DISTRIBUTED UNDER THE BSD 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 MmCis spec version 0.9. diff --git a/StandaloneMmPkg/Include/Guid/MpInformation.h b/StandaloneMmPkg/Include/Guid/MpInformation.h index c88ff4afab..e3a916dfc5 100644 --- a/StandaloneMmPkg/Include/Guid/MpInformation.h +++ b/StandaloneMmPkg/Include/Guid/MpInformation.h @@ -6,13 +6,7 @@ Copyright (c) 2009, Intel Corporation. All rights reserved.
Copyright (c) 2016 - 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 **/ -- cgit v1.2.3