To enable tidss video driver only at SPL stage, add necessary config, CONFIG_SPL_VIDEO_TIDSS.

Signed-off-by: Nikhil M Jain n-jain1@ti.com --- drivers/video/tidss/Kconfig | 6 ++++++ 1 file changed, 6 insertions(+)

diff --git a/drivers/video/tidss/Kconfig b/drivers/video/tidss/Kconfig index 2a5e56ea4e..748c332281 100644 --- a/drivers/video/tidss/Kconfig +++ b/drivers/video/tidss/Kconfig @@ -16,3 +16,9 @@ menuconfig VIDEO_TIDSS DPI . This option enables these supports which can be used on devices which have OLDI or HDMI display connected.

+config SPL_VIDEO_TIDSS + bool "Enable TIDSS video support in SPL Stage" + depends on SPL_VIDEO + help + This options enables tidss driver in SPL stage. If + you need to use tidssat SPL stage use this config.

CONFIG_CMD_BMP and CONFIG_SPLASH_SCREEN enable's splash display at only u-boot proper. To enable splash display at SPL stage add SPL specific configs, which are SPL_CMD_BMP and SPL_SPLASH_SCREEN.

Signed-off-by: Nikhil M Jain n-jain1@ti.com --- cmd/Kconfig | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)

diff --git a/cmd/Kconfig b/cmd/Kconfig index 2caa4af71c..2f7b820ab8 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -1415,6 +1415,11 @@ config CMD_READ help Provides low-level access to the data in a partition.

+config SPL_CMD_READ + bool "read - Read binary data from a partition" + help + Provides low-level access to the data in a partition at SPL stage. + config CMD_REMOTEPROC bool "remoteproc" depends on REMOTEPROC @@ -1931,6 +1936,18 @@ config CMD_BMP the image into RAM, then using this command to look at it or display it.

+config SPL_CMD_BMP + bool "Enable 'bmp' command" + depends on SPL_VIDEO + help + This provides a way to obtain information about a BMP-format image + and to display it in spl stage.BMP (which presumably stands for BitMaP) is a + file format defined by Microsoft which supports images of various + depths, formats and compression methods. Headers on the file + determine the formats used. This command can be used by first loading + the image into RAM, then using this command to look at it or display + it. + config CMD_BOOTCOUNT bool "bootcount" depends on BOOTCOUNT_LIMIT

To enable splash screen at SPL we need to add video driver at SPL stage. To support video driver and splash display function compile video_uclass.c, video_console.c and video_bmp.c, thus add rules to compile these files at SPL stage when CONFIG_SPL_VIDEO is defined.

Signed-off-by: Nikhil M Jain n-jain1@ti.com --- drivers/video/Makefile | 5 +++++ 1 file changed, 5 insertions(+)

diff --git a/drivers/video/Makefile b/drivers/video/Makefile index cdb7d9a54d..4e2d34e675 100644 --- a/drivers/video/Makefile +++ b/drivers/video/Makefile @@ -68,3 +68,8 @@ obj-$(CONFIG_VIDEO_ZYNQMP_DPSUB) += zynqmp_dpsub.o

obj-y += bridge/ obj-y += sunxi/ + +ifdef CONFIG_SPL_BUILD +obj-$(CONFIG_$(SPL_)VIDEO) += video-uclass.o vidconsole-uclass.o +obj-$(CONFIG_$(SPL_)VIDEO) += video_bmp.o +endif

To enable TIDSS driver only at SPL stage add rule to compile the TIDSS video driver, for SPL stage only if CONFIG_SPL_VIDEO_TIDSS is defined.

Signed-off-by: Nikhil M Jain n-jain1@ti.com --- drivers/video/Makefile | 1 + drivers/video/tidss/Makefile | 1 + 2 files changed, 2 insertions(+)

diff --git a/drivers/video/Makefile b/drivers/video/Makefile index 4e2d34e675..c92d151bac 100644 --- a/drivers/video/Makefile +++ b/drivers/video/Makefile @@ -72,4 +72,5 @@ obj-y += sunxi/ ifdef CONFIG_SPL_BUILD obj-$(CONFIG_$(SPL_)VIDEO) += video-uclass.o vidconsole-uclass.o obj-$(CONFIG_$(SPL_)VIDEO) += video_bmp.o +obj-${CONFIG_$(SPL_)VIDEO_TIDSS} += tidss/ endif diff --git a/drivers/video/tidss/Makefile b/drivers/video/tidss/Makefile index f4f8c6c470..acfd5d0d09 100644 --- a/drivers/video/tidss/Makefile +++ b/drivers/video/tidss/Makefile @@ -10,3 +10,4 @@

obj-${CONFIG_VIDEO_TIDSS} = tidss_drv.o +obj-${CONFIG_$(SPL_)VIDEO_TIDSS} = tidss_drv.o

Splash support requires functions which are in bmp.c and read.c to enable display of bmp image and reading image from boot media. Enable their compilation at SPL stage, using Kconfigs SPL_CMD_BMP, SPL_CMD_READ.

