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 BSD

  • Loading branch information...
commit 524b631c83c319318652badddbca29629eb03cb6 1 parent bf32559
Sébastien Bourdeauducq authored July 31, 2013

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

  1. 29  LICENSE
  2. 37  README
29  LICENSE
... ...
@@ -0,0 +1,29 @@
  1
+Unless otherwise noted, milkymist-ng's is copyright (C) 2011-2013 Sebastien Bourdeauducq.
  2
+All rights reserved.
  3
+
  4
+Redistribution and use in source and binary forms, with or without modification,
  5
+are permitted provided that the following conditions are met:
  6
+
  7
+1. Redistributions of source code must retain the above copyright notice, this
  8
+   list of conditions and the following disclaimer. 
  9
+2. Redistributions in binary form must reproduce the above copyright notice,
  10
+   this list of conditions and the following disclaimer in the documentation
  11
+   and/or other materials provided with the distribution. 
  12
+
  13
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  14
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  15
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  16
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
  17
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  18
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  19
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
  20
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  21
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  22
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  23
+
  24
+
  25
+Other authors retain ownership of their contributions. If a submission can
  26
+reasonably be considered independently copyrightable, it's yours and we
  27
+encourage you to claim it with appropriate copyright notices. This submission
  28
+then falls under the "otherwise noted" category. All submissions are strongly
  29
+encouraged to use the two-clause BSD license reproduced above.
37  README
... ...
@@ -1,4 +1,4 @@
1  
-[> Milkymist-NG system-on-chip
  1
+[> Milkymist-ng system-on-chip
2 2
 ------------------------------
3 3
 
4 4
 This is the next-generation Milkymist(tm) system-on-chip design,
@@ -10,7 +10,7 @@ This translates to more development productivity, better video resolution
10 10
 and quality, ease of designing complex hardware accelerators, and much
11 11
 more flexibility in hardware designs.
12 12
 
13  
-The Milkymist-NG SoC supports the Mixxeo and the Milkymist One.
  13
+The milkymist-ng SoC supports the Mixxeo and the Milkymist One.
14 14
 Obtain yours at http://milkymist.org
15 15
 
16 16
 [> Instructions (software)
@@ -53,7 +53,7 @@ Once this is done, build the bitstream with:
53 53
 This will generate the build/soc-<platform>.bit programming file
54 54
 and load it with UrJTAG.
55 55
 
56  
-A new BIOS needs to be built and flashed for the -NG SoC.
  56
+A new BIOS needs to be built and flashed for the -ng SoC.
57 57
 
58 58
 Enjoy!
59 59
 
@@ -65,20 +65,19 @@ Code repository:
65 65
 Send questions, comments and patches to devel [AT] lists.milkymist.org
66 66
 We are also on IRC: #milkymist on the Freenode network.
67 67
 
68  
-Milkymist-NG is free software: you can redistribute it and/or modify it
69  
-under the terms of the GNU General Public License as published by the
70  
-Free Software Foundation, version 3 of the License. This program is
71  
-distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
72  
-without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
73  
-PARTICULAR PURPOSE. See the GNU General Public License for more details.
  68
+Milkymist-ng is released under the very permissive two-clause BSD license. Under
  69
+the terms of this license, you are authorized to use milkymist-ng for
  70
+closed-source proprietary designs.
  71
+Even though we do not require you to do so, those things are awesome, so please
  72
+do them if possible:
  73
+ * tell us that you are using milkymist-ng
  74
+ * cite milkymist-ng in publications related to research it has helped
  75
+ * send us feedback and suggestions for improvements
  76
+ * send us bug reports when something goes wrong
  77
+ * send us the modifications and improvements you have done to milkymist-ng.
  78
+   The use of "git format-patch" is recommended. If your submission is large and
  79
+   complex and/or you are not sure how to proceed, feel free to discuss it on
  80
+   the mailing list or IRC (#milkymist on Freenode) beforehand.
74 81
 
75  
-The authors grant the additional permissions that the code can be used in
76  
-conjunction with the LatticeMico32 CPU core from Lattice.
77  
-
78  
-Unless otherwise noted, Milkymist-NG's source code is copyright (C)
79  
-2011-2013 Sebastien Bourdeauducq. Other authors retain ownership of their
80  
-contributions. If a submission can reasonably be considered independently
81  
-copyrightable, it's yours and I encourage you to claim it with
82  
-appropriate copyright notices. This submission then falls under the
83  
-"otherwise noted" category. All submissions must use a license compatible
84  
-with the GPL and the additional permissions above.
  82
+See LICENSE file for full copyright and license info. You can contact us on the
  83
+public mailing list devel [AT] lists.milkymist.org.

0 notes on commit 524b631

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