From ceb0a99d83ed992a3a3164f91f4c4c6d632550a5 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Mon, 15 Apr 2013 23:55:30 +0200 Subject: [PATCH] Change license to 2-clause BSD --- LICENSE | 65 +++++++++++++++++++++++---------------------------------- README | 25 ++++++++++++++++------ 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/LICENSE b/LICENSE index 383bb89c9..4f290601a 100644 --- a/LICENSE +++ b/LICENSE @@ -1,44 +1,31 @@ -Migen is free software: you can redistribute it and/or modify it under -the terms of the GNU General Public License as published by the Free -Software Foundation, version 3 of the License. This program is -distributed in the hope that it will be useful, but WITHOUT ANY -WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -more details. +Unless otherwise noted, Migen is copyright (C) 2011-2013 Sebastien Bourdeauducq. +The simulation extension (as mentioned in the comments at the beginning of the +corresponding source files) is copyright (C) 2012 Vermeer Manufacturing Co. All +rights reserved. -Additional permissions under section 7 of the GNU General Public License -(GPL) are hereby granted. The purpose of this exception is to allow -non-GPL (including proprietary) logic cores to be used in conjunction -with code generated by Migen in a design. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -"Generated" code refers to Verilog or VHDL code that has been obtained -by converting FHDL structures using Migen. +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. -To "instantiate" is to include and connect another module as specified -in section 12.1.2 of the IEEE standard 1364-2001 or in section 9.6 of -the IEEE standard 1076-1993. +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. -(1) You have permission to propagate a work of generated code that - instantiates modules that are not generated code and do not comply - with the GPL. -(2) You have permission to propagate a work of Verilog or VHDL code that - is not generated code, does not comply with the GPL and instantiates - generated code. -The availability of this exception does not imply any general -presumption that third-party software is unaffected by the copyleft -requirements of the license of Migen. - -Unless otherwise noted, Migen's source code is copyright (C) 2011-2012 -Sebastien Bourdeauducq. - -The simulation extension (as mentioned in the comments at the beginning -of the corresponding source files) is copyright (C) 2012 Vermeer -Manufacturing Co. - -Other authors retain ownership of their contributions. If a submission -can reasonably be considered independently copyrightable, it's yours and -I encourage you to claim it with appropriate copyright notices. This -submission then falls under the "otherwise noted" category. All -submissions must use a license compatible with the GPL and the exception -above. +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. diff --git a/README b/README index 3fa4e2178..18b2a00f1 100644 --- a/README +++ b/README @@ -27,19 +27,32 @@ written in Python. Migen is the foundation of the next-generation Milkymist SoC. -See the doc/ folder for a more complete description. +See the doc/ folder for more technical information. Code repository: https://github.com/milkymist/migen New Milkymist SoC based on Migen: https://github.com/milkymist/milkymist-ng -Migen is designed for Python 3. +Migen is designed for Python 3.3. -Send questions, comments and patches to devel [AT] lists.milkymist.org -There is a lot of room for improvement in many areas, contributions welcome. -We are also on IRC: #milkymist on the Freenode network. +Migen is released under the very permissive two-clause BSD license. Under the +terms of this license, you are authorized to use Migen for closed-source +proprietary designs. +Even though we do not require you to do so, those things are awesome, so please +do them if possible: + * tell us that you are using Migen + * put the Migen logo (doc/migen_logo.svg) on the page of a product using it, + with a link to milkymist.org + * cite Migen in publications related to research it has helped + * send us feedback and suggestions for improvements + * send us bug reports when something goes wrong + * send us the modifications and improvements you have done to Migen. The use + of "git format-patch" is recommended. If your submission is large and + complex and/or you are not sure how to proceed, feel free to discuss it on + the mailing list or IRC (#milkymist on Freenode) beforehand. -See LICENSE file for copyright and license info. +See LICENSE file for full copyright and license info. You can contact us on the +public mailing list devel [AT] lists.milkymist.org. "Electricity! It's like magic!"