1. Patchew
  2. EDK2
  3. View series

[edk2-devel] [[edk2-platforms][PATCH V2] 21/30] Silicon/Broadcom: Replace BSD License with BSD+Patent License

Michael D Kinney posted 1 patch 4 years, 11 months ago
Failed in applying to current master (apply log)
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(-)
[edk2-devel] [[edk2-platforms][PATCH V2] 21/30] Silicon/Broadcom: Replace BSD License with BSD+Patent License
Posted by Michael D Kinney 4 years, 11 months ago 
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>
---
 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


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#40733): https://edk2.groups.io/g/devel/message/40733
Mute This Topic: https://groups.io/mt/31635491/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [[edk2-platforms][PATCH V2] 21/30] Silicon/Broadcom: Replace BSD License with BSD+Patent License
Posted by Leif Lindholm 4 years, 11 months ago 
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
> 

-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#40908): https://edk2.groups.io/g/devel/message/40908
Mute This Topic: https://groups.io/mt/31635491/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [[edk2-platforms][PATCH V2] 21/30] Silicon/Broadcom: Replace BSD License with BSD+Patent License
Posted by Ard Biesheuvel 4 years, 11 months ago 
On Fri, 17 May 2019 at 13:08, Leif Lindholm <leif.lindholm@linaro.org> wrote:
>
> 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?
>

Indeed - I inadvertently copy/pasted a version of the license header
from another file that included the ARM non-endorsement clause, but
the intention was to use 2-clause BSD.

-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#40911): https://edk2.groups.io/g/devel/message/40911
Mute This Topic: https://groups.io/mt/31635491/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.