<p>Martin Roth has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/21456">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">soc/amd/stoney: Allow alternative placement for AMD FW directory<br><br>Allow the AMD FW directory to be placed at one of the alternative<br>locations within the ROM.<br><br>BUG=b:65484600<br>TEST=Assign PSP firmware location, build & test.<br><br>Change-Id: I9c95b9805c60ab6204750f7929049c7382e0c6cd<br>Signed-off-by: Martin Roth <martinroth@google.com><br>---<br>M src/soc/amd/stoneyridge/Kconfig<br>M src/soc/amd/stoneyridge/Makefile.inc<br>2 files changed, 19 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/56/21456/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/src/soc/amd/stoneyridge/Kconfig b/src/soc/amd/stoneyridge/Kconfig<br>index 08613fe..791cffb 100644<br>--- a/src/soc/amd/stoneyridge/Kconfig<br>+++ b/src/soc/amd/stoneyridge/Kconfig<br>@@ -305,4 +305,18 @@<br> <br>     If unsure, answer 'y'<br> <br>+config AMD_FWM_POSITION<br>+ hex "Firmware Directory Table location (0x0 for auto)"<br>+     default 0x0<br>+  help<br>+   Typically this is calculated by the ROM size, but there may<br>+          be situations where you want to put the firmware directory<br>+   table in a different location.  Suggested locations are:<br>+       512 KB - 0xFFFA0000<br>+          1 MB   - 0xFFF20000<br>+          2 MB   - 0xFFE20000<br>+          4 MB   - 0xFFC20000<br>+          8 MB   - 0xFF820000<br>+          16 MB  - 0xFF020000<br>+<br> endif # SOC_AMD_STONEYRIDGE_FP4 || SOC_AMD_STONEYRIDGE_FT4<br>diff --git a/src/soc/amd/stoneyridge/Makefile.inc b/src/soc/amd/stoneyridge/Makefile.inc<br>index b6669f1..8b63395 100644<br>--- a/src/soc/amd/stoneyridge/Makefile.inc<br>+++ b/src/soc/amd/stoneyridge/Makefile.inc<br>@@ -90,7 +90,7 @@<br> CPPFLAGS_common += -I$(src)/soc/amd/stoneyridge/include<br> CPPFLAGS_common += -I$(src)/soc/amd/stoneyridge/acpi<br> <br>-# ROMSIG At ROMBASE + 0x20000:<br>+# ROMSIG At ROMBASE + 0x20000 - Overridden by CONFIG_AMD_FWM_POSITION<br> # +-----------+---------------+----------------+------------+<br> # |0x55AA55AA |EC ROM Address |GEC ROM Address |USB3 ROM    |<br> # +-----------+---------------+----------------+------------+<br>@@ -98,7 +98,11 @@<br> # +-----------+<br> #<br> # EC ROM should be 64K aligned.<br>+ifneq ($(CONFIG_AMD_FWM_POSITION),0x0)<br>+STONEYRIDGE_FWM_POSITION=$(CONFIG_AMD_FWM_POSITION)<br>+else<br> STONEYRIDGE_FWM_POSITION=$(call int-add, $(call int-subtract, 0xffffffff $(CONFIG_ROM_SIZE)) 0x20000 1)<br>+endif<br> <br> ### 0<br> FIRMWARE_LOCATE=$(dir $(call strip_quotes, $(CONFIG_AMD_PUBKEY_FILE)))<br></pre><p>To view, visit <a href="https://review.coreboot.org/21456">change 21456</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/21456"/><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: I9c95b9805c60ab6204750f7929049c7382e0c6cd </div>
<div style="display:none"> Gerrit-Change-Number: 21456 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Martin Roth <martinroth@google.com> </div>