From: "Leif Lindholm" <leif.lindholm@linaro.org>
To: Michael D Kinney <michael.d.kinney@intel.com>
Cc: devel@edk2.groups.io, Ard Biesheuvel <ard.biesheuvel@linaro.org>
Subject: Re: [[edk2-platforms][PATCH V2] 21/30] Silicon/Broadcom: Replace BSD License with BSD+Patent License
Date: Fri, 17 May 2019 12:08:10 +0100 [thread overview]
Message-ID: <20190517110810.a27b443w66yuhusq@bivouac.eciton.net> (raw)
In-Reply-To: <20190515231012.7488-22-michael.d.kinney@intel.com>
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
>
next prev parent reply other threads:[~2019-05-17 11:08 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 ` [[edk2-platforms][PATCH V2] 18/30] Platform/SolidRun: " Michael D Kinney
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 [this message]
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=20190517110810.a27b443w66yuhusq@bivouac.eciton.net \
--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