From 524b631c83c319318652badddbca29629eb03cb6 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Wed, 31 Jul 2013 23:20:32 +0200 Subject: [PATCH] Change license to BSD --- LICENSE | 29 +++++++++++++++++++++++++++++ README | 37 ++++++++++++++++++------------------- 2 files changed, 47 insertions(+), 19 deletions(-) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 000000000..ceedb657d --- /dev/null +++ b/LICENSE @@ -0,0 +1,29 @@ +Unless otherwise noted, milkymist-ng's is copyright (C) 2011-2013 Sebastien Bourdeauducq. +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. diff --git a/README b/README index 1475e615f..412cd7fda 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -[> Milkymist-NG system-on-chip +[> Milkymist-ng system-on-chip ------------------------------ This is the next-generation Milkymist(tm) system-on-chip design, @@ -10,7 +10,7 @@ This translates to more development productivity, better video resolution and quality, ease of designing complex hardware accelerators, and much more flexibility in hardware designs. -The Milkymist-NG SoC supports the Mixxeo and the Milkymist One. +The milkymist-ng SoC supports the Mixxeo and the Milkymist One. Obtain yours at http://milkymist.org [> Instructions (software) @@ -53,7 +53,7 @@ Once this is done, build the bitstream with: This will generate the build/soc-.bit programming file and load it with UrJTAG. -A new BIOS needs to be built and flashed for the -NG SoC. +A new BIOS needs to be built and flashed for the -ng SoC. Enjoy! @@ -65,20 +65,19 @@ Code repository: Send questions, comments and patches to devel [AT] lists.milkymist.org We are also on IRC: #milkymist on the Freenode network. -Milkymist-NG 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. +Milkymist-ng is released under the very permissive two-clause BSD license. Under +the terms of this license, you are authorized to use milkymist-ng 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 milkymist-ng + * cite milkymist-ng 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 milkymist-ng. + 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. -The authors grant the additional permissions that the code can be used in -conjunction with the LatticeMico32 CPU core from Lattice. - -Unless otherwise noted, Milkymist-NG's source code is copyright (C) -2011-2013 Sebastien Bourdeauducq. 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 additional permissions above. +See LICENSE file for full copyright and license info. You can contact us on the +public mailing list devel [AT] lists.milkymist.org.