From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.115, mailfrom: michael.d.kinney@intel.com) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by groups.io with SMTP; Tue, 23 Jul 2019 00:12:08 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 23 Jul 2019 00:12:08 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,298,1559545200"; d="scan'208";a="180649015" Received: from orsmsx102.amr.corp.intel.com ([10.22.225.129]) by orsmga002.jf.intel.com with ESMTP; 23 Jul 2019 00:12:08 -0700 Received: from orsmsx154.amr.corp.intel.com (10.22.226.12) by ORSMSX102.amr.corp.intel.com (10.22.225.129) with Microsoft SMTP Server (TLS) id 14.3.439.0; Tue, 23 Jul 2019 00:12:08 -0700 Received: from orsmsx113.amr.corp.intel.com ([169.254.9.177]) by ORSMSX154.amr.corp.intel.com ([169.254.11.96]) with mapi id 14.03.0439.000; Tue, 23 Jul 2019 00:12:07 -0700 From: "Michael D Kinney" To: "devel@edk2.groups.io" , "leif.lindholm@linaro.org" , "Kinney, Michael D" CC: Ard Biesheuvel Subject: Re: [edk2-devel] [PATCH edk2-platforms 1/3] Platform,Silicon RPi3: update license headers to BSD+Patent Thread-Topic: [edk2-devel] [PATCH edk2-platforms 1/3] Platform,Silicon RPi3: update license headers to BSD+Patent Thread-Index: AQHVNnB2wYdfVfqz5EWAM/Rr9vSdxKbX3tzQ Date: Tue, 23 Jul 2019 07:12:06 +0000 Message-ID: References: <20190709160744.5898-1-leif.lindholm@linaro.org> <20190709160744.5898-2-leif.lindholm@linaro.org> In-Reply-To: <20190709160744.5898-2-leif.lindholm@linaro.org> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.0.600.7 dlp-reaction: no-action x-originating-ip: [10.22.254.138] MIME-Version: 1.0 Return-Path: michael.d.kinney@intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Michael D Kinney > -----Original Message----- > From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] > On Behalf Of Leif Lindholm > Sent: Tuesday, July 9, 2019 9:08 AM > To: devel@edk2.groups.io > Cc: Ard Biesheuvel ; Kinney, > Michael D > Subject: [edk2-devel] [PATCH edk2-platforms 1/3] > Platform,Silicon RPi3: update license headers to > BSD+Patent >=20 > RpiMbox.h and Bcm2836.h originate from Ard's original > efforts, and were always intended to be 2-clause BSD > licensed, but due to a copy/paste error, they ended up > with a 3-clause BSD license instead - which meant they > were left out in Mike's major relicensing set. >=20 > (This is explained/confirmed in > https://edk2.groups.io/g/devel/message/40909 > and > https://edk2.groups.io/g/devel/message/40911.) >=20 > This patch replaces the license headers in both with the > SPDX statement bringing it inline with the majority of > the rest of the codebase. >=20 > Signed-off-by: Leif Lindholm > Cc: Ard Biesheuvel > Cc: Michael D Kinney > --- >=20 > Platform/RaspberryPi/RPi3/Include/IndustryStandard/RpiMbo > x.h | 26 +------------------------- > Silicon/Broadcom/Bcm283x/Include/IndustryStandard/Bcm2836 > .h | 26 +------------------------- > 2 files changed, 2 insertions(+), 50 deletions(-) >=20 > diff --git > a/Platform/RaspberryPi/RPi3/Include/IndustryStandard/RpiM > box.h > b/Platform/RaspberryPi/RPi3/Include/IndustryStandard/RpiM > box.h > index 8547ad05ba61..d3b6f117cfdf 100644 > --- > a/Platform/RaspberryPi/RPi3/Include/IndustryStandard/RpiM > box.h > +++ > b/Platform/RaspberryPi/RPi3/Include/IndustryStandard/RpiM > box.h > @@ -3,31 +3,7 @@ > * Copyright (c) 2019, Pete Batard > * Copyright (c) 2016, Linaro Limited. All rights > reserved. > * > - * Redistribution and use in source and binary forms, > with or without > - * modification, are permitted provided that the > following conditions are met: > - * > - * Redistributions of source code must retain the above > copyright notice, this > - * list of conditions and the following disclaimer. > - * > - * Redistributions in binary form must reproduce the > above copyright notice, > - * this list of conditions and the following disclaimer > in the documentation > - * and/or other materials provided with the > distribution. > - * > - * Neither the name of ARM nor the names of its > contributors may be used > - * to endorse or promote products derived from this > software without specific > - * prior written permission. > - * > - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS > AND CONTRIBUTORS "AS IS" > - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT > NOT LIMITED TO, THE > - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR > A PARTICULAR PURPOSE > - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT > HOLDER OR CONTRIBUTORS BE > - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, > EXEMPLARY, OR > - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, > PROCUREMENT OF > - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR > PROFITS; OR BUSINESS > - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF > LIABILITY, WHETHER IN > - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING > NEGLIGENCE OR OTHERWISE) > - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, > EVEN IF ADVISED OF THE > - * POSSIBILITY OF SUCH DAMAGE. > + * SPDX-License-Identifier: BSD-2-Clause-Patent > * > **/ >=20 > diff --git > a/Silicon/Broadcom/Bcm283x/Include/IndustryStandard/Bcm28 > 36.h > b/Silicon/Broadcom/Bcm283x/Include/IndustryStandard/Bcm28 > 36.h > index f06eb2312c61..4007301228be 100644 > --- > a/Silicon/Broadcom/Bcm283x/Include/IndustryStandard/Bcm28 > 36.h > +++ > b/Silicon/Broadcom/Bcm283x/Include/IndustryStandard/Bcm28 > 36.h > @@ -3,31 +3,7 @@ > * Copyright (c) 2017, Andrei Warkentin > > * Copyright (c) 2016, Linaro Limited. All rights > reserved. > * > - * Redistribution and use in source and binary forms, > with or without > - * modification, are permitted provided that the > following conditions are met: > - * > - * Redistributions of source code must retain the above > copyright notice, this > - * list of conditions and the following disclaimer. > - * > - * Redistributions in binary form must reproduce the > above copyright notice, > - * this list of conditions and the following disclaimer > in the documentation > - * and/or other materials provided with the > distribution. > - * > - * Neither the name of ARM nor the names of its > contributors may be used > - * to endorse or promote products derived from this > software without specific > - * prior written permission. > - * > - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS > AND CONTRIBUTORS "AS IS" > - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, > BUT NOT LIMITED TO, THE > - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > FOR A PARTICULAR PURPOSE > - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT > HOLDER OR CONTRIBUTORS BE > - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, > SPECIAL, EXEMPLARY, OR > - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED > TO, PROCUREMENT OF > - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR > PROFITS; OR BUSINESS > - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF > LIABILITY, WHETHER IN > - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING > NEGLIGENCE OR OTHERWISE) > - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, > EVEN IF ADVISED OF THE > - * POSSIBILITY OF SUCH DAMAGE. > + * SPDX-License-Identifier: BSD-2-Clause-Patent > * > **/ >=20 > -- > 2.20.1 >=20 >=20 >=20