<p>Kane Chen has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/21142">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">soc/intel/apollolake: Allow overriding FSP_S settings by board<br><br>This change provides interface to override FSP_S settings per<br>board due to many projects share same devicetree.cb<br><br>BUG=b:64880573<br>TEST=Verify that FSP_S settings can be overridden in mainboard<br>     on coral<br><br>Change-Id: I349b1678d9e66022b586b6c7f344b831ed631c74<br>Signed-off-by: Kane Chen <kane.chen@intel.com><br>---<br>M src/mainboard/google/reef/mainboard.c<br>M src/mainboard/google/reef/variants/baseboard/include/baseboard/variants.h<br>M src/mainboard/google/reef/variants/coral/mainboard.c<br>M src/soc/intel/apollolake/chip.c<br>4 files changed, 16 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/42/21142/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/src/mainboard/google/reef/mainboard.c b/src/mainboard/google/reef/mainboard.c<br>index c6b1997..3c52ef0 100644<br>--- a/src/mainboard/google/reef/mainboard.c<br>+++ b/src/mainboard/google/reef/mainboard.c<br>@@ -82,6 +82,12 @@<br>  *oem_revision = variant_board_sku();<br> }<br> <br>+void __attribute__((weak)) variant_slicon_config_overrides(<br>+                                            FSP_S_CONFIG *silconfig)<br>+{<br>+ /* Override the FSP_S settings by variant_board_sku() */<br>+}<br>+<br> static unsigned long mainboard_write_acpi_tables(<br>   device_t device, unsigned long current, acpi_rsdp_t *rsdp)<br> {<br>diff --git a/src/mainboard/google/reef/variants/baseboard/include/baseboard/variants.h b/src/mainboard/google/reef/variants/baseboard/include/baseboard/variants.h<br>index 388397b..ad977e8 100644<br>--- a/src/mainboard/google/reef/variants/baseboard/include/baseboard/variants.h<br>+++ b/src/mainboard/google/reef/variants/baseboard/include/baseboard/variants.h<br>@@ -47,5 +47,6 @@<br> void variant_nhlt_oem_overrides(const char **oem_id,<br>                         const char **oem_table_id, uint32_t *oem_revision);<br> void variant_nhlt_init(struct nhlt *nhlt);<br>+void variant_slicon_config_overrides(FSP_S_CONFIG *silconfig);<br> <br> #endif /* BASEBOARD_VARIANTS_H */<br>diff --git a/src/mainboard/google/reef/variants/coral/mainboard.c b/src/mainboard/google/reef/variants/coral/mainboard.c<br>index 3da5456..cbbbaef 100644<br>--- a/src/mainboard/google/reef/variants/coral/mainboard.c<br>+++ b/src/mainboard/google/reef/variants/coral/mainboard.c<br>@@ -31,3 +31,8 @@<br>  *oem_table_id = CONFIG_VARIANT_DIR;<br>   *oem_revision = variant_board_sku();<br> }<br>+<br>+void variant_slicon_config_overrides(FSP_S_CONFIG *silconfig)<br>+{<br>+      /* Override the FSP_S settings by variant_board_sku() */<br>+}<br>diff --git a/src/soc/intel/apollolake/chip.c b/src/soc/intel/apollolake/chip.c<br>index af625a1..23924ae 100644<br>--- a/src/soc/intel/apollolake/chip.c<br>+++ b/src/soc/intel/apollolake/chip.c<br>@@ -45,6 +45,7 @@<br> #include <soc/systemagent.h><br> <br> #include "chip.h"<br>+#include <baseboard/variants.h><br> <br> static void *vbt;<br> static struct region_device vbt_rdev;<br>@@ -487,6 +488,9 @@<br>                        silconfig->PortUsb20HsNpreDrvSel[port] =<br>                           cfg->usb2eye[port].Usb20HsNpreDrvSel;<br>      }<br>+<br>+ /* interface to override FSP_S settings per board */<br>+ variant_slicon_config_overrides(silconfig);<br> #endif<br> }<br> <br></pre><p>To view, visit <a href="https://review.coreboot.org/21142">change 21142</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/21142"/><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: I349b1678d9e66022b586b6c7f344b831ed631c74 </div>
<div style="display:none"> Gerrit-Change-Number: 21142 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Kane Chen <kane.chen@intel.com> </div>