diff options
| author | Tom Rini <trini@konsulko.com> | 2021-02-22 09:11:27 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-02-22 09:11:27 -0500 |
| commit | a3ddc776fa2dfc57fba6ec44f95093156717eb1e (patch) | |
| tree | d12c7318182c40f3cc733e1c273a18cbe1a01d3c /common | |
| parent | 3c2ec6cb31522dfb3a35a6321768e3bb54ebe386 (diff) | |
| parent | 0f425612c886348f887c8dbc25f6ace8a87a0988 (diff) | |
Merge tag 'video-for-v2021.04-rc3' of https://gitlab.denx.de/u-boot/custodians/u-boot-video
- splash_source warning fix when building with 64-bit toolchains
- lq123p1jx31 and nv101wxmn51 compatible in simple panel driver
- remove not used mb862xx driver
- add Himax HX8238D panel driver
- s/video_uc_platdata/video_uc_plat/
Diffstat (limited to 'common')
| -rw-r--r-- | common/splash_source.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common/splash_source.c b/common/splash_source.c index d7f179e3ea..3cf926d91a 100644 --- a/common/splash_source.c +++ b/common/splash_source.c @@ -37,7 +37,7 @@ static int splash_sf_read_raw(u32 bmp_load_addr, int offset, size_t read_size) return -ENODEV; } - return spi_flash_read(sf, offset, read_size, (void *)bmp_load_addr); + return spi_flash_read(sf, offset, read_size, (void *)(uintptr_t)bmp_load_addr); } #else static int splash_sf_read_raw(u32 bmp_load_addr, int offset, size_t read_size) @@ -98,7 +98,7 @@ static int splash_load_raw(struct splash_location *location, u32 bmp_load_addr) if (res < 0) return res; - bmp_hdr = (struct bmp_header *)bmp_load_addr; + bmp_hdr = (struct bmp_header *)(uintptr_t)bmp_load_addr; bmp_size = le32_to_cpu(bmp_hdr->file_size); if (bmp_load_addr + bmp_size >= gd->start_addr_sp) |