# HG changeset patch
# User asl
# Date 1097056195 0
# Node ID 6aedf0a683e408a563c9eed29209a70659ca8371
# Parent  1a23a3a309844bab5ac2147c5262ffec79f7d589
        * src/flash.c (do_flash_init): We need info independent of
        CYGNUM_REDBOOT_FLASH_BASE being set or not.

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,8 @@
+2004-10-06  Andrew Lunn  <andrew.lunn@ascom.ch>
+
+	* src/flash.c (do_flash_init): We need info independent of
+	CYGNUM_REDBOOT_FLASH_BASE being set or not.
+	
 2004-09-14  Andrew Lunn  <andrew.lunn@ascom.ch>
 
 	* cdl/redboot.cdl: Change CYGNUM_REDBOOT_FLASH_BASE to a booldata
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
@@ -1374,9 +1374,7 @@ do_flash_init(void)
 {
     int stat, i;
     cyg_flashaddr_t err_addr;
-#ifdef CYGNUM_REDBOOT_FLASH_BASE
     cyg_flash_info_t info;
-#endif
 
     if (!__flash_init) {
         __flash_init = 1;