CVS: blob/src/blob Makefile.am,1.24,1.25 main.c,1.34,1.35 uucodec.c,1.4,1.5 xmodem.c,1.3,1.4 mini_inflate.c,1.2,NONE

[Erik M. <er...@us...>]

Update of /cvsroot/blob/blob/src/blob
In directory usw-pr-cvs1:/tmp/cvs-serv889/src/blob

Modified Files:
	Makefile.am main.c uucodec.c xmodem.c 
Removed Files:
	mini_inflate.c 
Log Message:
- cleanup configure.in and Makefile.am
- make uudecode and xmodem conditionally compiled sources
- make cramfs and jffs2 really conditionally compiled
- move mini_inflate to libblob


Index: Makefile.am
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/Makefile.am,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- Makefile.am	16 Feb 2002 00:43:59 -0000	1.24
+++ Makefile.am	17 Feb 2002 15:41:53 -0000	1.25
@@ -63,8 +63,8 @@
 	start-sa11x0.S
 
 blob_start_elf32_DEPENDENCIES	= \
-	@MEMSETUP@ \
-	@STARTCODE@ \
+	@BLOB_MEMSETUP_OBJS@ \
+	@BLOB_STARTCODE_OBJS@ \
 	start-ld-script
 
 blob_start_elf32_LDFLAGS	+= \
@@ -72,8 +72,8 @@
 	-Wl,-Map,blob-start-elf32.map
 
 blob_start_elf32_LDADD	+= \
-	@MEMSETUP@ \
-	@STARTCODE@ \
+	@BLOB_MEMSETUP_OBJS@ \
+	@BLOB_STARTCODE_OBJS@ \
 	-lgcc
 
 
@@ -133,14 +133,7 @@
 	param_block.c \
 	partition.c \
 	reboot.c \
-	uucodec.c \
-	xmodem.c \
 	load_kernel.c \
-	mini_inflate.c \
-	jffs2.c \
-	compr_rtime.c \
-	compr_rubin.c \
-	cramfs.c \
 	zImage.c
 
 
@@ -149,48 +142,46 @@
 	chkmem.c \
 	clock.c \
 	debug.c \
-	amd32.c \
-	intel16.c \
-	intel32.c \
-	nullflash.c \
-	accelent_sa.c \
-	assabet.c \
-	brutus.c \
-	badge4.c \
-	clart.c \
-	frodo.c \
-	h3600.c \
-	idr.c \
-	jornada720.c \
-	lart.c \
-	nesa.c \
-	pleb.c \
-	shannon.c \
+	amd32.c intel16.c intel32.c nullflash.c \
+	cramfs.c \
+	compr_rtime.c compr_rubin.c jffs2.c \
+	uucodec.c \
+	xmodem.c \
+	accelent_sa.c assabet.c brutus.c badge4.c clart.c frodo.c \
+	h3600.c idr.c jornada720.c lart.c nesa.c pleb.c shannon.c \
 	system3.c
 
 
 blob_rest_elf32_DEPENDENCIES = \
-	@BLOB_PLATFORM_OBJ@ \
+	@BLOB_CHKMEM_OBJS@ \
+	@BLOB_CLOCK_OBJS@ \
+	@BLOB_CRAMFS_OBJS@ \
+	@BLOB_DEBUG_OBJS@ \
 	@BLOB_FLASH_OBJS@ \
-	@CHKMEM@ \
-	@DEBUG@ \
-	@CLOCK@ \
+	@BLOB_JFFS2_OBJS@ \
+	@BLOB_PLATFORM_OBJS@ \
+	@BLOB_UUCODEC_OBJS@ \
+	@BLOB_XMODEM_OBJS@ \
 	${top_builddir}/src/commands/libcommands.a \
 	${top_builddir}/src/lib/libblob.a \
 	rest-ld-script
 
 
 blob_rest_elf32_LDFLAGS	+= \
+	@BLOB_CHKMEM_OBJS@ \
+	@BLOB_CLOCK_OBJS@ \
+	@BLOB_CRAMFS_OBJS@ \
+	@BLOB_DEBUG_OBJS@ \
+	@BLOB_FLASH_OBJS@ \
+	@BLOB_JFFS2_OBJS@ \
+	@BLOB_PLATFORM_OBJS@ \
+	@BLOB_UUCODEC_OBJS@ \
+	@BLOB_XMODEM_OBJS@ \
 	-Wl,-T,rest-ld-script \
 	-Wl,-Map,blob-rest-elf32.map
 
 
 blob_rest_elf32_LDADD	+= \
-	@BLOB_PLATFORM_OBJ@ \
-	@BLOB_FLASH_OBJS@ \
-	@CHKMEM@ \
-	@DEBUG@ \
-	@CLOCK@ \
 	-L${top_builddir}/src/commands -L${top_builddir}/src/lib \
 	-lcommands -lblob \
 	-lgcc

Index: main.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/main.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- main.c	16 Feb 2002 00:43:59 -0000	1.34
+++ main.c	17 Feb 2002 15:41:54 -0000	1.35
@@ -188,6 +188,7 @@
 
 
 
+#if (defined CONFIG_XMODEM_SUPPORT) || (defined CONFIG_UUCODEC_SUPPORT)
 static int set_download_parameters(char *name, u32 *startAddress, 
 				    int *bufLen, int **numRead,
 				   u32 **digest)
@@ -229,6 +230,7 @@
 
 	return 0;
 }
+#endif
 
 
 

Index: uucodec.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/uucodec.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- uucodec.c	5 Feb 2002 14:47:54 -0000	1.4
+++ uucodec.c	17 Feb 2002 15:41:54 -0000	1.5
@@ -37,8 +37,6 @@
 # include <blob/config.h>
 #endif
 
-#ifdef CONFIG_UUCODEC_SUPPORT
-
 #include <blob/errno.h>
 #include <blob/serial.h>
 #include <blob/util.h>
@@ -197,6 +195,3 @@
 	
 } /* UUEncode */
 #endif
-
-#endif	/* #ifdef CONFIG_UUCODEC_SUPPORT */
-

Index: xmodem.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/xmodem.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- xmodem.c	4 Feb 2002 12:14:16 -0000	1.3
+++ xmodem.c	17 Feb 2002 15:41:54 -0000	1.4
@@ -35,8 +35,6 @@
 # include <blob/config.h>
 #endif
 
-#ifdef CONFIG_XMODEM_SUPPORT
-
 #include <blob/errno.h>
 #include <blob/serial.h>
 #include <blob/util.h>
@@ -266,6 +264,3 @@
  done:
 	return length;
 }
-
-#endif	/* #ifdef CONFIG_XMODEM_SUPPORT */
-

--- mini_inflate.c DELETED ---