2005-10-05 Jiri Gaisler <jiri@gaisler.com>

            Edvin Catovic <edvin@gaisler.com>
            Konrad Eisele <konrad@gaisler.com>

	PR 827/bsps
	* custom/Makefile.am, custom/erc32.cfg, custom/erc32nfp.cfg,
	custom/leon1.cfg, custom/leon2.cfg: Portion of large update of SPARC
	BSPs. Includes addition of sis, leon2 and leon3 BSPs, deletion of
	leon BSP, addition of SMC91111 NIC driver and much more.
	* custom/sis.cfg: New file.

7 files changed, 60 insertions, 13 deletions

diff --git a/make/ChangeLog b/make/ChangeLog
index 21e353d4e9..88abe95863 100644
--- a/make/ChangeLog
+++ b/make/ChangeLog
@@ -1,3 +1,14 @@
+2005-10-05  Jiri Gaisler <jiri@gaisler.com>
+            Edvin Catovic <edvin@gaisler.com>
+            Konrad Eisele <konrad@gaisler.com>
+
+	PR 827/bsps
+	* custom/Makefile.am, custom/erc32.cfg, custom/erc32nfp.cfg,
+	custom/leon1.cfg, custom/leon2.cfg: Portion of large update of SPARC
+	BSPs. Includes addition of sis, leon2 and leon3 BSPs, deletion of
+	leon BSP, addition of SMC91111 NIC driver and much more.
+	* custom/sis.cfg: New file.
+
 2005-09-12	Thomas Doerfler <Thomas.Doerfler@imd-systems.de>
 
 	PR 822/bsps
diff --git a/make/custom/Makefile.am b/make/custom/Makefile.am
index 0203bdd352..cbec5018e2 100644
--- a/make/custom/Makefile.am
+++ b/make/custom/Makefile.am
@@ -10,9 +10,9 @@ rtems_make_custom_DATA = default.cfg
 
 EXTRA_DIST = Cygwin-posix.cfg FreeBSD-posix.cfg HPUX9-posix.cfg \
     Linux-posix.cfg Solaris-posix.cfg bare.cfg cvme961.cfg dmv152.cfg \
-    dmv177.cfg efi332.cfg efi68k.cfg ep1a.cfg erc32.cfg erc32nfp.cfg eth_comm.cfg \
+    dmv177.cfg efi332.cfg efi68k.cfg ep1a.cfg erc32.cfg eth_comm.cfg \
     gen68302.cfg gen68340.cfg gen68360.cfg gen68360_040.cfg gensh1.cfg \
-    helas403.cfg i386ex.cfg idp.cfg jmr3904.cfg leon1.cfg leon2.cfg \
+    helas403.cfg i386ex.cfg idp.cfg jmr3904.cfg leon2.cfg leon3.cfg \
     mcp750.cfg mvme136.cfg mvme147.cfg mvme147s.cfg mvme162.cfg mvme162lx.cfg \
     mvme167.cfg mvme2100.cfg mvme2307.cfg no_bsp.cfg \
     ods68302.cfg p4000.cfg p4600.cfg p4650.cfg pc386.cfg \
diff --git a/make/custom/erc32.cfg b/make/custom/erc32.cfg
index 27eb5ef0de..4d588693aa 100644
--- a/make/custom/erc32.cfg
+++ b/make/custom/erc32.cfg
@@ -13,11 +13,11 @@ RTEMS_CPU_MODEL=erc32
 # This is the actual bsp directory used during the build process.
 RTEMS_BSP_FAMILY=erc32
 
-CPU_CFLAGS = -mcpu=cypress
+CPU_CFLAGS = -mcpu=cypress -msoft-float
 
 # optimize flag: typically -0, could use -O4 or -fast
 # -O4 is ok for RTEMS
-CFLAGS_OPTIMIZE_V=-O4
+CFLAGS_OPTIMIZE_V=-O2
 
 # The following are definitions of make-exe which will work using ld as
 # is currently required.  It is expected that as of gcc 2.8, the end user
