2007-05-01 Ray Xu <xr@trasin.net>

	* README, times, console/lpc22xx_uart.h, console/uart.c, include/bsp.h,
	start/start.S, startup/bspstart.c, startup/exit.c, startup/linkcmds:
	Update BSP to address changes between 4.7 and CVS head as well as to
	address comments from Ralf and Joel.

3 files changed, 15 insertions, 15 deletions

diff --git a/c/src/lib/libbsp/arm/rtl22xx/startup/bspstart.c b/c/src/lib/libbsp/arm/rtl22xx/startup/bspstart.c
index 7881d227c4..2ae12acaf9 100644
--- a/c/src/lib/libbsp/arm/rtl22xx/startup/bspstart.c
+++ b/c/src/lib/libbsp/arm/rtl22xx/startup/bspstart.c
@@ -1,7 +1,7 @@
 /*
- *  LPC22XX Startup code
+ *  LPC22XX/LPC21xx Startup code
  *
- *  Copyright (c) 2005 by Ray X <rayx.cn@gmail.com>
+ *  Copyright (c) 2007 by Ray Xu <rayx.cn@gmail.com>
  *
  *  The license and distribution terms for this file may be
  *  found in the file LICENSE in this distribution or at
@@ -92,7 +92,8 @@ void bsp_pretasking_hook(void)
     heap_start =  free_mem_start;
 
     /*   heap_size = (free_mem_end - heap_start - MEM_NOCACHE_SIZE); */
-    /*the board seems to have only 512K memory, we use 256K as heap*/
+    /*the board seems to have only 512K memory, we use 256K as heap, 256K to 
+    store the .text*/
     heap_size = 0x40000;
 
     bsp_libc_init((void *)heap_start, heap_size, 0);
@@ -133,7 +134,6 @@ void bsp_pretasking_hook(void)
 /**************************************************************************/
 void bsp_start_default( void )
 {
-    uint32_t i;
     PINSEL2 =0x0f814914;
     BCFG0 = 0x1000ffef;
     BCFG1 = 0x1000ffef;
@@ -171,6 +171,7 @@ void bsp_start_default( void )
     PLLFEED = 0x55;
 
     /* memory configure */
+    /* it is not needed in my formatter board */
     //MAMCR = 0;
     // MAMTIM = 3;
     //MAMCR = 2;
@@ -201,6 +202,7 @@ void bsp_start_default( void )
 
     #if 0
     debug_printk(" bsp_start_defalt");
+    printi((int)&bsp_start_defalt);
     
     debug_printk(" _bss_free_start");
     printi((int)&_bss_free_start);
@@ -216,9 +218,6 @@ void bsp_start_default( void )
 
     debug_printk(" free_mem_end");
     printi((int)free_mem_end);
-
-    
-    printi(free_mem_end);
     #endif
 
     /*
diff --git a/c/src/lib/libbsp/arm/rtl22xx/startup/exit.c b/c/src/lib/libbsp/arm/rtl22xx/startup/exit.c
index 4e357dcf17..8090146483 100644
--- a/c/src/lib/libbsp/arm/rtl22xx/startup/exit.c
+++ b/c/src/lib/libbsp/arm/rtl22xx/startup/exit.c
@@ -1,7 +1,6 @@
 /*
- * Cirrus LPC22XX BSP Shutdown  code
- *
- * Copyright (c) 2002 by Jay Monkman <jtm@smoothsmoothie.com>
+ * Philips LPC22XX/LPC21xx BSP Shutdown  code
+ * Copyright (c) 2007 by Ray Xu <rayx.cn@gmail.com>
  *
  *  The license and distribution terms for this file may be
  *  found in the file LICENSE in this distribution or at
@@ -32,8 +31,8 @@ void bsp_cleanup(void)
    * use polled output/input. This is exactly what printk
    * does.
    */
-  printk("\n");
-  printk(line);
+  debug_printk("\n");
+  debug_printk(line);
   while (uart_poll_read(0) < 0) continue;
 
   /* rtemsReboot(); */
diff --git a/c/src/lib/libbsp/arm/rtl22xx/startup/linkcmds b/c/src/lib/libbsp/arm/rtl22xx/startup/linkcmds
index a9445ba7e2..d94e18b71c 100644
--- a/c/src/lib/libbsp/arm/rtl22xx/startup/linkcmds
+++ b/c/src/lib/libbsp/arm/rtl22xx/startup/linkcmds
@@ -3,6 +3,9 @@
  * By Ray,Xu
  * Rayx.cn@gmail.com
  *	
+ *  LPC22xx ARM do not have a MMU, the formatter got 512kb SRAM
+ *  I set the code entry to the beging of SRAM for debugging perpurse
+ *	
  *  The license and distribution terms for this file may be
  *  found in the file LICENSE in this distribution or at
  *
@@ -10,8 +13,7 @@
  *
  *
  *  $Id$
- *  LPC22xx ARM do not have a 
-*/
+ */
 
 OUTPUT_FORMAT("elf32-littlearm", "elf32-bigarm",
 	      "elf32-littlearm")
@@ -36,7 +38,7 @@ _sdram_size = DEFINED(_sdram_size) ? _sdram_size : 512K;
 _irq_stack_size = DEFINED(_irq_stack_size) ? _irq_stack_size : 0x100;
 _fiq_stack_size = DEFINED(_fiq_stack_size) ? _fiq_stack_size : 0x50;
 _abt_stack_size = DEFINED(_abt_stack_size) ? _abt_stack_size : 0x50;
-_svc_stack_size = DEFINED(_svc_stack_size) ? _svc_stack_size : 0x2000;
+_svc_stack_size = DEFINED(_svc_stack_size) ? _svc_stack_size : 0x500;