Signed-off-by: Nikhil M Jain n-jain1@ti.com --- cmd/Makefile | 2 ++ 1 file changed, 2 insertions(+)

diff --git a/cmd/Makefile b/cmd/Makefile index 36d2daf22a..e2ed35559c 100644 --- a/cmd/Makefile +++ b/cmd/Makefile @@ -232,6 +232,8 @@ obj-$(CONFIG_ARCH_MVEBU) += mvebu/ endif # !CONFIG_SPL_BUILD

obj-$(CONFIG_$(SPL_)CMD_TLV_EEPROM) += tlv_eeprom.o +obj-$(CONFIG_$(SPL_)CMD_BMP) += bmp.o +obj-$(CONFIG_$(SPL_)CMD_READ) += read.o

# core command obj-y += nvedit.o

CONFIG_SPLASH_SCREEN and CONFIG_CMD_BMP enables splash screen at u-boot proper. To enable splash screen at SPL, separate macros i.e. SPL_SPLASH_SCREEN and SPL_CMD_BMP are used instead. Use CONFIG_IS_ENABLED(#) to check for splash screen and bmp related macros, so that it checks for either u-boot proper or SPl related macros as enabled at u-boot proper or SPL stage respectively.

Signed-off-by: Nikhil M Jain n-jain1@ti.com --- common/splash.c | 2 +- include/splash.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/splash.c b/common/splash.c index 245ff680eb..885fa1ec86 100644 --- a/common/splash.c +++ b/common/splash.c @@ -157,7 +157,7 @@ void splash_display_banner(void) * Common function to show a splash image if env("splashimage") is set. * For additional details please refer to doc/README.splashprepare. */ -#if defined(CONFIG_SPLASH_SCREEN) && defined(CONFIG_CMD_BMP) +#if CONFIG_IS_ENABLED(SPLASH_SCREEN) && CONFIG_IS_ENABLED(CMD_BMP) int splash_display(void) { ulong addr; diff --git a/include/splash.h b/include/splash.h index 33e45e6941..1e4176b9ba 100644 --- a/include/splash.h +++ b/include/splash.h @@ -67,7 +67,7 @@ void splash_get_pos(int *x, int *y); static inline void splash_get_pos(int *x, int *y) { } #endif

-#if defined(CONFIG_SPLASH_SCREEN) && defined(CONFIG_CMD_BMP) +#if CONFIG_IS_ENABLED(SPLASH_SCREEN) && CONFIG_IS_ENABLED(CMD_BMP) int splash_display(void); #else static inline int splash_display(void)

Enable displaying of u-boot video logo as default at SPL stage to if splash screen is disabled at SPL stage. Use CONFIG_IS_ENABLED for checking on splash screen macro both at SPL stage or u-boot proper depending upon where it is enabled.

Signed-off-by: Nikhil M Jain n-jain1@ti.com --- drivers/video/Kconfig | 2 +- drivers/video/video-uclass.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 1097e2c623..96e0f367d7 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -28,7 +28,7 @@ if VIDEO || SPL_VIDEO

config VIDEO_LOGO bool "Show the U-Boot logo on the display" - default y if !SPLASH_SCREEN + default y if !SPLASH_SCREEN || !SPL_SPLASH_SCREEN select VIDEO_BMP_RLE8 help This enables showing the U-Boot logo on the display when a video diff --git a/drivers/video/video-uclass.c b/drivers/video/video-uclass.c index 6aaacff10d..5e473c1686 100644 --- a/drivers/video/video-uclass.c +++ b/drivers/video/video-uclass.c @@ -498,7 +498,7 @@ static int video_post_probe(struct udevice *dev) }

if (IS_ENABLED(CONFIG_VIDEO_LOGO) && - !IS_ENABLED(CONFIG_SPLASH_SCREEN) && !plat->hide_logo) { + !CONFIG_IS_ENABLED(SPLASH_SCREEN) && !plat->hide_logo) { ret = show_splash(dev); if (ret) { log_debug("Cannot show splash screen\n");

Add ospi boot media support to load splash image from OSPI memory, add offset to read image from ospi and necessary flags defininig type of storage and storage device.

Signed-off-by: Nikhil M Jain n-jain1@ti.com --- board/ti/am62x/evm.c | 6 ++++++ 1 file changed, 6 insertions(+)

diff --git a/board/ti/am62x/evm.c b/board/ti/am62x/evm.c index 20b2a70122..ca7c89aea0 100644 --- a/board/ti/am62x/evm.c +++ b/board/ti/am62x/evm.c @@ -22,6 +22,12 @@ DECLARE_GLOBAL_DATA_PTR;

#ifdef CONFIG_SPLASH_SCREEN static struct splash_location default_splash_locations[] = { + { + .name = "sf", + .storage = SPLASH_STORAGE_SF, + .flags = SPLASH_STORAGE_RAW, + .offset = 0x700000, + }, { .name = "mmc", .storage = SPLASH_STORAGE_MMC,