--- a/packages/hal/arm/lpc2xxx/olpcl2294/current/ChangeLog
+++ b/packages/hal/arm/lpc2xxx/olpcl2294/current/ChangeLog
@@ -1,3 +1,11 @@
+2009-02-02  Sergei Gavrikov <sergei.gavrikov@gmail.com>
+
+	* cdl/hal_arm_lpc2xxx_olpcl2294.cdl: Expanded a list the legal baud
+	rates for both diagnostic and debug channels (upon 230400b bps).
+	* include/hal_platform_setup.h, include/plf_io.h: Extra tabs expanded.
+	* include/hal_platform_setup.h: Fixed a comment about JTAG pinouts.
+	* src/olpcl2294_misc.c: Removed odd _impure_ptr stub.
+ 
 2009-01-31  Bart Veer <bartv@ecoscentric.com>
 
 	* cdl/hal_arm_lpc2xxx_olpcl2294.cdl: update compiler flags for gcc 4.x

--- a/packages/hal/arm/lpc2xxx/olpcl2294/current/cdl/hal_arm_lpc2xxx_olpcl2294.cdl
+++ b/packages/hal/arm/lpc2xxx/olpcl2294/current/cdl/hal_arm_lpc2xxx_olpcl2294.cdl
@@ -116,7 +116,7 @@ cdl_package CYGPKG_HAL_ARM_LPC2XXX_OLPCL
      cdl_option CYGNUM_HAL_VIRTUAL_VECTOR_CONSOLE_CHANNEL_BAUD {
         display       "Diagnostic serial port baud rate"
         flavor        data
-        legal_values  9600 19200 38400 57600 115200
+        legal_values  9600 19200 38400 57600 115200 230400
         default_value 38400
         description   "
             This option selects the baud rate used for the diagnostic
@@ -126,7 +126,7 @@ cdl_package CYGPKG_HAL_ARM_LPC2XXX_OLPCL
     cdl_option CYGNUM_HAL_VIRTUAL_VECTOR_DEBUG_CHANNEL_BAUD {
          display       "GDB serial port baud rate"
          flavor        data
-         legal_values  9600 19200 38400 57600 115200
+         legal_values  9600 19200 38400 57600 115200 230400
          default_value 38400
          description   "
             This option controls the baud rate used for the GDB

--- a/packages/hal/arm/lpc2xxx/olpcl2294/current/include/hal_platform_setup.h
+++ b/packages/hal/arm/lpc2xxx/olpcl2294/current/include/hal_platform_setup.h
@@ -131,13 +131,13 @@ 1:
         mov r1,#2 // 2, full MAM
         str r1,[r0,#CYGARC_HAL_LPC2XXX_REG_MAMCR]
 
-	// External memory interface depends on the bank width (32, 16 or 8 bit
-	// selected via MW bits in corresponding BCFG register).  Furthermore,
-	// choice of the memory chip(s) will require an adequate setup of RBLE
-	// bit in BCFG register, too. RBLE = 0 in case of 8-bit based external
-	// memories, while memory chips capable of accepting 16 or 32 bit wide
-	// data will work with RBLE = 1.
-	//
+        // External memory interface depends on the bank width (32, 16 or 8 bit
+        // selected via MW bits in corresponding BCFG register).  Furthermore,
+        // choice of the memory chip(s) will require an adequate setup of RBLE
+        // bit in BCFG register, too. RBLE = 0 in case of 8-bit based external
+        // memories, while memory chips capable of accepting 16 or 32 bit wide
+        // data will work with RBLE = 1.
+        //
         // BANK0: 2M FLASH
         // TE28F160C3BD70 (1024Kx16 x 1, 70nS)
         ldr r0,=CYGARC_HAL_LPC2XXX_REG_BCFG0
@@ -151,8 +151,8 @@ 1:
         // BANK1: 1M RAM
         // K6R4016V1D (512Kx16 x 2, 10nS)
         ldr r0,=CYGARC_HAL_LPC2XXX_REG_BCFG1
-	// Warning: changed these timings, you can fall dramatically the eCos
-	// kernel performance. Check it then using the eCos 'tm_basic' test.
+        // Warning: changed these timings, you can fall dramatically the eCos
+        // kernel performance. Check it then using the eCos 'tm_basic' test.
         ldr r1,=  (0x0 << 0)    /* IDCY=0, idle cycles  */\
                 | (0x0 << 5)    /* WST1=0, read timing  */\
                 | (0x1 << 10)   /* RBLE=1               */\
@@ -186,7 +186,7 @@ 1:
         str r1,[r0,#CYGARC_HAL_LPC2XXX_REG_PINSEL1]
 
         // GPIO P1.25:16, P3.24 are used as PIO
-        ldr r1,=  (0x1 << 2)    /* P1.36:26 Debug port  */\
+        ldr r1,=  (0x1 << 2)    /* P1.31:26 Debug port  */\
                 | (0x2 << 4)    /* D31:0,CS0,OE,BLS0-3  */\
                 | (0x1 << 8)    /* WE enabled           */\
                 | (0x1 << 11)   /* CS1 enabled          */\

--- a/packages/hal/arm/lpc2xxx/olpcl2294/current/include/plf_io.h
+++ b/packages/hal/arm/lpc2xxx/olpcl2294/current/include/plf_io.h
@@ -56,7 +56,7 @@
 #ifndef __ASSEMBLER__
 extern void hal_plf_hardware_init(void);
 #define HAL_PLF_HARDWARE_INIT() \
-	    hal_plf_hardware_init()
+            hal_plf_hardware_init()
 
 #endif // __ASSEMBLER__
 

--- a/packages/hal/arm/lpc2xxx/olpcl2294/current/src/olpcl2294_misc.c
+++ b/packages/hal/arm/lpc2xxx/olpcl2294/current/src/olpcl2294_misc.c
@@ -60,11 +60,6 @@
 #include <cyg/hal/hal_var_ints.h>
 #include <cyg/hal/drv_api.h>
 
-// Newlib provides support for building the run-time elements of C++
-// within the toolchain. Modern newlib stuff looks for a _impure_ptr
-// entry.
-void           *_impure_ptr;
-
 extern void cyg_hal_plf_serial_init (void);
 
 //--------------------------------------------------------------------------