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
> Cc: Ard Biesheuvel
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Michael D Kinney
> ---
> 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
> #
> -# This program and the accompanying materials are licensed and made
> available
> -# under the terms and conditions of the BSD License which accompanies this
> -# distribution. The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS 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
> # 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 @@
>
>
