2009-05-28 Joel Sherrill <joel.sherrill@OARcorp.com>

* Makefile.am, README, configure.ac, preinstall.am, start/start.S,
	startup/memmap.c: Add csb637 as alias and variant.
	* startup/linkcmds.csb637: New file.

c/src/lib/libbsp/arm/csb337/ChangeLog

@@ -1,3 +1,9 @@
+2009-05-28	Joel Sherrill <joel.sherrill@OARcorp.com>
+
+	* Makefile.am, README, configure.ac, preinstall.am, start/start.S,
+	startup/memmap.c: Add csb637 as alias and variant.
+	* startup/linkcmds.csb637: New file.
+
 2009-04-28	Chris Johns <chrisj@rtems.org>
 
 	* start/start.S: Update for boot_card command line change.

c/src/lib/libbsp/arm/csb337/Makefile.am

@@ -25,6 +25,7 @@ libbspstart_a_SOURCES = start/start.S
 project_lib_DATA = start.$(OBJEXT)
 
 dist_project_lib_DATA += startup/linkcmds
+dist_project_lib_DATA += startup/linkcmds.csb637
 
 noinst_LIBRARIES += libbsp.a
 libbsp_a_SOURCES =

c/src/lib/libbsp/arm/csb337/README

@@ -2,6 +2,12 @@
 #  $Id$
 #
 
-This is the BSP for Cogent Computer System's CSB337, a single board
-computer using the Atmel AT91RM9200 CPU.
+This is the BSP for Cogent Computer System's CSB337 and
+CSB637, single board computers using the Atmel AT91RM9200 CPU.
+The differences in the board are very slight but important:
 
+ CSB337             CSB637
+========           ========
+16Mb RAM           64Mb RAM
+
+? PHY is different

c/src/lib/libbsp/arm/csb337/configure.ac

@@ -18,6 +18,12 @@ RTEMS_PROG_CCAS
 RTEMS_CHECK_NETWORKING 
 AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes")
 
+RTEMS_BSPOPTS_SET([csb637],[csb637],[1])
+RTEMS_BSPOPTS_SET([csb637],[*],[0])
+RTEMS_BSPOPTS_HELP([csb637],
+[If defined, this indicates that the BSP is being built for the
+ csb637 variant.])
+
 RTEMS_BSPOPTS_SET([BSP_PRESS_KEY_FOR_RESET],[*],[1])
 RTEMS_BSPOPTS_HELP([BSP_PRESS_KEY_FOR_RESET],
 [If defined, print a message and wait until pressed before resetting

c/src/lib/libbsp/arm/csb337/preinstall.am

@@ -65,3 +65,7 @@ $(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
 PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
 
+$(PROJECT_LIB)/linkcmds.csb637: startup/linkcmds.csb637 $(PROJECT_LIB)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.csb637
+PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.csb637
+

c/src/lib/libbsp/arm/csb337/start/start.S

@@ -12,11 +12,6 @@
  *  $Id$
 */
 
-#warning Call to boot_card has changed and needs checking.
-#warning The call is "void boot_card(const char* cmdline);"
-#warning You need to pass a NULL.
-#warning Please check and remove these warnings.
-                
 /* Some standard definitions...*/
 .equ PSR_MODE_USR,       0x10
 .equ PSR_MODE_FIQ,       0x11
@@ -105,6 +100,7 @@ _bss_init:
         stmia   r0!, {r2-r9}
 
         /* Now we are prepared to start the BSP's C code */
+        mov     r0, #0
         bl      boot_card
 
         /* 

c/src/lib/libbsp/arm/csb337/startup/memmap.c

@@ -9,6 +9,8 @@
 #include <rtems.h>
 #include <libcpu/mmu.h>
 
+#include <bspopts.h>
+
 /* Remember, the ARM920 has 64 TLBs. If you have more 1MB sections than
  * that, you'll have TLB lookups, which could hurt performance.
  */
@@ -17,8 +19,12 @@ 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
+    {0x20000000, 0x20000000,  64,    MMU_CACHE_WTHROUGH}, /* SDRAM */
+#else /* CSB337 */
     {0x20000000, 0x20000000,  32,    MMU_CACHE_WTHROUGH}, /* SDRAM */
-    {0x30000000, 0x30000000,   1,    MMU_CACHE_NONE},     /* video */
+#endif
+    {0x30000000, 0x30000000,   8,    MMU_CACHE_NONE},     /* video */
     {0x40000000, 0x40000000,   1,    MMU_CACHE_NONE},     /* Expansion CS0 */
     {0x50000000, 0x50000000,   1,    MMU_CACHE_NONE},     /* CF CE 1 */
     {0x60000000, 0x60000000,   1,    MMU_CACHE_NONE},     /* CF CE 1 */