summaryrefslogtreecommitdiffstats
path: root/c/src/lib/libbsp/arm/armulator
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2001-12-20 17:32:24 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2001-12-20 17:32:24 +0000
commitdfe5faf880bd37b24061daba8de8d6e43a38a0ce (patch)
treefaeda36f54ba564215e68202e5ee349298bdc64d /c/src/lib/libbsp/arm/armulator
parent2001-12-20 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff)
downloadrtems-dfe5faf880bd37b24061daba8de8d6e43a38a0ce.tar.bz2
2001-12-20 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.ac: Add RTEMS_BSPOPTS_*(ARM_RDP_MONITOR). * startup/Makefile.am: Remove ARM_RDP_MONITOR, AM_CPPFLAGS.
Diffstat (limited to 'c/src/lib/libbsp/arm/armulator')
-rw-r--r--c/src/lib/libbsp/arm/armulator/ChangeLog5
-rw-r--r--c/src/lib/libbsp/arm/armulator/configure.ac15
-rw-r--r--c/src/lib/libbsp/arm/armulator/startup/Makefile.am8
3 files changed, 18 insertions, 10 deletions
diff --git a/c/src/lib/libbsp/arm/armulator/ChangeLog b/c/src/lib/libbsp/arm/armulator/ChangeLog
index 737406b89c..bc5863bd02 100644
--- a/c/src/lib/libbsp/arm/armulator/ChangeLog
+++ b/c/src/lib/libbsp/arm/armulator/ChangeLog
@@ -1,3 +1,8 @@
+2001-12-20 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * configure.ac: Add RTEMS_BSPOPTS_*(ARM_RDP_MONITOR).
+ * startup/Makefile.am: Remove ARM_RDP_MONITOR, AM_CPPFLAGS.
+
2001-12-09 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.ac: Add RTEMS_BPSOPTS_* for ARM_RDI_MONITOR.
diff --git a/c/src/lib/libbsp/arm/armulator/configure.ac b/c/src/lib/libbsp/arm/armulator/configure.ac
index 562e3d6936..e456bf1f44 100644
--- a/c/src/lib/libbsp/arm/armulator/configure.ac
+++ b/c/src/lib/libbsp/arm/armulator/configure.ac
@@ -15,9 +15,20 @@ RTEMS_BSP_CONFIGURE
RTEMS_PROG_CC_FOR_TARGET([-ansi -fasm])
RTEMS_CANONICALIZE_TOOLS
-RTEMS_BSPOPTS_SET([ARM_RDI_MONITOR],[*],[])
+# From newlib
+# Select which debug protocol is being used.
+# ARM_RDP_MONITOR selects the Demon monitor.
+# ARM_RDI_MONITOR selects the Angel monitor.
+# If neither are defined, then hard coded defaults will be used
+# to create the program's environment.
+
+RTEMS_BSPOPTS_SET([ARM_RDI_MONITOR],[*],[1])
RTEMS_BSPOPTS_HELP([ARM_RDI_MONITOR],
-[If defined enable ARM_RDI_MONITOR support])
+[If defined enable Angel monitor support])
+
+RTEMS_BSPOPTS_SET([ARM_RDP_MONITOR],[*],[])
+RTEMS_BSPOPTS_HELP([ARM_RDP_MONITOR],
+[If defined enable Demon monitor support])
# Explicitly list all Makefiles here
AC_CONFIG_FILES([Makefile
diff --git a/c/src/lib/libbsp/arm/armulator/startup/Makefile.am b/c/src/lib/libbsp/arm/armulator/startup/Makefile.am
index 74afb51aa9..a884b49fd5 100644
--- a/c/src/lib/libbsp/arm/armulator/startup/Makefile.am
+++ b/c/src/lib/libbsp/arm/armulator/startup/Makefile.am
@@ -25,14 +25,6 @@ include $(top_srcdir)/../../../../../../automake/lib.am
# (OPTIONAL) Add local stuff here using +=
#
-# From newlib
-# Select which debug protocol is being used.
-# ARM_RDP_MONITOR selects the Demon monitor.
-# ARM_RDI_MONITOR selects the Angel monitor.
-# If neither are defined, then hard coded defaults will be used
-# to create the program's environment.
-AM_CPPFLAGS += -DARM_RDI_MONITOR
-
$(PGM): $(OBJS)
$(make-rel)