aboutsummaryrefslogtreecommitdiff
path: root/board/raspberrypi/rpi/rpi.c
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2023-08-14 09:09:23 -0400
committerTom Rini <trini@konsulko.com>2023-08-14 09:09:23 -0400
commit70c45244d9dbbe724fe879dbb64f9b2a236d3bb4 (patch)
tree21ba558146bbe58c06c96aee747d96f35cc9e987 /board/raspberrypi/rpi/rpi.c
parenta5899cc69a99379f01e8e2f9f98e0e09b24f1656 (diff)
parent04cc66c047d959dc1b22a625b7949a26793ac52b (diff)
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
Diffstat (limited to 'board/raspberrypi/rpi/rpi.c')
-rw-r--r--board/raspberrypi/rpi/rpi.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c
index 1057ebb994..38bcab15cf 100644
--- a/board/raspberrypi/rpi/rpi.c
+++ b/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 */