From 511d0c72b82aab9b807efde50fc9e390365f5ca1 Mon Sep 17 00:00:00 2001 From: Wolfgang Denk Date: Mon, 9 Oct 2006 00:42:01 +0200 Subject: Coding style cleanup --- lib_generic/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib_generic') diff --git a/lib_generic/Makefile b/lib_generic/Makefile index fcd43c676f..a05b3552de 100644 --- a/lib_generic/Makefile +++ b/lib_generic/Makefile @@ -29,7 +29,7 @@ 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)) -- cgit From 2b208f5308ae0c72a6840180e59ed1ab4f9b69fc Mon Sep 17 00:00:00 2001 From: Wolfgang Denk Date: Mon, 9 Oct 2006 01:02:05 +0200 Subject: Move "ar" flags to config.mk to allow for silent "make -s" Based on patch by Mike Frysinger, 20 Jun 2006 --- lib_generic/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib_generic') diff --git a/lib_generic/Makefile b/lib_generic/Makefile index a05b3552de..f012cab7d8 100644 --- a/lib_generic/Makefile +++ b/lib_generic/Makefile @@ -34,7 +34,7 @@ SRCS := $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS)) $(LIB): $(obj).depend $(OBJS) - $(AR) crv $@ $(OBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) ######################################################################### -- cgit From 2255b2d2044d434463eb2661e18018e50f1643d9 Mon Sep 17 00:00:00 2001 From: Stefan Roese Date: Tue, 10 Oct 2006 12:36:02 +0200 Subject: * Several improvements to the new NAND subsystem: - JFFS2 related commands implemented in mtd-utils style - Support for bad blocks - Bad block testing commands - NAND lock commands Please take a look at doc/README.nand for more details Patch by Guido Classen, 10 Oct 2006 --- lib_generic/crc32.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'lib_generic') diff --git a/lib_generic/crc32.c b/lib_generic/crc32.c index 50ca4ffd38..8283413502 100644 --- a/lib_generic/crc32.c +++ b/lib_generic/crc32.c @@ -171,7 +171,9 @@ 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. -- cgit From 752d6837c3ea93e9e1c51165886b1aa77b144745 Mon Sep 17 00:00:00 2001 From: Stefan Roese Date: Wed, 11 Oct 2006 16:57:01 +0200 Subject: Cleanup of NAND update patch (remove changelog from cmd_nand.c) Patch by Guido Classen, 10 Oct 2006 --- lib_generic/crc32.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'lib_generic') diff --git a/lib_generic/crc32.c b/lib_generic/crc32.c index 8283413502..3db224a364 100644 --- a/lib_generic/crc32.c +++ b/lib_generic/crc32.c @@ -171,9 +171,8 @@ uLong ZEXPORT crc32(crc, buf, len) return crc ^ 0xffffffffL; } -#if (CONFIG_COMMANDS & CFG_CMD_JFFS2) \ - || (CONFIG_COMMANDS & CFG_CMD_NAND) && !defined(CFG_NAND_LEGACY) - +#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. -- cgit From 5c34eee94dfafab27d7d76aa5457458672f7544c Mon Sep 17 00:00:00 2001 From: Stefan Roese Date: Thu, 12 Oct 2006 07:04:24 +0200 Subject: Fix JFFS2 compilation problem Patch by Stefan Roese, 12 Oct 2006 --- lib_generic/crc32.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib_generic') diff --git a/lib_generic/crc32.c b/lib_generic/crc32.c index 3db224a364..3d99b69296 100644 --- a/lib_generic/crc32.c +++ b/lib_generic/crc32.c @@ -171,8 +171,8 @@ uLong ZEXPORT crc32(crc, buf, len) return crc ^ 0xffffffffL; } -#if ((CONFIG_COMMANDS & CFG_CMD_JFFS2) || (CONFIG_COMMANDS & CFG_CMD_NAND)) \ - && !defined(CFG_NAND_LEGACY) +#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. -- cgit