summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2003-08-20 13:36:43 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2003-08-20 13:36:43 +0000
commitbd6ec2876cd9d6090cf5fa543f0e3f1d9f6a8821 (patch)
tree2483408520ca9d8f2c16f361bc951e885e9e4a18
parent2003-08-20 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff)
downloadrtems-bd6ec2876cd9d6090cf5fa543f0e3f1d9f6a8821.tar.bz2
2003-08-20 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.ac: Add BSPOPTS PRINTK_MINOR and CONSOLE_MINOR. * console/Makefile.am: Don't include @RTEMS_BSP@.cfg
-rw-r--r--c/src/lib/libbsp/m68k/mvme167/ChangeLog5
-rw-r--r--c/src/lib/libbsp/m68k/mvme167/configure.ac16
-rw-r--r--c/src/lib/libbsp/m68k/mvme167/console/Makefile.am1
3 files changed, 21 insertions, 1 deletions
diff --git a/c/src/lib/libbsp/m68k/mvme167/ChangeLog b/c/src/lib/libbsp/m68k/mvme167/ChangeLog
index ee315e49d1..769f5c17ae 100644
--- a/c/src/lib/libbsp/m68k/mvme167/ChangeLog
+++ b/c/src/lib/libbsp/m68k/mvme167/ChangeLog
@@ -1,3 +1,8 @@
+2003-08-20 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * configure.ac: Add BSPOPTS PRINTK_MINOR and CONSOLE_MINOR.
+ * console/Makefile.am: Don't include @RTEMS_BSP@.cfg
+
2003-08-18 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Reflect having moved aclocal/.
diff --git a/c/src/lib/libbsp/m68k/mvme167/configure.ac b/c/src/lib/libbsp/m68k/mvme167/configure.ac
index 1cad5452b0..ec3d848e02 100644
--- a/c/src/lib/libbsp/m68k/mvme167/configure.ac
+++ b/c/src/lib/libbsp/m68k/mvme167/configure.ac
@@ -34,6 +34,22 @@ RTEMS_BSPOPTS_SET([CD2401_USE_TERMIOS],[*],[0])
RTEMS_BSPOPTS_HELP([CD2401_USE_TERMIOS],
[1 for using termios based console.])
+RTEMS_BSPOPTS_SET([CONSOLE_MINOR],[*],[1])
+RTEMS_BSPOPTS_HELP([CONSOLE_MINOR],
+[Port to use for the RTEMS console.
+ 0 - /dev/tty0, Serial Port 1/Console on the MVME712M.
+ 1 - /dev/tty1, Serial Port 2/TTY01 on the MVME712M.
+ 2 - /dev/tty2, Serial Port 3 on the MVME712M.
+ 3 - /dev/tty3, Serial Port 4 on the MVME712M.])
+
+RTEMS_BSPOPTS_SET([PRINTK_MINOR],[*],[1])
+RTEMS_BSPOPTS_HELP([PRINTK_MINOR],
+[Port to use for printk debugging output.
+ 0 - /dev/tty0, Serial Port 1/Console on the MVME712M.
+ 1 - /dev/tty1, Serial Port 2/TTY01 on the MVME712M.
+ 2 - /dev/tty2, Serial Port 3 on the MVME712M.
+ 3 - /dev/tty3, Serial Port 4 on the MVME712M.])
+
# Explicitly list all Makefiles here
AC_CONFIG_FILES([Makefile
clock/Makefile
diff --git a/c/src/lib/libbsp/m68k/mvme167/console/Makefile.am b/c/src/lib/libbsp/m68k/mvme167/console/Makefile.am
index 16943a5ee4..2b13f40134 100644
--- a/c/src/lib/libbsp/m68k/mvme167/console/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme167/console/Makefile.am
@@ -8,7 +8,6 @@ PGM = $(ARCH)/console.rel
C_FILES = console.c
OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../../../../automake/compile.am
include $(top_srcdir)/../../../../automake/lib.am