Module Name: src
Committed By: tsutsui
Date: Sat Dec 14 02:58:20 UTC 2019
Modified Files:
src/sys/arch/emips/ebus: ace_ebus.c flash_ebus.c
src/sys/arch/emips/emips: bus_space.c
src/sys/arch/emips/include: loadfile_machdep.h
src/sys/arch/emips/stand/common: bootinfo.c bootinfo.h bootxx.c
prom_iface.c
Log Message:
Remove clause 3 and 4 from TNF licenses.
Ok'ed by martin@ in PR/54760.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/emips/ebus/ace_ebus.c \
src/sys/arch/emips/ebus/flash_ebus.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/emips/emips/bus_space.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/emips/include/loadfile_machdep.h
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/emips/stand/common/bootinfo.c \
src/sys/arch/emips/stand/common/bootinfo.h \
src/sys/arch/emips/stand/common/bootxx.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/emips/stand/common/prom_iface.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/emips/ebus/ace_ebus.c
diff -u src/sys/arch/emips/ebus/ace_ebus.c:1.21 src/sys/arch/emips/ebus/ace_ebus.c:1.22
--- src/sys/arch/emips/ebus/ace_ebus.c:1.21 Mon Dec 2 19:40:19 2019
+++ src/sys/arch/emips/ebus/ace_ebus.c Sat Dec 14 02:58:19 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ace_ebus.c,v 1.21 2019/12/02 19:40:19 bouyer Exp $ */
+/* $NetBSD: ace_ebus.c,v 1.22 2019/12/14 02:58:19 tsutsui Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ace_ebus.c,v 1.21 2019/12/02 19:40:19 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ace_ebus.c,v 1.22 2019/12/14 02:58:19 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1501,13 +1501,6 @@ sysace_send_config(struct ace_softc *sc,
* 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 the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation 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 THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
Index: src/sys/arch/emips/ebus/flash_ebus.c
diff -u src/sys/arch/emips/ebus/flash_ebus.c:1.21 src/sys/arch/emips/ebus/flash_ebus.c:1.22
--- src/sys/arch/emips/ebus/flash_ebus.c:1.21 Mon Dec 2 19:40:19 2019
+++ src/sys/arch/emips/ebus/flash_ebus.c Sat Dec 14 02:58:19 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: flash_ebus.c,v 1.21 2019/12/02 19:40:19 bouyer Exp $ */
+/* $NetBSD: flash_ebus.c,v 1.22 2019/12/14 02:58:19 tsutsui Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: flash_ebus.c,v 1.21 2019/12/02 19:40:19 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: flash_ebus.c,v 1.22 2019/12/14 02:58:19 tsutsui Exp $");
/* Driver for the Intel 28F320/640/128 (J3A150) StrataFlash memory device
* Extended to include the Intel JS28F256P30T95.
@@ -1341,13 +1341,6 @@ static int eflash_write_at (struct eflas
* 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 the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation 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 THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
Index: src/sys/arch/emips/emips/bus_space.c
diff -u src/sys/arch/emips/emips/bus_space.c:1.2 src/sys/arch/emips/emips/bus_space.c:1.3
--- src/sys/arch/emips/emips/bus_space.c:1.2 Sun Feb 12 16:34:07 2012
+++ src/sys/arch/emips/emips/bus_space.c Sat Dec 14 02:58:20 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_space.c,v 1.2 2012/02/12 16:34:07 matt Exp $ */
+/* $NetBSD: bus_space.c,v 1.3 2019/12/14 02:58:20 tsutsui Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -16,13 +16,6 @@
* 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 the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation 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 THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@@ -42,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_space.c,v 1.2 2012/02/12 16:34:07 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_space.c,v 1.3 2019/12/14 02:58:20 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/arch/emips/include/loadfile_machdep.h
diff -u src/sys/arch/emips/include/loadfile_machdep.h:1.2 src/sys/arch/emips/include/loadfile_machdep.h:1.3
--- src/sys/arch/emips/include/loadfile_machdep.h:1.2 Wed Aug 6 21:57:49 2014
+++ src/sys/arch/emips/include/loadfile_machdep.h Sat Dec 14 02:58:20 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: loadfile_machdep.h,v 1.2 2014/08/06 21:57:49 joerg Exp $ */
+/* $NetBSD: loadfile_machdep.h,v 1.3 2019/12/14 02:58:20 tsutsui Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -15,13 +15,6 @@
* 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 the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation 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 THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
Index: src/sys/arch/emips/stand/common/bootinfo.c
diff -u src/sys/arch/emips/stand/common/bootinfo.c:1.1 src/sys/arch/emips/stand/common/bootinfo.c:1.2
--- src/sys/arch/emips/stand/common/bootinfo.c:1.1 Wed Jan 26 01:18:54 2011
+++ src/sys/arch/emips/stand/common/bootinfo.c Sat Dec 14 02:58:20 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: bootinfo.c,v 1.1 2011/01/26 01:18:54 pooka Exp $ */
+/* $NetBSD: bootinfo.c,v 1.2 2019/12/14 02:58:20 tsutsui Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -15,13 +15,6 @@
* 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 the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation 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 THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
Index: src/sys/arch/emips/stand/common/bootinfo.h
diff -u src/sys/arch/emips/stand/common/bootinfo.h:1.1 src/sys/arch/emips/stand/common/bootinfo.h:1.2
--- src/sys/arch/emips/stand/common/bootinfo.h:1.1 Wed Jan 26 01:18:54 2011
+++ src/sys/arch/emips/stand/common/bootinfo.h Sat Dec 14 02:58:20 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: bootinfo.h,v 1.1 2011/01/26 01:18:54 pooka Exp $ */
+/* $NetBSD: bootinfo.h,v 1.2 2019/12/14 02:58:20 tsutsui Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -15,13 +15,6 @@
* 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 the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation 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 THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
Index: src/sys/arch/emips/stand/common/bootxx.c
diff -u src/sys/arch/emips/stand/common/bootxx.c:1.1 src/sys/arch/emips/stand/common/bootxx.c:1.2
--- src/sys/arch/emips/stand/common/bootxx.c:1.1 Wed Jan 26 01:18:54 2011
+++ src/sys/arch/emips/stand/common/bootxx.c Sat Dec 14 02:58:20 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: bootxx.c,v 1.1 2011/01/26 01:18:54 pooka Exp $ */
+/* $NetBSD: bootxx.c,v 1.2 2019/12/14 02:58:20 tsutsui Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -15,13 +15,6 @@
* 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 the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation 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 THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
Index: src/sys/arch/emips/stand/common/prom_iface.c
diff -u src/sys/arch/emips/stand/common/prom_iface.c:1.6 src/sys/arch/emips/stand/common/prom_iface.c:1.7
--- src/sys/arch/emips/stand/common/prom_iface.c:1.6 Sat Mar 12 02:13:35 2016
+++ src/sys/arch/emips/stand/common/prom_iface.c Sat Dec 14 02:58:20 2019
@@ -11,13 +11,6 @@
* 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 the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation 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 THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
