Update Eric Norum contact info and start to normalize file headers

13 files changed, 21 insertions, 60 deletions

diff --git a/bsps/powerpc/gen5200/console/console.c b/bsps/powerpc/gen5200/console/console.c
index 8f7129f23c..9071754859 100644
--- a/bsps/powerpc/gen5200/console/console.c
+++ b/bsps/powerpc/gen5200/console/console.c
@@ -16,8 +16,7 @@
  * Copyright (C) 1998 by Frasca International, Inc.
  *
  * Derived from c/src/lib/libbsp/m68k/gen360/console/console.c
- * Author: W. Eric Norum <eric@skatter.usask.ca>
- * Saskatchewan Accelerator Laboratory, University of Saskatchewan, CANADA
+ * Author: W. Eric Norum <eric@norum.ca>
  *
  * COPYRIGHT (c) 1989, 2008.
  * On-Line Applications Research Corporation (OAR).
diff --git a/bsps/powerpc/include/mpc5xx.h b/bsps/powerpc/include/mpc5xx.h
index fc9b756cbf..fe5c1ac86c 100644
--- a/bsps/powerpc/include/mpc5xx.h
+++ b/bsps/powerpc/include/mpc5xx.h
@@ -11,14 +11,7 @@
  *
  *  Submitted By:                                                        *
  *                                                                       *
- *      W. Eric Norum                                                    *
- *      Saskatchewan Accelerator Laboratory                              *
- *      University of Saskatchewan                                       *
- *      107 North Road                                                   *
- *      Saskatoon, Saskatchewan, CANADA                                  *
- *      S7N 5C6                                                          *
- *                                                                       *
- *      eric@skatter.usask.ca                                            *
+ *      Eric Norum <eric@norum.ca>                                       *
  *                                                                       *
  *  Modified for use with the MPC860 (original code was for MC68360)     *
  *  by                                                                   *
diff --git a/bsps/powerpc/include/mpc8260.h b/bsps/powerpc/include/mpc8260.h
index ea088ebae8..25e1d78be3 100644
--- a/bsps/powerpc/include/mpc8260.h
+++ b/bsps/powerpc/include/mpc8260.h
@@ -21,14 +21,7 @@
 **								        **
 **  Submitted By:                                                       **
 **                                                                      **
-**      W. Eric Norum                                                   **
-**      Saskatchewan Accelerator Laboratory                             **
-**      University of Saskatchewan                                      **
-**      107 North Road                                                  **
-**      Saskatoon, Saskatchewan, CANADA                                 **
-**      S7N 5C6                                                         **
-**                                                                      **
-**      eric@skatter.usask.ca                                           **
+**      Eric Norum <eric.norum.ca>                                      **
 **                                                                      **
 **  Modified for use with the MPC860 (original code was for MC68360)    **
 **  by                                                                  **
diff --git a/bsps/powerpc/include/mpc8xx.h b/bsps/powerpc/include/mpc8xx.h
index 60baf60593..3e9be35d5d 100644
--- a/bsps/powerpc/include/mpc8xx.h
+++ b/bsps/powerpc/include/mpc8xx.h
@@ -9,14 +9,7 @@
 **                                                                      **
 **  Submitted By:                                                       **
 **                                                                      **
-**      W. Eric Norum                                                   **
-**      Saskatchewan Accelerator Laboratory                             **
-**      University of Saskatchewan                                      **
-**      107 North Road                                                  **
-**      Saskatoon, Saskatchewan, CANADA                                 **
-**      S7N 5C6                                                         **
-**                                                                      **
-**      eric@skatter.usask.ca                                           **
+**      Eric Norum <eric.norum.ca>                                      **
 **                                                                      **
 **  Modified for use with the MPC860 (original code was for MC68360)    **
 **  by                                                                  **
diff --git a/bsps/powerpc/mpc8260ads/dev/console-generic.c b/bsps/powerpc/mpc8260ads/dev/console-generic.c
index 4bfb6407eb..ed842c6652 100644
--- a/bsps/powerpc/mpc8260ads/dev/console-generic.c
+++ b/bsps/powerpc/mpc8260ads/dev/console-generic.c
@@ -27,11 +27,7 @@
  *  Copyright (C) 1998 by Frasca International, Inc.
  *
  *  Derived from c/src/lib/libbsp/m68k/gen360/console/console.c written by:
- *    W. Eric Norum
- *    Saskatchewan Accelerator Laboratory
- *    University of Saskatchewan
- *    Saskatoon, Saskatchewan, CANADA
- *    eric@skatter.usask.ca
+ *    Eric Norum <eric.norum.ca>
  *
  *  COPYRIGHT (c) 1989-1998.
  *  On-Line Applications Research Corporation (OAR).
diff --git a/bsps/powerpc/mpc8260ads/start/brg.c b/bsps/powerpc/mpc8260ads/start/brg.c
index 741f131a8d..596a67fa93 100644
--- a/bsps/powerpc/mpc8260ads/start/brg.c
+++ b/bsps/powerpc/mpc8260ads/start/brg.c
@@ -21,11 +21,7 @@
  *    Author: Jay Monkman (jmonkman@frasca.com)
  *    Copyright (C) 1998 by Frasca International, Inc.
  *  and
- *    W. Eric Norum
- *    Saskatchewan Accelerator Laboratory
- *    University of Saskatchewan
- *    Saskatoon, Saskatchewan, CANADA
- *    eric@skatter.usask.ca
+ *    Eric Norum <eric.norum.ca>
  *
  *  The license and distribution terms for this file may be
  *  found in the file LICENSE in this distribution or at
