diff options
| author | Tom Rini <[email protected]> | 2019-02-15 20:10:15 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2019-02-15 20:10:15 -0500 |
| commit | e35171e94efdd0fa6c63083a682d452a2403bea1 (patch) | |
| tree | 768ced9a491d1cbaa2f0f8d922f3a95c60a5aa13 | |
| parent | c59786f21a9a503d98582003962e7c66a73312e9 (diff) | |
| parent | 7e2ae620e15ef578b8f2812ec21ec07fae6c1e2f (diff) | |
Merge tag '2019.01-next' of https://github.com/mbgg/u-boot
- add compute module 3+
- fix 64 bit warning in bmp command
| -rw-r--r-- | board/raspberrypi/rpi/rpi.c | 5 | ||||
| -rw-r--r-- | cmd/bmp.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c index 153a1fdcb71..617c892dde0 100644 --- a/board/raspberrypi/rpi/rpi.c +++ b/board/raspberrypi/rpi/rpi.c @@ -143,6 +143,11 @@ static const struct rpi_model rpi_models_new_scheme[] = { DTB_DIR "bcm2837-rpi-3-a-plus.dtb", false, }, + [0x10] = { + "Compute Module 3+", + DTB_DIR "bcm2837-rpi-cm3.dtb", + false, + }, }; static const struct rpi_model rpi_models_old_scheme[] = { diff --git a/cmd/bmp.c b/cmd/bmp.c index b8af784590d..00f0256a30e 100644 --- a/cmd/bmp.c +++ b/cmd/bmp.c @@ -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) { |