diff options
| author | Tom Rini <trini@konsulko.com> | 2020-06-30 11:43:18 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-06-30 11:43:18 -0400 |
| commit | 5fdb3c0e7ee6bac6b8809ae69e52f16d22d45035 (patch) | |
| tree | d04c64ec751e7adf24de995ce0fa7eabc88865bc /common | |
| parent | 6b3c74428a3faca92701843c954b717e8d186b17 (diff) | |
| parent | e35c2a8fdd41a34c06c409ce700c5d5591429367 (diff) | |
| download | u-boot-5fdb3c0e7ee6bac6b8809ae69e52f16d22d45035.zip u-boot-5fdb3c0e7ee6bac6b8809ae69e52f16d22d45035.tar.gz u-boot-5fdb3c0e7ee6bac6b8809ae69e52f16d22d45035.tar.bz2 | |
Merge tag 'mips-pull-2020-06-29' of https://gitlab.denx.de/u-boot/custodians/u-boot-mips into next
- net: pcnet: cleanup and add DM support
- Makefile: add rule to build an endian-swapped U-Boot image
used by MIPS Malta EL variants
- CI: add Qemu tests for MIPS Malta
Diffstat (limited to 'common')
| -rw-r--r-- | common/splash.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/splash.c b/common/splash.c index e7d8477..2b9313e 100644 --- a/common/splash.c +++ b/common/splash.c @@ -59,7 +59,7 @@ static struct splash_location default_splash_locations[] = { static int splash_video_logo_load(void) { char *splashimage; - u32 bmp_load_addr; + ulong bmp_load_addr; splashimage = env_get("splashimage"); if (!splashimage) |