# HG changeset patch
# User asl
# Date 1059300804 0
# Node ID 3067974be2f3b548e2ddc692a83b743e2ce3daee
# Parent  2ed60876c63706d516878c6126e4de9585c8deae
        * src/flash.c (fis_find_free)
        * src/flash.c (fis_free): Do not search areas reserved for RedBoot
        when scanning for free space.

diff --git a/packages/redboot/current/ChangeLog b/packages/redboot/current/ChangeLog
--- a/packages/redboot/current/ChangeLog
+++ b/packages/redboot/current/ChangeLog
@@ -1,3 +1,9 @@
+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:
diff --git a/packages/redboot/current/src/flash.c b/packages/redboot/current/src/flash.c
--- a/packages/redboot/current/src/flash.c
+++ b/packages/redboot/current/src/flash.c
@@ -508,7 +508,9 @@ fis_free(int argc, char *argv[])
     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) {
@@ -545,7 +547,9 @@ fis_find_free(CYG_ADDRESS *addr, unsigne
     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) {