2009-06-12 Joel Sherrill <joel.sherrill@OARcorp.com>

	* Makefile.am, preinstall.am: Add MicroMonitor support.
	* startup/umonsupp.c: New file.

4 files changed, 55 insertions, 0 deletions

diff --git a/c/src/lib/libbsp/arm/csb337/ChangeLog b/c/src/lib/libbsp/arm/csb337/ChangeLog
index 151bfbd976..7f6507d7bb 100644
--- a/c/src/lib/libbsp/arm/csb337/ChangeLog
+++ b/c/src/lib/libbsp/arm/csb337/ChangeLog
@@ -1,3 +1,8 @@
+2009-06-12	Joel Sherrill <joel.sherrill@OARcorp.com>
+
+	* Makefile.am, preinstall.am: Add MicroMonitor support.
+	* startup/umonsupp.c: New file.
+
 2009-06-11	Joel Sherrill <joel.sherrill@OARcorp.com>
 
 	* network/network.c: Attempt to support csb637 PHY.
diff --git a/c/src/lib/libbsp/arm/csb337/Makefile.am b/c/src/lib/libbsp/arm/csb337/Makefile.am
index 3bb9130283..cc896dc320 100644
--- a/c/src/lib/libbsp/arm/csb337/Makefile.am
+++ b/c/src/lib/libbsp/arm/csb337/Makefile.am
@@ -14,6 +14,12 @@ include_HEADERS = include/bsp.h
 include_HEADERS += ../../shared/include/tm27.h
 include_HEADERS += include/sed1356.h
 
+include_umondir = $(includedir)/umon
+include_umon_HEADERS  = ../../shared/umon/cli.h
+include_umon_HEADERS += ../../shared/umon/monlib.h
+include_umon_HEADERS += ../../shared/umon/tfs.h
+
+
 nodist_include_HEADERS = include/bspopts.h
 nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
 DISTCLEANFILES = include/bspopts.h
@@ -50,6 +56,10 @@ libbsp_a_SOURCES += console/sed1356.c console/fbcons.c
 endif
 # abort
 libbsp_a_SOURCES += ../shared/abort/abort.c
+# umon
+libbsp_a_SOURCES += ../../shared/umon/umonrtemsglue.c  \
+    ../../shared/umon/monlib.c ../../shared/umon/tfsDriver.c \
+    startup/umonsupp.c
 
 if HAS_NETWORKING
 network_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__
diff --git a/c/src/lib/libbsp/arm/csb337/preinstall.am b/c/src/lib/libbsp/arm/csb337/preinstall.am
index ec6b0f7ec6..d14c41a24c 100644
--- a/c/src/lib/libbsp/arm/csb337/preinstall.am
+++ b/c/src/lib/libbsp/arm/csb337/preinstall.am
@@ -49,6 +49,23 @@ $(PROJECT_INCLUDE)/sed1356.h: include/sed1356.h $(PROJECT_INCLUDE)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sed1356.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/sed1356.h
 
+$(PROJECT_INCLUDE)/umon/$(dirstamp):
+	@$(MKDIR_P) $(PROJECT_INCLUDE)/umon
+	@: > $(PROJECT_INCLUDE)/umon/$(dirstamp)
+PREINSTALL_DIRS += $(PROJECT_INCLUDE)/umon/$(dirstamp)
+
+$(PROJECT_INCLUDE)/umon/cli.h: ../../shared/umon/cli.h $(PROJECT_INCLUDE)/umon/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/umon/cli.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/umon/cli.h
+
+$(PROJECT_INCLUDE)/umon/monlib.h: ../../shared/umon/monlib.h $(PROJECT_INCLUDE)/umon/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/umon/monlib.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/umon/monlib.h
+
+$(PROJECT_INCLUDE)/umon/tfs.h: ../../shared/umon/tfs.h $(PROJECT_INCLUDE)/umon/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/umon/tfs.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/umon/tfs.h
+
 $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
diff --git a/c/src/lib/libbsp/arm/csb337/startup/umonsupp.c b/c/src/lib/libbsp/arm/csb337/startup/umonsupp.c
new file mode 100644
index 0000000000..3b832658e2
--- /dev/null
+++ b/c/src/lib/libbsp/arm/csb337/startup/umonsupp.c
@@ -0,0 +1,23 @@
+/*
+ *  COPYRIGHT (c) 1989-2009.
+ *  On-Line Applications Research Corporation (OAR).
+ *
+ *  The license and distribution terms for this file may be
+ *  found in the file LICENSE in this distribution or at
+ *  http://www.rtems.com/license/LICENSE.
+ *
+ *  $Id$
+ */
+
+#include <bsp.h>
+
+/*
+ * BSP specific routine to help when calling monConnect().  This
+ * returns the value known to uMon as MONCOMPTR.
+ */
+
+void *rtems_bsp_get_umon_monptr(void)
+{
+  return (void *)0x10000020;
+}
+