summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--board/raspberrypi/rpi/rpi.c5
-rw-r--r--cmd/bmp.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c
index 153a1fdcb7..617c892dde 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 b8af784590..00f0256a30 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) {