commit | 24796d27be0d0f403ed6ad7e3022b33e36ac08b5 | [log] [tgz] |
---|---|---|
author | Tom Rini <trini@konsulko.com> | Tue Jun 06 07:13:39 2017 -0400 |
committer | Tom Rini <trini@konsulko.com> | Tue Jun 06 07:13:39 2017 -0400 |
tree | 32baa93caf855c166af80bd42350b4d511cddc25 | |
parent | b9eaeae19eb93993e18149f119fa360b13c5643f [diff] | |
parent | 34cc30af27165696a36274394f6ff019ed762ce6 [diff] |
Merge git://git.denx.de/u-boot-ubi
diff --git a/fs/ubifs/ubifs.c b/fs/ubifs/ubifs.c index cc397d6..db29489 100644 --- a/fs/ubifs/ubifs.c +++ b/fs/ubifs/ubifs.c
@@ -939,7 +939,7 @@ printf("Loading file '%s' to addr 0x%08x...\n", filename, addr); - err = ubifs_read(filename, (void *)addr, 0, size, &actread); + err = ubifs_read(filename, (void *)(uintptr_t)addr, 0, size, &actread); if (err == 0) { setenv_hex("filesize", actread); printf("Done\n");