Mercurial > flash_v2

changeset 1268:205922255412

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Minor fconfig fixes
author gthomas
date Fri, 03 Oct 2003 23:49:20 +0000
parents b3b9cc536753
children 46534b4d0054
files packages/redboot/current/ChangeLog packages/redboot/current/src/flash.c
diffstat 2 files changed, 10 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/packages/redboot/current/ChangeLog
+++ b/packages/redboot/current/ChangeLog
@@ -1,3 +1,9 @@
+2003-10-03  Gary Thomas  <gary@mlbassoc.com>
+
+	* src/flash.c (fis_delete): 'fconfig' data only shows up in FIS if
+	the data is stored in FLASH - account for this.  Also, make sure 
+	FLASH gets initialized if built without 'fconfig' enabled.
+
 2003-10-02  Gary Thomas  <gary@mlbassoc.com>
 
 	* src/fconfig.c: 
--- a/packages/redboot/current/src/flash.c
+++ b/packages/redboot/current/src/flash.c
@@ -818,7 +818,7 @@ fis_delete(int argc, char *argv[])
 #ifdef CYGOPT_REDBOOT_FIS_REDBOOT_POST
     num_reserved++;
 #endif
-#ifdef CYGSEM_REDBOOT_FLASH_CONFIG
+#if defined(CYGSEM_REDBOOT_FLASH_CONFIG) && defined(CYGHWR_REDBOOT_FLASH_CONFIG_MEDIA_FLASH)
     num_reserved++;
 #endif
 #if 1 // And the descriptor for the descriptor table itself
@@ -1233,12 +1233,13 @@ do_flash_init(void)
 static void
 _do_flash_init(void)
 {
+    static int init_done = 0;
+    if (init_done) return;
+    init_done = 1;
     do_flash_init();
 }
 
-#ifndef CYGOPT_REDBOOT_FLASH_CONFIG
 RedBoot_init(_do_flash_init, RedBoot_INIT_FIRST);
-#endif
 
 static void
 do_fis(int argc, char *argv[])