diff options
| author | Tom Rini <trini@konsulko.com> | 2023-07-21 19:33:05 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-07-21 19:33:05 -0400 |
| commit | 247aa5a191159ea7e03bf1918e22fbbb784cd410 (patch) | |
| tree | 56297e86b3ac1b199488643da8322f2f623159a2 /common/splash_source.c | |
| parent | 226ecf8be4c6a29caa86d1c9f33d5794c5732375 (diff) | |
| parent | 373991d6939b01c47b352b1f620ef772419a9cf4 (diff) | |
Merge branch '2023-07-21-assorted-TI-platform-updates'
- The first half of a number of TI platform bugfixes and improvements,
primarily around K3 platforms and splash screen support.
Diffstat (limited to 'common/splash_source.c')
| -rw-r--r-- | common/splash_source.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/common/splash_source.c b/common/splash_source.c index a260137619..7223a1aae7 100644 --- a/common/splash_source.c +++ b/common/splash_source.c @@ -363,7 +363,7 @@ static int splash_load_fit(struct splash_location *location, u32 bmp_load_addr) if (res < 0) return res; - img_header = (struct legacy_img_hdr *)bmp_load_addr; + img_header = (struct legacy_img_hdr *)(uintptr_t)bmp_load_addr; if (image_get_magic(img_header) != FDT_MAGIC) { printf("Could not find FDT magic\n"); return -EINVAL; @@ -373,7 +373,7 @@ static int splash_load_fit(struct splash_location *location, u32 bmp_load_addr) /* Read in entire FIT */ fit_header = (const u32 *)(bmp_load_addr + header_size); - res = splash_storage_read_raw(location, (u32)fit_header, fit_size); + res = splash_storage_read_raw(location, (uintptr_t)fit_header, fit_size); if (res < 0) return res; @@ -398,7 +398,7 @@ static int splash_load_fit(struct splash_location *location, u32 bmp_load_addr) /* Extract the splash data from FIT */ /* 1. Test if splash is in FIT internal data. */ if (!fit_image_get_data(fit_header, node_offset, &internal_splash_data, &internal_splash_size)) - memmove((void *)bmp_load_addr, internal_splash_data, internal_splash_size); + memmove((void *)(uintptr_t)bmp_load_addr, internal_splash_data, internal_splash_size); /* 2. Test if splash is in FIT external data with fixed position. */ else if (!fit_image_get_data_position(fit_header, node_offset, &external_splash_addr)) is_splash_external = true; |