Updates from Eric Norum to use the mcpu32 flags and fix comments.

4 files changed, 45 insertions, 84 deletions

diff --git a/c/src/exec/score/cpu/m68k/m68360.h b/c/src/exec/score/cpu/m68k/m68360.h
index cf3984eb7f..84687c49fa 100644
--- a/c/src/exec/score/cpu/m68k/m68360.h
+++ b/c/src/exec/score/cpu/m68k/m68360.h
@@ -6,6 +6,20 @@
  **                                                                      **
  **                        HARDWARE DECLARATIONS                         **
  **                                                                      **
+ **                                                                      **
+ **  Submitted By:                                                       **
+ **                                                                      **
+ **      W. Eric Norum                                                   **
+ **      Saskatchewan Accelerator Laboratory                             **
+ **      University of Saskatchewan                                      **
+ **      107 North Road                                                  **
+ **      Saskatoon, Saskatchewan, CANADA                                 **
+ **      S7N 5C6                                                         **
+ **                                                                      **
+ **      eric@skatter.usask.ca                                           **
+ **                                                                      **
+ **  $Id$                                                                **
+ **                                                                      **
  **************************************************************************
  **************************************************************************
  */
@@ -14,33 +28,6 @@
 #define __MC68360_h
 
 /*
- *  $Revision$    $Date$     $Author$
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- * 
- * W. Eric Norum
- * Saskatchewan Accelerator Laboratory
- * University of Saskatchewan
- * 107 North Road
- * Saskatoon, Saskatchewan, CANADA
- * S7N 5C6
- * 
- * eric@skatter.usask.ca
- */
-
-/*
  *************************************************************************
  *                         REGISTER SUBBLOCKS                            *
  *************************************************************************
diff --git a/c/src/exec/score/cpu/m68k/m68k.h b/c/src/exec/score/cpu/m68k/m68k.h
index 2f935d53ab..8ac881628b 100644
--- a/c/src/exec/score/cpu/m68k/m68k.h
+++ b/c/src/exec/score/cpu/m68k/m68k.h
@@ -59,7 +59,7 @@ extern "C" {
  *     m68lc040      (no FP)
  *     m68ec040      (no FP)
  *     m68302        (no FP)
- *     m68360        (no FP)
+ *     mcpu32        (no FP)  (includes m68360)
  *
  *  Primary difference (for RTEMS) between m68040, m680lc040, and 
  *  m68ec040 is the presence or absence of the FPU.
@@ -177,9 +177,9 @@ extern "C" {
 #define M68K_HAS_PREINDEXING     0
 #define M68K_HAS_EXTB_L          1
 
-#elif defined(m68360)
+#elif defined(mcpu32)
  
-#define CPU_MODEL_NAME         "m68360"
+#define CPU_MODEL_NAME         "mcpu32"
 #define M68K_HAS_VBR             1
 #define M68K_HAS_SEPARATE_STACKS 0
 #define M68K_HAS_FPU             0
diff --git a/cpukit/score/cpu/m68k/m68360.h b/cpukit/score/cpu/m68k/m68360.h
index cf3984eb7f..84687c49fa 100644
--- a/cpukit/score/cpu/m68k/m68360.h
+++ b/cpukit/score/cpu/m68k/m68360.h
@@ -6,6 +6,20 @@
  **                                                                      **
  **                        HARDWARE DECLARATIONS                         **
  **                                                                      **
+ **                                                                      **
+ **  Submitted By:                                                       **
+ **                                                                      **
+ **      W. Eric Norum                                                   **
+ **      Saskatchewan Accelerator Laboratory                             **
+ **      University of Saskatchewan                                      **
+ **      107 North Road                                                  **
+ **      Saskatoon, Saskatchewan, CANADA                                 **
+ **      S7N 5C6                                                         **
+ **                                                                      **
+ **      eric@skatter.usask.ca                                           **
+ **                                                                      **
+ **  $Id$                                                                **
+ **                                                                      **
  **************************************************************************
  **************************************************************************
  */
@@ -14,33 +28,6 @@
 #define __MC68360_h
 
 /*
- *  $Revision$    $Date$     $Author$
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- * 
- * W. Eric Norum
- * Saskatchewan Accelerator Laboratory
- * University of Saskatchewan
- * 107 North Road
- * Saskatoon, Saskatchewan, CANADA
- * S7N 5C6
- * 
- * eric@skatter.usask.ca
- */
-
-/*
  *************************************************************************
  *                         REGISTER SUBBLOCKS                            *
  *************************************************************************
diff --git a/cpukit/score/cpu/m68k/rtems/m68k/m68360.h b/cpukit/score/cpu/m68k/rtems/m68k/m68360.h
index cf3984eb7f..84687c49fa 100644
--- a/cpukit/score/cpu/m68k/rtems/m68k/m68360.h
+++ b/cpukit/score/cpu/m68k/rtems/m68k/m68360.h
@@ -6,6 +6,20 @@
  **                                                                      **
  **                        HARDWARE DECLARATIONS                         **
  **                                                                      **
+ **                                                                      **
+ **  Submitted By:                                                       **
+ **                                                                      **
+ **      W. Eric Norum                                                   **
+ **      Saskatchewan Accelerator Laboratory                             **
+ **      University of Saskatchewan                                      **
+ **      107 North Road                                                  **
+ **      Saskatoon, Saskatchewan, CANADA                                 **
+ **      S7N 5C6                                                         **
+ **                                                                      **
+ **      eric@skatter.usask.ca                                           **
+ **                                                                      **
+ **  $Id$                                                                **
+ **                                                                      **
  **************************************************************************
  **************************************************************************
  */
@@ -14,33 +28,6 @@
 #define __MC68360_h
 
 /*
- *  $Revision$    $Date$     $Author$
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- * 
- * W. Eric Norum
- * Saskatchewan Accelerator Laboratory
- * University of Saskatchewan
- * 107 North Road
- * Saskatoon, Saskatchewan, CANADA
- * S7N 5C6
- * 
- * eric@skatter.usask.ca
- */
-
-/*
  *************************************************************************
  *                         REGISTER SUBBLOCKS                            *
  *************************************************************************