diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2008-03-31 11:02:01 -0400 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-04-24 13:18:17 +0200 |
| commit | 89cdab788f3716b335fefb60b836ebcf975aceab (patch) | |
| tree | 8d315784366d9b3c5ce7ffd39913eb6fb3979a26 /tools | |
| parent | 58c5376ba67767ee684069d43e7f747a5d9ae8ed (diff) | |
| download | u-boot-imx-89cdab788f3716b335fefb60b836ebcf975aceab.zip u-boot-imx-89cdab788f3716b335fefb60b836ebcf975aceab.tar.gz u-boot-imx-89cdab788f3716b335fefb60b836ebcf975aceab.tar.bz2 | |
crc32: use uint32_t rather than unsigned long
The envcrc.c does sizeof(unsigned long) when calculating the crc, but
this is done with the build toolchain instead of the target tool
chain, so if the build is a 64bit system but the target is 32bits,
the size will obviously be wrong. This converts all unsigned long
stuff related to crc32 to uint32_t types. Compile tested only: output
of ./tools/envcrc when run on a 32bit build system matches that of a
64bit build system.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Makefile | 6 | ||||
| -rw-r--r-- | tools/envcrc.c | 9 |
2 files changed, 10 insertions, 5 deletions
diff --git a/tools/Makefile b/tools/Makefile index 8784a6d..b897923 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -236,7 +236,11 @@ $(obj)environment.c: $(obj)environment.o: $(obj)environment.c $(CC) -g $(HOST_ENVIRO_CFLAGS) $(CPPFLAGS) -c -o $@ $< -$(obj)crc32.c: +$(obj)zlib.h: + @rm -f $@ + ln -s $(src)../include/zlib.h $@ + +$(obj)crc32.c: $(obj)zlib.h @rm -f $(obj)crc32.c ln -s $(src)../lib_generic/crc32.c $(obj)crc32.c diff --git a/tools/envcrc.c b/tools/envcrc.c index 7b77183..550cf82 100644 --- a/tools/envcrc.c +++ b/tools/envcrc.c @@ -22,6 +22,7 @@ */ #include <stdio.h> +#include <stdint.h> #include <stdlib.h> #include <unistd.h> @@ -58,15 +59,15 @@ #endif /* CFG_ENV_IS_IN_FLASH */ #ifdef CFG_REDUNDAND_ENVIRONMENT -# define ENV_HEADER_SIZE (sizeof(unsigned long) + 1) +# define ENV_HEADER_SIZE (sizeof(uint32_t) + 1) #else -# define ENV_HEADER_SIZE (sizeof(unsigned long)) +# define ENV_HEADER_SIZE (sizeof(uint32_t)) #endif #define ENV_SIZE (CFG_ENV_SIZE - ENV_HEADER_SIZE) -extern unsigned long crc32 (unsigned long, const unsigned char *, unsigned int); +extern uint32_t crc32 (uint32_t, const unsigned char *, unsigned int); #ifdef ENV_IS_EMBEDDED extern unsigned int env_size; @@ -76,7 +77,7 @@ extern unsigned char environment; int main (int argc, char **argv) { #ifdef ENV_IS_EMBEDDED - int crc; + uint32_t crc; unsigned char *envptr = &environment, *dataptr = envptr + ENV_HEADER_SIZE; unsigned int datasize = ENV_SIZE; |