Hardware
/
litex
mirror of https://github.com/enjoy-digital/litex.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LICENSE: clarify

This commit is contained in:
Florent Kermarrec 2019-05-11 09:26:51 +02:00
parent 67159349d6
commit 6e4ac1c493
3 changed files with 6 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
LICENSE
View File

@ -1,4 +1,8 @@
Unless otherwise noted, LiteX is copyright (C) 2012-2019 Florent Kermarrec. LiteX is a MiSoC-based SoC builder using Migen as Python DSL.
Unless otherwise noted, LiteX is copyright (C) 2012-2019 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. All rights reserved.
Redistribution and use in source and binary forms, with or without modification, Redistribution and use in source and binary forms, with or without modification,

29
litex/soc/MISOC_LICENSE
View File

@ -1,29 +0,0 @@
Unless otherwise noted, MiSoC is copyright (C) 2011-2014 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.

2
litex/soc/software/bios/main.c
View File

@ -398,7 +398,7 @@ int main(int i, char **c)
printf("\e[1m /____/_/\\__/\\__/_/|_|\e[0m\n"); printf("\e[1m /____/_/\\__/\\__/_/|_|\e[0m\n");
printf("\n"); printf("\n");
printf(" (c) Copyright 2012-2019 Enjoy-Digital\n"); printf(" (c) Copyright 2012-2019 Enjoy-Digital\n");
printf(" (c) Copyright 2012-2015 M-Labs Ltd\n"); printf(" (c) Copyright 2007-2015 M-Labs Ltd\n");
printf("\n"); printf("\n");
printf(" BIOS built on "__DATE__" "__TIME__"\n"); printf(" BIOS built on "__DATE__" "__TIME__"\n");
crcbios(); crcbios();