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

board/raspberrypi/rpi/rpi.c

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

drivers/video/Kconfig

@@ -1115,7 +1115,7 @@ config SPL_VIDEO_REMOVE
 	bool "Remove video driver after SPL stage"
 	help
 	  if this  option is enabled video driver will be removed at the end of
-	  SPL stage, beforeloading the next stage.
+	  SPL stage, before loading the next stage.
 
 if SPL_SPLASH_SCREEN
 

drivers/video/bcm2835.c

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

drivers/video/vidconsole-uclass.c

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