This is the mail archive of the
ecos-patches@sources.redhat.com
mailing list for the eCos project.
RedBoot - Fix build when X-modem is disabled
- From: Gary Thomas <gary at mlbassoc dot com>
- To: eCos patches <ecos-patches at sources dot redhat dot com>
- Date: 03 Apr 2003 08:27:50 -0700
- Subject: RedBoot - Fix build when X-modem is disabled
Index: redboot/current/ChangeLog
===================================================================
RCS file: /misc/cvsfiles/ecos/packages/redboot/current/ChangeLog,v
retrieving revision 1.100
diff -u -5 -p -r1.100 ChangeLog
--- redboot/current/ChangeLog 3 Apr 2003 15:21:10 -0000 1.100
+++ redboot/current/ChangeLog 3 Apr 2003 15:26:19 -0000
@@ -1,9 +1,10 @@
2003-04-03 Gary Thomas <gary at mlbassoc dot com>
* 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.
2003-03-28 Gary Thomas <gary at mlbassoc dot com> inspired by
Index: redboot/current/src/load.c
===================================================================
RCS file: /misc/cvsfiles/ecos/packages/redboot/current/src/load.c,v
retrieving revision 1.31
diff -u -5 -p -r1.31 load.c
--- redboot/current/src/load.c 3 Apr 2003 15:21:10 -0000 1.31
+++ redboot/current/src/load.c 3 Apr 2003 15:25:50 -0000
@@ -52,12 +52,14 @@
//####DESCRIPTIONEND####
//
//==========================================================================
#include <redboot.h>
-#include <xyzModem.h>
#include <elf.h>
+#ifdef CYGBLD_BUILD_REDBOOT_WITH_XYZMODEM
+#include <xyzModem.h>
+#endif
#ifdef CYGPKG_REDBOOT_DISK
#include <fs/disk.h>
#endif
#ifdef CYGPKG_REDBOOT_NETWORKING
#ifdef CYGSEM_REDBOOT_NET_TFTP_DOWNLOAD
@@ -691,13 +693,18 @@ do_load(int argc, char *argv[])
which = "HTTP";
io = &http_io;
#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);
}
#ifdef CYGSEM_REDBOOT_VALIDATE_USER_RAM_LOADS
if (base_addr_set &&
--
------------------------------------------------------------
Gary Thomas |
MLB Associates | Consulting for the
+1 (970) 229-1963 | Embedded world
http://www.mlbassoc.com/ |
email: <gary at mlbassoc dot com> |
gpg: http://www.chez-thomas.org/gary/gpg_key.asc
------------------------------------------------------------