From 77195216ff1d1d75a7a988bf577f02340f28479d Mon Sep 17 00:00:00 2001 From: Adam Heinrich Date: Mon, 31 Dec 2018 12:11:08 +0100 Subject: [PATCH 1/2] cmd: bmp: Make integer-to-pointer cast platform, independent This patch fixes the int-to-pointer-cast warning on aarch64. Signed-off-by: Adam Heinrich Signed-off-by: Alexander Graf Signed-off-by: Matthias Brugger --- cmd/bmp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) { From 7e2ae620e15ef578b8f2812ec21ec07fae6c1e2f Mon Sep 17 00:00:00 2001 From: Jonathan Gray Date: Thu, 31 Jan 2019 09:24:44 +1100 Subject: [PATCH 2/2] rpi: add Compute Module 3+ Add Raspberry Pi Compute Module 3+ to list of models, the revision code is 0x10 according to the list on raspberrypi.org. v2: Use the same dtb name as CM3 as CM3+ is a drop in replacement for CM3. Signed-off-by: Jonathan Gray Reviewed-by: Alexander Graf Signed-off-by: Matthias Brugger --- board/raspberrypi/rpi/rpi.c | 5 +++++ 1 file changed, 5 insertions(+) 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[] = {