diff options
| author | Tom Rini <[email protected]> | 2024-10-22 14:11:20 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2024-10-22 14:11:20 -0600 |
| commit | 392ff1449f7d30cc48fd4d17320d05882cd68f2e (patch) | |
| tree | 14cbc33a7c2d0d57f72e537dc66a23bd694102de /board | |
| parent | 6606a6adfaf8517cff7e5fe0fb206beed80087d5 (diff) | |
| parent | 722073a0653dd18d0148dd435f067be4e82f9129 (diff) | |
Merge tag 'video-20241022' of https://source.denx.de/u-boot/custodians/u-boot-video
CI: https://source.denx.de/u-boot/custodians/u-boot-video/-/pipelines/22907
* VNBYTES() comment fix
* add VIDEO dependency for FDT_SIMPLEFB
* fdt_simplefb: drop not needed CONFIG_VIDEO check
* am62x,evm: preserve splash screen while OS is booting
* simplefb: warning fix for CONFIG_FDT_64BIT=n
Diffstat (limited to 'board')
| -rw-r--r-- | board/ti/am62x/evm.c | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/board/ti/am62x/evm.c b/board/ti/am62x/evm.c index 1166c9b8e09..9075df01cac 100644 --- a/board/ti/am62x/evm.c +++ b/board/ti/am62x/evm.c @@ -16,6 +16,7 @@ #include <cpu_func.h> #include <k3-ddrss.h> #include <fdt_support.h> +#include <fdt_simplefb.h> #include <asm/io.h> #include <asm/arch/hardware.h> #include <dm/uclass.h> @@ -162,3 +163,23 @@ void spl_perform_fixups(struct spl_image_info *spl_image) #endif } #endif + +#if defined(CONFIG_OF_BOARD_SETUP) +int ft_board_setup(void *blob, struct bd_info *bd) +{ + int ret = -1; + + if (IS_ENABLED(CONFIG_FDT_SIMPLEFB)) + ret = fdt_simplefb_enable_and_mem_rsv(blob); + + /* If simplefb is not enabled and video is active, then at least reserve + * the framebuffer region to preserve the splash screen while OS is booting + */ + if (IS_ENABLED(CONFIG_VIDEO) && IS_ENABLED(CONFIG_OF_LIBFDT)) { + if (ret && video_is_active()) + return fdt_add_fb_mem_rsv(blob); + } + + return 0; +} +#endif |