This is the mail archive of the
ecos-patches@sources.redhat.com
mailing list for the eCos project.
RedBoot - small 'fconfig' cleanups
- From: Gary Thomas <gary at mlbassoc dot com>
- To: eCos patches <ecos-patches at sources dot redhat dot com>
- Date: 03 Oct 2003 17:49:55 -0600
- Subject: RedBoot - small 'fconfig' cleanups
- Organization: MLB Associates
--
Gary Thomas <gary@mlbassoc.com>
MLB Associates
Index: redboot/current/ChangeLog
===================================================================
RCS file: /misc/cvsfiles/ecos/packages/redboot/current/ChangeLog,v
retrieving revision 1.144
diff -u -5 -p -r1.144 ChangeLog
--- redboot/current/ChangeLog 2 Oct 2003 20:13:29 -0000 1.144
+++ redboot/current/ChangeLog 3 Oct 2003 23:49:03 -0000
@@ -1,5 +1,11 @@
+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:
* cdl/redboot.cdl: Allow platforms to provide a function to validate
ethernet station addresses.
Index: redboot/current/src/flash.c
===================================================================
RCS file: /misc/cvsfiles/ecos/packages/redboot/current/src/flash.c,v
retrieving revision 1.52
diff -u -5 -p -r1.52 flash.c
--- redboot/current/src/flash.c 26 Sep 2003 18:44:02 -0000 1.52
+++ redboot/current/src/flash.c 3 Oct 2003 12:05:41 -0000
@@ -816,11 +816,11 @@ fis_delete(int argc, char *argv[])
num_reserved++;
#endif
#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
num_reserved++;
#endif
@@ -1231,16 +1231,17 @@ do_flash_init(void)
// Wrapper to avoid compiler warnings
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[])
{
struct cmd *cmd;