diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2006-02-01 20:57:35 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2006-02-01 20:57:35 +0000 |
| commit | 36ffcf3b409ccbb5326e5a7de97586432020a480 (patch) | |
| tree | 20892fcf9e19aef3d5653f6a1b96b877f3c9b8e9 /c/src/lib/libbsp/i386 | |
| parent | 2006-02-01 Joel Sherrill <joel@OARcorp.com> (diff) | |
| download | rtems-36ffcf3b409ccbb5326e5a7de97586432020a480.tar.bz2 | |
2006-02-01 Joel Sherrill <joel@OARcorp.com>
* configure.ac, console/console.c: Add USE_COM1_AS_CONSOLE BSP option.
This makes it easy to build the pc386 BSP in a configuration that
corresponds to qemu with COM1 redirected to stdio.
Diffstat (limited to 'c/src/lib/libbsp/i386')
| -rw-r--r-- | c/src/lib/libbsp/i386/pc386/ChangeLog | 6 | ||||
| -rw-r--r-- | c/src/lib/libbsp/i386/pc386/configure.ac | 6 | ||||
| -rw-r--r-- | c/src/lib/libbsp/i386/pc386/console/console.c | 6 |
3 files changed, 17 insertions, 1 deletions
diff --git a/c/src/lib/libbsp/i386/pc386/ChangeLog b/c/src/lib/libbsp/i386/pc386/ChangeLog index 4d25676215..55b2c1deb7 100644 --- a/c/src/lib/libbsp/i386/pc386/ChangeLog +++ b/c/src/lib/libbsp/i386/pc386/ChangeLog @@ -1,3 +1,9 @@ +2006-02-01 Joel Sherrill <joel@OARcorp.com> + + * configure.ac, console/console.c: Add USE_COM1_AS_CONSOLE BSP option. + This makes it easy to build the pc386 BSP in a configuration that + corresponds to qemu with COM1 redirected to stdio. + 2006-01-11 Ralf Corsepius <ralf.corsepius@rtems.org> * configure.ac: Remove explicit ampolish3 support (now in diff --git a/c/src/lib/libbsp/i386/pc386/configure.ac b/c/src/lib/libbsp/i386/pc386/configure.ac index 5f34c22360..cb04cd9462 100644 --- a/c/src/lib/libbsp/i386/pc386/configure.ac +++ b/c/src/lib/libbsp/i386/pc386/configure.ac @@ -18,6 +18,12 @@ RTEMS_PROG_CCAS 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 f6339b1452..887fcb9334 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; |