Index: redboot/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/redboot/current/ChangeLog,v
retrieving revision 1.128
diff -u -5 -b -p -r1.128 ChangeLog
--- redboot/current/ChangeLog	19 Sep 2003 22:21:51 -0000	1.128
+++ redboot/current/ChangeLog	20 Sep 2003 13:06:23 -0000
@@ -1,5 +1,13 @@
+2003-09-20  Chris Garry  <cgarry@sweeneydesign.co.uk>
+
+    * src/main.c: Modified the way multiple "RAM" segments are reported.
+
+    * src/fconfig.c: Variables 'stat' and '*err_addr' in function
+    flash_write_config() are now defined regardless of whether 
+    CYGSEM_REDBOOT_FLASH_COMBINED_FIS_AND_CONFIG is defined of not.
+
 2003-09-19  Gary Thomas  <gary@mlbassoc.com>
 
 	* src/net/timers.c (__timer_poll): Need to call MS_TICKS_DELAY() or
 	else time will never progress.  This can cause a missed TCP packet
 	to cause the stack to freeze.  BUG #23006
Index: redboot/current/src/main.c
===================================================================
RCS file: /cvs/ecos/ecos/packages/redboot/current/src/main.c,v
retrieving revision 1.46
diff -u -5 -b -p -r1.46 main.c
--- redboot/current/src/main.c	19 Sep 2003 17:11:34 -0000	1.46
+++ redboot/current/src/main.c	20 Sep 2003 13:06:26 -0000
@@ -171,18 +171,20 @@ do_version(int argc, char *argv[])
     diag_printf("Platform: %s (%s) %s\n", HAL_PLATFORM_BOARD, HAL_PLATFORM_CPU, HAL_PLATFORM_EXTRA);
 #endif
     diag_printf("Copyright (C) 2000, 2001, 2002, Red Hat, Inc.\n\n");
     diag_printf("RAM: %p-%p, ", (void*)ram_start, (void*)ram_end);
     diag_printf("[%p-%p]", mem_segments[0].start, mem_segments[0].end);
+    diag_printf(" available\n");
 #if CYGBLD_REDBOOT_MAX_MEM_SEGMENTS > 1
     for (seg = 1;  seg < CYGBLD_REDBOOT_MAX_MEM_SEGMENTS;  seg++) {
         if (mem_segments[seg].start != NO_MEMORY) {
+            diag_printf("     %p-%p, ", mem_segments[seg].start, mem_segments[seg].end);
             diag_printf("[%p-%p]", mem_segments[seg].start, mem_segments[seg].end);
+            diag_printf(" available\n");
         }
     }
 #endif
-    diag_printf(" available\n");
 #ifdef CYGPKG_REDBOOT_FLASH
     _flash_info();
 #endif
 }