diff --git a/c/src/lib/libcpu/arm/ChangeLog b/c/src/lib/libcpu/arm/ChangeLog
index b9e7757c83..d2ee041681 100644
--- a/c/src/lib/libcpu/arm/ChangeLog
+++ b/c/src/lib/libcpu/arm/ChangeLog
@@ -1,3 +1,12 @@
+2008-09-22	Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	* at91rm9200/dbgu/dbgu.c: Use standardized bsp_cleanup() which can
+	optionally print a message, poll for user to press key, and call
+	bsp_reset(). Using this eliminates the various bsp_cleanup()
+	implementations which had their own implementation and variety of
+	string constants. This driver had to support the standard poll
+	key input method.
+
 2008-09-05	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* at91rm9200/timer/timer.c, lpc22xx/timer/timer.c, 
diff --git a/c/src/lib/libcpu/arm/at91rm9200/dbgu/dbgu.c b/c/src/lib/libcpu/arm/at91rm9200/dbgu/dbgu.c
index 79a8e406ef..b6c860076b 100644
--- a/c/src/lib/libcpu/arm/at91rm9200/dbgu/dbgu.c
+++ b/c/src/lib/libcpu/arm/at91rm9200/dbgu/dbgu.c
@@ -179,7 +179,7 @@ static void dbgu_init(int minor)
     dbgu->cr = (DBGU_CR_TXEN | DBGU_CR_RXEN);
 }
 
-/* I'm not sure this is needed for the shared console driver. */
+/* This is used for getchark support */
 static void dbgu_write_polled(int minor, char c)
 {
     dbgu_write(minor, &c, 1);
@@ -218,4 +218,9 @@ static void _BSP_put_char( char c ) {
 
 BSP_output_char_function_type BSP_output_char = _BSP_put_char;
 
+int _BSP_poll_char()
+{
+  return dbgu_poll_read(0);
+}
 
+BSP_polling_getchar_function_type BSP_poll_char = _BSP_poll_char;