random-mirrors/smaeul-u-boot
1
0
Fork 0
mirror of https://github.com/smaeul/u-boot.git synced 2025-10-25 18:18:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

- VNBYTES() comment fix

Browse Source 
- 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
 -----BEGIN PGP SIGNATURE-----
 
 iGwEABECACwWIQSC4hxrSoIUVfFO0kRM6ATMmsalXAUCZxgEmQ4cYWd1c3RAZGVu
 eC5kZQAKCRBM6ATMmsalXNzwAJ4u2/QQ4yWrhSInFhNABwcAXZFOOQCfdoyKFHrp
 EIGzVUGFQssY1z3iLu0=
 =uNBi
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Tom Rini 2024-10-22 14:11:20 -06:00
commit 392ff1449f
5 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
board/ti/am62x/evm.c
View File

@ -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

1
boot/Kconfig
View File

@ -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

2
boot/fdt_simplefb.c
View File

@ -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

3
drivers/video/simplefb.c
View File

@ -27,7 +27,8 @@ static int simple_video_probe(struct udevice *dev)
return -EINVAL;
}
debug("%s: base=%llx, size=%llu\n", __func__, base, size);
debug("%s: base=%llx, size=%llu\n",
__func__, (unsigned long long)base, (unsigned long long)size);
/*
* TODO is there some way to reserve the framebuffer

6
include/video.h
View File

@ -57,12 +57,8 @@ enum video_log2_bpp {
VIDEO_BPP32,
};
/*
* Convert enum video_log2_bpp to bytes and bits. Note we omit the outer
* brackets to allow multiplication by fractional pixels.
*/
/* Convert enum video_log2_bpp to bytes and bits */
#define VNBYTES(bpix) ((1 << (bpix)) / 8)
#define VNBITS(bpix) (1 << (bpix))
enum video_format {