Reviewed-by: Michael D Kinney <michael.d.kin...@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.biesheu...@linaro.org>; Kinney, > Michael D <michael.d.kin...@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.lindh...@linaro.org> > Cc: Ard Biesheuvel <ard.biesheu...@linaro.org> > Cc: Michael D Kinney <michael.d.kin...@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 <p...@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.warken...@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 > > >
-=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#44215): https://edk2.groups.io/g/devel/message/44215 Mute This Topic: https://groups.io/mt/32406748/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
