2008-09-25 Joel Sherrill <joel.sherrill@oarcorp.com>

	* Makefile.am, custom/simsh4.cfg: Recognize the the GDB SuperH
	simulator is just an architectural simulator and does not include
	devices. Rename existing simulator BSP configurations to simsh1 and
	simsh2 and add simsh4.
	* custom/simsh1.cfg, custom/simsh2.cfg: New files.
	* custom/shsim.cfg, custom/simsh7032.cfg, custom/simsh7045.cfg: Removed.

6 files changed, 22 insertions, 45 deletions

diff --git a/make/ChangeLog b/make/ChangeLog
index d8fcb368c1..18f0d91823 100644
--- a/make/ChangeLog
+++ b/make/ChangeLog
@@ -1,5 +1,14 @@
 2008-09-25	Joel Sherrill <joel.sherrill@oarcorp.com>
 
+	* Makefile.am, custom/simsh4.cfg: Recognize the the GDB SuperH
+	simulator is just an architectural simulator and does not include
+	devices. Rename existing simulator BSP configurations to simsh1 and
+	simsh2 and add simsh4.
+	* custom/simsh1.cfg, custom/simsh2.cfg: New files.
+	* custom/shsim.cfg, custom/simsh7032.cfg, custom/simsh7045.cfg: Removed.
+
+2008-09-25	Joel Sherrill <joel.sherrill@oarcorp.com>
+
 	* custom/bf537skyeye.cfg: Removed.
 
 2008-09-25	Joel Sherrill <joel.sherrill@oarcorp.com>
diff --git a/make/Makefile.am b/make/Makefile.am
index 2ec4537410..d6ac90ee5a 100644
--- a/make/Makefile.am
+++ b/make/Makefile.am
@@ -33,7 +33,7 @@ EXTRA_DIST += custom/Cygwin-posix.cfg custom/FreeBSD-posix.cfg \
     custom/nios2_iss.cfg \
     custom/ods68302.cfg custom/pc386.cfg custom/posix.cfg \
     custom/psim.cfg custom/rtl22xx.cfg custom/score603e.cfg \
-    custom/shsim.cfg custom/ts_386ex.cfg custom/nds.cfg \
-    custom/smdk2410.cfg
+    custom/simsh1.cfg custom/simsh2.cfg custom/simsh4.cfg \
+    custom/ts_386ex.cfg custom/nds.cfg custom/smdk2410.cfg
 
 include $(top_srcdir)/automake/host.am
diff --git a/make/custom/shsim.cfg b/make/custom/shsim.cfg
deleted file mode 100644
index 175840b594..0000000000
--- a/make/custom/shsim.cfg
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-#  Config file for the sh simulator in gdb
-#
-#  $Id$
-#
-
-include $(RTEMS_ROOT)/make/custom/default.cfg
-
-RTEMS_CPU=sh
-RTEMS_CPU_MODEL=sh7032
-
-# This is the actual bsp directory used during the build process.
-RTEMS_BSP_FAMILY=shsim
-
-#  This contains the compiler options necessary to select the CPU model
-#  and (hopefully) optimize for it. 
-#
-CPU_CFLAGS = -m1
-
-# optimize flag: typically -O2
-CFLAGS_OPTIMIZE_V = -O2 -g
diff --git a/make/custom/simsh7032.cfg b/make/custom/simsh1.cfg
index 059ec03fe2..2ba4b154cd 100644
--- a/make/custom/simsh7032.cfg
+++ b/make/custom/simsh1.cfg
@@ -1,7 +1,7 @@
 #
-#  simsh7032.cfg
+#  simsh1.cfg
 #
-#  default configuration for gdb-simulation of Hitachi sh7032 processors
+#  default configuration for gdb-simulation of Hitachi sh1 processors
 #
 #  Author: Ralf Corsepius (corsepiu@faw.uni-ulm.de)
 #
@@ -11,7 +11,7 @@
 include $(RTEMS_ROOT)/make/custom/shsim.cfg
 
 RTEMS_CPU=sh
-RTEMS_CPU_MODEL=sh7032
+RTEMS_CPU_MODEL=shgdb
 
 #
 #  This contains the compiler options necessary to select the CPU model
diff --git a/make/custom/simsh7045.cfg b/make/custom/simsh2.cfg
index 464b38b44b..26a441c8ce 100644
--- a/make/custom/simsh7045.cfg
+++ b/make/custom/simsh2.cfg
@@ -1,7 +1,7 @@
 #
-#  simsh7045.cfg
+#  simsh2.cfg
 #
-#  default configuration for gdb-simulation of Hitachi sh7045 processors
+#  default configuration for gdb-simulation of Hitachi sh2 processors
 #
 #  Author: Ralf Corsepius (corsepiu@faw.uni-ulm.de)
 #
@@ -11,7 +11,7 @@
 include $(RTEMS_ROOT)/make/custom/shsim.cfg
 
 RTEMS_CPU=sh
-RTEMS_CPU_MODEL=sh7045
+RTEMS_CPU_MODEL=shgdb
 
 #
 #  This contains the compiler options necessary to select the CPU model
diff --git a/make/custom/simsh4.cfg b/make/custom/simsh4.cfg
index a01f81906f..106d4a3460 100644
--- a/make/custom/simsh4.cfg
+++ b/make/custom/simsh4.cfg
@@ -1,10 +1,5 @@
 #
-# simsh4.cfg
-#
-# default configuration for Hitachi SH4 architecture simulator
-#
-# Copyright (C) 2001 OKTET Ltd., St.-Petersburg, Russia
-# Author: Victor V. Vengerov <vvv@oktet.ru>
+#  Config file for the sh simulator in gdb
 #
 #  $Id$
 #
@@ -12,21 +7,15 @@
 include $(RTEMS_ROOT)/make/custom/default.cfg
 
 RTEMS_CPU=sh
-RTEMS_CPU_MODEL=sh7750
+RTEMS_CPU_MODEL=shgdb
 
 # This is the actual bsp directory used during the build process.
-RTEMS_BSP_FAMILY=simsh4
+RTEMS_BSP_FAMILY=shsim
 
-#
 #  This contains the compiler options necessary to select the CPU model
-#  and (hopefully) optimize for it.
-#
-# Seems to be good without initialisation FPSCR.
-# Also works with SH4_FPSCR_DN bit set.
-#CPU_CFLAGS = -m4-single-only -ml
+#  and (hopefully) optimize for it. 
 #
-# It works with SH4_FPSCR_PR bit set
 CPU_CFLAGS = -m4 -ml
 
 # optimize flag: typically -O2
-CFLAGS_OPTIMIZE_V = -O2 -g 
+CFLAGS_OPTIMIZE_V = -O2 -g