diff options
Diffstat (limited to 'lib_generic')
| -rw-r--r-- | lib_generic/Makefile | 4 | ||||
| -rw-r--r-- | lib_generic/crc32.c | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/lib_generic/Makefile b/lib_generic/Makefile index fcd43c676f..f012cab7d8 100644 --- a/lib_generic/Makefile +++ b/lib_generic/Makefile @@ -29,12 +29,12 @@ COBJS = bzlib.o bzlib_crctable.o bzlib_decompress.o \ bzlib_randtable.o bzlib_huffman.o \ crc32.o ctype.o display_options.o ldiv.o \ string.o vsprintf.o zlib.o - + SRCS := $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS)) $(LIB): $(obj).depend $(OBJS) - $(AR) crv $@ $(OBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) ######################################################################### diff --git a/lib_generic/crc32.c b/lib_generic/crc32.c index 50ca4ffd38..3d99b69296 100644 --- a/lib_generic/crc32.c +++ b/lib_generic/crc32.c @@ -171,7 +171,8 @@ uLong ZEXPORT crc32(crc, buf, len) return crc ^ 0xffffffffL; } -#if (CONFIG_COMMANDS & CFG_CMD_JFFS2) +#if (CONFIG_COMMANDS & CFG_CMD_JFFS2) || \ + ((CONFIG_COMMANDS & CFG_CMD_NAND) && !defined(CFG_NAND_LEGACY)) /* No ones complement version. JFFS2 (and other things ?) * don't use ones compliment in their CRC calculations. |