Mercurial > flash_v2

changeset 899:17dd6922881b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix build when X-modem is disabled
author gthomas
date Thu, 03 Apr 2003 15:27:23 +0000
parents 6f9085944169
children 370be9d42783
files packages/redboot/current/ChangeLog packages/redboot/current/src/load.c
diffstat 2 files changed, 9 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/packages/redboot/current/ChangeLog
+++ b/packages/redboot/current/ChangeLog
@@ -2,6 +2,7 @@ 2003-04-03  Gary Thomas  <gary@mlbassoc.
 
 	* src/load.c: Better handling of default download mode.  Also
 	display information when I/O errors occor (was silent).
+	(do_load): Handle case when X-modem protocol is disabled.
 
 	* src/net/http_client.c: 
 	* include/net/http.h: Improve parsing of HTTP responses for errors.
--- a/packages/redboot/current/src/load.c
+++ b/packages/redboot/current/src/load.c
@@ -54,8 +54,10 @@
 //==========================================================================
 
 #include <redboot.h>
+#include <elf.h>
+#ifdef CYGBLD_BUILD_REDBOOT_WITH_XYZMODEM
 #include <xyzModem.h>
-#include <elf.h>
+#endif
 #ifdef CYGPKG_REDBOOT_DISK
 #include <fs/disk.h>
 #endif
@@ -693,9 +695,14 @@ do_load(int argc, char *argv[])
 #endif
 #endif
         if (!io) {
+#ifdef CYGBLD_BUILD_REDBOOT_WITH_XYZMODEM
             which = "Xmodem";
             io = &xyzModem_io;
             verbose = false;
+#else
+            diag_printf("No default protocol!\n");
+            return;
+#endif
         }
         diag_printf("Using default protocol (%s)\n", which);
     }