From cf8f0693a60ba32ce65e522eca00d1ba37082920 Mon Sep 17 00:00:00 2001 From: Subrata Banik Date: Wed, 5 Mar 2025 10:53:51 +0000 Subject: [PATCH] {drivers, lib}: Rename FSP*_LOGO_FILE_NAME to BMP_LOGO_FILE_NAME MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit standardizes the Kconfig option for the boot logo file name across FSP drivers and the common library. The `FSP1_1_LOGO_FILE_NAME` and `FSP2_0_LOGO_FILE_NAME` options are renamed to `BMP_LOGO_FILE_NAME`. BUG=b:400738815 TEST=Able to build and boot google/brox. Change-Id: I6a6c2c6d235ad9643879b00232930c8a0d2e3801 Signed-off-by: Subrata Banik Reviewed-on: https://review.coreboot.org/c/coreboot/+/86725 Tested-by: build bot (Jenkins) Reviewed-by: Dinesh Gehlot Reviewed-by: Jérémy Compostella --- src/drivers/intel/fsp1_1/Kconfig | 2 +- src/drivers/intel/fsp1_1/Makefile.mk | 2 +- src/drivers/intel/fsp2_0/Kconfig | 2 +- src/lib/Makefile.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/drivers/intel/fsp1_1/Kconfig b/src/drivers/intel/fsp1_1/Kconfig index 3ab90963fe..aabcabbf26 100644 --- a/src/drivers/intel/fsp1_1/Kconfig +++ b/src/drivers/intel/fsp1_1/Kconfig @@ -85,7 +85,7 @@ config BMP_LOGO Uses the FSP to display the boot logo. This method supports a BMP file only. The uncompressed size can be up to 1 MB. -config FSP1_1_LOGO_FILE_NAME +config BMP_LOGO_FILE_NAME string "Logo file" depends on BMP_LOGO default "3rdparty/blobs/mainboard/\$(MAINBOARDDIR)/logo.bmp" diff --git a/src/drivers/intel/fsp1_1/Makefile.mk b/src/drivers/intel/fsp1_1/Makefile.mk index c890f350e1..28489fe133 100644 --- a/src/drivers/intel/fsp1_1/Makefile.mk +++ b/src/drivers/intel/fsp1_1/Makefile.mk @@ -38,7 +38,7 @@ endif # Add logo to the cbfs image cbfs-files-$(CONFIG_BMP_LOGO) += logo.bmp -logo.bmp-file := $(call strip_quotes,$(CONFIG_FSP1_1_LOGO_FILE_NAME)) +logo.bmp-file := $(call strip_quotes,$(CONFIG_BMP_LOGO_FILE_NAME)) logo.bmp-type := raw logo.bmp-compression := LZMA diff --git a/src/drivers/intel/fsp2_0/Kconfig b/src/drivers/intel/fsp2_0/Kconfig index 317fea21c0..c9fa8e560f 100644 --- a/src/drivers/intel/fsp2_0/Kconfig +++ b/src/drivers/intel/fsp2_0/Kconfig @@ -302,7 +302,7 @@ config BMP_LOGO_COMPRESS_LZ4 endchoice -config FSP2_0_LOGO_FILE_NAME +config BMP_LOGO_FILE_NAME string "Logo file" depends on BMP_LOGO default "3rdparty/blobs/mainboard/\$(MAINBOARDDIR)/logo.bmp" diff --git a/src/lib/Makefile.mk b/src/lib/Makefile.mk index 5e1e81a5d0..84b982dbf6 100644 --- a/src/lib/Makefile.mk +++ b/src/lib/Makefile.mk @@ -438,7 +438,7 @@ endef ifneq ($(CONFIG_HAVE_CUSTOM_BMP_LOGO),y) $(eval $(call add_bmp_logo_file_to_cbfs,CONFIG_BMP_LOGO, logo.bmp,\ - CONFIG_FSP2_0_LOGO_FILE_NAME)) + CONFIG_BMP_LOGO_FILE_NAME)) endif $(eval $(call add_bmp_logo_file_to_cbfs,CONFIG_PLATFORM_HAS_LOW_BATTERY_INDICATOR, \