Index: redboot/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/redboot/current/ChangeLog,v
retrieving revision 1.120
diff -u -5 -p -r1.120 ChangeLog
--- redboot/current/ChangeLog	16 Jul 2003 19:08:54 -0000	1.120
+++ redboot/current/ChangeLog	23 Jul 2003 14:59:05 -0000
@@ -1,5 +1,11 @@
+2003-07-23  Patrick Doyle  <wpd@dtccom.com>
+
+	* src/flash.c (fis_find_free)
+	* src/flash.c (fis_free): Do not search areas reserved for RedBoot
+	when scanning for free space.
+
 2003-07-16  Gary Thomas  <gary@mlbassoc.com>
 
 	* src/net/ping.c:
 	* src/net/bootp.c: Allow ^C to abort.
 
Index: redboot/current/src/flash.c
===================================================================
RCS file: /cvs/ecos/ecos/packages/redboot/current/src/flash.c,v
retrieving revision 1.46
diff -u -5 -p -r1.46 flash.c
--- redboot/current/src/flash.c	14 May 2003 20:12:54 -0000	1.46
+++ redboot/current/src/flash.c	23 Jul 2003 14:59:06 -0000
@@ -506,11 +506,11 @@ fis_free(int argc, char *argv[])
 {
     unsigned long *fis_ptr, *fis_end;
     unsigned long *area_start;
 
     // Do not search the area reserved for pre-RedBoot systems:
-    fis_ptr = (unsigned long *)((CYG_ADDRESS)flash_start + CYGNUM_REDBOOT_FLASH_RESERVED_BASE);
+    fis_ptr = (unsigned long *)((CYG_ADDRESS)flash_start + CYGNUM_REDBOOT_FLASH_RESERVED_BASE + CYGBLD_REDBOOT_MIN_IMAGE_SIZE);
     fis_end = (unsigned long *)(CYG_ADDRESS)flash_end;
     area_start = fis_ptr;
     while (fis_ptr < fis_end) {
         if (*fis_ptr != (unsigned long)0xFFFFFFFF) {
             if (area_start != fis_ptr) {
@@ -543,11 +543,11 @@ fis_find_free(CYG_ADDRESS *addr, unsigne
 {
     unsigned long *fis_ptr, *fis_end;
     unsigned long *area_start;
 
     // Do not search the area reserved for pre-RedBoot systems:
-    fis_ptr = (unsigned long *)((CYG_ADDRESS)flash_start + CYGNUM_REDBOOT_FLASH_RESERVED_BASE);
+    fis_ptr = (unsigned long *)((CYG_ADDRESS)flash_start + CYGNUM_REDBOOT_FLASH_RESERVED_BASE + CYGBLD_REDBOOT_MIN_IMAGE_SIZE);
     fis_end = (unsigned long *)(CYG_ADDRESS)flash_end;
     area_start = fis_ptr;
     while (fis_ptr < fis_end) {
         if (*fis_ptr != (unsigned long)0xFFFFFFFF) {
             if (area_start != fis_ptr) {