<p>Marshall Dawson has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/22428">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">NOTFORMERGE amd/stoneyridge: Make SMU FW load conditional<br><br>This facilitates easily changing between a PSP bootloader which loads the<br>SMU FW blobs automatically and one where we must manually load them.<br><br>Change-Id: I2e90c59c43058e2cfdd2b4db9ca19e2b611a772b<br>Signed-off-by: Marshall Dawson <marshalldawson3rd@gmail.com><br>---<br>M src/soc/amd/stoneyridge/bootblock/bootblock.c<br>M src/soc/amd/stoneyridge/chip.c<br>2 files changed, 3 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/28/22428/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/src/soc/amd/stoneyridge/bootblock/bootblock.c b/src/soc/amd/stoneyridge/bootblock/bootblock.c<br>index e9fe908..abe06fb 100644<br>--- a/src/soc/amd/stoneyridge/bootblock/bootblock.c<br>+++ b/src/soc/amd/stoneyridge/bootblock/bootblock.c<br>@@ -113,7 +113,7 @@<br>     u32 val = cpuid_eax(1);<br>       printk(BIOS_DEBUG, "Family_Model: %08x\n", val);<br> <br>-        if (boot_cpu())<br>+      if (boot_cpu() && IS_ENABLED(CONFIG_SOC_AMD_PSP_SELECTABLE_SMU_FW))<br>           load_smu_fw1();<br> <br>    post_code(0x37);<br>diff --git a/src/soc/amd/stoneyridge/chip.c b/src/soc/amd/stoneyridge/chip.c<br>index 3891ad9..8e4ab2e 100644<br>--- a/src/soc/amd/stoneyridge/chip.c<br>+++ b/src/soc/amd/stoneyridge/chip.c<br>@@ -82,7 +82,8 @@<br> static void earliest_ramstage(void *unused)<br> {<br>        post_code(0x46);<br>-     psp_load_named_blob(MBOX_BIOS_CMD_SMU_FW2, "smu_fw2");<br>+     if (IS_ENABLED(CONFIG_SOC_AMD_PSP_SELECTABLE_SMU_FW))<br>+                psp_load_named_blob(MBOX_BIOS_CMD_SMU_FW2, "smu_fw2");<br> <br>   post_code(0x47);<br>      AGESAWRAPPER(amdinitenv);<br></pre><p>To view, visit <a href="https://review.coreboot.org/22428">change 22428</a>. To unsubscribe, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/22428"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I2e90c59c43058e2cfdd2b4db9ca19e2b611a772b </div>
<div style="display:none"> Gerrit-Change-Number: 22428 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Marshall Dawson <marshalldawson3rd@gmail.com> </div>