From: "Michael D Kinney" <michael.d.kinney@intel.com>
To: devel@edk2.groups.io
Cc: Leif Lindholm <leif.lindholm@linaro.org>,
Ard Biesheuvel <ard.biesheuvel@linaro.org>
Subject: [[edk2-platforms][PATCH V2] 18/30] Platform/SolidRun: Replace BSD License with BSD+Patent License
Date: Wed, 15 May 2019 16:09:59 -0700 [thread overview]
Message-ID: <20190515231012.7488-19-michael.d.kinney@intel.com> (raw)
In-Reply-To: <20190515231012.7488-1-michael.d.kinney@intel.com>
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
next prev parent reply other threads:[~2019-05-15 23:10 UTC|newest]
Thread overview: 63+ messages / expand[flat|nested] mbox.gz Atom feed top
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-16 0:36 ` [edk2-devel] " Chiu, Chasel
2019-05-17 6:39 ` Kubacki, Michael A
2019-05-17 21:01 ` Sinha, Ankit
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
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 ` [[edk2-platforms][PATCH V2] 04/30] Platform/ARM: " 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
2019-05-15 23:09 ` [[edk2-platforms][PATCH V2] 06/30] Platform/Comcast: " Michael D Kinney
2019-05-15 23:09 ` [[edk2-platforms][PATCH V2] 07/30] Platform/Hisilicon: " Michael D Kinney
2019-05-17 10:59 ` [edk2-devel] " Leif Lindholm
2019-05-19 7:31 ` Ming Huang
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
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
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
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
2019-05-15 23:09 ` [[edk2-platforms][PATCH V2] 12/30] Platform/Intel/PurleyOpenBoardPkg: " 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
2019-05-15 23:09 ` [[edk2-platforms][PATCH V2] 14/30] Platform/Marvell: " 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
2019-05-17 11:07 ` [edk2-devel] " Leif Lindholm
2019-05-17 11:08 ` Ard Biesheuvel
2019-05-15 23:09 ` [[edk2-platforms][PATCH V2] 16/30] Platform/Socionext: " Michael D Kinney
2019-05-15 23:09 ` [[edk2-platforms][PATCH V2] 17/30] Platform/SoftIron: " Michael D Kinney
2019-05-15 23:09 ` Michael D Kinney [this message]
2019-05-15 23:10 ` [[edk2-platforms][PATCH V2] 19/30] Silicon/AMD: " Michael D Kinney
2019-05-15 23:10 ` [[edk2-platforms][PATCH V2] 20/30] Silicon/Atmel: " Michael D Kinney
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
2019-05-15 23:10 ` [[edk2-platforms][PATCH V2] 22/30] Silicon/Hisilicon: " Michael D Kinney
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
2019-05-15 23:10 ` [[edk2-platforms][PATCH V2] 24/30] Silicon/Intel/LewisburgPkg: " 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
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
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
2019-05-17 10:50 ` Leif Lindholm
2019-05-28 9:50 ` Leif Lindholm
2019-05-28 10:23 ` Marcin Wojtas
2019-05-28 11:59 ` [EXT] " Nadav Haklai
2019-05-15 23:10 ` [[edk2-platforms][PATCH V2] 28/30] Silicon/NXP: " Michael D Kinney
2019-05-15 23:10 ` [[edk2-platforms][PATCH V2] 29/30] Silicon/Socionext: " 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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190515231012.7488-19-michael.d.kinney@intel.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox