Attention is currently required from: Andrey Petrov, Intel coreboot Reviewers, Ronak Kanabar.
Subrata Banik has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/86367?usp=email )
Change subject: lib: Centralize logo.bmp inclusion in lib/Makefile.mk ......................................................................
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 subratabanik@google.com --- M src/drivers/intel/fsp2_0/Makefile.mk M src/lib/Makefile.mk 2 files changed, 12 insertions(+), 12 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/67/86367/1
diff --git a/src/drivers/intel/fsp2_0/Makefile.mk b/src/drivers/intel/fsp2_0/Makefile.mk index 4cb24ff..18a62e3 100644 --- a/src/drivers/intel/fsp2_0/Makefile.mk +++ b/src/drivers/intel/fsp2_0/Makefile.mk @@ -126,18 +126,6 @@ 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 40df2b8..292f5d2 100644 --- a/src/lib/Makefile.mk +++ b/src/lib/Makefile.mk @@ -420,3 +420,15 @@ 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