From: "Michael D Kinney" <michael.d.kinney@intel.com>
To: "devel@edk2.groups.io" <devel@edk2.groups.io>,
"leif.lindholm@linaro.org" <leif.lindholm@linaro.org>,
"Kinney, Michael D" <michael.d.kinney@intel.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Subject: Re: [edk2-devel] [PATCH edk2-platforms 1/3] Platform,Silicon RPi3: update license headers to BSD+Patent
Date: Tue, 23 Jul 2019 07:12:06 +0000 [thread overview]
Message-ID: <E92EE9817A31E24EB0585FDF735412F5B9D7C9B1@ORSMSX113.amr.corp.intel.com> (raw)
In-Reply-To: <20190709160744.5898-2-leif.lindholm@linaro.org>
Reviewed-by: Michael D Kinney <michael.d.kinney@intel.com>
> -----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 <ard.biesheuvel@linaro.org>; Kinney,
> Michael D <michael.d.kinney@intel.com>
> Subject: [edk2-devel] [PATCH edk2-platforms 1/3]
> Platform,Silicon RPi3: update license headers to
> BSD+Patent
>
> 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.
>
> (This is explained/confirmed in
> https://edk2.groups.io/g/devel/message/40909
> and
> https://edk2.groups.io/g/devel/message/40911.)
>
> This patch replaces the license headers in both with the
> SPDX statement bringing it inline with the majority of
> the rest of the codebase.
>
> Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> ---
>
> Platform/RaspberryPi/RPi3/Include/IndustryStandard/RpiMbo
> x.h | 26 +-------------------------
> Silicon/Broadcom/Bcm283x/Include/IndustryStandard/Bcm2836
> .h | 26 +-------------------------
> 2 files changed, 2 insertions(+), 50 deletions(-)
>
> 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 <pete@akeo.ie>
> * 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
> *
> **/
>
> 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
> <andrey.warkentin@gmail.com>
> * 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
> *
> **/
>
> --
> 2.20.1
>
>
>
next prev parent reply other threads:[~2019-07-23 7:12 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-09 16:07 [PATCH edk2-platforms 0/3] Rectify licensing on various files Leif Lindholm
2019-07-09 16:07 ` [PATCH edk2-platforms 1/3] Platform,Silicon RPi3: update license headers to BSD+Patent Leif Lindholm
2019-07-23 7:12 ` Michael D Kinney [this message]
2019-07-09 16:07 ` [PATCH edk2-platforms 2/3] Platform/RaspberryPi: add license header to PlatformUiAppLib.inf Leif Lindholm
2019-07-23 7:12 ` Michael D Kinney
2019-07-23 8:47 ` Leif Lindholm
2019-07-09 16:07 ` [PATCH edk2-platforms 3/3] Silicon/Hisilicon: add SPDX license tags to IORT .asl files Leif Lindholm
2019-07-23 7:13 ` 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=E92EE9817A31E24EB0585FDF735412F5B9D7C9B1@ORSMSX113.amr.corp.intel.com \
--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