[U-Boot] [PATCH] tools/env: Fix environment size and CRC on 64-bit hosts

[U-Boot] [PATCH] tools/env: Fix environment size and CRC on 64-bit hosts

[Dominic Sacré]

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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 @@ static int get_config (char *);
 #endif
 static inline ulong getenvsize (void)
 {
-	ulong rc = CUR_ENVSIZE - sizeof(long);
+	ulong rc = CUR_ENVSIZE - sizeof(uint32_t);
 
 	if (HaveRedundEnv)
 		rc -= sizeof (char);
-- 
2.1.3

[U-Boot] tools/env: Fix environment size and CRC on 64-bit hosts

[Tom Rini]

On Wed, Nov 05, 2014 at 12:30:18AM +0100, Dominic Sacr? wrote:

> 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>

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20141110/438b619e/attachment.pgp>