diff --git a/make/custom/erc32nfp.cfg b/make/custom/erc32nfp.cfg
index 7cef835eaf..61fb3be5eb 100644
--- a/make/custom/erc32nfp.cfg
+++ b/make/custom/erc32nfp.cfg
@@ -31,3 +31,36 @@ define make-exe
 	$(SIZE) $(basename $@).exe
 endef
 # Miscellaneous additions go here
+#
+#  Config file for the European Space Agency ERC32
+#  a V7 SPARC processor derived from the Cypress 601/602 set.
+#
+#  $Id$
+#
+
+# ERC32 without FPU
+
+RTEMS_CPU_MODEL=erc32nfp
+
+include $(RTEMS_ROOT)/make/custom/default.cfg
+
+# This is the actual bsp directory used during the build process.
+RTEMS_BSP_FAMILY=erc32
+
+CPU_CFLAGS = -mcpu=cypress -msoft-float
+
+# optimize flag: typically -0, could use -O4 or -fast
+# -O4 is ok for RTEMS
+CFLAGS_OPTIMIZE_V=-O4
+
+# The following are definitions of make-exe which will work using ld as
+# is currently required.  It is expected that as of gcc 2.8, the end user
+# will be able to override parts of the compilers specs and link using gcc.
+
+define make-exe
+	$(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) -o $(basename $@).exe \
+	    $(LINK_OBJS) $(LINK_LIBS)
+	$(NM) -g -n $(basename $@).exe > $(basename $@).num
+	$(SIZE) $(basename $@).exe
+endef
+# Miscellaneous additions go here
diff --git a/make/custom/leon1.cfg b/make/custom/leon1.cfg
index 39614e3b3f..a9822eefcb 100644
--- a/make/custom/leon1.cfg
+++ b/make/custom/leon1.cfg
@@ -9,4 +9,3 @@
 RTEMS_CPU_MODEL=leon1
 
 include $(RTEMS_ROOT)/make/custom/leon2.cfg
-
diff --git a/make/custom/leon2.cfg b/make/custom/leon2.cfg
index 28a6719d74..67507e350b 100644
--- a/make/custom/leon2.cfg
+++ b/make/custom/leon2.cfg
@@ -7,14 +7,9 @@
 include $(RTEMS_ROOT)/make/custom/default.cfg
 
 RTEMS_CPU=sparc
-
-ifeq ($(RTEMS_CPU_MODEL),leon1)
-MSOFT_FLOAT = -msoft-float
-else
 RTEMS_CPU_MODEL=leon2
-endif
 # This is the actual bsp directory used during the build process.
-RTEMS_BSP_FAMILY=leon
+RTEMS_BSP_FAMILY=leon2
 
 #   The -mflat avoids the use of save/restore instructions.  It has
 #   a negative impact on the performance of RTEMS and should not be used.
@@ -22,11 +17,12 @@ RTEMS_BSP_FAMILY=leon
 # This had been used with gcc-2.7.2
 # CPU_CFLAGS = -mno-v8 -mcypress $(MSOFT_FLOAT)
 #     -mcpu=cypress says to optimize for a Cypress 60x chipset
-CPU_CFLAGS = -mcpu=cypress $(MSOFT_FLOAT)
+#CPU_CFLAGS = -mcpu=cypress $(MSOFT_FLOAT)
+CPU_CFLAGS = -mcpu=cypress -msoft-float
 
 # optimize flag: typically -0, could use -O4 or -fast
 # -O4 is ok for RTEMS
-CFLAGS_OPTIMIZE_V=-O4
+CFLAGS_OPTIMIZE_V=-O2
 
 # The following are definitions of make-exe which will work using ld as
 # is currently required.  It is expected that as of gcc 2.8, the end user
diff --git a/make/custom/sis.cfg b/make/custom/sis.cfg
new file mode 100644
index 0000000000..1c33252e81
--- /dev/null
+++ b/make/custom/sis.cfg
@@ -0,0 +1,8 @@
+#
+#  Configuration file for the SPARC/ERC32 Simulator SIS
+#
+#  $Id$
+#
+
+include $(RTEMS_ROOT)/make/custom/erc32.cfg
+