[S] Change in coreboot[main]: WIP: drivers/intel/fsp2_0: Add second logo file to cbfs

[Shelley Chen (Code Review)]

Shelley Chen has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/79772?usp=email )

Change subject: WIP: drivers/intel/fsp2_0: Add second logo file to cbfs
......................................................................

WIP: drivers/intel/fsp2_0: Add second logo file to cbfs

BUG=b:317880956
BRANCH=None
TEST=emerge-rex coreboot chromeos-bootimage
     Make sure that FW splash screen still is displayed during
     firmware bootup

Change-Id: I705e937bab61f1a566e33971f78f3f8ba60c6ce2
Signed-off-by: Shelley Chen 
---
M src/drivers/intel/fsp2_0/Kconfig
M src/drivers/intel/fsp2_0/Makefile.inc
2 files changed, 17 insertions(+), 5 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/72/79772/1

diff --git a/src/drivers/intel/fsp2_0/Kconfig b/src/drivers/intel/fsp2_0/Kconfig
index e27249f..e75eebc 100644
--- a/src/drivers/intel/fsp2_0/Kconfig
+++ b/src/drivers/intel/fsp2_0/Kconfig
@@ -287,6 +287,11 @@
    depends on BMP_LOGO
    default "3rdparty/blobs/mainboard/$(MAINBOARDDIR)/logo.bmp"

+config FSP2_0_LOGO_FILE_NAME2
+	string "Logo file 2"
+	depends on BMP_LOGO
+	default "3rdparty/blobs/mainboard/$(MAINBOARDDIR)/logo.bmp"
+
 config FSP_COMPRESS_FSP_S_LZMA
    bool

diff --git a/src/drivers/intel/fsp2_0/Makefile.inc b/src/drivers/intel/fsp2_0/Makefile.inc
index 5463405..e5ebe75 100644
--- a/src/drivers/intel/fsp2_0/Makefile.inc
+++ b/src/drivers/intel/fsp2_0/Makefile.inc
@@ -127,13 +127,20 @@
 endif

# Add logo to the cbfs image
-cbfs-files-$(CONFIG_BMP_LOGO) += logo.bmp
-logo.bmp-file := $(call strip_quotes,$(CONFIG_FSP2_0_LOGO_FILE_NAME))
-logo.bmp-type := raw
+cbfs-files-$(CONFIG_BMP_LOGO) += cb_logo.bmp
+cb_logo.bmp-file := $(call strip_quotes,$(CONFIG_FSP2_0_LOGO_FILE_NAME))
+cb_logo.bmp-type := raw
+
+cbfs-files-$(CONFIG_BMP_LOGO) += cbx_logo.bmp
+cbx_logo.bmp-file := $(call strip_quotes,$(CONFIG_FSP2_0_LOGO_FILE_NAME2))
+cbx_logo.bmp-type := raw
+
 ifeq ($(CONFIG_BMP_LOGO_COMPRESS_LZMA),y)
-logo.bmp-compression := LZMA
+cb_logo.bmp-compression := LZMA
+cbx_logo.bmp-compression := LZMA
 else ifeq ($(CONFIG_BMP_LOGO_COMPRESS_LZ4),y)
-logo.bmp-compression := LZ4
+cb_logo.bmp-compression := LZ4
+cbx_logo.bmp-compression := LZ4
 endif

ifneq ($(call strip_quotes,$(CONFIG_FSP_HEADER_PATH)),)