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 /boot | |
| 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 'boot')
| -rw-r--r-- | boot/Kconfig | 1 | ||||
| -rw-r--r-- | boot/fdt_simplefb.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/boot/Kconfig b/boot/Kconfig index 1ce1da6020c..fe2919f18c4 100644 --- a/boot/Kconfig +++ b/boot/Kconfig @@ -1683,6 +1683,7 @@ config FDT_FIXUP_PARTITIONS config FDT_SIMPLEFB bool "FDT tools for simplefb support" + depends on VIDEO help Enable the fdt tools to manage the simple fb nodes in device tree. These functions can be used by board to indicate to the OS diff --git a/boot/fdt_simplefb.c b/boot/fdt_simplefb.c index 71b833eb9bd..5822131767d 100644 --- a/boot/fdt_simplefb.c +++ b/boot/fdt_simplefb.c @@ -103,7 +103,6 @@ static int fdt_simplefb_enable_existing_node(void *blob) return fdt_simplefb_configure_node(blob, off); } -#if IS_ENABLED(CONFIG_VIDEO) int fdt_simplefb_enable_and_mem_rsv(void *blob) { int ret; @@ -118,4 +117,3 @@ int fdt_simplefb_enable_and_mem_rsv(void *blob) return fdt_add_fb_mem_rsv(blob); } -#endif |