[coreboot-gerrit] Change in coreboot[master]: NOTFORMERGE amd/stoneyridge: Make SMU FW load conditional

[Marshall Dawson (Code Review)]

Marshall Dawson has uploaded this change for review. ( https://review.coreboot.org/22428


Change subject: NOTFORMERGE amd/stoneyridge: Make SMU FW load conditional
......................................................................

NOTFORMERGE amd/stoneyridge: Make SMU FW load conditional

This facilitates easily changing between a PSP bootloader which loads the
SMU FW blobs automatically and one where we must manually load them.

Change-Id: I2e90c59c43058e2cfdd2b4db9ca19e2b611a772b
Signed-off-by: Marshall Dawson <marshalldawson3rd at gmail.com>
---
M src/soc/amd/stoneyridge/bootblock/bootblock.c
M src/soc/amd/stoneyridge/chip.c
2 files changed, 3 insertions(+), 2 deletions(-)



  git pull ssh://review.coreboot.org:29418/coreboot refs/changes/28/22428/1

diff --git a/src/soc/amd/stoneyridge/bootblock/bootblock.c b/src/soc/amd/stoneyridge/bootblock/bootblock.c
index e9fe908..abe06fb 100644
--- a/src/soc/amd/stoneyridge/bootblock/bootblock.c
+++ b/src/soc/amd/stoneyridge/bootblock/bootblock.c
@@ -113,7 +113,7 @@
 	u32 val = cpuid_eax(1);
 	printk(BIOS_DEBUG, "Family_Model: %08x\n", val);
 
-	if (boot_cpu())
+	if (boot_cpu() && IS_ENABLED(CONFIG_SOC_AMD_PSP_SELECTABLE_SMU_FW))
 		load_smu_fw1();
 
 	post_code(0x37);
diff --git a/src/soc/amd/stoneyridge/chip.c b/src/soc/amd/stoneyridge/chip.c
index 3891ad9..8e4ab2e 100644
--- a/src/soc/amd/stoneyridge/chip.c
+++ b/src/soc/amd/stoneyridge/chip.c
@@ -82,7 +82,8 @@
 static void earliest_ramstage(void *unused)
 {
 	post_code(0x46);
-	psp_load_named_blob(MBOX_BIOS_CMD_SMU_FW2, "smu_fw2");
+	if (IS_ENABLED(CONFIG_SOC_AMD_PSP_SELECTABLE_SMU_FW))
+		psp_load_named_blob(MBOX_BIOS_CMD_SMU_FW2, "smu_fw2");
 
 	post_code(0x47);
 	AGESAWRAPPER(amdinitenv);

-- 
To view, visit https://review.coreboot.org/22428
To unsubscribe, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2e90c59c43058e2cfdd2b4db9ca19e2b611a772b
Gerrit-Change-Number: 22428
Gerrit-PatchSet: 1
Gerrit-Owner: Marshall Dawson <marshalldawson3rd at gmail.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20171111/1ed2e24b/attachment.html>