# HG changeset patch
# User gthomas
# Date 1064064510 0
# Node ID e4e339326f84ba5aaeb07b588374f4db762504f7
# Parent  89db0c354b7b63f69c75de122fde1f21957461f2
Improve memory layout display - from Chris Garry

diff --git a/packages/redboot/current/ChangeLog b/packages/redboot/current/ChangeLog
--- a/packages/redboot/current/ChangeLog
+++ b/packages/redboot/current/ChangeLog
@@ -1,8 +1,10 @@
 2003-09-20  Chris Garry  <cgarry@sweeneydesign.co.uk>
-
-    * 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.
+	
+	* 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>
 
diff --git a/packages/redboot/current/src/main.c b/packages/redboot/current/src/main.c
--- a/packages/redboot/current/src/main.c
+++ b/packages/redboot/current/src/main.c
@@ -173,14 +173,16 @@ do_version(int argc, char *argv[])
     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