mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2025-10-09 14:41:44 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

- fix NULL dereference in vidconsole_measure()

Browse Source 
- fix simplefb format for raspberrypi-4b
  - fix typo in Kconfig
 -----BEGIN PGP SIGNATURE-----
 
 iGwEABECACwWIQSC4hxrSoIUVfFO0kRM6ATMmsalXAUCZNnCUQ4cYWd1c3RAZGVu
 eC5kZQAKCRBM6ATMmsalXNeWAJ9UAkaoM0B7iTAieOTSFhQNYVXlRQCeNTEISsLe
 lfCsmvp0A6Fa+8dq9s0=
 =Xt1C
 -----END PGP SIGNATURE-----

Merge tag 'video-20230814' of https://source.denx.de/u-boot/custodians/u-boot-video

 - fix NULL dereference in vidconsole_measure()
 - fix simplefb format for raspberrypi-4b
 - fix typo in Kconfig
This commit is contained in:
Tom Rini 2023-08-14 09:09:23 -04:00
commit 70c45244d9
4 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -561,6 +561,8 @@ int ft_board_setup(void *blob, struct bd_info *bd)
node = fdt_node_offset_by_compatible(blob, -1, "simple-framebuffer"); node = fdt_node_offset_by_compatible(blob, -1, "simple-framebuffer");
if (node < 0) if (node < 0)
fdt_simplefb_add_node(blob); fdt_simplefb_add_node(blob);
else
fdt_simplefb_enable_and_mem_rsv(blob);
#ifdef CONFIG_EFI_LOADER #ifdef CONFIG_EFI_LOADER
/* Reserve the spin table */ /* Reserve the spin table */

3
drivers/video/bcm2835.c
View File

@ -54,6 +54,9 @@ static const struct udevice_id bcm2835_video_ids[] = {
{ .compatible = "brcm,bcm2835-hdmi" }, { .compatible = "brcm,bcm2835-hdmi" },
{ .compatible = "brcm,bcm2711-hdmi0" }, { .compatible = "brcm,bcm2711-hdmi0" },
{ .compatible = "brcm,bcm2708-fb" }, { .compatible = "brcm,bcm2708-fb" },
#if !IS_ENABLED(CONFIG_VIDEO_DT_SIMPLEFB)
{ .compatible = "simple-framebuffer" },
#endif
{ } { }
}; };

2
drivers/video/vidconsole-uclass.c
View File

@ -603,7 +603,7 @@ int vidconsole_measure(struct udevice *dev, const char *name, uint size,
struct vidconsole_ops *ops = vidconsole_get_ops(dev); struct vidconsole_ops *ops = vidconsole_get_ops(dev);
int ret; int ret;
if (ops->select_font) { if (ops->measure) {
ret = ops->measure(dev, name, size, text, bbox); ret = ops->measure(dev, name, size, text, bbox);
if (ret != -ENOSYS) if (ret != -ENOSYS)
return ret; return ret;