From cf18d1d52d02e717be63212e4dcc42775bc9322f Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Wed, 20 Aug 2003 13:40:56 +0000 Subject: [PATCH] 2003-08-20 Ralf Corsepius * configure.ac: Add BSPOPTS PRINTK_MINOR and CONSOLE_MINOR. * console/Makefile.am: Don't include @RTEMS_BSP@.cfg. Remove BSP_CPPFLAGS. --- c/src/lib/libbsp/m68k/mvme167/ChangeLog | 6 ++++++ c/src/lib/libbsp/m68k/mvme167/configure.ac | 16 ++++++++++++++++ .../lib/libbsp/m68k/mvme167/console/Makefile.am | 3 --- 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/c/src/lib/libbsp/m68k/mvme167/ChangeLog b/c/src/lib/libbsp/m68k/mvme167/ChangeLog index 55559dde2a..1d46d0e1d5 100644 --- a/c/src/lib/libbsp/m68k/mvme167/ChangeLog +++ b/c/src/lib/libbsp/m68k/mvme167/ChangeLog @@ -1,3 +1,9 @@ +2003-08-20 Ralf Corsepius + + * configure.ac: Add BSPOPTS PRINTK_MINOR and CONSOLE_MINOR. + * console/Makefile.am: Don't include @RTEMS_BSP@.cfg. + Remove BSP_CPPFLAGS. + 2003-08-11 Ralf Corsepius * configure.ac: Use rtems-bugs@rtems.com as bug report email address. 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 4bd67ed079..b010e230c8 100644 --- a/c/src/lib/libbsp/m68k/mvme167/console/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme167/console/Makefile.am @@ -2,17 +2,14 @@ ## $Id$ ## - 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 -AM_CPPFLAGS += $(BSP_CPPFLAGS) # # (OPTIONAL) Add local stuff here using += #