diff options
| author | Tom Rini <trini@konsulko.com> | 2019-02-15 20:10:15 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-02-15 20:10:15 -0500 |
| commit | e35171e94efdd0fa6c63083a682d452a2403bea1 (patch) | |
| tree | 768ced9a491d1cbaa2f0f8d922f3a95c60a5aa13 /cmd | |
| parent | c59786f21a9a503d98582003962e7c66a73312e9 (diff) | |
| parent | 7e2ae620e15ef578b8f2812ec21ec07fae6c1e2f (diff) | |
| download | u-boot-e35171e94efdd0fa6c63083a682d452a2403bea1.zip u-boot-e35171e94efdd0fa6c63083a682d452a2403bea1.tar.gz u-boot-e35171e94efdd0fa6c63083a682d452a2403bea1.tar.bz2 | |
Merge tag '2019.01-next' of https://github.com/mbgg/u-boot
- add compute module 3+
- fix 64 bit warning in bmp command
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/bmp.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -57,7 +57,7 @@ struct bmp_image *gunzip_bmp(unsigned long addr, unsigned long *lenp, bmp = dst; /* align to 32-bit-aligned-address + 2 */ - bmp = (struct bmp_image *)((((unsigned int)dst + 1) & ~3) + 2); + bmp = (struct bmp_image *)((((uintptr_t)dst + 1) & ~3) + 2); if (gunzip(bmp, CONFIG_SYS_VIDEO_LOGO_MAX_SIZE, map_sysmem(addr, 0), &len) != 0) { |