Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Change license to 2-clause BSD

  • Loading branch information...
commit ceb0a99d83ed992a3a3164f91f4c4c6d632550a5 1 parent 8e11fcf
Sébastien Bourdeauducq authored April 15, 2013

Showing 2 changed files with 52 additions and 52 deletions. Show diff stats Hide diff stats

  1. 75  LICENSE
  2. 29  README
75  LICENSE
... ...
@@ -1,44 +1,31 @@
1  
-Migen is free software: you can redistribute it and/or modify it under
2  
-the terms of the GNU General Public License as published by the Free
3  
-Software Foundation, version 3 of the License. This program is
4  
-distributed in the hope that it will be useful, but WITHOUT ANY
5  
-WARRANTY; without even the implied warranty of MERCHANTABILITY or
6  
-FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
7  
-more details.
8  
-
9  
-Additional permissions under section 7 of the GNU General Public License
10  
-(GPL) are hereby granted. The purpose of this exception is to allow
11  
-non-GPL (including proprietary) logic cores to be used in conjunction
12  
-with code generated by Migen in a design.
13  
-
14  
-"Generated" code refers to Verilog or VHDL code that has been obtained
15  
-by converting FHDL structures using Migen.
16  
-
17  
-To "instantiate" is to include and connect another module as specified
18  
-in section 12.1.2 of the IEEE standard 1364-2001 or in section 9.6 of
19  
-the IEEE standard 1076-1993.
20  
-
21  
-(1) You have permission to propagate a work of generated code that
22  
-    instantiates modules that are not generated code and do not comply
23  
-    with the GPL.
24  
-(2) You have permission to propagate a work of Verilog or VHDL code that
25  
-    is not generated code, does not comply with the GPL and instantiates
26  
-    generated code.
27  
-
28  
-The availability of this exception does not imply any general
29  
-presumption that third-party software is unaffected by the copyleft
30  
-requirements of the license of Migen.
31  
-
32  
-Unless otherwise noted, Migen's source code is copyright (C) 2011-2012
33  
-Sebastien Bourdeauducq.
34  
-
35  
-The simulation extension (as mentioned in the comments at the beginning
36  
-of the corresponding source files) is copyright (C) 2012 Vermeer
37  
-Manufacturing Co.
38  
-
39  
-Other authors retain ownership of their contributions. If a submission
40  
-can reasonably be considered independently copyrightable, it's yours and
41  
-I encourage you to claim it with appropriate copyright notices. This
42  
-submission then falls under the "otherwise noted" category. All
43  
-submissions must use a license compatible with the GPL and the exception
44  
-above.
  1
+Unless otherwise noted, Migen is copyright (C) 2011-2013 Sebastien Bourdeauducq.
  2
+The simulation extension (as mentioned in the comments at the beginning of the
  3
+corresponding source files) is copyright (C) 2012 Vermeer Manufacturing Co. All
  4
+rights reserved.
  5
+
  6
+Redistribution and use in source and binary forms, with or without modification,
  7
+are permitted provided that the following conditions are met:
  8
+
  9
+1. Redistributions of source code must retain the above copyright notice, this
  10
+   list of conditions and the following disclaimer. 
  11
+2. Redistributions in binary form must reproduce the above copyright notice,
  12
+   this list of conditions and the following disclaimer in the documentation
  13
+   and/or other materials provided with the distribution. 
  14
+
  15
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  16
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  17
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  18
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
  19
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  20
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  21
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
  22
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  23
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  24
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  25
+
  26
+
  27
+Other authors retain ownership of their contributions. If a submission can
  28
+reasonably be considered independently copyrightable, it's yours and we
  29
+encourage you to claim it with appropriate copyright notices. This submission
  30
+then falls under the "otherwise noted" category. All submissions are strongly
  31
+encouraged to use the two-clause BSD license reproduced above.
29  README
@@ -27,19 +27,32 @@ written in Python.
27 27
 
28 28
 Migen is the foundation of the next-generation Milkymist SoC.
29 29
 
30  
-See the doc/ folder for a more complete description.
  30
+See the doc/ folder for more technical information.
31 31
 
32 32
 Code repository:
33 33
 https://github.com/milkymist/migen
34 34
 New Milkymist SoC based on Migen:
35 35
 https://github.com/milkymist/milkymist-ng
36 36
 
37  
-Migen is designed for Python 3.
38  
-
39  
-Send questions, comments and patches to devel [AT] lists.milkymist.org
40  
-There is a lot of room for improvement in many areas, contributions welcome.
41  
-We are also on IRC: #milkymist on the Freenode network.
42  
-
43  
-See LICENSE file for copyright and license info.
  37
+Migen is designed for Python 3.3.
  38
+
  39
+Migen is released under the very permissive two-clause BSD license. Under the
  40
+terms of this license, you are authorized to use Migen for closed-source
  41
+proprietary designs.
  42
+Even though we do not require you to do so, those things are awesome, so please
  43
+do them if possible:
  44
+ * tell us that you are using Migen
  45
+ * put the Migen logo (doc/migen_logo.svg) on the page of a product using it,
  46
+   with a link to milkymist.org
  47
+ * cite Migen in publications related to research it has helped
  48
+ * send us feedback and suggestions for improvements
  49
+ * send us bug reports when something goes wrong
  50
+ * send us the modifications and improvements you have done to Migen. The use
  51
+   of "git format-patch" is recommended. If your submission is large and
  52
+   complex and/or you are not sure how to proceed, feel free to discuss it on
  53
+   the mailing list or IRC (#milkymist on Freenode) beforehand.
  54
+
  55
+See LICENSE file for full copyright and license info. You can contact us on the
  56
+public mailing list devel [AT] lists.milkymist.org.
44 57
 
45 58
   "Electricity! It's like magic!"

0 notes on commit ceb0a99

Please sign in to comment.
Something went wrong with that request. Please try again.