CVS: blob/src/commands Makefile.am,1.6,1.7 setip.c,1.1,1.2 sysupd.c,1.1,1.2 tftp.c,1.1,1.2

[Abraham vd M. <ab...@us...>]

Update of /cvsroot/blob/blob/src/commands
In directory sc8-pr-cvs1:/tmp/cvs-serv7704/src/commands

Modified Files:
	Makefile.am setip.c sysupd.c tftp.c 
Log Message:
Support for CSIR IMS board and also a working PXA25x port. Still needs some
cleaning up and the lubbock and PXA IDP targets are going to be broken by
this (not sure if they ever worked and fixing them is trivial).


Index: Makefile.am
===================================================================
RCS file: /cvsroot/blob/blob/src/commands/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Makefile.am	3 Apr 2003 14:39:11 -0000	1.6
+++ Makefile.am	6 Aug 2003 22:55:41 -0000	1.7
@@ -24,8 +24,11 @@
 noinst_LIBRARIES	= \
 	libcommands.a
 
-
 libcommands_a_SOURCES	= \
+	terminal.c \
+	reboot.c
+
+EXTRA_libcommands_a_SOURCES	= \
 	call.c \
 	changebit.c \
 	dummy.c \
@@ -34,13 +37,11 @@
 	ferase.c \
 	fwrite.c \
 	memcpy.c \
-	md5chk.c \
 	peek.c \
 	poke.c \
-	reboot.c \
+	md5chk.c \
 	setip.c \
 	sysupd.c \
-	terminal.c \
 	tftp.c
 
 

Index: setip.c
===================================================================
RCS file: /cvsroot/blob/blob/src/commands/setip.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- setip.c	3 Apr 2003 14:37:25 -0000	1.1
+++ setip.c	6 Aug 2003 22:55:41 -0000	1.2
@@ -31,6 +31,8 @@
 # include <blob/config.h>
 #endif
 
+#if defined( CONFIG_NETWORK_SUPPORT ) 
+
 #include <blob/errno.h>
 #include <blob/debug.h>
 #include <blob/types.h>
@@ -38,10 +40,6 @@
 
 #include <net/net.h>
 
-#if !defined( CONFIG_NETWORK_SUPPORT ) 
-#	error "You must enable NETWORK support."
-#endif
-
 /**********************************************************************
  * defines
  */
@@ -111,3 +109,6 @@
 char setip_help[] = "setip command. Set IP addresses for tftp.\n"
 "usage: setip {client|server} ip\n"
 "\tip in usual dotted-quad format please.\n";;
+
+#endif
+

Index: sysupd.c
===================================================================
RCS file: /cvsroot/blob/blob/src/commands/sysupd.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- sysupd.c	3 Apr 2003 14:37:25 -0000	1.1
+++ sysupd.c	6 Aug 2003 22:55:41 -0000	1.2
@@ -32,6 +32,8 @@
 # include <blob/config.h>
 #endif
 
+#if defined( CONFIG_GIO_SUPPORT ) 
+
 #include <blob/errno.h>
 #include <blob/debug.h>
 #include <blob/types.h>
@@ -44,10 +46,6 @@
 #include <blob/ide.h>
 #include <blob/tar.h>
 
-#if !defined( CONFIG_GIO_SUPPORT ) 
-#	error "You must also enable PCMCIA and gereric IO support."
-#endif
-
 /* these are the default images */
 static char *update_files[] = {
 	"blob",
@@ -177,3 +175,6 @@
 char sysupd_help[] = "sysupd [CF|RAM] [image [image]...]\n\nUpdate board firmware from CF card or RAM.\n"
 	"You have to have a update CF card inserted (for CF updates) _or_ uploaded a\n"
 	"update image to ram.";
+
+#endif
+

Index: tftp.c
===================================================================
RCS file: /cvsroot/blob/blob/src/commands/tftp.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- tftp.c	3 Apr 2003 14:37:25 -0000	1.1
+++ tftp.c	6 Aug 2003 22:55:41 -0000	1.2
@@ -37,9 +37,7 @@
 
 #include <net/net.h>
 
-#if !defined( CONFIG_NETWORK_SUPPORT ) 
-#	error "You must enable NETWORK support."
-#endif
+#if defined( CONFIG_NETWORK_SUPPORT ) 
 
 #if !defined( RAM_START ) 
 #	error "Please define RAM_START for your arch!"
@@ -93,3 +91,6 @@
 "usage: tftp filename\n"
 "\tdownloads file over TFTP to RAM.\n"
 "\tUse setip to set client and server IP addresses\n";
+
+#endif
+