summaryrefslogtreecommitdiffstats
path: root/c/src/lib/libbsp/m68k
diff options
context:
space:
mode:
authorEric Norum <WENorum@lbl.gov>2005-02-04 20:29:42 +0000
committerEric Norum <WENorum@lbl.gov>2005-02-04 20:29:42 +0000
commitfa39b174e6575fa02c63336b6d2c9d5d023584a7 (patch)
tree659716908789fb97a2606fcedb352bc2b2cec604 /c/src/lib/libbsp/m68k
parent2005-02-04 Ralf Corsepius <ralf.corsepius@rtems.org> (diff)
downloadrtems-fa39b174e6575fa02c63336b6d2c9d5d023584a7.tar.bz2
Fix flash base address.
Enable UART2.
Diffstat (limited to 'c/src/lib/libbsp/m68k')
-rw-r--r--c/src/lib/libbsp/m68k/uC5282/README4
-rw-r--r--c/src/lib/libbsp/m68k/uC5282/console/console.c15
-rw-r--r--c/src/lib/libbsp/m68k/uC5282/startup/bspstart.c2
3 files changed, 14 insertions, 7 deletions
diff --git a/c/src/lib/libbsp/m68k/uC5282/README b/c/src/lib/libbsp/m68k/uC5282/README
index 68ceb465a9..6b5bf47f1e 100644
--- a/c/src/lib/libbsp/m68k/uC5282/README
+++ b/c/src/lib/libbsp/m68k/uC5282/README
@@ -27,6 +27,8 @@ Make a clean exit routine to return to Arcturus monitor
The bsp relies on the Arcturus monitor to set up DRAM and all chip selects.
This seems OK to me, but others may find it lame.....
+I/O pin restrictions make simultatenous operation
+of I2C, CAN and UART2 impossible.
BSP NAME: uC5282
BOARD: Arcturus Netrworks uCdimm 5282
@@ -58,7 +60,7 @@ TTY DRIVER: UART1, 2 and 3
STDIO
=====
-PORT: UART1 Terminal
+PORT: UART0 Terminal
ELECTRICAL: RS-232
BAUD: 9600
BITS PER CHARACTER: 8
diff --git a/c/src/lib/libbsp/m68k/uC5282/console/console.c b/c/src/lib/libbsp/m68k/uC5282/console/console.c
index e30ae63387..a54015abd1 100644
--- a/c/src/lib/libbsp/m68k/uC5282/console/console.c
+++ b/c/src/lib/libbsp/m68k/uC5282/console/console.c
@@ -43,10 +43,10 @@ _BSP_null_char( char c )
BSP_output_char_function_type BSP_output_char = _BSP_null_char;
/*
- * The MCF5282 has three UARTs but we enable only two here since it's likely
- * that the I/O pins available to the third will be used for CAN/I2C
+ * The MCF5282 has three UARTs. Enable all them here. I/O pin selection
+ * is assumed to have been done elsewher.
*/
-#define MAX_UART_INFO 2
+#define MAX_UART_INFO 3
#define RX_BUFFER_SIZE 512
struct IntUartInfoStruct
@@ -616,7 +616,7 @@ void console_reserve_resources( rtems_configuration_table *configuration )
/***************************************************************************
Function : console_initialize
- Description : This initialises termios, both sets of uart hardware before
+ Description : This initialises termios, all uart hardware before
registering /dev/tty devices for each channel and the system /dev/console.
***************************************************************************/
rtems_device_driver console_initialize(
@@ -641,7 +641,7 @@ rtems_device_driver console_initialize(
rtems_fatal_error_occurred (status);
}
- /* Register the other port */
+ /* Register the other ports */
if ( CONSOLE_PORT != 0 )
{
status = rtems_io_register_name ("/dev/tty00", major, 0);
@@ -658,6 +658,11 @@ rtems_device_driver console_initialize(
rtems_fatal_error_occurred (status);
}
}
+ status = rtems_io_register_name ("/dev/tty02", major, 2);
+ if ( status != RTEMS_SUCCESSFUL )
+ {
+ rtems_fatal_error_occurred (status);
+ }
return(RTEMS_SUCCESSFUL);
}
diff --git a/c/src/lib/libbsp/m68k/uC5282/startup/bspstart.c b/c/src/lib/libbsp/m68k/uC5282/startup/bspstart.c
index d4c9ff6740..45a5d921eb 100644
--- a/c/src/lib/libbsp/m68k/uC5282/startup/bspstart.c
+++ b/c/src/lib/libbsp/m68k/uC5282/startup/bspstart.c
@@ -48,7 +48,7 @@ char *rtems_progname;
*/
#define SDRAM_BASE 0
#define SDRAM_SIZE (16*1024*1024)
-#define FLASH_BASE 0x10C10000
+#define FLASH_BASE 0x10000000
#define FLASH_SIZE (4*1024*1024)
/*