From 65e34be9b468a447967a1efbe06326b6109891cf Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Wed, 11 Mar 2015 09:14:15 -0600 Subject: [PATCH] Update COPYING file with special license requirements for PPPD --- COPYING | 47 ++++++++++++++++++++++++-- arch/arm/include/armv7-m/irq_lazyfpu.h | 2 +- 2 files changed, 46 insertions(+), 3 deletions(-) diff --git a/COPYING b/COPYING index 8b294040a8..1c82d0ca20 100644 --- a/COPYING +++ b/COPYING @@ -9,10 +9,12 @@ have any licensing concerns. NuttX ^^^^^^ -License for NuttX in general (authorship of individual files may vary): +License for NuttX in general (authorship and copyright dates on +individual files will vary): + /************************************************************************* * - * Copyright (C) 2007-2014 Gregory Nutt. All rights reserved. + * Copyright (C) 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -223,3 +225,44 @@ drivers/video/ov2640 content of those tables and still retain this BSD license. I am guessing so, but I am not a copyright attorney so you should use this driver in products at your own risk. + +apps/netutils/pppd +^^^^^^^^^^^^^^^^^^ + + This implementation of PPPD has a license that is mostly compatible the + NuttX 3-clause BSD license, but includes a fourth clause that required + acknowledgement of Mike Johnson/Mycal Labs if it is built into your + product: + + Copyright (C) 2000, Mycal Labs www.mycal.com + Copyright (c) 2003, Mike Johnson, Mycal Labs, www.mycal.net + 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. + 3. All advertising materials mentioning features or use of this software + must display the following acknowledgement: + This product includes software developed by Mike Johnson/Mycal Labs + www.mycal.net. + 4. The name of the author may not be used to endorse or promote + products derived from this software without specific prior + written permission. + + THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. diff --git a/arch/arm/include/armv7-m/irq_lazyfpu.h b/arch/arm/include/armv7-m/irq_lazyfpu.h index e211cfbe50..7d9a792ff6 100644 --- a/arch/arm/include/armv7-m/irq_lazyfpu.h +++ b/arch/arm/include/armv7-m/irq_lazyfpu.h @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/arm/include/armv7-m/irq.h + * arch/arm/include/armv7-m/irq_lazyfpu.h * * Copyright (C) 2009, 2011-2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt