2000-11-13 Jiri Gaisler <jgais@ws.estec.esa.nl>

	* Makefile.am, configure.in, gnatsupp/Makefile.am,
	gnatsupp/gnatsupp.c, include/Makefile.am, include/bsp.h,
	start/Makefile.am, startup/Makefile.am, startup/setvec.c,
	wrapup/Makefile.am:
	* erc32sonic: New directory.
	* erc32sonic/Makefile.am, erc32sonic/erc32sonic.c,
	erc32sonic/.cvsignore: New files.
	* include/erc32.h: New file.
	* startup/boardinit.S: New file.
	Big update of SPARC support for ERC32 and LEON.
	Added support for ERC32 without floating point.
	Added SONIC support as configured on Tharsys ERC32 board.
	The bsp's share various code in the shared directory:
	   gnat-support, start-up code, etc.
	To decrease the foot-print, I removed the 16 kbyte start-up
	stack that was put in .bss and never reused once the system
	was up. The stack is now put between the heap and the
	workspace. To reclaim it, the user can do a rtems_region_extend
	to merge the stack to the heap region once the system is up.

3 files changed, 147 insertions, 0 deletions

diff --git a/c/src/lib/libbsp/sparc/erc32/erc32sonic/.cvsignore b/c/src/lib/libbsp/sparc/erc32/erc32sonic/.cvsignore
new file mode 100644
index 0000000000..282522db03
--- /dev/null
+++ b/c/src/lib/libbsp/sparc/erc32/erc32sonic/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/c/src/lib/libbsp/sparc/erc32/erc32sonic/Makefile.am b/c/src/lib/libbsp/sparc/erc32/erc32sonic/Makefile.am
new file mode 100644
index 0000000000..6e5ed48573
--- /dev/null
+++ b/c/src/lib/libbsp/sparc/erc32/erc32sonic/Makefile.am
@@ -0,0 +1,35 @@
+##
+## $Id$
+##
+
+AUTOMAKE_OPTIONS = foreign 1.4
+
+PGM = $(ARCH)/erc32sonic.rel
+
+C_FILES = erc32sonic.c
+C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
+
+OBJS = $(C_O_FILES)
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../../../../../../automake/compile.am
+include $(top_srcdir)/../../../../../../automake/lib.am
+
+#
+# (OPTIONAL) Add local stuff here using +=
+#
+
+AM_CPPFLAGS += -D__INSIDE_RTEMS_BSD_TCPIP_STACK__
+
+$(PGM): $(OBJS)
+	$(make-rel)
+
+# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
+
+all-local: $(ARCH) $(OBJS) $(PGM)
+
+.PRECIOUS: $(PGM)
+
+EXTRA_DIST = erc32sonic.c
+
+include $(top_srcdir)/../../../../../../automake/local.am
diff --git a/c/src/lib/libbsp/sparc/erc32/erc32sonic/erc32sonic.c b/c/src/lib/libbsp/sparc/erc32/erc32sonic/erc32sonic.c
new file mode 100644
index 0000000000..82f05c9c57
--- /dev/null
+++ b/c/src/lib/libbsp/sparc/erc32/erc32sonic/erc32sonic.c
@@ -0,0 +1,110 @@
+/*
+ *  THARSYS VME SPARC RT board SONIC Configuration Information
+ *
+ *  References:
+ *
+ *  1) SVME/DMV-171 Single Board Computer Documentation Package, #805905,
+ *     DY 4 Systems Inc., Kanata, Ontario, September, 1996.
+ *
+ *  $Id$
+ */
+
+#include <bsp.h>
+#include <libchip/sonic.h>
+#if (SONIC_DEBUG & SONIC_DEBUG_PRINT_REGISTERS)
+#include <stdio.h>
+#endif
+
+void erc32_sonic_write_register(
+  void       *base,
+  unsigned32  regno,
+  unsigned32  value
+)
+{
+  volatile unsigned32 *p = base;
+
+#if (SONIC_DEBUG & SONIC_DEBUG_PRINT_REGISTERS)
+  printf( "%p Write 0x%04x to %s (0x%02x)\n",
+      &p[regno], value, SONIC_Reg_name[regno], regno );
+  fflush( stdout );
+#endif
+  p[regno] = 0x0ffff & value;
+}
+
+unsigned32 erc32_sonic_read_register(
+  void       *base,
+  unsigned32  regno
+)
+{
+  volatile unsigned32 *p = base;
+  unsigned32           value;
+
+  value = p[regno];
+#if (SONIC_DEBUG & SONIC_DEBUG_PRINT_REGISTERS)
+  printf( "%p Read 0x%04x from %s (0x%02x)\n",
+      &p[regno], value, SONIC_Reg_name[regno], regno );
+  fflush( stdout );
+#endif
+  return 0x0ffff & value;
+}
+
+/*
+ * Default sizes of transmit and receive descriptor areas
+ */
+#define RDA_COUNT     20 /* 20 */
+#define TDA_COUNT     20 /* 10 */
+
+/*
+ * Default device configuration register values
+ * Conservative, generic values.
+ * DCR:
+ *      No extended bus mode
+ *      Unlatched bus retry
+ *      Programmable outputs unused
+ *      Asynchronous bus mode
+ *      User definable pins unused
+ *      No wait states (access time controlled by DTACK*)
+ *      32-bit DMA
+ *      Empty/Fill DMA mode
+ *      Maximum Transmit/Receive FIFO
+ * DC2:
+ *      Extended programmable outputs unused
+ *      Normal HOLD request
+ *      Packet compress output unused
+ *      No reject on CAM match
+ */
+#define SONIC_DCR  ( DCR_DW32 | DCR_RFT24 | DCR_TFT28)
+#define SONIC_DC2 (0)
+
+/*
+ * Default location of device registers
+ */
+#define SONIC_BASE_ADDRESS 0x10000100
+
+/*
+ * Default interrupt vector
+ */
+#define SONIC_VECTOR 0x1E
+
+sonic_configuration_t erc32_sonic_configuration = {
+  SONIC_BASE_ADDRESS,        /* base address */ 
+  SONIC_VECTOR,              /* vector number */ 
+  SONIC_DCR,                 /* DCR register value */
+  SONIC_DC2,                 /* DC2 register value */
+  TDA_COUNT,                 /* number of transmit descriptors */
+  RDA_COUNT,                 /* number of receive descriptors */
+  erc32_sonic_write_register,
+  erc32_sonic_read_register
+};
+
+int rtems_erc32_sonic_driver_attach(struct rtems_bsdnet_ifconfig *config)
+{
+
+  ERC32_MEC.IO_Configuration |= (0x15 << (((SONIC_BASE_ADDRESS >> 24) & 0x3) * 8));
+  ERC32_MEC.Control &= ~0xe0000;	/* Disable DMA time-out and parity */
+  ERC32_MEC.Control |= 0x10001; 		/* Enable DMA */
+  ERC32_MEC.Interrupt_Mask &= ~0x000340;
+  *((volatile int *) 0x10000300) = 0;
+  return(rtems_sonic_driver_attach( config, &erc32_sonic_configuration ));
+  
+}