changeset 1734:6aedf0a683e4

* src/flash.c (do_flash_init): We need info independent of CYGNUM_REDBOOT_FLASH_BASE being set or not.
author asl
date Wed, 06 Oct 2004 09:49:55 +0000
parents 1a23a3a30984
children e308039f4579
files packages/redboot/current/ChangeLog packages/redboot/current/src/flash.c
diffstat 2 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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;