2009-11-30 Fernando Nicodemos <fgnicodemos@terra.com.br>

	* Makefile.am, preinstall.am, console/fbcons.c, console/font8x16.h,
	console/sed1356.c, console/uarts.c, include/sed1356.h,
	startup/bspstart.c, startup/linkcmds.csb337, startup/linkcmds.csb637,
	startup/memmap.c, startup/umonsupp.c: Update to match development
	version.

13 files changed, 661 insertions, 552 deletions

diff --git a/c/src/lib/libbsp/arm/csb337/ChangeLog b/c/src/lib/libbsp/arm/csb337/ChangeLog
index 1518d9a5ff..772ac53f97 100644
--- a/c/src/lib/libbsp/arm/csb337/ChangeLog
+++ b/c/src/lib/libbsp/arm/csb337/ChangeLog
@@ -1,3 +1,11 @@
+2009-11-30	Fernando Nicodemos <fgnicodemos@terra.com.br>
+
+	* Makefile.am, preinstall.am, console/fbcons.c, console/font8x16.h,
+	console/sed1356.c, console/uarts.c, include/sed1356.h,
+	startup/bspstart.c, startup/linkcmds.csb337, startup/linkcmds.csb637,
+	startup/memmap.c, startup/umonsupp.c: Update to match development
+	version.
+
 2009-11-21	Fernando Nicodemos <fgnicodemos@terra.com.br>
 
 	* Makefile.am, configure.ac, console/uarts.c: Add initial support for
diff --git a/c/src/lib/libbsp/arm/csb337/Makefile.am b/c/src/lib/libbsp/arm/csb337/Makefile.am
index 6e876fe3fe..09d728afe1 100644
--- a/c/src/lib/libbsp/arm/csb337/Makefile.am
+++ b/c/src/lib/libbsp/arm/csb337/Makefile.am
@@ -57,7 +57,7 @@ libbsp_a_SOURCES = ../../shared/bsplibc.c ../../shared/bsppost.c \
     ../../shared/bsppretaskinghook.c startup/bspstart.c \
     ../../shared/bspclean.c startup/bspreset.c \
     startup/memmap.c ../../shared/bootcard.c ../../shared/sbrk.c \
-    ../../shared/gnatinstallhandler.c startup/umonsupp.c
+    ../../shared/gnatinstallhandler.c
 # console
 libbsp_a_SOURCES += ../../shared/console.c console/uarts.c
 if ENABLE_LCD
diff --git a/c/src/lib/libbsp/arm/csb337/console/fbcons.c b/c/src/lib/libbsp/arm/csb337/console/fbcons.c
index 54e309c52d..c3c85b3b0d 100644
--- a/c/src/lib/libbsp/arm/csb337/console/fbcons.c
+++ b/c/src/lib/libbsp/arm/csb337/console/fbcons.c
@@ -4,6 +4,9 @@
  *  COPYRIGHT (c) 1989-2009.
  *  On-Line Applications Research Corporation (OAR).
  *
+ *  Modified by Fernando Nicodemos <fgnicodemos@terra.com.br>
+ *  from NCB - Sistemas Embarcados Ltda. (Brazil)
+ *
  *  The license and distribution terms for this file may be
  *  found in the file LICENSE in this distribution or at
  *  http://www.rtems.com/license/LICENSE.
diff --git a/c/src/lib/libbsp/arm/csb337/console/font8x16.h b/c/src/lib/libbsp/arm/csb337/console/font8x16.h
index 87cb5b74ac..b53865b685 100755
--- a/c/src/lib/libbsp/arm/csb337/console/font8x16.h
+++ b/c/src/lib/libbsp/arm/csb337/console/font8x16.h
@@ -1,8 +1,8 @@
 /*
  * font8x16.h
  *
- * Simple 8 x 16 font printable characters only.  To lookoup, subtract
- * FIRST_CHAR from the character, multiply x FONT_HEIGHT and get the next
+ * Simple 8 x 16 font printable Characters only.  To lookup, subtract
+ * FIRST_CHAR from the Character, multiply x FONT_HEIGHT and get the next
  * FONT_WIDTH bytes.
  *
  *  Based upon code from MicroMonitor 1.17 from http://www.umonfw.com/
@@ -29,14 +29,16 @@
  *
  *  Ed Sutter has been informed that this code is being used in RTEMS.
  *
- *  The code has been reformatted to be more compliant with RTEMS
- *  coding standards and to eliminate C++ style comments.
+ *  This code was reformatted by Joel Sherrill from OAR Corporation and
+ *  Fernando Nicodemos <fgnicodemos@terra.com.br> from NCB - Sistemas
+ *  Embarcados Ltda. (Brazil) to be more compliant with RTEMS coding
+ *  standards and to eliminate C++ style comments.
  *
  *  $Id$
  */
 
 #define FONT_WIDTH		8
-#define FONT_HEIGHT 	16
+#define FONT_HEIGHT 		16
 #define FIRST_CHAR 		0x20
 #define LAST_CHAR 		0x7f
 #define CURSOR_ON  		0x7F
