Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/arm/at91 Drop 3rd and 4th clauses. Approved by all...
details: https://anonhg.NetBSD.org/src/rev/b98e433ed247
branches: trunk
changeset: 748408:b98e433ed247
user: snj <snj%NetBSD.org@localhost>
date: Fri Oct 23 06:53:12 2009 +0000
description:
Drop 3rd and 4th clauses. Approved by all copyright holders:
joff and Embedtronics Oy's owners (Jukka Marin and Sami Kantoluoto).
diffstat:
sys/arch/arm/at91/at91_bus_space.c | 10 ++--------
sys/arch/arm/at91/at91aic.c | 11 ++---------
sys/arch/arm/at91/at91aicreg.h | 8 +-------
sys/arch/arm/at91/at91aicvar.h | 8 +-------
sys/arch/arm/at91/at91bus.c | 11 ++---------
sys/arch/arm/at91/at91busvar.h | 10 ++--------
sys/arch/arm/at91/at91dbgureg.h | 8 +-------
sys/arch/arm/at91/at91dbguvar.h | 10 ++--------
sys/arch/arm/at91/at91emac.c | 13 +++----------
sys/arch/arm/at91/at91emacreg.h | 12 +++---------
sys/arch/arm/at91/at91emacvar.h | 12 +++---------
sys/arch/arm/at91/at91intr.h | 11 ++---------
sys/arch/arm/at91/at91pdcreg.h | 8 +-------
sys/arch/arm/at91/at91pmc.c | 11 ++---------
sys/arch/arm/at91/at91pmcvar.h | 8 +-------
sys/arch/arm/at91/at91reg.h | 10 ++--------
sys/arch/arm/at91/at91rm9200busvar.h | 10 ++--------
sys/arch/arm/at91/at91rm9200reg.h | 10 ++--------
sys/arch/arm/at91/at91sam9261busvar.h | 10 ++--------
sys/arch/arm/at91/at91sam9261reg.h | 10 ++--------
sys/arch/arm/at91/at91streg.h | 12 +++---------
sys/arch/arm/at91/at91tcreg.h | 12 +++---------
sys/arch/arm/at91/at91usart.c | 13 +++----------
sys/arch/arm/at91/at91usartreg.h | 8 +-------
sys/arch/arm/at91/at91usartvar.h | 10 ++--------
sys/arch/arm/at91/at91var.h | 8 +-------
26 files changed, 51 insertions(+), 213 deletions(-)
diffs (truncated from 656 to 300 lines):
diff -r c2ec6a6cbbcb -r b98e433ed247 sys/arch/arm/at91/at91_bus_space.c
--- a/sys/arch/arm/at91/at91_bus_space.c Fri Oct 23 05:37:18 2009 +0000
+++ b/sys/arch/arm/at91/at91_bus_space.c Fri Oct 23 06:53:12 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: at91_bus_space.c,v 1.2 2008/07/03 01:15:38 matt Exp $ */
+/* $NetBSD: at91_bus_space.c,v 1.3 2009/10/23 06:53:12 snj Exp $ */
/*
* Based on ep93xx_space.c
@@ -16,12 +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 Ichiro FUKUHARA.
- * 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 ICHIRO FUKUHARA ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -37,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: at91_bus_space.c,v 1.2 2008/07/03 01:15:38 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: at91_bus_space.c,v 1.3 2009/10/23 06:53:12 snj Exp $");
/*
* bus_space I/O functions for ep93xx
diff -r c2ec6a6cbbcb -r b98e433ed247 sys/arch/arm/at91/at91aic.c
--- a/sys/arch/arm/at91/at91aic.c Fri Oct 23 05:37:18 2009 +0000
+++ b/sys/arch/arm/at91/at91aic.c Fri Oct 23 06:53:12 2009 +0000
@@ -1,5 +1,5 @@
-/* $Id: at91aic.c,v 1.2 2008/07/03 01:15:38 matt Exp $ */
-/* $NetBSD: at91aic.c,v 1.2 2008/07/03 01:15:38 matt Exp $ */
+/* $Id: at91aic.c,v 1.3 2009/10/23 06:53:12 snj Exp $ */
+/* $NetBSD: at91aic.c,v 1.3 2009/10/23 06:53:12 snj Exp $ */
/*
* Copyright (c) 2007 Embedtronics Oy.
@@ -23,13 +23,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
diff -r c2ec6a6cbbcb -r b98e433ed247 sys/arch/arm/at91/at91aicreg.h
--- a/sys/arch/arm/at91/at91aicreg.h Fri Oct 23 05:37:18 2009 +0000
+++ b/sys/arch/arm/at91/at91aicreg.h Fri Oct 23 06:53:12 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: at91aicreg.h,v 1.2 2008/07/03 01:15:38 matt Exp $ */
+/* $NetBSD: at91aicreg.h,v 1.3 2009/10/23 06:53:13 snj Exp $ */
/*
* Copyright (c) 2007 Embedtronics Oy
@@ -12,12 +12,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 Ichiro FUKUHARA.
- * 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 ICHIRO FUKUHARA ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
diff -r c2ec6a6cbbcb -r b98e433ed247 sys/arch/arm/at91/at91aicvar.h
--- a/sys/arch/arm/at91/at91aicvar.h Fri Oct 23 05:37:18 2009 +0000
+++ b/sys/arch/arm/at91/at91aicvar.h Fri Oct 23 06:53:12 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: at91aicvar.h,v 1.2 2008/07/03 01:15:38 matt Exp $ */
+/* $NetBSD: at91aicvar.h,v 1.3 2009/10/23 06:53:13 snj Exp $ */
/*
* Copyright (c) 2007 Embedtronics Oy
@@ -12,12 +12,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 Ichiro FUKUHARA.
- * 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 ICHIRO FUKUHARA ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
diff -r c2ec6a6cbbcb -r b98e433ed247 sys/arch/arm/at91/at91bus.c
--- a/sys/arch/arm/at91/at91bus.c Fri Oct 23 05:37:18 2009 +0000
+++ b/sys/arch/arm/at91/at91bus.c Fri Oct 23 06:53:12 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: at91bus.c,v 1.6 2009/08/11 17:04:14 matt Exp $ */
+/* $NetBSD: at91bus.c,v 1.7 2009/10/23 06:53:13 snj Exp $ */
/*
* Copyright (c) 2007 Embedtronics Oy
@@ -12,13 +12,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
@@ -34,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: at91bus.c,v 1.6 2009/08/11 17:04:14 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: at91bus.c,v 1.7 2009/10/23 06:53:13 snj Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
diff -r c2ec6a6cbbcb -r b98e433ed247 sys/arch/arm/at91/at91busvar.h
--- a/sys/arch/arm/at91/at91busvar.h Fri Oct 23 05:37:18 2009 +0000
+++ b/sys/arch/arm/at91/at91busvar.h Fri Oct 23 06:53:12 2009 +0000
@@ -1,5 +1,5 @@
-/* $Id: at91busvar.h,v 1.2 2008/07/03 01:15:38 matt Exp $ */
-/* $NetBSD: at91busvar.h,v 1.2 2008/07/03 01:15:38 matt Exp $ */
+/* $Id: at91busvar.h,v 1.3 2009/10/23 06:53:13 snj Exp $ */
+/* $NetBSD: at91busvar.h,v 1.3 2009/10/23 06:53:13 snj Exp $ */
/*
* Copyright (c) 2007 Embedtronics Oy
@@ -13,12 +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 Ichiro FUKUHARA.
- * 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 ICHIRO FUKUHARA ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
diff -r c2ec6a6cbbcb -r b98e433ed247 sys/arch/arm/at91/at91dbgureg.h
--- a/sys/arch/arm/at91/at91dbgureg.h Fri Oct 23 05:37:18 2009 +0000
+++ b/sys/arch/arm/at91/at91dbgureg.h Fri Oct 23 06:53:12 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: at91dbgureg.h,v 1.2 2008/07/03 01:15:38 matt Exp $ */
+/* $NetBSD: at91dbgureg.h,v 1.3 2009/10/23 06:53:13 snj Exp $ */
/*
* Copyright (c) 2007 Embedtronics Oy
@@ -12,12 +12,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 Ichiro FUKUHARA.
- * 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 ICHIRO FUKUHARA ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
diff -r c2ec6a6cbbcb -r b98e433ed247 sys/arch/arm/at91/at91dbguvar.h
--- a/sys/arch/arm/at91/at91dbguvar.h Fri Oct 23 05:37:18 2009 +0000
+++ b/sys/arch/arm/at91/at91dbguvar.h Fri Oct 23 06:53:12 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: at91dbguvar.h,v 1.2 2008/07/03 01:15:38 matt Exp $ */
+/* $NetBSD: at91dbguvar.h,v 1.3 2009/10/23 06:53:13 snj Exp $ */
/*-
* Copyright (c) 2007 Embedtronics Oy
@@ -11,13 +11,7 @@
* 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
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
diff -r c2ec6a6cbbcb -r b98e433ed247 sys/arch/arm/at91/at91emac.c
--- a/sys/arch/arm/at91/at91emac.c Fri Oct 23 05:37:18 2009 +0000
+++ b/sys/arch/arm/at91/at91emac.c Fri Oct 23 06:53:12 2009 +0000
@@ -1,5 +1,5 @@
-/* $Id: at91emac.c,v 1.5 2009/03/18 16:00:09 cegger Exp $ */
-/* $NetBSD: at91emac.c,v 1.5 2009/03/18 16:00:09 cegger Exp $ */
+/* $Id: at91emac.c,v 1.6 2009/10/23 06:53:13 snj Exp $ */
+/* $NetBSD: at91emac.c,v 1.6 2009/10/23 06:53:13 snj Exp $ */
/*
* Copyright (c) 2007 Embedtronics Oy
@@ -18,13 +18,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
@@ -40,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: at91emac.c,v 1.5 2009/03/18 16:00:09 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: at91emac.c,v 1.6 2009/10/23 06:53:13 snj Exp $");
#include <sys/types.h>
#include <sys/param.h>
diff -r c2ec6a6cbbcb -r b98e433ed247 sys/arch/arm/at91/at91emacreg.h
--- a/sys/arch/arm/at91/at91emacreg.h Fri Oct 23 05:37:18 2009 +0000
+++ b/sys/arch/arm/at91/at91emacreg.h Fri Oct 23 06:53:12 2009 +0000
@@ -1,5 +1,5 @@
-/* $Id: at91emacreg.h,v 1.2 2008/07/03 01:15:38 matt Exp $ */
-/* $NetBSD: at91emacreg.h,v 1.2 2008/07/03 01:15:38 matt Exp $ */
+/* $Id: at91emacreg.h,v 1.3 2009/10/23 06:53:13 snj Exp $ */
+/* $NetBSD: at91emacreg.h,v 1.3 2009/10/23 06:53:13 snj Exp $ */
/*-
* Copyright (c) 2007 Embedtronics Oy
* All rights reserved
@@ -12,13 +12,7 @@
* 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
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
diff -r c2ec6a6cbbcb -r b98e433ed247 sys/arch/arm/at91/at91emacvar.h
--- a/sys/arch/arm/at91/at91emacvar.h Fri Oct 23 05:37:18 2009 +0000
+++ b/sys/arch/arm/at91/at91emacvar.h Fri Oct 23 06:53:12 2009 +0000
@@ -1,5 +1,5 @@
-/* $Id: at91emacvar.h,v 1.2 2008/07/03 01:15:38 matt Exp $ */
-/* $NetBSD: at91emacvar.h,v 1.2 2008/07/03 01:15:38 matt Exp $ */
+/* $Id: at91emacvar.h,v 1.3 2009/10/23 06:53:13 snj Exp $ */
+/* $NetBSD: at91emacvar.h,v 1.3 2009/10/23 06:53:13 snj Exp $ */
/*-
* Copyright (c) 2007 Embedtronics Oy
* All rights reserved
@@ -17,13 +17,7 @@
* 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
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
diff -r c2ec6a6cbbcb -r b98e433ed247 sys/arch/arm/at91/at91intr.h
--- a/sys/arch/arm/at91/at91intr.h Fri Oct 23 05:37:18 2009 +0000
+++ b/sys/arch/arm/at91/at91intr.h Fri Oct 23 06:53:12 2009 +0000
@@ -1,5 +1,5 @@
-/* $Id: at91intr.h,v 1.2 2008/07/03 01:15:38 matt Exp $ */
-/* $NetBSD: at91intr.h,v 1.2 2008/07/03 01:15:38 matt Exp $ */
+/* $Id: at91intr.h,v 1.3 2009/10/23 06:53:13 snj Exp $ */
+/* $NetBSD: at91intr.h,v 1.3 2009/10/23 06:53:13 snj Exp $ */
/*
* Copyright (c) 2007 Embedtronics Oy.
@@ -17,13 +17,6 @@
Home |
Main Index |
Thread Index |
Old Index