Mercurial > ecos-v3_0-branch

changeset 2835:69fda884b880

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* cdl/hal_arm_lpc2xxx_olpce2294.cdl: Expanded a list the legal baud rates for both diagnostic and debug channels (upon 230400 bps). * include/hal_platform_setup.h, include/plf_io.h: Extra tabs expanded. * include/hal_platform_setup.h: Fixed a comment about JTAG pinouts.
author asl
date Mon, 02 Mar 2009 20:34:50 +0000
parents fbf38a65f4e1
children 6283be95ef53
files packages/hal/arm/lpc2xxx/olpce2294/current/ChangeLog packages/hal/arm/lpc2xxx/olpce2294/current/cdl/hal_arm_lpc2xxx_olpce2294.cdl packages/hal/arm/lpc2xxx/olpce2294/current/include/hal_platform_setup.h packages/hal/arm/lpc2xxx/olpce2294/current/include/plf_io.h
diffstat 4 files changed, 13 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/packages/hal/arm/lpc2xxx/olpce2294/current/ChangeLog
+++ b/packages/hal/arm/lpc2xxx/olpce2294/current/ChangeLog
@@ -1,3 +1,10 @@
+2009-02-02  Sergei Gavrikov <sergei.gavrikov@gmail.com>
+
+ 	* cdl/hal_arm_lpc2xxx_olpce2294.cdl: Expanded a list the legal baud
+ 	rates for both diagnostic and debug channels (upon 230400 bps).
+ 	* include/hal_platform_setup.h, include/plf_io.h: Extra tabs expanded.
+ 	* include/hal_platform_setup.h: Fixed a comment about JTAG pinouts.
+ 
 2009-01-31  Bart Veer <bartv@ecoscentric.com>
 
 	* cdl/hal_arm_lpc2xxx_olpce2294.cdl: update compiler flags for gcc 4.x
--- a/packages/hal/arm/lpc2xxx/olpce2294/current/cdl/hal_arm_lpc2xxx_olpce2294.cdl
+++ b/packages/hal/arm/lpc2xxx/olpce2294/current/cdl/hal_arm_lpc2xxx_olpce2294.cdl
@@ -122,7 +122,7 @@ cdl_package CYGPKG_HAL_ARM_LPC2XXX_OLPCE
      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
@@ -132,7 +132,7 @@ cdl_package CYGPKG_HAL_ARM_LPC2XXX_OLPCE
     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/olpce2294/current/include/hal_platform_setup.h
+++ b/packages/hal/arm/lpc2xxx/olpce2294/current/include/hal_platform_setup.h
@@ -150,8 +150,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               */\
@@ -187,7 +187,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/olpce2294/current/include/plf_io.h
+++ b/packages/hal/arm/lpc2xxx/olpce2294/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__