diff options
| author | Jon Loeliger <jdl@jdl.com> | 2007-06-11 19:03:03 -0500 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2007-07-04 00:23:17 +0200 |
| commit | 0c505db0a0dc1f670b13ce3b4d3fbf1ec5b3cbd2 (patch) | |
| tree | bdaf55b34bb47c67b2d19bc382a7f42af3928914 /lib_generic | |
| parent | 73f032021ec5f13cda8faa4e34b6de80960eb86f (diff) | |
| download | u-boot-imx-0c505db0a0dc1f670b13ce3b4d3fbf1ec5b3cbd2.zip u-boot-imx-0c505db0a0dc1f670b13ce3b4d3fbf1ec5b3cbd2.tar.gz u-boot-imx-0c505db0a0dc1f670b13ce3b4d3fbf1ec5b3cbd2.tar.bz2 | |
lib_*/: Augment CONFIG_COMMANDS tests with defined(CONFIG_CMD_*).
This is a compatibility step that allows both the older form
and the new form to co-exist for a while until the older can
be removed entirely.
All transformations are of the form:
Before:
#if (CONFIG_COMMANDS & CFG_CMD_AUTOSCRIPT)
After:
#if (CONFIG_COMMANDS & CFG_CMD_AUTOSCRIPT) || defined(CONFIG_CMD_AUTOSCRIPT)
Signed-off-by: Jon Loeliger <jdl@freescale.com>
Diffstat (limited to 'lib_generic')
| -rw-r--r-- | lib_generic/crc32.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib_generic/crc32.c b/lib_generic/crc32.c index 3d99b69..84deba9 100644 --- a/lib_generic/crc32.c +++ b/lib_generic/crc32.c @@ -171,8 +171,9 @@ 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) || defined(CONFIG_CMD_JFFS2)) || \ + (((CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND)) \ + && !defined(CFG_NAND_LEGACY)) /* No ones complement version. JFFS2 (and other things ?) * don't use ones compliment in their CRC calculations. |