[coreboot-gerrit] Change in coreboot[master]: mb/google/kahlee: Set EFS SPI platform configuration

[Matt Papageorge (Code Review)]

Matt Papageorge has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/44002 )

Change subject: mb/google/kahlee: Set EFS SPI platform configuration
......................................................................

mb/google/kahlee: Set EFS SPI platform configuration

Set platform defaults for SPI settings in Kconfig for EFS
for Kahlee based platforms.

BUG=b:158755102
TEST=Build test. I have no device for a boot test.

Change-Id: I9b979d79ad2dc920e8baf288ddfab04f04f42789
Signed-off-by: Matt Papageorge 
---
M src/mainboard/google/kahlee/Kconfig
M src/soc/amd/stoneyridge/Makefile.inc
2 files changed, 15 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/02/44002/1

diff --git a/src/mainboard/google/kahlee/Kconfig b/src/mainboard/google/kahlee/Kconfig
index a9ba0f5..9ce3760 100644
--- a/src/mainboard/google/kahlee/Kconfig
+++ b/src/mainboard/google/kahlee/Kconfig
@@ -127,4 +127,14 @@
 config USE_PSPSECUREOS
    def_bool n

+config EFS_SPI_READ_MODE
+	int
+	default 4
+	default 0 if EM100
+
+config EFS_SPI_SPEED
+	int
+	default 0
+	default 3 if EM100
+
 endif # BOARD_GOOGLE_BASEBOARD_KAHLEE
diff --git a/src/soc/amd/stoneyridge/Makefile.inc b/src/soc/amd/stoneyridge/Makefile.inc
index 0d7b5d1..ecb1414 100644
--- a/src/soc/amd/stoneyridge/Makefile.inc
+++ b/src/soc/amd/stoneyridge/Makefile.inc
@@ -193,6 +193,8 @@
 SUBPROG_FN_SMU_FW=1
 OPT_SMUFWM_FN_FILE=$(call add_opt_prefix, $(SMUFWM_FN_FILE), --subprogram $(SUBPROG_FN_SMU_FW) --smufirmware)
 OPT_SMUFIRMWARE2_FN_FILE=$(call add_opt_prefix, $(SMUFIRMWARE2_FN_FILE), --subprogram $(SUBPROG_FN_SMU_FW) --smufirmware2)
+OPT_EFS_SPI_READ_MODE=$(call add_opt_prefix, $(CONFIG_EFS_SPI_READ_MODE), --spi-read-mode)
+OPT_EFS_SPI_SPEED=$(call add_opt_prefix, $(CONFIG_EFS_SPI_SPEED), --spi-speed)

ifeq ($(FIRMWARE_TYPE),ST)
 OPT_COMBOCAPABLE=--combo-capable
@@ -247,6 +249,9 @@
    	$(OPT_SMUFIRMWARE2_FN_FILE) \
    	$(OPT_SMUSCS_FILE) \
    	$(OPT_COMBOCAPABLE)\
+		$(OPT_EFS_SPI_READ_MODE) \
+		$(OPT_EFS_SPI_SPEED) \
+		--soc-name "Stoneyridge" \
    	--flashsize $(CONFIG_ROM_SIZE) \
    	--location $(shell printf "0x%x" $(STONEYRIDGE_FWM_POSITION)) \
    	--output	$@