From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=LKpQ+mb6; spf=pass (domain: linaro.org, ip: 209.85.128.65, mailfrom: leif.lindholm@linaro.org) Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by groups.io with SMTP; Fri, 17 May 2019 04:08:14 -0700 Received: by mail-wm1-f65.google.com with SMTP id q15so6351336wmj.0 for ; Fri, 17 May 2019 04:08:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=HZDo7Ev157oKY78pxjjQ5uk7qlWkdEJ/Xeaz5R4PNpc=; b=LKpQ+mb6Q0zi2M9KoVr8U16A6XV/Hv51b1m3VgPgNHmVjCxR9q+AqI0wnx0zCUL79S 5cPcW5cVIjJtSi3afNKFJjEyQ74ccYSa297JXZdlNSvPM7/vuGh5jWV+G2N5qeLUJp+c ti77FHOswO5hk3mM1wdDTEqINtezcoYFVZnKmcnnCmMkmQCXcItuVPGEsqZbZHsczcYU 7RSENj65QKgj4/nxIqApXVeXrDlf3zYp8FPzJ1chWwZfo81IDnDJUJ8eUydwkfxan9o3 j2FZ7uVCqHNp7jo1iB0Y/e3poLM8ax4LBSsyF+/1jr2wrJo/XqQKDuuE0h5vkXuN7/h2 YKgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=HZDo7Ev157oKY78pxjjQ5uk7qlWkdEJ/Xeaz5R4PNpc=; b=llB34CZ967PlQLgXRj5ZKwVI3SmmyJGL4YRvhhIKpvAZKhByMuOziVGKsFoqPoM3fM 7blLSErc20MlT6Tvr4DNjMAiKm/BhvH0t+hrcfibQgRLLd2jF5GZyWSUZ2pUuxtm2mr9 QManUZGKSpfb1WT90rt2br4Tn9sMagUPKHHk0DeeEGqLZGTUSQDpWkc5fiYoIkEuSnW1 162YkeBUlO6RephUY7NhIoySxXfDWVpLKG3t1pKgFEhUA9veBFEes9Q1lHMRiq0SkYgj 4EXuqGXBU/wPjSOpah9engkicpTg9NmpjPPuWUncND5GjiEI/vb35VHsoJ+yH0TWek12 Uxlw== X-Gm-Message-State: APjAAAXNX/p9yzU+fLjnL8KUYbN9I+QrhjrJY+aFiACJrKc/r4xTqN94 AlYWgiGGC9utySyTfAEGRNXGXUO6eAg= X-Google-Smtp-Source: APXvYqzuYzrpH1pMqiiwiVSb34MMfhlv2qVEEK/fOtfaXs6c7fWNni9b6l7sExSqR8t73QzShEEWnw== X-Received: by 2002:a1c:1d16:: with SMTP id d22mr1881415wmd.110.1558091292689; Fri, 17 May 2019 04:08:12 -0700 (PDT) Return-Path: Received: from bivouac.eciton.net (bivouac.eciton.net. [2a00:1098:0:86:1000:23:0:2]) by smtp.gmail.com with ESMTPSA id j13sm6199207wru.78.2019.05.17.04.08.11 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 17 May 2019 04:08:12 -0700 (PDT) Date: Fri, 17 May 2019 12:08:10 +0100 From: "Leif Lindholm" To: Michael D Kinney Cc: devel@edk2.groups.io, Ard Biesheuvel Subject: Re: [[edk2-platforms][PATCH V2] 21/30] Silicon/Broadcom: Replace BSD License with BSD+Patent License Message-ID: <20190517110810.a27b443w66yuhusq@bivouac.eciton.net> References: <20190515231012.7488-1-michael.d.kinney@intel.com> <20190515231012.7488-22-michael.d.kinney@intel.com> MIME-Version: 1.0 In-Reply-To: <20190515231012.7488-22-michael.d.kinney@intel.com> User-Agent: NeoMutt/20170113 (1.7.2) Content-Type: text/plain; charset=us-ascii Content-Disposition: inline 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 @@ > > 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/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 > * 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 > * 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 > * > - * 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 > * > - * 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 > # > -# 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 >