aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Hershberger <joe.hershberger@ni.com>2012-10-04 09:54:07 +0000
committerTom Rini <trini@ti.com>2012-10-05 11:07:42 -0700
commit961c437b6cd68375d66c1f0cac9ade63115c0750 (patch)
tree82604c7021d342b571b7a6ed1986a95e2ee0d68f
parentd923a5d59f2ca2ba4d31b424ff36ff282f858eb5 (diff)
downloadu-boot-linaro-stable-961c437b6cd68375d66c1f0cac9ade63115c0750.tar.gz
Improve license declaration for cmd_ini.h
Instead of referenceing the source webpage (which can change) include the license in the source file. Signed-off-by: Joe Hershberger <joe.hershberger@ni.com> Reported-by: Igor Grinberg <grinberg@compulab.co.il> Cc: Igor Grinberg <grinberg@compulab.co.il> Cc: Tom Rini <trini@ti.com> Cc: Wolfgang Denk <wd@denx.de> Acked-by: Wolfgang Denk <wd@denx.de>
-rw-r--r--common/cmd_ini.c32
1 files changed, 30 insertions, 2 deletions
diff --git a/common/cmd_ini.c b/common/cmd_ini.c
index 652e4f607..74481cbf6 100644
--- a/common/cmd_ini.c
+++ b/common/cmd_ini.c
@@ -1,9 +1,37 @@
/*
* inih -- simple .INI file parser
*
- * inih is released under the New BSD license (see LICENSE.txt). Go to the
- * project home page for more info:
+ * Copyright (c) 2009, Brush Technology
+ * Copyright (c) 2012:
+ * Joe Hershberger, National Instruments, joe.hershberger@ni.com
+ * All rights reserved.
*
+ * The "inih" library is distributed under the following license, which is
+ * derived from and very similar to the 3-clause BSD license:
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * 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.
+ * * Neither the name of Brush Technology nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY BRUSH TECHNOLOGY ''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 BRUSH TECHNOLOGY 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.
+ *
+ * Go to the project home page for more info:
* http://code.google.com/p/inih/
*/