From 9192b13bc88df9c0635d162c543f89efac66b188 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Sun, 20 Aug 2023 18:24:45 +0200 Subject: [PATCH] board: stm32f746-disco: refactor the display of the ST logo The patch removes the legacy mode of displaying the ST logo and adopts the approach introduced by the commit 284b08fb51b6 ("board: stm32mp1: add splash screen with stmicroelectronics logo"). It was necessary to use a specific logo for the stm32f746-disco board. Furthermore, the previous version didn't properly center the logo, hiding its upper part. Signed-off-by: Dario Binacchi Reviewed-by: Patrick Delaunay Reviewed-by: Patrice Chotard --- board/st/stm32f746-disco/stm32f746-disco.c | 6 ------ configs/stm32f746-disco_defconfig | 2 +- configs/stm32f746-disco_spl_defconfig | 2 +- include/configs/stm32f746-disco.h | 7 ++++++- tools/logos/stm32f746-disco.bmp | Bin 0 -> 18052 bytes 5 files changed, 8 insertions(+), 9 deletions(-) create mode 100644 tools/logos/stm32f746-disco.bmp diff --git a/board/st/stm32f746-disco/stm32f746-disco.c b/board/st/stm32f746-disco/stm32f746-disco.c index 4cfb29ef428..0f966600843 100644 --- a/board/st/stm32f746-disco/stm32f746-disco.c +++ b/board/st/stm32f746-disco/stm32f746-disco.c @@ -14,7 +14,6 @@ #include #include #include -#include #include #include #include @@ -134,10 +133,5 @@ int board_init(void) } #endif -#if defined(CONFIG_CMD_BMP) - bmp_display((ulong)stmicroelectronics_uboot_logo_8bit_rle, - BMP_ALIGN_CENTER, BMP_ALIGN_CENTER); -#endif /* CONFIG_CMD_BMP */ - return 0; } diff --git a/configs/stm32f746-disco_defconfig b/configs/stm32f746-disco_defconfig index 057cb7e8963..3c3a0d25d4d 100644 --- a/configs/stm32f746-disco_defconfig +++ b/configs/stm32f746-disco_defconfig @@ -56,13 +56,13 @@ CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_STM32_QSPI=y CONFIG_VIDEO=y +CONFIG_VIDEO_LOGO=y CONFIG_BACKLIGHT_GPIO=y CONFIG_VIDEO_STM32=y CONFIG_VIDEO_STM32_MAX_XRES=480 CONFIG_VIDEO_STM32_MAX_YRES=272 CONFIG_SPLASH_SCREEN=y CONFIG_SPLASH_SCREEN_ALIGN=y -CONFIG_VIDEO_BMP_RLE8=y CONFIG_BMP_16BPP=y CONFIG_BMP_24BPP=y CONFIG_BMP_32BPP=y diff --git a/configs/stm32f746-disco_spl_defconfig b/configs/stm32f746-disco_spl_defconfig index 0534d62d005..1b8b5a17b7c 100644 --- a/configs/stm32f746-disco_spl_defconfig +++ b/configs/stm32f746-disco_spl_defconfig @@ -82,13 +82,13 @@ CONFIG_DM_SPI=y CONFIG_STM32_QSPI=y CONFIG_SPL_TIMER=y CONFIG_VIDEO=y +CONFIG_VIDEO_LOGO=y CONFIG_BACKLIGHT_GPIO=y CONFIG_VIDEO_STM32=y CONFIG_VIDEO_STM32_MAX_XRES=480 CONFIG_VIDEO_STM32_MAX_YRES=272 CONFIG_SPLASH_SCREEN=y CONFIG_SPLASH_SCREEN_ALIGN=y -CONFIG_VIDEO_BMP_RLE8=y CONFIG_BMP_16BPP=y CONFIG_BMP_24BPP=y CONFIG_BMP_32BPP=y diff --git a/include/configs/stm32f746-disco.h b/include/configs/stm32f746-disco.h index 9bf01cac47a..00ec9efba57 100644 --- a/include/configs/stm32f746-disco.h +++ b/include/configs/stm32f746-disco.h @@ -23,6 +23,10 @@ #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 0) +#define STM32F746_BOARD_EXTRA_ENV \ + "splashimage=0xC0448000\0" \ + "splashpos=m,m\0" + #include #define CFG_EXTRA_ENV_SETTINGS \ "kernel_addr_r=0xC0008000\0" \ @@ -31,7 +35,8 @@ "scriptaddr=0xC0418000\0" \ "pxefile_addr_r=0xC0428000\0" \ "ramdisk_addr_r=0xC0438000\0" \ - BOOTENV + BOOTENV \ + STM32F746_BOARD_EXTRA_ENV #define CFG_SYS_UBOOT_BASE (CFG_SYS_FLASH_BASE + \ CONFIG_SPL_PAD_TO) diff --git a/tools/logos/stm32f746-disco.bmp b/tools/logos/stm32f746-disco.bmp new file mode 100644 index 0000000000000000000000000000000000000000..c1ef4fb035c0833ea22aaa7d8aef1f0f4129d7fa GIT binary patch literal 18052 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