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.lindh...@linaro.org> Cc: Ard Biesheuvel <ard.biesheu...@linaro.org> Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Michael D Kinney <michael.d.kin...@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 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#40717): https://edk2.groups.io/g/devel/message/40717 Mute This Topic: https://groups.io/mt/31635475/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-