diff --git a/bsps/powerpc/mpc8260ads/start/cp.c b/bsps/powerpc/mpc8260ads/start/cp.c
index b8adf9feaf..76e6ae2f80 100644
--- a/bsps/powerpc/mpc8260ads/start/cp.c
+++ b/bsps/powerpc/mpc8260ads/start/cp.c
@@ -6,7 +6,7 @@
  * Based on code (alloc860.c in eth_comm port) by
  * Jay Monkman (jmonkman@frasca.com),
  * which, in turn, is based on code by
- * W. Eric Norum (eric@skatter.usask.ca).
+ * Eric Norum <eric.norum.ca>
  *
  * Modifications by Darlene Stewart (Darlene.Stewart@iit.nrc.ca):
  * Copyright (c) 1999, National Research Council of Canada
diff --git a/bsps/powerpc/mpc8260ads/start/dpram.c b/bsps/powerpc/mpc8260ads/start/dpram.c
index 8b74a9759c..fd0b6927eb 100644
--- a/bsps/powerpc/mpc8260ads/start/dpram.c
+++ b/bsps/powerpc/mpc8260ads/start/dpram.c
@@ -7,7 +7,7 @@
  * Based on code (alloc860.c in eth_comm port) by
  * Jay Monkman (jmonkman@frasca.com),
  * which, in turn, is based on code by
- * W. Eric Norum (eric@skatter.usask.ca).
+ * Eric Norum <eric.norum.ca>
  *
  *
  * Modifications :
diff --git a/bsps/powerpc/ss555/dev/console-generic.c b/bsps/powerpc/ss555/dev/console-generic.c
index 7e1629b714..6dfdf28749 100644
--- a/bsps/powerpc/ss555/dev/console-generic.c
+++ b/bsps/powerpc/ss555/dev/console-generic.c
@@ -21,11 +21,7 @@
  *  Copyright (C) 1998 by Frasca International, Inc.
  *
  *  Derived from c/src/lib/libbsp/m68k/gen360/console/console.c written by:
- *    W. Eric Norum
- *    Saskatchewan Accelerator Laboratory
- *    University of Saskatchewan
- *    Saskatoon, Saskatchewan, CANADA
- *    eric@skatter.usask.ca
+ *    Eric Norum <eric@norum.ca>
  *
  *  COPYRIGHT (c) 1989-1998.
  *  On-Line Applications Research Corporation (OAR).
diff --git a/bsps/powerpc/ss555/start/start.S b/bsps/powerpc/ss555/start/start.S
index 121403e1fc..924ef82e64 100644
--- a/bsps/powerpc/ss555/start/start.S
+++ b/bsps/powerpc/ss555/start/start.S
@@ -8,7 +8,7 @@
  * This file is based on several others:
  *
  * (1) start360.s from the gen68360 BSP by
- *     W. Eric Norum (eric@skatter.usask.ca)
+ *     W. Eric Norum (eric@norum.ca)
  *     with the following copyright and license:
  *
  *     COPYRIGHT (c) 1989-1998.
diff --git a/bsps/powerpc/tqm8xx/console/console.c b/bsps/powerpc/tqm8xx/console/console.c
index 0e0dace33e..f1bc7792c7 100644
--- a/bsps/powerpc/tqm8xx/console/console.c
+++ b/bsps/powerpc/tqm8xx/console/console.c
@@ -13,23 +13,18 @@
  */
 
 /*
- *  Author:
- *    W. Eric Norum
- *    Saskatchewan Accelerator Laboratory
- *    University of Saskatchewan
- *    Saskatoon, Saskatchewan, CANADA
- *    eric@skatter.usask.ca
+ * Copyright (c) 2005 Eric Norum <eric@norum.ca>
  *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
+ * COPYRIGHT (c) 1989-1998.
+ * On-Line Applications Research Corporation (OAR).
+ * Copyright assigned to U.S. Government, 1994.
  *
- *  Copyright (c) 2008 Thomas Doerfler, embedded brains GmbH.
- *  All rights reserved.
+ * Copyright (c) 2008 Thomas Doerfler, embedded brains GmbH.
+ * All rights reserved.
  *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
+ * The license and distribution terms for this file may be
+ * found in the file LICENSE in this distribution or at
+ * http://www.OARcorp.com/rtems/license.html.
  */
 
 #include <unistd.h>
diff --git a/bsps/powerpc/tqm8xx/start/cp.c b/bsps/powerpc/tqm8xx/start/cp.c
index de38f0a5df..9938f37623 100644
--- a/bsps/powerpc/tqm8xx/start/cp.c
+++ b/bsps/powerpc/tqm8xx/start/cp.c
@@ -6,7 +6,7 @@
  * Based on code (alloc860.c in eth_comm port) by
  * Jay Monkman (jmonkman@frasca.com),
  * which, in turn, is based on code by
- * W. Eric Norum (eric@skatter.usask.ca).
+ * W. Eric Norum (eric@norum.ca).
  *
  * Modifications by Darlene Stewart (Darlene.Stewart@iit.nrc.ca):
  * Copyright (c) 1999, National Research Council of Canada
diff --git a/bsps/powerpc/tqm8xx/start/dpram.c b/bsps/powerpc/tqm8xx/start/dpram.c
index 4f6cb6d94a..f40e207c93 100644
--- a/bsps/powerpc/tqm8xx/start/dpram.c
+++ b/bsps/powerpc/tqm8xx/start/dpram.c
@@ -6,7 +6,7 @@
  * Based on code (alloc860.c in eth_comm port) by
  * Jay Monkman (jmonkman@frasca.com),
  * which, in turn, is based on code by
- * W. Eric Norum (eric@skatter.usask.ca).
+ * W. Eric Norum (eric@norum.ca).
  *
  *
  * Modifications :