svn commit: r203974 - in head/sys/arm: arm include sa11x0
Warner Losh
imp at FreeBSD.org
Tue Feb 16 21:59:19 UTC 2010
Author: imp
Date: Tue Feb 16 21:59:17 2010
New Revision: 203974
URL: http://svn.freebsd.org/changeset/base/203974
Log:
The NetBSD Foundation has granted permission to remove clauses 3 and 4.
Obtained from: NetBSD
Modified:
head/sys/arm/arm/pmap.c
head/sys/arm/arm/support.S
head/sys/arm/include/_inttypes.h
head/sys/arm/include/_stdint.h
head/sys/arm/include/bus.h
head/sys/arm/include/bus_dma.h
head/sys/arm/include/ucontext.h
head/sys/arm/sa11x0/sa11x0.c
head/sys/arm/sa11x0/sa11x0_dmacreg.h
head/sys/arm/sa11x0/sa11x0_gpioreg.h
head/sys/arm/sa11x0/sa11x0_irq.S
head/sys/arm/sa11x0/sa11x0_irqhandler.c
head/sys/arm/sa11x0/sa11x0_ostreg.h
head/sys/arm/sa11x0/sa11x0_ppcreg.h
head/sys/arm/sa11x0/sa11x0_reg.h
head/sys/arm/sa11x0/sa11x0_var.h
Modified: head/sys/arm/arm/pmap.c
==============================================================================
--- head/sys/arm/arm/pmap.c Tue Feb 16 21:49:36 2010 (r203973)
+++ head/sys/arm/arm/pmap.c Tue Feb 16 21:59:17 2010 (r203974)
@@ -77,13 +77,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
Modified: head/sys/arm/arm/support.S
==============================================================================
--- head/sys/arm/arm/support.S Tue Feb 16 21:49:36 2010 (r203973)
+++ head/sys/arm/arm/support.S Tue Feb 16 21:59:17 2010 (r203974)
@@ -72,13 +72,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
Modified: head/sys/arm/include/_inttypes.h
==============================================================================
--- head/sys/arm/include/_inttypes.h Tue Feb 16 21:49:36 2010 (r203973)
+++ head/sys/arm/include/_inttypes.h Tue Feb 16 21:59:17 2010 (r203974)
@@ -13,13 +13,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
Modified: head/sys/arm/include/_stdint.h
==============================================================================
--- head/sys/arm/include/_stdint.h Tue Feb 16 21:49:36 2010 (r203973)
+++ head/sys/arm/include/_stdint.h Tue Feb 16 21:59:17 2010 (r203974)
@@ -14,13 +14,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
Modified: head/sys/arm/include/bus.h
==============================================================================
--- head/sys/arm/include/bus.h Tue Feb 16 21:49:36 2010 (r203973)
+++ head/sys/arm/include/bus.h Tue Feb 16 21:59:17 2010 (r203974)
@@ -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
Modified: head/sys/arm/include/bus_dma.h
==============================================================================
--- head/sys/arm/include/bus_dma.h Tue Feb 16 21:49:36 2010 (r203973)
+++ head/sys/arm/include/bus_dma.h Tue Feb 16 21:59:17 2010 (r203974)
@@ -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
Modified: head/sys/arm/include/ucontext.h
==============================================================================
--- head/sys/arm/include/ucontext.h Tue Feb 16 21:49:36 2010 (r203973)
+++ head/sys/arm/include/ucontext.h Tue Feb 16 21:59:17 2010 (r203974)
@@ -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
Modified: head/sys/arm/sa11x0/sa11x0.c
==============================================================================
--- head/sys/arm/sa11x0/sa11x0.c Tue Feb 16 21:49:36 2010 (r203973)
+++ head/sys/arm/sa11x0/sa11x0.c Tue Feb 16 21:59:17 2010 (r203974)
@@ -14,13 +14,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.
*/
/*-
* Copyright (c) 1999
Modified: head/sys/arm/sa11x0/sa11x0_dmacreg.h
==============================================================================
--- head/sys/arm/sa11x0/sa11x0_dmacreg.h Tue Feb 16 21:49:36 2010 (r203973)
+++ head/sys/arm/sa11x0/sa11x0_dmacreg.h Tue Feb 16 21:59:17 2010 (r203974)
@@ -14,13 +14,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 REGENTS AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
Modified: head/sys/arm/sa11x0/sa11x0_gpioreg.h
==============================================================================
--- head/sys/arm/sa11x0/sa11x0_gpioreg.h Tue Feb 16 21:49:36 2010 (r203973)
+++ head/sys/arm/sa11x0/sa11x0_gpioreg.h Tue Feb 16 21:59:17 2010 (r203974)
@@ -14,13 +14,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
Modified: head/sys/arm/sa11x0/sa11x0_irq.S
==============================================================================
--- head/sys/arm/sa11x0/sa11x0_irq.S Tue Feb 16 21:49:36 2010 (r203973)
+++ head/sys/arm/sa11x0/sa11x0_irq.S Tue Feb 16 21:59:17 2010 (r203974)
@@ -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 Mark Brinicombe
- * for the NetBSD Project.
- * 4. The name of the company nor the name of the author may 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
Modified: head/sys/arm/sa11x0/sa11x0_irqhandler.c
==============================================================================
--- head/sys/arm/sa11x0/sa11x0_irqhandler.c Tue Feb 16 21:49:36 2010 (r203973)
+++ head/sys/arm/sa11x0/sa11x0_irqhandler.c Tue Feb 16 21:59:17 2010 (r203974)
@@ -19,13 +19,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
Modified: head/sys/arm/sa11x0/sa11x0_ostreg.h
==============================================================================
--- head/sys/arm/sa11x0/sa11x0_ostreg.h Tue Feb 16 21:49:36 2010 (r203973)
+++ head/sys/arm/sa11x0/sa11x0_ostreg.h Tue Feb 16 21:59:17 2010 (r203974)
@@ -14,13 +14,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
Modified: head/sys/arm/sa11x0/sa11x0_ppcreg.h
==============================================================================
--- head/sys/arm/sa11x0/sa11x0_ppcreg.h Tue Feb 16 21:49:36 2010 (r203973)
+++ head/sys/arm/sa11x0/sa11x0_ppcreg.h Tue Feb 16 21:59:17 2010 (r203974)
@@ -14,13 +14,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 REGENTS AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
Modified: head/sys/arm/sa11x0/sa11x0_reg.h
==============================================================================
--- head/sys/arm/sa11x0/sa11x0_reg.h Tue Feb 16 21:49:36 2010 (r203973)
+++ head/sys/arm/sa11x0/sa11x0_reg.h Tue Feb 16 21:59:17 2010 (r203974)
@@ -14,13 +14,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
Modified: head/sys/arm/sa11x0/sa11x0_var.h
==============================================================================
--- head/sys/arm/sa11x0/sa11x0_var.h Tue Feb 16 21:49:36 2010 (r203973)
+++ head/sys/arm/sa11x0/sa11x0_var.h Tue Feb 16 21:59:17 2010 (r203974)
@@ -14,13 +14,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 REGENTS AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
More information about the svn-src-all
mailing list