Save more space with unused string functions, minor cleanups

diff --git a/u-boot/lib_generic/Makefile b/u-boot/lib_generic/Makefile
index 4fe36489f0d092606e9c7849d712029dc8411783..61f49166da47672a5106c6a390576bdc234dcea1 100644 (file)
--- a/u-boot/lib_generic/Makefile
+++ b/u-boot/lib_generic/Makefile
@@ -23,19 +23,24 @@
 
 include $(TOPDIR)/config.mk
 
-LIB    = libgeneric.a
-
-OBJS    = crc32.o ctype.o display_options.o ldiv.o string.o vsprintf.o LzmaWrapper.o LzmaDecode.o
+LIB   = libgeneric.a
+OBJS  = crc32.o \
+       ctype.o \
+       display_options.o \
+       string.o \
+       LzmaDecode.o \
+       LzmaWrapper.o \
+       vsprintf.o
 
 CFLAGS += -DCONFIG_LZMA=1
 
-$(LIB):        .depend $(OBJS)
+$(LIB): .depend $(OBJS)
        $(AR) crv $@ $(OBJS)
 
 #########################################################################
 
-.depend:       Makefile $(OBJS:.o=.c)
-               $(CC) -M $(CFLAGS) $(OBJS:.o=.c) > $@
+.depend: Makefile $(OBJS:.o=.c)
+       $(CC) -M $(CFLAGS) $(OBJS:.o=.c) > $@
 
 sinclude .depend
 

diff --git a/u-boot/lib_generic/string.c b/u-boot/lib_generic/string.c
index 0e99d1b2b50cc9200da6dc49de3a35a858490a90..07a88842bac02b74353adef61ce67e22372e2273 100644 (file)
--- a/u-boot/lib_generic/string.c
+++ b/u-boot/lib_generic/string.c
@@ -20,6 +20,16 @@
 #include <linux/ctype.h>
 #include <malloc.h>
 
+#define __HAVE_ARCH_STRNICMP
+#define __HAVE_ARCH_STRRCHR
+#define __HAVE_ARCH_STRSPN
+#define __HAVE_ARCH_STRPBRK
+#define __HAVE_ARCH_STRTOK
+#define __HAVE_ARCH_STRSEP
+#define __HAVE_ARCH_STRSWAB
+#define __HAVE_ARCH_BCOPY
+#define __HAVE_ARCH_MEMSCAN
+#define __HAVE_ARCH_MEMCHR
 
 #ifndef __HAVE_ARCH_STRNICMP
 /**
@@ -54,8 +64,6 @@ int strnicmp(const char *s1, const char *s2, size_t len)
 }
 #endif
 
-char * ___strtok;
-
 #ifndef __HAVE_ARCH_STRCPY
 /**
  * strcpy - Copy a %NUL terminated string
@@ -308,6 +316,7 @@ char * strpbrk(const char * cs,const char * ct)
 #endif
 
 #ifndef __HAVE_ARCH_STRTOK
+char * ___strtok;
 /**
  * strtok - Split a string into tokens
  * @s: The string to be searched

diff --git a/u-boot/lib_generic/vsprintf.c b/u-boot/lib_generic/vsprintf.c
index e6e0638f8ddfe9362b290609974cc6e75e685df9..0a7e9ef4bc82f0913602960f21968f4b31c61dcc 100644 (file)
--- a/u-boot/lib_generic/vsprintf.c
+++ b/u-boot/lib_generic/vsprintf.c
@@ -16,9 +16,6 @@
 #include <common.h>
 #include <command.h>
 
-/*cmd_boot.c*/
-extern int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
-
 unsigned long simple_strtoul(const char *cp,char **endp,unsigned int base){
        unsigned long result = 0,value;