summaryrefslogtreecommitdiff
path: root/include/environment.h
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2008-03-31 11:02:01 -0400
committerWolfgang Denk <wd@denx.de>2008-04-24 13:18:17 +0200
commit89cdab788f3716b335fefb60b836ebcf975aceab (patch)
tree8d315784366d9b3c5ce7ffd39913eb6fb3979a26 /include/environment.h
parent58c5376ba67767ee684069d43e7f747a5d9ae8ed (diff)
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 'include/environment.h')
-rw-r--r--include/environment.h11
1 files changed, 8 insertions, 3 deletions
diff --git a/include/environment.h b/include/environment.h
index af605ab7a9c..c4f7c33be6b 100644
--- a/include/environment.h
+++ b/include/environment.h
@@ -84,18 +84,23 @@
# endif
#endif /* CFG_ENV_IS_IN_NAND */
+#ifdef USE_HOSTCC
+# include <stdint.h>
+#else
+# include <linux/types.h>
+#endif
#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)
typedef struct environment_s {
- unsigned long crc; /* CRC32 over data bytes */
+ uint32_t crc; /* CRC32 over data bytes */
#ifdef CFG_REDUNDAND_ENVIRONMENT
unsigned char flags; /* active/obsolete flags */
#endif