brain-hackers_pepepper-mirror/u-boot-brain
1
0
Fork 0
mirror of https://github.com/brain-hackers/u-boot-brain synced 2024-06-09 23:36:03 +09:00
Code Issues Projects Releases Wiki Activity

- add compute module 3+

Browse Source 
- fix 64 bit warning in bmp command
 -----BEGIN PGP SIGNATURE-----
 
 iQJGBAABCAAwFiEEiUuSfQSYnG8EMsBltDliWyzx00MFAlxm5V8SHG1icnVnZ2Vy
 QHN1c2UuY29tAAoJELQ5Ylss8dNDRvYP/AuU6p486zZOmiIihqT97HiLGP7kayFI
 q5MzVxdv/Ro7W6rYbdd5V4F1clV/jha3NkA7Ty166Xg0/lBZ/bsDcQQqIUE8Wa8b
 5ug68pRRqX52H43h6XgGRz+JaNRvP1X06AxZt0/ouqQJY3mfGjyUnCrpofhsxIsu
 nFLuNQj+sTLo0k2ktZ4ouU/8zeH2AN42Ml/6edXyDdkWvWKiX7QICryKT9AoaF21
 OfIgQyQFExBj3HX/i8QM7KPJtc++FqDol2dLpIt1XyqdFeSPazQZf1L+y364LtEU
 0tw+xzsl2csgcBMOOyK3Qn+b65qDPDQpMZ2mW5XqZeKcCHUY7ZA5r5EWJWV8abj/
 D3ogIOG8zmVrxRgqQriHVVA6WtUe3dHOZdhR0yyGfZeiEok3kvnM8kzZqiS1D3x6
 NzWAL58rQHz3QQOqcvarH4x3qub9pnKUsfh3z/Jt0jxqPL4WES+3oe2WJeR+1EUJ
 6TVXy09zsqTZizjviQ71kQLMAYMAlvOJfQNgret1uPczhZxZ+yxNdJX+RnyIMkkP
 gatGpn/mXrFW7tieYfXGSVzYjRK8ydeg5UfGsKjG1j0gr8hYzXXkcTQEHkCaufFo
 Mtytfx197KNN2pc9DgPDUITe3BJ5z4WTD7WhTP7VmACkWiwkvv9V0JjIDFy0bXaS
 QIWx64kE9AX2
 =FbbB
 -----END PGP SIGNATURE-----

Merge tag '2019.01-next' of https://github.com/mbgg/u-boot

- add compute module 3+
- fix 64 bit warning in bmp command
This commit is contained in:
Tom Rini 2019-02-15 20:10:15 -05:00
commit e35171e94e
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
board/raspberrypi/rpi/rpi.c
View File

@ -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[] = {

2
cmd/bmp.c
View File

@ -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) {