commit 6da7466ebc7395ebfd3478eba0182b5eb52ebd65
author Dominic Sacré <dominic.sacre@gmx.de> Wed Nov 05 00:30:18 2014 +0100
committer Tom Rini <trini@ti.com> Fri Nov 07 16:27:07 2014 -0500
tree 62c64e36bf5c74df3e896f809d3df5de8c3988e4
parent 5fe7b1ecc022f870e077cb605f61cfb1dc867bcc

tools/env: Fix environment size and CRC on 64-bit hosts

On architectures where 'long' is 64 bit, the u-boot environment
as seen by the fw_env tools was missing 4 bytes.
This patch fixes getenvsize(), and thus also ensures that the
environment's CRC32 checksum is calculated correctly.

Signed-off-by: Dominic Sacré <dominic.sacre@gmx.de>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Tom Rini <trini@ti.com>

tools/env/fw_env.c

diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c
index 30d5b03..1173eea 100644
--- a/tools/env/fw_env.c
+++ b/tools/env/fw_env.c
@@ -125,7 +125,7 @@
 #endif
 static inline ulong getenvsize (void)
 {
-	ulong rc = CUR_ENVSIZE - sizeof(long);
+	ulong rc = CUR_ENVSIZE - sizeof(uint32_t);
 
 	if (HaveRedundEnv)
 		rc -= sizeof (char);