diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-10-28 15:43:55 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-10-28 15:43:56 +0300 |
commit | cae294d875605889ccd88a371a958394dacd3c81 (patch) | |
tree | db38be37642df291edb506882d75be9ca1a2221c /meta-raspberrypi/files | |
parent | 2d39a06105c717cc742ee37700441975ddd5f81e (diff) | |
download | openbmc-cae294d875605889ccd88a371a958394dacd3c81.tar.xz |
meta-raspberrypi: subtree update:4776ecc532..254c9366b9
Martin Jansa (1):
linux-raspberrypi=4.19.80 bcm2835-bootfiles=20191021
Paul Barker (4):
licenses: Drop unused Broadcom license file
armstubs: License is BSD-3-Clause
bcm2835-bootfiles: Clarify license conditions
vc-graphics: Clarify license conditions
Change-Id: I2238c23361c7140f4651faba33c11eb150cdcda6
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-raspberrypi/files')
-rw-r--r-- | meta-raspberrypi/files/custom-licenses/Broadcom | 25 | ||||
-rw-r--r-- | meta-raspberrypi/files/custom-licenses/Broadcom-RPi | 29 |
2 files changed, 29 insertions, 25 deletions
diff --git a/meta-raspberrypi/files/custom-licenses/Broadcom b/meta-raspberrypi/files/custom-licenses/Broadcom deleted file mode 100644 index 2582681610..0000000000 --- a/meta-raspberrypi/files/custom-licenses/Broadcom +++ /dev/null @@ -1,25 +0,0 @@ -Copyright (c) 2012, Broadcom Europe Ltd -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 the copyright holder 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. - diff --git a/meta-raspberrypi/files/custom-licenses/Broadcom-RPi b/meta-raspberrypi/files/custom-licenses/Broadcom-RPi new file mode 100644 index 0000000000..6f3baa0ca2 --- /dev/null +++ b/meta-raspberrypi/files/custom-licenses/Broadcom-RPi @@ -0,0 +1,29 @@ +Copyright (c) 2006, Broadcom Corporation. +Copyright (c) 2015, Raspberry Pi (Trading) Ltd +All rights reserved. + +Redistribution. Redistribution and use in binary form, without +modification, are permitted provided that the following conditions are +met: + +* This software may only be used for the purposes of developing for, + running or using a Raspberry Pi device. +* Redistributions must reproduce the above copyright notice and the + following disclaimer in the documentation and/or other materials + provided with the distribution. +* Neither the name of Broadcom Corporation nor the names of its suppliers + may be used to endorse or promote products derived from this software + without specific prior written permission. + +DISCLAIMER. 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 OWNER 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. |