From 8953c772cf8c6e28fe81d7e6ffda4c56b67824ca Mon Sep 17 00:00:00 2001 From: Pranava Y N Date: Mon, 22 Sep 2025 18:35:07 +0530 Subject: [PATCH] lib: Fix bad whitespace in add_bmp_logo_file_to_cbfs_call The multi-line `$(eval $(call ...))` for adding the default BMP logo contained extraneous whitespace. This included a leading space before `logo.bmp` and, more critically, a newline, tab, and non-breaking spaces before `CONFIG_BMP_LOGO_FILE_NAME`. This problematic whitespace was passed as part of the third argument (`$(3)`) to the `add_bmp_logo_file_to_cbfs` macro. Inside the macro, the deferred variable expansion `$$($(3))` would fail because it was searching for a variable name with leading non-breaking spaces. This resulted in the `logo.bmp-file` variable being set to an empty string, causing a build failure when the cbfs tool tried to find the logo file. This commit collapses the function call onto a single line to remove all line continuations and problematic whitespace, ensuring the correct, clean arguments are passed to the macro. BUG=b:444655145 TEST=Able to verify that 'logo.bmp' is added correctly to the CBFS, and also verify the FW splash screen visible on redrix device. Change-Id: Ia91b927dd0248909fc1c75534a7e7b00dab0fc09 Signed-off-by: Pranava Y N Reviewed-on: https://review.coreboot.org/c/coreboot/+/89292 Tested-by: build bot (Jenkins) Reviewed-by: Subrata Banik Reviewed-by: Elyes Haouas --- src/lib/Makefile.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/lib/Makefile.mk b/src/lib/Makefile.mk index ecb06c4765..d9792dbea4 100644 --- a/src/lib/Makefile.mk +++ b/src/lib/Makefile.mk @@ -442,8 +442,7 @@ $(2)-compression := $$(BMP_LOGO_COMPRESS_FLAG) endef ifneq ($(CONFIG_HAVE_CUSTOM_BMP_LOGO),y) -$(eval $(call add_bmp_logo_file_to_cbfs,CONFIG_BMP_LOGO, logo.bmp,\ - CONFIG_BMP_LOGO_FILE_NAME)) +$(eval $(call add_bmp_logo_file_to_cbfs,CONFIG_BMP_LOGO,logo.bmp,CONFIG_BMP_LOGO_FILE_NAME)) endif $(eval $(call add_bmp_logo_file_to_cbfs,CONFIG_PLATFORM_HAS_LOW_BATTERY_INDICATOR, \