<p>Philipp Deppenwiese <strong>merged</strong> this change.</p><p><a href="https://review.coreboot.org/c/coreboot/+/29593">View Change</a></p><div style="white-space:pre-wrap">Approvals:
build bot (Jenkins): Verified
Philipp Deppenwiese: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mainboard/ocp/wedge100s: Add vboot support<br><br>* Add RO only FMAP.<br>* Add kconfig options.<br><br>Tested=OCP Wedge100s<br><br>Change-Id: I1979e0263e41f21c01c407ac81ad1198a53741e8<br>Signed-off-by: Philipp Deppenwiese <zaolin.daisuki@gmail.com><br>Reviewed-on: https://review.coreboot.org/c/29593<br>Tested-by: build bot (Jenkins) <no-reply@coreboot.org><br>---<br>M src/mainboard/ocp/wedge100s/Kconfig<br>M src/mainboard/ocp/wedge100s/cmos.layout<br>A src/mainboard/ocp/wedge100s/vboot-ro.fmd<br>3 files changed, 33 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/mainboard/ocp/wedge100s/Kconfig b/src/mainboard/ocp/wedge100s/Kconfig</span><br><span>index 5d4349d..df6c57e 100644</span><br><span>--- a/src/mainboard/ocp/wedge100s/Kconfig</span><br><span>+++ b/src/mainboard/ocp/wedge100s/Kconfig</span><br><span>@@ -16,6 +16,14 @@</span><br><span> select MAINBOARD_HAS_LPC_TPM</span><br><span> select MAINBOARD_HAS_TPM1</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+config VBOOT</span><br><span style="color: hsl(120, 100%, 40%);">+ select VBOOT_VBNV_CMOS</span><br><span style="color: hsl(120, 100%, 40%);">+ select VBOOT_NO_BOARD_SUPPORT</span><br><span style="color: hsl(120, 100%, 40%);">+ select GBB_FLAG_DISABLE_LID_SHUTDOWN</span><br><span style="color: hsl(120, 100%, 40%);">+ select GBB_FLAG_DISABLE_PD_SOFTWARE_SYNC</span><br><span style="color: hsl(120, 100%, 40%);">+ select GBB_FLAG_DISABLE_EC_SOFTWARE_SYNC</span><br><span style="color: hsl(120, 100%, 40%);">+ select GBB_FLAG_DISABLE_FWMP</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> config MAINBOARD_DIR</span><br><span> string</span><br><span> default "ocp/wedge100s"</span><br><span>@@ -30,6 +38,7 @@</span><br><span> </span><br><span> config CBFS_SIZE</span><br><span> hex</span><br><span style="color: hsl(120, 100%, 40%);">+ default 0x006fa000 if VBOOT</span><br><span> default 0x00200000</span><br><span> </span><br><span> config VIRTUAL_ROM_SIZE</span><br><span>@@ -45,6 +54,7 @@</span><br><span> </span><br><span> config FMDFILE</span><br><span> string</span><br><span style="color: hsl(120, 100%, 40%);">+ default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/vboot-ro.fmd" if VBOOT</span><br><span> default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/board.fmd"</span><br><span> </span><br><span> endif # BOARD_OCP_WEDGE100S</span><br><span>diff --git a/src/mainboard/ocp/wedge100s/cmos.layout b/src/mainboard/ocp/wedge100s/cmos.layout</span><br><span>index 3c5bc3b..3aaa56b 100644</span><br><span>--- a/src/mainboard/ocp/wedge100s/cmos.layout</span><br><span>+++ b/src/mainboard/ocp/wedge100s/cmos.layout</span><br><span>@@ -81,6 +81,7 @@</span><br><span> 408 1 e 1 nmi</span><br><span> 409 2 e 7 power_on_after_fail</span><br><span> #411 5 r 0 unused</span><br><span style="color: hsl(120, 100%, 40%);">+416 128 r 0 vbnv</span><br><span> </span><br><span> # MRC Scrambler Seed values</span><br><span> 896 32 r 0 mrc_scrambler_seed</span><br><span>diff --git a/src/mainboard/ocp/wedge100s/vboot-ro.fmd b/src/mainboard/ocp/wedge100s/vboot-ro.fmd</span><br><span>new file mode 100644</span><br><span>index 0000000..a591bae</span><br><span>--- /dev/null</span><br><span>+++ b/src/mainboard/ocp/wedge100s/vboot-ro.fmd</span><br><span>@@ -0,0 +1,22 @@</span><br><span style="color: hsl(120, 100%, 40%);">+FLASH 16M {</span><br><span style="color: hsl(120, 100%, 40%);">+ SI_ALL@0x0 0x800000 {</span><br><span style="color: hsl(120, 100%, 40%);">+ SI_DESC@0x0 0x1000</span><br><span style="color: hsl(120, 100%, 40%);">+ SI_ME@0x1000 0x7ff000</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ SI_BIOS@0x800000 0x800000 {</span><br><span style="color: hsl(120, 100%, 40%);">+ MISC_RW@0x0 0x20000 {</span><br><span style="color: hsl(120, 100%, 40%);">+ RW_MRC_CACHE@0x0 0x10000</span><br><span style="color: hsl(120, 100%, 40%);">+ RW_VPD@0x010000 0x4000</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ WP_RO@0x020000 0x7e0000 {</span><br><span style="color: hsl(120, 100%, 40%);">+ RO_VPD@0x0 0x4000</span><br><span style="color: hsl(120, 100%, 40%);">+ RO_SECTION@0x4000 0x7dc000 {</span><br><span style="color: hsl(120, 100%, 40%);">+ FMAP@0x0 0x800</span><br><span style="color: hsl(120, 100%, 40%);">+ RO_FRID@0x800 0x40</span><br><span style="color: hsl(120, 100%, 40%);">+ RO_FRID_PAD@0x840 0x7c0</span><br><span style="color: hsl(120, 100%, 40%);">+ GBB@0x1000 0xef000</span><br><span style="color: hsl(120, 100%, 40%);">+ COREBOOT(CBFS)@0xf0000 0x6ec000</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/c/coreboot/+/29593">change 29593</a>. To unsubscribe, or for help writing mail filters, 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/c/coreboot/+/29593"/><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-Change-Id: I1979e0263e41f21c01c407ac81ad1198a53741e8 </div>
<div style="display:none"> Gerrit-Change-Number: 29593 </div>
<div style="display:none"> Gerrit-PatchSet: 9 </div>
<div style="display:none"> Gerrit-Owner: Philipp Deppenwiese <zaolin.daisuki@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: David Hendricks <david.hendricks@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Patrick Rudolph <patrick.rudolph@9elements.com> </div>
<div style="display:none"> Gerrit-Reviewer: Patrick Rudolph <siro@das-labor.org> </div>
<div style="display:none"> Gerrit-Reviewer: Paul Menzel <paulepanter@users.sourceforge.net> </div>
<div style="display:none"> Gerrit-Reviewer: Philipp Deppenwiese <zaolin.daisuki@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>