@@ -105,10 +107,10 @@ const uint8_t	font8x16[] = {
 0x00,
 0x00,
 0x18,
-0x3c,
-0x3c,
-0x3c,
-0x3c,
+0x3C,
+0x3C,
+0x3C,
+0x3C,
 0x18,
 0x18,
 0x00,
@@ -123,11 +125,11 @@ const uint8_t	font8x16[] = {
    ht=16, width=8
    +--------+
    |        |
+   |        |
    |  ** ** |
    |  ** ** |
    |  ** ** |
    |  ** ** |
-   |   * *  |
    |        |
    |        |
    |        |
@@ -178,16 +180,16 @@ const uint8_t	font8x16[] = {
    +--------+ */
 0x00,
 0x00,
-0x6c,
-0x6c,
-0x6c,
-0xfe,
-0x6c,
-0x6c,
-0xfe,
-0x6c,
-0x6c,
-0x6c,
+0x6C,
+0x6C,
+0x6C,
+0xFE,
+0x6C,
+0x6C,
+0xFE,
+0x6C,
+0x6C,
+0x6C,
 0x00,
 0x00,
 0x00,
@@ -202,10 +204,10 @@ const uint8_t	font8x16[] = {
    |   **   |
    | *****  |
    |**   ** |
-   |**      |
+   |** *    |
    | ****   |
    |  ****  |
-   |     ** |
+   |   * ** |
    |**   ** |
    | *****  |
    |   **   |
@@ -217,14 +219,14 @@ const uint8_t	font8x16[] = {
 0x00,
 0x18,
 0x18,
-0x7c,
-0xc6,
-0xc0,
+0x7C,
+0xC6,
+0xC0,
 0x78,
-0x3c,
+0x3C,
 0x06,
-0xc6,
-0x7c,
+0xC6,
+0x7C,
 0x18,
 0x18,
 0x00,
@@ -257,11 +259,11 @@ const uint8_t	font8x16[] = {
 0x00,
 0x62,
 0x66,
-0x0c,
+0x0C,
 0x18,
 0x30,
 0x66,
-0xc6,
+0xC6,
 0x00,
 0x00,
 0x00,
@@ -290,14 +292,14 @@ const uint8_t	font8x16[] = {
 0x00,
 0x00,
 0x38,
-0x6c,
+0x6C,
 0x38,
 0x30,
 0x76,
-0x7e,
-0xcc,
-0xcc,
-0xcc,
+0x7E,
+0xCC,
+0xCC,
+0xCC,
 0x76,
 0x00,
 0x00,
@@ -325,9 +327,9 @@ const uint8_t	font8x16[] = {
    |        |
    +--------+ */
 0x00,
-0x0c,
-0x0c,
-0x0c,
+0x0C,
+0x0C,
+0x0C,
 0x18,
 0x00,
 0x00,
@@ -363,7 +365,7 @@ const uint8_t	font8x16[] = {
    +--------+ */
 0x00,
 0x00,
-0x0c,
+0x0C,
 0x18,
 0x30,
 0x30,
@@ -372,7 +374,7 @@ const uint8_t	font8x16[] = {
 0x30,
 0x30,
 0x18,
-0x0c,
+0x0C,
 0x00,
 0x00,
 0x00,
@@ -402,12 +404,12 @@ const uint8_t	font8x16[] = {
 0x00,
 0x30,
 0x18,
-0x0c,
-0x0c,
-0x0c,
-0x0c,
-0x0c,
-0x0c,
+0x0C,
+0x0C,
+0x0C,
+0x0C,
+0x0C,
+0x0C,
 0x18,
 0x30,
 0x00,
@@ -415,7 +417,7 @@ const uint8_t	font8x16[] = {
 0x00,
 0x00,
 
-/* Character * (0x2a):
+/* Character * (0x2A):
    ht=16, width=8
    +--------+
    |        |
@@ -440,11 +442,11 @@ const uint8_t	font8x16[] = {
 0x00,
 0x00,
 0x00,
-0x6c,
+0x6C,
 0x38,
-0xfe,
+0xFE,
 0x38,
-0x6c,
+0x6C,
 0x00,
 0x00,
 0x00,
@@ -452,7 +454,7 @@ const uint8_t	font8x16[] = {
 0x00,
 0x00,
 
-/* Character + (0x2b):
+/* Character  (0x2B):
    ht=16, width=8
    +--------+
    |        |
@@ -479,7 +481,7 @@ const uint8_t	font8x16[] = {
 0x00,
 0x18,
 0x18,
-0x7e,
+0x7E,
 0x18,
 0x18,
 0x00,
@@ -489,7 +491,7 @@ const uint8_t	font8x16[] = {
 0x00,
 0x00,
 
-/* Character , (0x2c):
+/* Character , (0x2C):
    ht=16, width=8
    +--------+
    |        |
@@ -518,15 +520,15 @@ const uint8_t	font8x16[] = {
 0x00,
 0x00,
 0x00,
-0x0c,
-0x0c,
-0x0c,
+0x0C,
+0x0C,
+0x0C,
 0x18,
 0x00,
 0x00,
 0x00,
 
-/* Character - (0x2d):
+/* Character - (0x2D):
    ht=16, width=8
    +--------+
    |        |
@@ -536,7 +538,7 @@ const uint8_t	font8x16[] = {
    |        |
    |        |
    |        |
-   |******* |
+   | ****** |
    |        |
    |        |
    |        |
@@ -553,7 +555,7 @@ const uint8_t	font8x16[] = {
 0x00,
 0x00,
 0x00,
-0xfe,
+0xFE,
 0x00,
 0x00,
 0x00,
@@ -563,7 +565,7 @@ const uint8_t	font8x16[] = {
 0x00,
 0x00,
 
-/* Character . (0x2e):
+/* Character . (0x2E):
    ht=16, width=8
    +--------+
    |        |
@@ -600,7 +602,7 @@ const uint8_t	font8x16[] = {
 0x00,
 0x00,
 
-/* Character / (0x2f):
+/* Character / (0x2F):
    ht=16, width=8
    +--------+
    |        |
@@ -613,8 +615,8 @@ const uint8_t	font8x16[] = {
    |   **   |
    |  **    |
    | **     |
-   |**      |
-   |*       |
+   | *      |
+   |        |
    |        |
    |        |
    |        |
@@ -626,11 +628,11 @@ const uint8_t	font8x16[] = {
 0x00,
 0x02,
 0x06,
-0x0c,
+0x0C,
 0x18,
 0x30,
 0x60,
-0xc0,
+0xC0,
 0x80,
 0x00,
 0x00,
@@ -659,16 +661,16 @@ const uint8_t	font8x16[] = {
    +--------+ */
 0x00,
 0x00,
-0x7c,
-0xc6,
-0xc6,
-0xce,
-0xde,
-0xf6,
-0xe6,
-0xc6,
-0xc6,
-0x7c,
+0x7C,
+0xC6,
+0xC6,
+0xCE,
+0xDE,
+0xF6,
+0xE6,
+0xC6,
+0xC6,
+0x7C,
 0x00,
 0x00,
 0x00,
@@ -705,7 +707,7 @@ const uint8_t	font8x16[] = {
 0x18,
 0x18,
 0x18,
-0x7e,
+0x7E,
 0x00,
 0x00,
 0x00,
@@ -733,16 +735,16 @@ const uint8_t	font8x16[] = {
    +--------+ */
 0x00,
 0x00,
-0x7c,
-0xc6,
-0xc6,
+0x7C,
+0xC6,
+0xC6,
 0x06,
-0x0c,
+0x0C,
 0x18,
 0x30,
 0x60,
-0xc6,
-0xfe,
+0xC6,
+0xFE,
 0x00,
 0x00,
 0x00,
@@ -770,16 +772,16 @@ const uint8_t	font8x16[] = {
    +--------+ */
 0x00,
 0x00,
-0x7c,
-0xc6,
+0x7C,
+0xC6,
 0x06,
 0x06,
-0x3c,
+0x3C,
 0x06,
 0x06,
 0x06,
-0xc6,
-0x7c,
+0xC6,
+0x7C,
 0x00,
 0x00,
 0x00,
@@ -807,16 +809,16 @@ const uint8_t	font8x16[] = {
    +--------+ */
 0x00,
 0x00,
-0x0c,
-0x1c,
-0x3c,
-0x6c,
-0xcc,
-0xcc,
-0xfe,
-0x0c,
-0x0c,
-0x1e,
+0x0C,
+0x1C,
+0x3C,
+0x6C,
+0xCC,
+0xCC,
+0xFE,
+0x0C,
+0x0C,
+0x1E,
 0x00,
 0x00,
 0x00,
@@ -844,16 +846,16 @@ const uint8_t	font8x16[] = {
    +--------+ */
 0x00,
 0x00,
-0xfe,
-0xc0,
-0xc0,
-0xc0,
-0xfc,
+0xFE,
+0xC0,
+0xC0,
+0xC0,
+0xFC,
 0x06,
 0x06,
 0x06,
-0xc6,
-0x7c,
+0xC6,
+0x7C,
 0x00,
 0x00,
 0x00,
@@ -881,16 +883,16 @@ const uint8_t	font8x16[] = {
    +--------+ */
 0x00,
 0x00,
-0x7c,
-0xc6,
-0xc0,
-0xc0,
-0xfc,
-0xc6,
-0xc6,
-0xc6,
-0xc6,
-0x7c,
+0x7C,
+0xC6,
+0xC0,
+0xC0,
+0xFC,
+0xC6,
+0xC6,
+0xC6,
+0xC6,
+0x7C,
 0x00,
 0x00,
 0x00,
@@ -918,10 +920,10 @@ const uint8_t	font8x16[] = {
    +--------+ */
 0x00,
 0x00,
-0xfe,
-0xc6,
+0xFE,
+0xC6,
 0x06,
-0x0c,
+0x0C,
 0x18,
 0x30,
 0x30,
@@ -955,16 +957,16 @@ const uint8_t	font8x16[] = {
    +--------+ */
 0x00,
 0x00,
-0x7c,
-0xc6,
-0xc6,
-0xc6,
-0x7c,
-0xc6,
-0xc6,
-0xc6,
-0xc6,
-0x7c,
+0x7C,
+0xC6,
+0xC6,
+0xC6,
+0x7C,
+0xC6,
+0xC6,
+0xC6,
+0xC6,
+0x7C,
 0x00,
 0x00,
 0x00,
@@ -992,22 +994,22 @@ const uint8_t	font8x16[] = {
    +--------+ */
 0x00,
 0x00,
-0x7c,
-0xc6,
-0xc6,
-0xc6,
-0xc6,
-0x7e,
+0x7C,
+0xC6,
+0xC6,
+0xC6,
+0xC6,
+0x7E,
 0x06,
 0x06,
-0xc6,
-0x7c,
+0xC6,
+0x7C,
 0x00,
 0x00,
 0x00,
 0x00,
 
-/* Character : (0x3a):
+/* Character : (0x3A):
    ht=16, width=8
    +--------+
    |        |
@@ -1032,19 +1034,19 @@ const uint8_t	font8x16[] = {
 0x00,
 0x00,
 0x00,
-0x0c,
-0x0c,
+0x0C,
+0x0C,
 0x00,
 0x00,
-0x0c,
-0x0c,
+0x0C,
+0x0C,
 0x00,
 0x00,
 0x00,
 0x00,
 0x00,
 
-/* Character ; (0x3b):
+/* Character ; (0x3B):
    ht=16, width=8
    +--------+
    |        |
@@ -1069,19 +1071,19 @@ const uint8_t	font8x16[] = {
 0x00,
 0x00,
 0x00,
-0x0c,
-0x0c,
+0x0C,
+0x0C,
 0x00,
 0x00,
-0x0c,
-0x0c,
-0x0c,
+0x0C,
+0x0C,
+0x0C,
 0x18,
 0x00,
 0x00,
 0x00,
 
-/* Character < (0x3c):
+/* Character < (0x3C):
    ht=16, width=8
    +--------+
    |        |
@@ -1104,21 +1106,21 @@ const uint8_t	font8x16[] = {
 0x00,
 0x00,
 0x00,
-0x0c,
+0x0C,
 0x18,
 0x30,
 0x60,
-0xc0,
+0xC0,
 0x60,
 0x30,
 0x18,
-0x0c,
+0x0C,
 0x00,
 0x00,
 0x00,
 0x00,
 
-/* Character = (0x3d):
+/* Character = (0x3D):
    ht=16, width=8
    +--------+
    |        |
@@ -1144,9 +1146,9 @@ const uint8_t	font8x16[] = {
 0x00,
 0x00,
 0x00,
-0xfe,
+0xFE,
 0x00,
-0xfe,
+0xFE,
 0x00,
 0x00,
 0x00,
@@ -1155,7 +1157,7 @@ const uint8_t	font8x16[] = {
 0x00,
 0x00,
 
-/* Character > (0x3e):
+/* Character > (0x3E):
    ht=16, width=8
    +--------+
    |        |
@@ -1181,9 +1183,9 @@ const uint8_t	font8x16[] = {
 0x60,
 0x30,
 0x18,
-0x0c,
+0x0C,
 0x06,
-0x0c,
+0x0C,
 0x18,
 0x30,
 0x60,
@@ -1192,7 +1194,7 @@ const uint8_t	font8x16[] = {
 0x00,
 0x00,
 
-/* Character ? (0x3f):
+/* Character ? (0x3F):
    ht=16, width=8
    +--------+
    |        |
@@ -1214,10 +1216,10 @@ const uint8_t	font8x16[] = {
    +--------+ */
 0x00,
 0x00,
-0x7c,
-0xc6,
-0xc6,
-0x0c,
+0x7C,
+0xC6,
+0xC6,
+0x0C,
 0x18,
 0x18,
 0x18,
@@ -1251,16 +1253,16 @@ const uint8_t	font8x16[] = {
    +--------+ */
 0x00,
 0x00,
-0x7c,
-0xc6,
-0xc6,
-0xc6,
-0xde,
-0xde,
-0xde,
-0xdc,
-0xc0,
-0x7e,
+0x7C,
+0xC6,
+0xC6,
+0xC6,
+0xDE,
+0xDE,
+0xDE,
+0xDC,
+0xC0,
+0x7E,
 0x00,
 0x00,
 0x00,
@@ -1289,15 +1291,15 @@ const uint8_t	font8x16[] = {
 0x00,
 0x00,
 0x38,
-0x6c,
-0xc6,
-0xc6,
-0xc6,
-0xfe,
-0xc6,
-0xc6,
-0xc6,
-0xc6,
+0x6C,
+0xC6,
+0xC6,
+0xC6,
+0xFE,
+0xC6,
+0xC6,
+0xC6,
+0xC6,
 0x00,
 0x00,
 0x00,
@@ -1325,16 +1327,16 @@ const uint8_t	font8x16[] = {
    +--------+ */
 0x00,
 0x00,
-0xfc,
+0xFC,
 0x66,
 0x66,
 0x66,
-0x7c,
+0x7C,
 0x66,
 0x66,
 0x66,
 0x66,
-0xfc,
+0xFC,
 0x00,
 0x00,
 0x00,
@@ -1362,16 +1364,16 @@ const uint8_t	font8x16[] = {
    +--------+ */
 0x00,
 0x00,
-0x3c,
+0x3C,
 0x66,
-0xc2,
-0xc0,
-0xc0,
-0xc0,
-0xc0,
-0xc2,
+0xC2,
+0xC0,
+0xC0,
+0xC0,
+0xC0,
+0xC2,
 0x66,
-0x3c,
+0x3C,
 0x00,
 0x00,
 0x00,
@@ -1399,16 +1401,16 @@ const uint8_t	font8x16[] = {
    +--------+ */
 0x00,
 0x00,
-0xf8,
-0x6c,
+0xF8,
+0x6C,
 0x66,
 0x66,
 0x66,
 0x66,
 0x66,
 0x66,
-0x6c,
-0xf8,
+0x6C,
+0xF8,
 0x00,
 0x00,
 0x00,
@@ -1436,16 +1438,16 @@ const uint8_t	font8x16[] = {
    +--------+ */
 0x00,
 0x00,
-0xfe,
+0xFE,
 0x66,
 0x60,
 0x64,
-0x7c,
+0x7C,
 0x64,
 0x60,
 0x60,
 0x66,
-0xfe,
+0xFE,
 0x00,
 0x00,
 0x00,
@@ -1473,16 +1475,16 @@ const uint8_t	font8x16[] = {
    +--------+ */
 0x00,
 0x00,
-0xfe,
+0xFE,
 0x66,
 0x60,
 0x64,
-0x7c,
+0x7C,
 0x64,
 0x60,
 0x60,
 0x60,
-0xf0,
+0xF0,
 0x00,
 0x00,
 0x00,
@@ -1510,16 +1512,16 @@ const uint8_t	font8x16[] = {
    +--------+ */
 0x00,
 0x00,
-0x7c,
-0xc6,
-0xc6,
-0xc0,
-0xc0,
-0xc0,
-0xce,
-0xc6,
-0xc6,
-0x7c,
+0x7C,
+0xC6,
+0xC6,
+0xC0,
+0xC0,
+0xC0,
+0xCE,
+0xC6,
+0xC6,
+0x7C,
 0x00,
 0x00,
 0x00,
@@ -1547,16 +1549,16 @@ const uint8_t	font8x16[] = {
    +--------+ */
 0x00,
 0x00,
-0xc6,
-0xc6,
-0xc6,
-0xc6,
-0xfe,
-0xc6,
-0xc6,
-0xc6,
-0xc6,
-0xc6,
+0xC6,
+0xC6,
+0xC6,
+0xC6,
+0xFE,
+0xC6,
+0xC6,
+0xC6,
+0xC6,
+0xC6,
 0x00,
 0x00,
 0x00,
@@ -1584,7 +1586,7 @@ const uint8_t	font8x16[] = {
    +--------+ */
 0x00,
 0x00,
-0x3c,
+0x3C,
 0x18,
 0x18,
 0x18,
@@ -1593,13 +1595,13 @@ const uint8_t	font8x16[] = {
 0x18,
 0x18,
 0x18,
-0x3c,
+0x3C,
 0x00,
 0x00,
 0x00,
 0x00,
 
-/* Character J (0x4a):
+/* Character J (0x4A):
    ht=16, width=8
    +--------+
    |        |
@@ -1621,22 +1623,22 @@ const uint8_t	font8x16[] = {
    +--------+ */
 0x00,
 0x00,
-0x3c,
+0x3C,
 0x18,
 0x18,
 0x18,
 0x18,
 0x18,
 0x18,
-0xd8,
-0xd8,
+0xD8,
+0xD8,
 0x70,
 0x00,
 0x00,
 0x00,
 0x00,
 
-/* Character K (0x4b):
+/* Character K (0x4B):
    ht=16, width=8
    +--------+
    |        |
@@ -1658,22 +1660,22 @@ const uint8_t	font8x16[] = {
    +--------+ */
 0x00,
 0x00,
-0xc6,
-0xc6,
-0xcc,
-0xd8,
-0xf0,
-0xf0,
-0xd8,
-0xcc,
-0xc6,
-0xc6,
+0xC6,
+0xC6,
+0xCC,
+0xD8,
+0xF0,
+0xF0,
+0xD8,
+0xCC,
+0xC6,
+0xC6,
 0x00,
 0x00,
 0x00,
 0x00,
 
-/* Character L (0x4c):
+/* Character L (0x4C):
    ht=16, width=8
    +--------+
    |        |
@@ -1695,7 +1697,7 @@ const uint8_t	font8x16[] = {
    +--------+ */
 0x00,
 0x00,
-0xf0,
+0xF0,
 0x60,
 0x60,
 0x60,
@@ -1704,13 +1706,13 @@ const uint8_t	font8x16[] = {
 0x60,
 0x62,
 0x66,
-0xfe,
+0xFE,
 0x00,
 0x00,
 0x00,
 0x00,
 
-/* Character M (0x4d):
+/* Character M (0x4D):
    ht=16, width=8
    +--------+
    |        |
@@ -1732,22 +1734,22 @@ const uint8_t	font8x16[] = {
    +--------+ */
 0x00,
 0x00,
-0xc6,
-0xc6,
-0xee,
-0xee,
-0xfe,
-0xd6,
-0xd6,
-0xd6,
-0xc6,
-0xc6,
+0xC6,
+0xC6,
+0xEE,
+0xEE,
+0xFE,
+0xD6,
+0xD6,
+0xD6,
+0xC6,
+0xC6,
 0x00,
 0x00,
 0x00,
 0x00,
 
-/* Character N (0x4e):
+/* Character N (0x4E):
    ht=16, width=8
    +--------+
    |        |
@@ -1769,22 +1771,22 @@ const uint8_t	font8x16[] = {
    +--------+ */
 0x00,
 0x00,
-0xc6,
-0xc6,
-0xe6,
-0xe6,
-0xf6,
-0xde,
-0xce,
-0xce,
-0xc6,
-0xc6,
+0xC6,
+0xC6,
+0xE6,
+0xE6,
+0xF6,
+0xDE,
+0xCE,
+0xCE,
+0xC6,
+0xC6,
 0x00,
 0x00,
 0x00,
 0x00,
 
-/* Character O (0x4f):
+/* Character O (0x4F):
    ht=16, width=8
    +--------+
    |        |
@@ -1806,16 +1808,16 @@ const uint8_t	font8x16[] = {
    +--------+ */
 0x00,
 0x00,
-0x7c,
-0xc6,
-0xc6,
-0xc6,
-0xc6,
-0xc6,
-0xc6,
-0xc6,
-0xc6,
-0x7c,
+0x7C,
+0xC6,
+0xC6,
+0xC6,
+0xC6,
+0xC6,
+0xC6,
+0xC6,
+0xC6,
+0x7C,
 0x00,
 0x00,
 0x00,
@@ -1843,16 +1845,16 @@ const uint8_t	font8x16[] = {
    +--------+ */
 0x00,
 0x00,
-0xfc,
+0xFC,
 0x66,
 0x66,
 0x66,
 0x66,
-0x7c,
+0x7C,
 0x60,
 0x60,
 0x60,
-0xf0,
+0xF0,
 0x00,
 0x00,
 0x00,
@@ -1880,16 +1882,16 @@ const uint8_t	font8x16[] = {
    +--------+ */
 0x00,
 0x00,
-0x7c,
-0xc6,
-0xc6,
-0xc6,
-0xc6,
-0xc6,
-0xc6,
-0xd6,
-0xd6,
-0x7c,
+0x7C,
+0xC6,
+0xC6,
+0xC6,
+0xC6,
+0xC6,
+0xC6,
+0xD6,
+0xD6,
+0x7C,
 0x06,
 0x00,
 0x00,
@@ -1917,16 +1919,16 @@ const uint8_t	font8x16[] = {
    +--------+ */
 0x00,
 0x00,
-0xfc,
+0xFC,
 0x66,
 0x66,
 0x66,
-0x7c,
+0x7C,
 0x78,
-0x6c,
+0x6C,
 0x66,
 0x66,
-0xe6,
+0xE6,
 0x00,
 0x00,
 0x00,
@@ -1954,16 +1956,16 @@ const uint8_t	font8x16[] = {
    +--------+ */
 0x00,
 0x00,
-0x7c,
-0xc6,
-0xc0,
-0xc0,
+0x7C,
+0xC6,
+0xC0,
+0xC0,
 0x70,
-0x1c,
+0x1C,
 0x06,
 0x06,
-0xc6,
-0x7c,
+0xC6,
+0x7C,
 0x00,
 0x00,
 0x00,
@@ -1991,8 +1993,8 @@ const uint8_t	font8x16[] = {
    +--------+ */
 0x00,
 0x00,
-0x7e,
-0x5a,
+0x7E,
+0x5A,
 0x18,
 0x18,
 0x18,
@@ -2000,7 +2002,7 @@ const uint8_t	font8x16[] = {
 0x18,
 0x18,
 0x18,
-0x3c,
+0x3C,
 0x00,
 0x00,
 0x00,
@@ -2028,16 +2030,16 @@ const uint8_t	font8x16[] = {
    +--------+ */
 0x00,
 0x00,
-0xc6,
-0xc6,
-0xc6,
-0xc6,
-0xc6,
-0xc6,
-0xc6,
-0xc6,
-0xc6,
-0x7c,
+0xC6,
+0xC6,
+0xC6,
+0xC6,
+0xC6,
+0xC6,
+0xC6,
+0xC6,
+0xC6,
+0x7C,
 0x00,
 0x00,
 0x00,
@@ -2065,14 +2067,14 @@ const uint8_t	font8x16[] = {
    +--------+ */
 0x00,
 0x00,
-0xc6,
-0xc6,
-0xc6,
-0xc6,
-0xc6,
-0xc6,
-0xc6,
-0x6c,
+0xC6,
+0xC6,
+0xC6,
+0xC6,
+0xC6,
+0xC6,
+0xC6,
+0x6C,
 0x38,
 0x10,
 0x00,
@@ -2102,16 +2104,16 @@ const uint8_t	font8x16[] = {
    +--------+ */
 0x00,
 0x00,
-0xc6,
-0xc6,
-0xc6,
-0xd6,
-0xd6,
-0xd6,
-0xfe,
-0xee,
-0xc6,
-0xc6,
+0xC6,
+0xC6,
+0xC6,
+0xD6,
+0xD6,
+0xD6,
+0xFE,
+0xEE,
+0xC6,
+0xC6,
 0x00,
 0x00,
 0x00,
@@ -2139,16 +2141,16 @@ const uint8_t	font8x16[] = {
    +--------+ */
 0x00,
 0x00,
-0xc6,
-0xc6,
-0xc6,
-0x6c,
+0xC6,
+0xC6,
+0xC6,
+0x6C,
 0x38,
 0x38,
-0x6c,
-0xc6,
-0xc6,
-0xc6,
+0x6C,
+0xC6,
+0xC6,
+0xC6,
 0x00,
 0x00,
 0x00,
@@ -2181,17 +2183,17 @@ const uint8_t	font8x16[] = {
 0x66,
 0x66,
 0x66,
-0x3c,
+0x3C,
 0x18,
 0x18,
 0x18,
-0x3c,
+0x3C,
 0x00,
 0x00,
 0x00,
 0x00,
 
-/* Character Z (0x5a):
+/* Character Z (0x5A):
    ht=16, width=8
    +--------+
    |        |
@@ -2213,22 +2215,22 @@ const uint8_t	font8x16[] = {
    +--------+ */
 0x00,
 0x00,
-0xfe,
-0xc6,
+0xFE,
+0xC6,
 0x86,
-0x0c,
+0x0C,
 0x18,
 0x30,
 0x60,
-0xc2,
-0xc6,
-0xfe,
+0xC2,
+0xC6,
+0xFE,
 0x00,
 0x00,
 0x00,
 0x00,
 
-/* Character [ (0x5b):
+/* Character [ (0x5B):
    ht=16, width=8
    +--------+
    |        |
@@ -2250,7 +2252,7 @@ const uint8_t	font8x16[] = {
    +--------+ */
 0x00,
 0x00,
-0x7c,
+0x7C,
 0x60,
 0x60,
 0x60,
@@ -2259,13 +2261,13 @@ const uint8_t	font8x16[] = {
 0x60,
 0x60,
 0x60,
-0x7c,
+0x7C,
 0x00,
 0x00,
 0x00,
 0x00,
 
-/* Character \ (0x5c):
+/* Character \ (0x5C):
    ht=16, width=8
    +--------+
    |        |
@@ -2290,11 +2292,11 @@ const uint8_t	font8x16[] = {
 0x00,
 0x00,
 0x80,
-0xc0,
+0xC0,
 0x60,
 0x30,
 0x18,
-0x0c,
+0x0C,
 0x06,
 0x02,
 0x00,
@@ -2302,7 +2304,7 @@ const uint8_t	font8x16[] = {
 0x00,
 0x00,
 
-/* Character ] (0x5d):
+/* Character ] (0x5D):
    ht=16, width=8
    +--------+
    |        |
@@ -2324,22 +2326,22 @@ const uint8_t	font8x16[] = {
    +--------+ */
 0x00,
 0x00,
-0x7c,
-0x0c,
-0x0c,
-0x0c,
-0x0c,
-0x0c,
-0x0c,
-0x0c,
-0x0c,
-0x7c,
+0x7C,
+0x0C,
+0x0C,
+0x0C,
+0x0C,
+0x0C,
+0x0C,
+0x0C,
+0x0C,
+0x7C,
 0x00,
 0x00,
 0x00,
 0x00,
 
-/* Character ^ (0x5e):
+/* Character ^ (0x5E):
    ht=16, width=8
    +--------+
    |        |
@@ -2362,8 +2364,8 @@ const uint8_t	font8x16[] = {
 0x00,
 0x10,
 0x38,
-0x6c,
-0xc6,
+0x6C,
+0xC6,
 0x00,
 0x00,
 0x00,
@@ -2376,7 +2378,7 @@ const uint8_t	font8x16[] = {
 0x00,
 0x00,
 
-/* Character _ (0x5f):
+/* Character _ (0x5F):
    ht=16, width=8
    +--------+
    |        |
@@ -2409,7 +2411,7 @@ const uint8_t	font8x16[] = {
 0x00,
 0x00,
 0x00,
-0xff,
+0xFF,
 0x00,
 0x00,
 
@@ -2437,7 +2439,7 @@ const uint8_t	font8x16[] = {
 0x18,
 0x18,
 0x18,
-0x0c,
+0x0C,
 0x00,
 0x00,
 0x00,
@@ -2450,7 +2452,7 @@ const uint8_t	font8x16[] = {
 0x00,
 0x00,
 
-/* Character a (0x61):
+/* Character A (0x61):
    ht=16, width=8
    +--------+
    |        |
@@ -2476,18 +2478,18 @@ const uint8_t	font8x16[] = {
 0x00,
 0x00,
 0x78,
-0x0c,
-0x7c,
-0xcc,
-0xcc,
-0xdc,
+0x0C,
+0x7C,
+0xCC,
+0xCC,
+0xDC,
 0x76,
 0x00,
 0x00,
 0x00,
 0x00,
 
-/* Character b (0x62):
+/* Character B (0x62):
    ht=16, width=8
    +--------+
    |        |
@@ -2509,22 +2511,22 @@ const uint8_t	font8x16[] = {
    +--------+ */
 0x00,
 0x00,
-0xe0,
+0xE0,
 0x60,
 0x60,
-0x7c,
+0x7C,
 0x66,
 0x66,
 0x66,
 0x66,
 0x66,
-0xfc,
+0xFC,
 0x00,
 0x00,
 0x00,
 0x00,
 
-/* Character c (0x63):
+/* Character C (0x63):
    ht=16, width=8
    +--------+
    |        |
@@ -2549,19 +2551,19 @@ const uint8_t	font8x16[] = {
 0x00,
 0x00,
 0x00,
-0x7c,
-0xc6,
-0xc0,
-0xc0,
-0xc0,
-0xc6,
-0x7c,
+0x7C,
+0xC6,
+0xC0,
+0xC0,
+0xC0,
+0xC6,
+0x7C,
 0x00,
 0x00,
 0x00,
 0x00,
 
-/* Character d (0x64):
+/* Character D (0x64):
    ht=16, width=8
    +--------+
    |        |
@@ -2583,22 +2585,22 @@ const uint8_t	font8x16[] = {
    +--------+ */
 0x00,
 0x00,
-0x1c,
-0x0c,
-0x0c,
-0x7c,
-0xcc,
-0xcc,
-0xcc,
-0xcc,
-0xcc,
-0x7e,
+0x1C,
+0x0C,
+0x0C,
+0x7C,
+0xCC,
+0xCC,
+0xCC,
+0xCC,
+0xCC,
+0x7E,
 0x00,
 0x00,
 0x00,
 0x00,
 
-/* Character e (0x65):
+/* Character E (0x65):
    ht=16, width=8
    +--------+
    |        |
@@ -2623,19 +2625,19 @@ const uint8_t	font8x16[] = {
 0x00,
 0x00,
 0x00,
-0x7c,
-0xc6,
-0xc6,
-0xfe,
-0xc0,
-0xc6,
-0x7c,
+0x7C,
+0xC6,
+0xC6,
+0xFE,
+0xC0,
+0xC6,
+0x7C,
 0x00,
 0x00,
 0x00,
 0x00,
 
-/* Character f (0x66):
+/* Character F (0x66):
    ht=16, width=8
    +--------+
    |        |
@@ -2657,11 +2659,11 @@ const uint8_t	font8x16[] = {
    +--------+ */
 0x00,
 0x00,
-0x1c,
+0x1C,
 0x36,
 0x30,
 0x30,
-0xfc,
+0xFC,
 0x30,
 0x30,
 0x30,
@@ -2698,14 +2700,14 @@ const uint8_t	font8x16[] = {
 0x00,
 0x00,
 0x76,
-0xce,
-0xc6,
-0xc6,
-0xce,
+0xCE,
+0xC6,
+0xC6,
+0xCE,
 0x76,
 0x06,
-0xc6,
-0x7c,
+0xC6,
+0x7C,
 0x00,
 0x00,
 
@@ -2731,16 +2733,16 @@ const uint8_t	font8x16[] = {
    +--------+ */
 0x00,
 0x00,
-0xe0,
+0xE0,
 0x60,
 0x60,
-0x7c,
+0x7C,
 0x66,
 0x66,
 0x66,
 0x66,
 0x66,
-0xe6,
+0xE6,
 0x00,
 0x00,
 0x00,
@@ -2777,13 +2779,13 @@ const uint8_t	font8x16[] = {
 0x18,
 0x18,
 0x18,
-0x3c,
+0x3C,
 0x00,
 0x00,
 0x00,
 0x00,
 
-/* Character j (0x6a):
+/* Character j (0x6A):
    ht=16, width=8
    +--------+
    |        |
@@ -2805,22 +2807,22 @@ const uint8_t	font8x16[] = {
    +--------+ */
 0x00,
 0x00,
-0x0c,
-0x0c,
+0x0C,
+0x0C,
 0x00,
-0x1c,
-0x0c,
-0x0c,
-0x0c,
-0x0c,
-0x0c,
-0xcc,
-0xcc,
+0x1C,
+0x0C,
+0x0C,
+0x0C,
+0x0C,
+0x0C,
+0xCC,
+0xCC,
 0x78,
 0x00,
 0x00,
 
-/* Character k (0x6b):
+/* Character k (0x6B):
    ht=16, width=8
    +--------+
    |        |
@@ -2842,22 +2844,22 @@ const uint8_t	font8x16[] = {
    +--------+ */
 0x00,
 0x00,
-0xe0,
+0xE0,
 0x60,
 0x60,
 0x66,
 0x66,
-0x6c,
+0x6C,
 0x78,
-0x6c,
+0x6C,
 0x66,
-0xe6,
+0xE6,
 0x00,
 0x00,
 0x00,
 0x00,
 
-/* Character l (0x6c):
+/* Character l (0x6C):
    ht=16, width=8
    +--------+
    |        |
@@ -2888,13 +2890,13 @@ const uint8_t	font8x16[] = {
 0x18,
 0x18,
 0x18,
-0x1c,
+0x1C,
 0x00,
 0x00,
 0x00,
 0x00,
 
-/* Character m (0x6d):
+/* Character m (0x6D):
    ht=16, width=8
    +--------+
    |        |
@@ -2919,19 +2921,19 @@ const uint8_t	font8x16[] = {
 0x00,
 0x00,
 0x00,
-0x6c,
-0xfe,
-0xd6,
-0xd6,
-0xc6,
-0xc6,
-0xc6,
+0x6C,
+0xFE,
+0xD6,
+0xD6,
+0xC6,
+0xC6,
+0xC6,
 0x00,
 0x00,
 0x00,
 0x00,
 
-/* Character n (0x6e):
+/* Character n (0x6E):
    ht=16, width=8
    +--------+
    |        |
@@ -2956,7 +2958,7 @@ const uint8_t	font8x16[] = {
 0x00,
 0x00,
 0x00,
-0xdc,
+0xDC,
 0x66,
 0x66,
 0x66,
@@ -2968,7 +2970,7 @@ const uint8_t	font8x16[] = {
 0x00,
 0x00,
 
-/* Character o (0x6f):
+/* Character o (0x6F):
    ht=16, width=8
    +--------+
    |        |
@@ -2993,13 +2995,13 @@ const uint8_t	font8x16[] = {
 0x00,
 0x00,
 0x00,
-0x7c,
-0xc6,
-0xc6,
-0xc6,
-0xc6,
-0xc6,
-0x7c,
+0x7C,
+0xC6,
+0xC6,
+0xC6,
+0xC6,
+0xC6,
+0x7C,
 0x00,
 0x00,
 0x00,
@@ -3030,15 +3032,15 @@ const uint8_t	font8x16[] = {
 0x00,
 0x00,
 0x00,
-0xdc,
+0xDC,
 0x66,
 0x66,
 0x66,
 0x66,
-0x7c,
+0x7C,
 0x60,
 0x60,
-0xf0,
+0xF0,
 0x00,
 0x00,
 
@@ -3068,14 +3070,14 @@ const uint8_t	font8x16[] = {
 0x00,
 0x00,
 0x76,
-0xcc,
-0xcc,
-0xcc,
-0xcc,
-0x7c,
-0x0c,
-0x0c,
-0x1e,
+0xCC,
+0xCC,
+0xCC,
+0xCC,
+0x7C,
+0x0C,
+0x0C,
+0x1E,
 0x00,
 0x00,
 
@@ -3104,13 +3106,13 @@ const uint8_t	font8x16[] = {
 0x00,
 0x00,
 0x00,
-0xdc,
+0xDC,
 0x66,
 0x60,
 0x60,
 0x60,
 0x60,
-0xf0,
+0xF0,
 0x00,
 0x00,
 0x00,
@@ -3141,13 +3143,13 @@ const uint8_t	font8x16[] = {
 0x00,
 0x00,
 0x00,
-0x7c,
-0xc6,
-0xc0,
-0x7c,
+0x7C,
+0xC6,
+0xC0,
+0x7C,
 0x06,
-0xc6,
-0x7c,
+0xC6,
+0x7C,
 0x00,
 0x00,
 0x00,
@@ -3178,13 +3180,13 @@ const uint8_t	font8x16[] = {
 0x30,
 0x30,
 0x30,
-0xfc,
+0xFC,
 0x30,
 0x30,
 0x30,
 0x30,
 0x36,
-0x1c,
+0x1C,
 0x00,
 0x00,
 0x00,
@@ -3215,12 +3217,12 @@ const uint8_t	font8x16[] = {
 0x00,
 0x00,
 0x00,
-0xcc,
-0xcc,
-0xcc,
-0xcc,
-0xcc,
-0xcc,
+0xCC,
+0xCC,
+0xCC,
+0xCC,
+0xCC,
+0xCC,
 0x76,
 0x00,
 0x00,
@@ -3252,11 +3254,11 @@ const uint8_t	font8x16[] = {
 0x00,
 0x00,
 0x00,
-0xc6,
-0xc6,
-0xc6,
-0xc6,
-0x6c,
+0xC6,
+0xC6,
+0xC6,
+0xC6,
+0x6C,
 0x38,
 0x10,
 0x00,
@@ -3289,13 +3291,13 @@ const uint8_t	font8x16[] = {
 0x00,
 0x00,
 0x00,
-0xc6,
-0xc6,
-0xd6,
-0xd6,
-0xd6,
-0xfe,
-0x6c,
+0xC6,
+0xC6,
+0xD6,
+0xD6,
+0xD6,
+0xFE,
+0x6C,
 0x00,
 0x00,
 0x00,
@@ -3326,13 +3328,13 @@ const uint8_t	font8x16[] = {
 0x00,
 0x00,
 0x00,
-0xc6,
-0xc6,
-0x6c,
+0xC6,
+0xC6,
+0x6C,
 0x38,
-0x6c,
-0xc6,
-0xc6,
+0x6C,
+0xC6,
+0xC6,
 0x00,
 0x00,
 0x00,
@@ -3363,19 +3365,19 @@ const uint8_t	font8x16[] = {
 0x00,
 0x00,
 0x00,
-0xc6,
-0xc6,
-0xc6,
-0xc6,
-0xce,
+0xC6,
+0xC6,
+0xC6,
+0xC6,
+0xCE,
 0x76,
 0x06,
-0xc6,
-0x7c,
+0xC6,
+0x7C,
 0x00,
 0x00,
 
-/* Character z (0x7a):
+/* Character z (0x7A):
    ht=16, width=8
    +--------+
    |        |
@@ -3400,19 +3402,19 @@ const uint8_t	font8x16[] = {
 0x00,
 0x00,
 0x00,
-0xfe,
+0xFE,
 0x86,
-0x0c,
+0x0C,
 0x18,
 0x30,
 0x62,
-0xfe,
+0xFE,
 0x00,
 0x00,
 0x00,
 0x00,
 
-/* Character { (0x7b):
+/* Character { (0x7B):
    ht=16, width=8
    +--------+
    |        |
@@ -3434,7 +3436,7 @@ const uint8_t	font8x16[] = {
    +--------+ */
 0x00,
 0x00,
-0x0e,
+0x0E,
 0x18,
 0x18,
 0x18,
@@ -3443,13 +3445,13 @@ const uint8_t	font8x16[] = {
 0x18,
 0x18,
 0x18,
-0x0e,
+0x0E,
 0x00,
 0x00,
 0x00,
 0x00,
 
-/* Character | (0x7c):
+/* Character | (0x7C):
    ht=16, width=8
    +--------+
    |        |
@@ -3486,7 +3488,7 @@ const uint8_t	font8x16[] = {
 0x00,
 0x00,
 
-/* Character } (0x7d):
+/* Character } (0x7D):
    ht=16, width=8
    +--------+
    |        |
@@ -3512,7 +3514,7 @@ const uint8_t	font8x16[] = {
 0x18,
 0x18,
 0x18,
-0x0e,
+0x0E,
 0x18,
 0x18,
 0x18,
@@ -3523,7 +3525,7 @@ const uint8_t	font8x16[] = {
 0x00,
 0x00,
 
-/* Character ~ (0x7e):
+/* Character ~ (0x7E):
    ht=16, width=8
    +--------+
    |        |
@@ -3546,7 +3548,7 @@ const uint8_t	font8x16[] = {
 0x00,
 0x00,
 0x76,
-0xdc,
+0xDC,
 0x00,
 0x00,
 0x00,
@@ -3560,7 +3562,7 @@ const uint8_t	font8x16[] = {
 0x00,
 0x00,
 
-/* Character  (0x7f):
+/* Character DELTA (0x7F):
    ht=16, width=8
    +--------+
    |        |
@@ -3588,13 +3590,12 @@ const uint8_t	font8x16[] = {
 0x10,
 0x38,
 0x38,
-0x6c,
-0x6c,
-0xfe,
+0x6C,
+0x6C,
+0xFE,
 0x00,
 0x00,
 0x00,
 0x00,
 0x00,
-
 };
diff --git a/c/src/lib/libbsp/arm/csb337/console/sed1356.c b/c/src/lib/libbsp/arm/csb337/console/sed1356.c
index 7e81ff4b4a..865245643e 100644
--- a/c/src/lib/libbsp/arm/csb337/console/sed1356.c
+++ b/c/src/lib/libbsp/arm/csb337/console/sed1356.c
@@ -1,5 +1,5 @@
 /*
- *  SED1356 Support
+ *  SED1356 Support (for  KIT637_V6 (CSB637)
  *
  *  Based upon code from MicroMonitor 1.17 from http://www.umonfw.com/
  *  which includes this notice:
@@ -25,8 +25,10 @@
  *
  *  Ed Sutter has been informed that this code is being used in RTEMS.
  *
- *  The code has been reformatted to be more compliant with RTEMS
- *  coding standards and to eliminate C++ style comments.
+ *  This code was reformatted by Joel Sherrill from OAR Corporation and
+ *  Fernando Nicodemos <fgnicodemos@terra.com.br> from NCB - Sistemas
+ *  Embarcados Ltda. (Brazil) to be more compliant with RTEMS coding
+ *  standards and to eliminate C++ style comments.
  *
  *  $Id$
  */
diff --git a/c/src/lib/libbsp/arm/csb337/console/uarts.c b/c/src/lib/libbsp/arm/csb337/console/uarts.c
index 7b9ab8002c..c15175f902 100644
--- a/c/src/lib/libbsp/arm/csb337/console/uarts.c
+++ b/c/src/lib/libbsp/arm/csb337/console/uarts.c
@@ -135,7 +135,7 @@ console_tbl Console_Port_Tbl[] = {
     0                  /* ulIntVector - NOT USED */
   },
 #endif
-#if ENABLE_UMON
+#if (ENABLE_UMON && ENABLE_UMON_CONSOLE)
   {
     "/dev/umon",       /* sDeviceName */
     SERIAL_CUSTOM,     /* deviceType */
diff --git a/c/src/lib/libbsp/arm/csb337/include/sed1356.h b/c/src/lib/libbsp/arm/csb337/include/sed1356.h
index acf207c2b1..97756f0985 100644
--- a/c/src/lib/libbsp/arm/csb337/include/sed1356.h
+++ b/c/src/lib/libbsp/arm/csb337/include/sed1356.h
@@ -1,9 +1,12 @@
 /*
- *  Public Interface for SED Video Controller Operations
+ * Public Interface for SED Video Controller Operations
  *
  *  COPYRIGHT (c) 1989-2009.
  *  On-Line Applications Research Corporation (OAR).
  *
+ *  Modified by Fernando Nicodemos <fgnicodemos@terra.com.br>
+ *  from NCB - Sistemas Embarcados Ltda. (Brazil)
+ *
  *  The license and distribution terms for this file may be
  *  found in the file LICENSE in this distribution or at
  *  http://www.rtems.com/license/LICENSE.
diff --git a/c/src/lib/libbsp/arm/csb337/preinstall.am b/c/src/lib/libbsp/arm/csb337/preinstall.am
index 78fb8f1f9b..bc980b7e38 100644
--- a/c/src/lib/libbsp/arm/csb337/preinstall.am
+++ b/c/src/lib/libbsp/arm/csb337/preinstall.am
@@ -45,10 +45,12 @@ $(PROJECT_INCLUDE)/tm27.h: ../../shared/include/tm27.h $(PROJECT_INCLUDE)/$(dirs
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
 
+if ENABLE_LCD
 $(PROJECT_INCLUDE)/sed1356.h: include/sed1356.h $(PROJECT_INCLUDE)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sed1356.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/sed1356.h
-
+endif
+if ENABLE_UMON
 $(PROJECT_INCLUDE)/umon/$(dirstamp):
 	@$(MKDIR_P) $(PROJECT_INCLUDE)/umon
 	@: > $(PROJECT_INCLUDE)/umon/$(dirstamp)
@@ -74,7 +76,7 @@ PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/$(dirstamp)
 $(PROJECT_INCLUDE)/rtems/umon.h: ../../shared/umon/umon.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/umon.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/umon.h
-
+endif
 $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
diff --git a/c/src/lib/libbsp/arm/csb337/startup/bspstart.c b/c/src/lib/libbsp/arm/csb337/startup/bspstart.c
index 7566e32e85..5857d04429 100644
--- a/c/src/lib/libbsp/arm/csb337/startup/bspstart.c
+++ b/c/src/lib/libbsp/arm/csb337/startup/bspstart.c
@@ -1,26 +1,33 @@
 /*
- * Cogent CSB337 - AT91RM9200 Startup code
+ * Cogent CSB337 - AT91RM9200 Startup Code
  *
- * Copyright (c) 2004 by Cogent Computer Systems
- * Written by Jay Monkman <jtm@lopingdog.com>
+ *  Copyright (c) 2004 by Cogent Computer Systems
+ *  Written by Jay Monkman <jtm@lopingdog.com>
  *
+ *  Modified by Joel Sherill 
+ *  from OAR Corporation and 
+ *  Fernando Nicodemos <fgnicodemos@terra.com.br>
+ *  from NCB - Sistemas Embarcados Ltda. (Brazil)
+ * 
  *  The license and distribution terms for this file may be
  *  found in the file LICENSE in this distribution or at
- *
  *  http://www.rtems.com/license/LICENSE.
  *
- *
  *  $Id$
-*/
+ */
+
 #include <bsp.h>
 #include <at91rm9200.h>
 #include <at91rm9200_pmc.h>
 #include <at91rm9200_emac.h>
+#include <at91rm9200_gpio.h>
+#include <at91rm9200_usart.h>
 
 /* Function prototypes */
 extern void rtems_irq_mngt_init(void);
 void bsp_libc_init( void *, uint32_t, int );
 static void fix_mac_addr(void);
+void bsp_usart_init(void);
 
 /*
  * bsp_start_default - BSP initialization function
@@ -45,6 +52,11 @@ void bsp_start_default( void )
   fix_mac_addr();
 
   /*
+   * Init rtems PIO configuration for USARTs
+   */
+  bsp_usart_init(); 
+
+  /*
    * Init rtems exceptions management
    */
   rtems_exception_init_mngt();
@@ -85,6 +97,67 @@ static void fix_mac_addr(void)
   }
 }
 
+/*
+ *
+ * NAME: bsp_usart_init - Function to setup the PIO in USART mode
+ *       before startup
+ *
+ * DESCRIPTION:
+ *   This function is called before usart driver is initialized and is
+ *   used to setup the proper mode of PIO operation for USART.
+ *
+ * NOTES:
+ *   The initialization could be done smarter by programming only the
+ *   bits you need to program for each USART when the port is ENABLED.
+ *
+ */
+void bsp_usart_init(void)
+{
+  /*
+   * Configure shared pins for USARTs.
+   * Disables the PIO from controlling the corresponding pin.
+   */
+  PIOA_REG(PIO_PDR) |= ( BIT5  |   /* USART3 TXD3  */
+                         BIT6  |   /* USART3 RXD3  */
+                         BIT17 |   /* USART0 TXD0  */
+                         BIT18 |   /* USART0 RXD0  */
+                         BIT22 |   /* USART2 RXD2  */
+                         BIT23 );  /* USART2 TXD2  */
+
+  PIOB_REG(PIO_PDR) |= ( BIT20 |   /* USART1 TXD1  */
+                         BIT21 );  /* USART1 RXD1  */
+
+  /**** PIO Controller A - Pins you want in mode B ****/
+  PIOA_REG(PIO_BSR) |=  ( BIT5 |   /* USART3 TXD3  */ /* add */
+                          BIT6 );  /* USART3 RXD3  */ 
+  PIOA_REG(PIO_ASR) &= ~( BIT5 |   /* USART3 TXD3  */
+                          BIT6 );  /* USART3 RXD3  */
+
+  /**** PIO Controller A - Pins you want in mode A ****/
+  PIOA_REG(PIO_ASR) |=  ( BIT17 |   /* USART0 TXD0  */
+                          BIT18 |   /* USART0 RXD0  */
+                          BIT22 |   /* USART2 RXD2  */
+                          BIT23 );  /* USART2 TXD2  */
+  PIOA_REG(PIO_BSR) &= ~( BIT17 |   /* USART0 TXD0  */ /* add */
+                          BIT18 |   /* USART0 RXD0  */
+                          BIT22 |   /* USART2 RXD2  */
+                          BIT23 );  /* USART2 TXD2  */
+
+  /**** PIO Controller B - Pins you want in mode A ****/
+  PIOB_REG(PIO_ASR) |=  ( BIT20 |   /* USART1 TXD1  */
+                          BIT21 );  /* USART1 RXD1  */
+  PIOB_REG(PIO_BSR) &= ~( BIT20 |   /* USART1 TXD1  */
+                          BIT21 );  /* USART1 RXD1  */
+
+  /**** PIO Controller B - Pins you want in mode B ****/
+  /**** none ****/
+
+  /* Enable the clock to the USARTs */
+  PMC_REG(PMC_PCER) |= ( PMC_PCR_PID_US0 |   /* USART 0 Peripheral Clock */
+                         PMC_PCR_PID_US1 |   /* USART 1 Peripheral Clock */
+                         PMC_PCR_PID_US2 |   /* USART 2 Peripheral Clock */ 
+                         PMC_PCR_PID_US3 );  /* USART 3 Peripheral Clock */
+} 
 
 /*
  *  By making this a weak alias for bsp_start_default, a brave soul
diff --git a/c/src/lib/libbsp/arm/csb337/startup/linkcmds.csb337 b/c/src/lib/libbsp/arm/csb337/startup/linkcmds.csb337
index abc9658357..4e66e4365a 100644
--- a/c/src/lib/libbsp/arm/csb337/startup/linkcmds.csb337
+++ b/c/src/lib/libbsp/arm/csb337/startup/linkcmds.csb337
@@ -1,14 +1,12 @@
 /*
- * Cogent CSB337 Linker script
+ *  Cogent CSB337 Linker script
  *
- * Copyright (c) 2004 by Jay Monkman <jtm@lopingdog.com>
+ *  Copyright (c) 2004 by Jay Monkman <jtm@lopingdog.com>
  *
  *  The license and distribution terms for this file may be
  *  found in the file LICENSE in this distribution or at
- *
  *  http://www.rtems.com/license/LICENSE.
  *
- *
  *  $Id$
  */
 
diff --git a/c/src/lib/libbsp/arm/csb337/startup/linkcmds.csb637 b/c/src/lib/libbsp/arm/csb337/startup/linkcmds.csb637
index 9cfd3f76c2..0058b020f0 100644
--- a/c/src/lib/libbsp/arm/csb337/startup/linkcmds.csb637
+++ b/c/src/lib/libbsp/arm/csb337/startup/linkcmds.csb637
@@ -1,14 +1,18 @@
 /*
- * Cogent CSB337 Linker script
+ * Cogent CSB637 linker script
  *
- * Copyright (c) 2004 by Jay Monkman <jtm@lopingdog.com>
- *	
+ *  Copyright (c) 2004 by Jay Monkman <jtm@lopingdog.com>
+ *  File from the old CSB337 RTEMS BSP
+ * 
+ *  Modified by Joel Sherill 
+ *  from OAR Corporation and 
+ *  Fernando Nicodemos <fgnicodemos@terra.com.br>
+ *  from NCB - Sistemas Embarcados Ltda. (Brazil)
+ * 
  *  The license and distribution terms for this file may be
  *  found in the file LICENSE in this distribution or at
- *
  *  http://www.rtems.com/license/LICENSE.
  *
- *
  *  $Id$
  */
 
diff --git a/c/src/lib/libbsp/arm/csb337/startup/memmap.c b/c/src/lib/libbsp/arm/csb337/startup/memmap.c
index 4e219bee73..440c9e6f02 100644
--- a/c/src/lib/libbsp/arm/csb337/startup/memmap.c
+++ b/c/src/lib/libbsp/arm/csb337/startup/memmap.c
@@ -1,11 +1,21 @@
 /*
- *  CSB337 Memory Map
+ * CSB337 and CSB637 Memory map
  *
- *  Copyright (c) 2004 by Cogent Computer Systems
- *  Written by Jay Monkman <jtm@lopingdog.com>
+ * Copyright (c) 2004 by Jay Monkman <jtm@lopingdog.com>
+ * File from the old CSB337 RTEMS BSP
+ * 
+ *  Modified by Joel Sherill 
+ *  from OAR Corporation and 
+ *  Fernando Nicodemos <fgnicodemos@terra.com.br>
+ *  from NCB - Sistemas Embarcados Ltda. (Brazil)
+ * 
+ *  The license and distribution terms for this file may be
+ *  found in the file LICENSE in this distribution or at
+ *  http://www.rtems.com/license/LICENSE.
  *
  *  $Id$
  */
+
 #include <rtems.h>
 #include <libcpu/mmu.h>
 
@@ -19,13 +29,15 @@ mmu_sect_map_t mem_map[] = {
     {0x00200000, 0x00000000,   1,    MMU_CACHE_NONE},     /* SRAM */
     {0x00200000, 0x00200000,   1,    MMU_CACHE_NONE},     /* SRAM */
     {0x10000000, 0x10000000,   8,    MMU_CACHE_NONE},     /* FLASH */
-#if csb637
+#if csb637 /* CSB637 or KIT637_V6 */
+    {0x20000000, 0x20000000,  64,    MMU_CACHE_WTHROUGH}, /* SDRAM */
+#elif kit637_v6 
     {0x20000000, 0x20000000,  64,    MMU_CACHE_WTHROUGH}, /* SDRAM */
 #else /* CSB337 */
     {0x20000000, 0x20000000,  32,    MMU_CACHE_WTHROUGH}, /* SDRAM */
 #endif
 #if ENABLE_LCD
-    {0x30000000, 0x30000000,   8,    MMU_CACHE_NONE},     /* video */
+    {0x30000000, 0x30000000,   8,    MMU_CACHE_NONE},     /* Video buffer - 8MB */
 #endif
     {0x40000000, 0x40000000,   1,    MMU_CACHE_NONE},     /* Expansion CS0 */
     {0x50000000, 0x50000000,   1,    MMU_CACHE_NONE},     /* CF CE 1 */
diff --git a/c/src/lib/libbsp/arm/csb337/startup/umonsupp.c b/c/src/lib/libbsp/arm/csb337/startup/umonsupp.c
index 3b832658e2..c2d3d662e5 100644
--- a/c/src/lib/libbsp/arm/csb337/startup/umonsupp.c
+++ b/c/src/lib/libbsp/arm/csb337/startup/umonsupp.c
@@ -2,6 +2,9 @@
  *  COPYRIGHT (c) 1989-2009.
  *  On-Line Applications Research Corporation (OAR).
  *
+ *  Modified by Fernando Nicodemos <fgnicodemos@terra.com.br>
+ *  from NCB - Sistemas Embarcados Ltda. (Brazil)
+ *
  *  The license and distribution terms for this file may be
  *  found in the file LICENSE in this distribution or at
  *  http://www.rtems.com/license/LICENSE.