Index: redboot/current/src/main.c
===================================================================
RCS file: /misc/cvsfiles/ecos/packages/redboot/current/src/main.c,v
retrieving revision 1.50
diff -u -5 -p -r1.50 main.c
--- redboot/current/src/main.c	24 Nov 2003 21:12:07 -0000	1.50
+++ redboot/current/src/main.c	10 Dec 2003 14:53:55 -0000
@@ -297,10 +297,14 @@ cyg_start(void)
 #ifdef CYGOPT_REDBOOT_FIS_ZLIB_COMMON_BUFFER
     fis_zlib_common_buffer =
     workspace_end -= CYGNUM_REDBOOT_FIS_ZLIB_COMMON_BUFFER_SIZE;
 #endif
 
+#ifdef CYGFUN_REDBOOT_BOOT_SCRIPT
+    script_timeout = CYGNUM_REDBOOT_BOOT_SCRIPT_DEFAULT_TIMEOUT;
+#endif
+
     for (init_entry = __RedBoot_INIT_TAB__; init_entry != &__RedBoot_INIT_TAB_END__;  init_entry++) {
         (*init_entry->fun)();
     }
 
     mem_segments[0].start = workspace_start;
@@ -318,13 +322,10 @@ cyg_start(void)
 
 #ifdef CYGFUN_REDBOOT_BOOT_SCRIPT
 # ifdef CYGDAT_REDBOOT_DEFAULT_BOOT_SCRIPT
     if (!script) {
       script = CYGDAT_REDBOOT_DEFAULT_BOOT_SCRIPT;
-#  ifndef CYGSEM_REDBOOT_FLASH_CONFIG
-      script_timeout = CYGNUM_REDBOOT_BOOT_SCRIPT_DEFAULT_TIMEOUT;
-#  endif
     }
 # endif
     if (script) {
         // Give the guy a chance to abort any boot script
         unsigned char *hold_script = script;