summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2006-04-24 18:50:55 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2006-04-24 18:50:55 +0000
commit26660ffff2a2120eca14eec7092a0d8eb6914634 (patch)
treedd9fc609bd491374b8b667370c7bb7c27b8588e4
parenteab1cfee71ca94ce8d775452cfb18cd4bf6ecd38 (diff)
downloadrtems-26660ffff2a2120eca14eec7092a0d8eb6914634.tar.bz2
2006-04-24 Joel Sherrill <joel@OARcorp.com>
* configure.ac, console/console.c:
-rw-r--r--c/src/lib/libbsp/i386/pc386/ChangeLog4
-rw-r--r--c/src/lib/libbsp/i386/pc386/configure.ac6
-rw-r--r--c/src/lib/libbsp/i386/pc386/console/console.c6
3 files changed, 15 insertions, 1 deletions
diff --git a/c/src/lib/libbsp/i386/pc386/ChangeLog b/c/src/lib/libbsp/i386/pc386/ChangeLog
index ace59aca5e..2e788c56b3 100644
--- a/c/src/lib/libbsp/i386/pc386/ChangeLog
+++ b/c/src/lib/libbsp/i386/pc386/ChangeLog
@@ -1,3 +1,7 @@
+2006-04-24 Joel Sherrill <joel@OARcorp.com>
+
+ * configure.ac, console/console.c:
+
2005-11-08 Till Straumann <strauman@slac.stanford.edu>
PR832/bsps
diff --git a/c/src/lib/libbsp/i386/pc386/configure.ac b/c/src/lib/libbsp/i386/pc386/configure.ac
index 3ec4622356..c9a779226b 100644
--- a/c/src/lib/libbsp/i386/pc386/configure.ac
+++ b/c/src/lib/libbsp/i386/pc386/configure.ac
@@ -16,6 +16,12 @@ RTEMS_CANONICALIZE_TOOLS
RTEMS_CHECK_NETWORKING
+RTEMS_BSPOPTS_SET([USE_COM1_AS_CONSOLE],[*],[0])
+RTEMS_BSPOPTS_HELP([USE_COM1_AS_CONSOLE],
+[Determines, whether the console will be associated with the standard
+ VGA display or with the COM1 serial port. Currently only the VGA
+ display and COM1 support printk.])
+
RTEMS_BSPOPTS_SET([IDE_USE_PRIMARY_INTERFACE],[*],[1])
RTEMS_BSPOPTS_HELP([IDE_USE_PRIMARY_INTERFACE],
[Determines, whether RTEMS will try to use the primary IDE interface.
diff --git a/c/src/lib/libbsp/i386/pc386/console/console.c b/c/src/lib/libbsp/i386/pc386/console/console.c
index f8a5b8b5f9..73bf7cad2e 100644
--- a/c/src/lib/libbsp/i386/pc386/console/console.c
+++ b/c/src/lib/libbsp/i386/pc386/console/console.c
@@ -61,10 +61,14 @@ void __assert (const char *file, int line, const char *msg);
* to same serial device it does not work that great
*/
+#if (USE_COM1_AS_CONSOLE == 1)
+int BSPConsolePort = BSP_UART_COM1;
+int BSPPrintkPort = BSP_UART_COM1;
+#else
int BSPConsolePort = BSP_CONSOLE_PORT_CONSOLE;
int BSPPrintkPort = BSP_CONSOLE_PORT_CONSOLE;
+#endif
-/* int BSPConsolePort = BSP_UART_COM2; */
int BSPBaseBaud = 115200;
extern BSP_polling_getchar_function_type BSP_poll_char;