diff options
| author | Dario Binacchi | 2023-08-20 18:24:45 +0200 |
|---|---|---|
| committer | Patrice Chotard | 2023-10-04 13:26:02 +0200 |
| commit | 9192b13bc88df9c0635d162c543f89efac66b188 (patch) | |
| tree | 2eaade8a5e10f82b704b3a7e994fec6be0432b19 | |
| parent | 20af6b897b12628ffcff0445d4d62ba653dcfcc5 (diff) | |
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 <dario.binacchi@amarulasolutions.com>
Reviewed-by: Patrick Delaunay <patrick.delaunay@foss.st.com>
Reviewed-by: Patrice Chotard <patrice.chotard@foss.st.com>
| -rw-r--r-- | board/st/stm32f746-disco/stm32f746-disco.c | 6 | ||||
| -rw-r--r-- | configs/stm32f746-disco_defconfig | 2 | ||||
| -rw-r--r-- | configs/stm32f746-disco_spl_defconfig | 2 | ||||
| -rw-r--r-- | include/configs/stm32f746-disco.h | 7 | ||||
| -rw-r--r-- | tools/logos/stm32f746-disco.bmp | bin | 0 -> 18052 bytes |
5 files changed, 8 insertions, 9 deletions
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 <serial.h> #include <spl.h> #include <splash.h> -#include <st_logo_data.h> #include <video.h> #include <asm/global_data.h> #include <asm/io.h> @@ -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 <config_distro_bootcmd.h> #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 Binary files differnew file mode 100644 index 00000000000..c1ef4fb035c --- /dev/null +++ b/tools/logos/stm32f746-disco.bmp |
