From a1ff0b77c3803829021d7f054f6705eb6c07d2cd Mon Sep 17 00:00:00 2001 From: Peter McGoron Date: Mon, 29 May 2023 13:14:19 -0400 Subject: [PATCH] licensing --- firmware/COPYING => copying/CERN-OHL-S-v2.0 | 107 ------------------ .../COPYING => copying/COPYING.buildroot | 6 +- copying/COPYING.opensbi | 55 +++++++++ COPYING => copying/GPL-3.0 | 15 +-- copying/index.md | 23 ++++ doc/maintenance_manual.md | 2 +- firmware/soc.py | 32 +++++- 7 files changed, 115 insertions(+), 125 deletions(-) rename firmware/COPYING => copying/CERN-OHL-S-v2.0 (72%) rename buildroot/COPYING => copying/COPYING.buildroot (85%) create mode 100644 copying/COPYING.opensbi rename COPYING => copying/GPL-3.0 (98%) create mode 100644 copying/index.md diff --git a/firmware/COPYING b/copying/CERN-OHL-S-v2.0 similarity index 72% rename from firmware/COPYING rename to copying/CERN-OHL-S-v2.0 index 3d80346..0f10922 100644 --- a/firmware/COPYING +++ b/copying/CERN-OHL-S-v2.0 @@ -1,8 +1,3 @@ -The code under this directory is dual-licensed under the CERN-OHL-S, version 2 -(or any later version), and the GNU GPL v3.0 (or any later version). -Some parts are governed by additional requirements: see below. - -========================================================================== CERN Open Hardware Licence Version 2 - Strongly Reciprocal @@ -292,105 +287,3 @@ subsection 3.2. 8.6 This Licence shall not be enforceable except by a Licensor acting as such, and third party beneficiary rights are specifically excluded. - -================================================================== - -soc.py -======= - -https://github.com/litex-hub/litex-boards - -Copyright (c) 2015-2019 Florent Kermarrec -Copyright (c) 2020 Antmicro -Copyright (c) 2022 Victor Suarez Rovere -BSD 2-Clause License - -Copyright (c) Copyright 2012-2022 Enjoy-Digital. -Copyright (c) Copyright 2012-2022 / LiteX-Hub community. -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - -2. 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. - -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. - -litex_json2dts_zephyr.py -======================== - -Governed by the license in https://github.com/enjoy-digital/litex - -LiteX is a Migen/MiSoC based Core/SoC builder that provides the infrastructure to -easily create Cores/SoCs. - -Unless otherwise noted, LiteX is copyright (C) 2012-2022 Enjoy-Digital. -Unless otherwise noted, MiSoC is copyright (C) 2012-2015 Enjoy-Digital. -Unless otherwise noted, MiSoC is copyright (C) 2007-2015 M-Labs 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: - -1. Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. -2. 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. - -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. - - -Other authors retain ownership of their contributions. If a submission can -reasonably be considered independently copyrightable, it's yours and we -encourage you to claim it with appropriate copyright notices. This submission -then falls under the "otherwise noted" category. All submissions are strongly -encouraged to use the two-clause BSD license reproduced above. - -A7-constraints.xdc -================== - -MIT License - -Copyright (c) 2017 Digilent - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/buildroot/COPYING b/copying/COPYING.buildroot similarity index 85% rename from buildroot/COPYING rename to copying/COPYING.buildroot index 8bb257a..947495b 100644 --- a/buildroot/COPYING +++ b/copying/COPYING.buildroot @@ -1,11 +1,7 @@ -The files "board/litex_vexriscv/linux.config" and -"configs/litex_vexriscv_defconfig" incorporate code from - https://github.com/litex-hub/linux-on-litex-vexriscv -________________________________________________________________________ - BSD 2-Clause License Copyright (c) 2019-2021, Linux-on-LiteX-VexRiscv Developers +Copyright (c) 2023 Peter McGoron All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/copying/COPYING.opensbi b/copying/COPYING.opensbi new file mode 100644 index 0000000..971781d --- /dev/null +++ b/copying/COPYING.opensbi @@ -0,0 +1,55 @@ +The 2-Clause BSD License +SPDX short identifier: BSD-2-Clause + +Copyright (c) 2019 Western Digital Corporation or its affiliates and other +contributors. +Copyright (c) 2023 Peter McGoron. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. +2. 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. + +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. + +Contributors: + +List of OpenSBI Contributors (Alphabetically sorted) +==================================================== + +* **[Western Digital Corporation](https://www.wdc.com/)** + * Project initiator and maintainer + * Copyright (c) 2019 Western Digital Corporation or its affiliates + +* Alistair Francis + +* Andreas Schwab + +* Anup Patel + +* Atish Patra + +* Bin Meng + +* Damien Le Moal + +* Karsten Merker + +* Nick Kossifidis + +* Shawn Chang + +* Xiang Wang diff --git a/COPYING b/copying/GPL-3.0 similarity index 98% rename from COPYING rename to copying/GPL-3.0 index 5ef20fb..f288702 100644 --- a/COPYING +++ b/copying/GPL-3.0 @@ -1,14 +1,7 @@ -The code under this directory is licensed under the GNU GPL v3.0, or at your -option, any later version. - -Some parts of this software are dual-licensed. Please check other COPYING -files for more information. - -===================== GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007 - Copyright (C) 2007 Free Software Foundation, Inc. + Copyright (C) 2007 Free Software Foundation, Inc. Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -652,7 +645,7 @@ the "copyright" line and a pointer to where the full notice is found. GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . + along with this program. If not, see . Also add information on how to contact you by electronic and paper mail. @@ -671,11 +664,11 @@ might be different; for a GUI interface, you would use an "about box". You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. For more information on this, and how to apply and follow the GNU GPL, see -. +. The GNU General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. But first, please read -. +. diff --git a/copying/index.md b/copying/index.md new file mode 100644 index 0000000..1aa096d --- /dev/null +++ b/copying/index.md @@ -0,0 +1,23 @@ +Upsilon is a copyleft hardware project, which brings its own difficulties. +Upsilon is dual-licensed in many locations. + +The files under `firmware/` are disjunctive dual-licensed under the CERN-OHL-S +v2.0 (or any later version), or the GNU GPL v3.0 (or any later version). + +The files under `buildroot/` and `opensbi/` are licensed under a BSD +2-clause license. + +The files under `doc/` are disjunctively dual-licensed under the CC BY-SA 4.0, +or the GNU GPL v3.0 (or any later version). + +The files under `software/` are disjunctively dual-licensed under the +CERN-OHL-S v2.0 (or any later version), or the GNU GPL v3.0 (or any later +version). + +All license files under `copying/` (except this one) are licensed according +to the text of the license. + +Any other file is licensed under the GNU GPL v3.0 (or any later version). + +Some files contain additional licenses. You must comply with the terms of +both the license in a file and the licenses specified here. diff --git a/doc/maintenance_manual.md b/doc/maintenance_manual.md index bdf8d2e..6e26867 100644 --- a/doc/maintenance_manual.md +++ b/doc/maintenance_manual.md @@ -1,4 +1,4 @@ -Upsilon Maintenance Manual. This document may be distributed under the terms +Upsilon Maintenance Manual. This document may be distributed under your choice of the GNU GPL v3.0 (or any later version), or under the [CC BY-SA 4.0][CC]. [CC]: https://creativecommons.org/licenses/by-sa/4.0/legalcode diff --git a/firmware/soc.py b/firmware/soc.py index 7f57a0f..0277541 100644 --- a/firmware/soc.py +++ b/firmware/soc.py @@ -1,5 +1,35 @@ # Portions of this file incorporate code licensed under the -# BSD 2-Clause License. See COPYING. +# BSD 2-Clause License. +# +# Copyright (c) 2015-2019 Florent Kermarrec +# Copyright (c) 2020 Antmicro +# Copyright (c) 2022 Victor Suarez Rovere +# BSD 2-Clause License +# +# Copyright (c) Copyright 2012-2022 Enjoy-Digital. +# Copyright (c) Copyright 2012-2022 / LiteX-Hub community. +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, this +# list of conditions and the following disclaimer. +# +# 2. 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. +# +# 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. # There is nothing fundamental about the Arty A7(35|100)T to this # design, but another eval board will require some porting.