From 801d0a1491c48bfb56e91214bec9eb8d21646193 Mon Sep 17 00:00:00 2001 From: Subrata Banik Date: Tue, 11 Feb 2025 14:53:39 +0000 Subject: [PATCH] lib: Centralize logo.bmp inclusion in lib/Makefile.mk This commit moves the logo.bmp inclusion logic from `src/drivers/intel/fsp2_0/Makefile.mk` to `src/lib/Makefile.mk`. This change centralizes the logo inclusion logic within the `lib` directory, aligning it with the location of `bmp_logo.c` and making it independent of the FSP 2.0 driver. Change-Id: I16ed1cf29b839c25b6ea1c2f10faf3d99dd707c9 Signed-off-by: Subrata Banik Reviewed-on: https://review.coreboot.org/c/coreboot/+/86367 Tested-by: build bot (Jenkins) Reviewed-by: Karthik Ramasubramanian Reviewed-by: Julius Werner --- src/drivers/intel/fsp2_0/Makefile.mk | 12 ------------ src/lib/Makefile.mk | 12 ++++++++++++ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/drivers/intel/fsp2_0/Makefile.mk b/src/drivers/intel/fsp2_0/Makefile.mk index 4cb24ffb56..18a62e3b57 100644 --- a/src/drivers/intel/fsp2_0/Makefile.mk +++ b/src/drivers/intel/fsp2_0/Makefile.mk @@ -126,18 +126,6 @@ $(obj)/Fsp_2_S.fd: $(call strip_quotes,$(CONFIG_FSP_FD_PATH_2)) $(obj)/Fsp_M.fd true endif -# Add logo to the cbfs image -ifneq ($(CONFIG_HAVE_CUSTOM_BMP_LOGO),y) -cbfs-files-$(CONFIG_BMP_LOGO) += logo.bmp -logo.bmp-file := $(call strip_quotes,$(CONFIG_FSP2_0_LOGO_FILE_NAME)) -logo.bmp-type := raw -ifeq ($(CONFIG_BMP_LOGO_COMPRESS_LZMA),y) -logo.bmp-compression := LZMA -else ifeq ($(CONFIG_BMP_LOGO_COMPRESS_LZ4),y) -logo.bmp-compression := LZ4 -endif -endif - ifneq ($(call strip_quotes,$(CONFIG_FSP_HEADER_PATH)),) CPPFLAGS_common+=-I$(CONFIG_FSP_HEADER_PATH) endif diff --git a/src/lib/Makefile.mk b/src/lib/Makefile.mk index 40df2b8f56..292f5d2889 100644 --- a/src/lib/Makefile.mk +++ b/src/lib/Makefile.mk @@ -420,3 +420,15 @@ header_pointer-position := -4 header_pointer-type := "cbfs header" romstage-y += ux_locales.c + +# Add logo to the cbfs image +ifneq ($(CONFIG_HAVE_CUSTOM_BMP_LOGO),y) +cbfs-files-$(CONFIG_BMP_LOGO) += logo.bmp +logo.bmp-file := $(call strip_quotes,$(CONFIG_FSP2_0_LOGO_FILE_NAME)) +logo.bmp-type := raw +ifeq ($(CONFIG_BMP_LOGO_COMPRESS_LZMA),y) +logo.bmp-compression := LZMA +else ifeq ($(CONFIG_BMP_LOGO_COMPRESS_LZ4),y) +logo.bmp-compression := LZ4 +endif +endif