<p>Philipp Deppenwiese has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/25084">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mainboard/opencellular/rotundu: Fix TPM and VBoot 2 support<br><br>Change-Id: I49d97a9d324207e45520d43b814b03a20005122a<br>Signed-off-by: zaolin <zaolin@das-labor.org><br>---<br>M src/mainboard/opencellular/rotundu/Kconfig<br>M src/mainboard/opencellular/rotundu/mainboard.c<br>A src/mainboard/opencellular/rotundu/vboot-16M.fmd<br>A src/mainboard/opencellular/rotundu/vboot-8M.fmd<br>4 files changed, 81 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/84/25084/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/mainboard/opencellular/rotundu/Kconfig b/src/mainboard/opencellular/rotundu/Kconfig</span><br><span>index 761a21d..79b67fb 100644</span><br><span>--- a/src/mainboard/opencellular/rotundu/Kconfig</span><br><span>+++ b/src/mainboard/opencellular/rotundu/Kconfig</span><br><span>@@ -28,10 +28,16 @@</span><br><span> select USE_BLOBS</span><br><span> select HAVE_FSP_BIN if FSP_PACKAGE_DEFAULT</span><br><span> select MAINBOARD_HAS_LPC_TPM</span><br><span style="color: hsl(0, 100%, 40%);">- select TPM1</span><br><span style="color: hsl(120, 100%, 40%);">+ select MAINBOARD_HAS_TPM1</span><br><span> </span><br><span> if BOARD_OPENCELLULAR_BASEBOARD_ROTUNDU</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+config VBOOT</span><br><span style="color: hsl(120, 100%, 40%);">+ select MRC_CACHE_FMAP</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%);">+</span><br><span> config VARIANT_DIR</span><br><span> string</span><br><span> default "rotundu" if BOARD_OPENCELLULAR_ROTUNDU</span><br><span>@@ -67,6 +73,12 @@</span><br><span> hex</span><br><span> default 0xfffb0000</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+config FMDFILE</span><br><span style="color: hsl(120, 100%, 40%);">+ string</span><br><span style="color: hsl(120, 100%, 40%);">+ depends on VBOOT</span><br><span style="color: hsl(120, 100%, 40%);">+ default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/vboot-8M.fmd" if BOARD_ROMSIZE_KB_8192</span><br><span style="color: hsl(120, 100%, 40%);">+ default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/vboot-16M.fmd"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> # FIXME: Slow boot performance when increasing CBFS_SIZE beyond 8MB?</span><br><span> config CBFS_SIZE</span><br><span> hex</span><br><span>diff --git a/src/mainboard/opencellular/rotundu/mainboard.c b/src/mainboard/opencellular/rotundu/mainboard.c</span><br><span>index dbcfe2d..cabef0d 100644</span><br><span>--- a/src/mainboard/opencellular/rotundu/mainboard.c</span><br><span>+++ b/src/mainboard/opencellular/rotundu/mainboard.c</span><br><span>@@ -18,7 +18,6 @@</span><br><span> </span><br><span> #include <device/device.h></span><br><span> #include <arch/acpi.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <security/tpm/tspi.h></span><br><span> </span><br><span> /*</span><br><span> * mainboard_enable is executed as first thing after enumerate_buses().</span><br><span>@@ -26,12 +25,6 @@</span><br><span> */</span><br><span> static void mainboard_enable(device_t dev)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- if ((IS_ENABLED(CONFIG_TPM1) || IS_ENABLED(CONFIG_TPM2)) &&</span><br><span style="color: hsl(0, 100%, 40%);">- !IS_ENABLED(CONFIG_VBOOT)) {</span><br><span style="color: hsl(0, 100%, 40%);">- int s3resume = acpi_is_wakeup_s3();</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- tpm_setup(s3resume);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span> }</span><br><span> </span><br><span> /*</span><br><span>diff --git a/src/mainboard/opencellular/rotundu/vboot-16M.fmd b/src/mainboard/opencellular/rotundu/vboot-16M.fmd</span><br><span>new file mode 100644</span><br><span>index 0000000..778d537</span><br><span>--- /dev/null</span><br><span>+++ b/src/mainboard/opencellular/rotundu/vboot-16M.fmd</span><br><span>@@ -0,0 +1,37 @@</span><br><span style="color: hsl(120, 100%, 40%);">+FLASH 16M {</span><br><span style="color: hsl(120, 100%, 40%);">+ SI_ALL@0x0 0x300000 {</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 0x2ff000</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ SI_BIOS@0x300000 0xd00000 {</span><br><span style="color: hsl(120, 100%, 40%);">+ RW_SECTION_A@0x0 0x410040 {</span><br><span style="color: hsl(120, 100%, 40%);">+ VBLOCK_A@0x0 0x10000</span><br><span style="color: hsl(120, 100%, 40%);">+ FW_MAIN_A(CBFS)@0x10000 0x400000</span><br><span style="color: hsl(120, 100%, 40%);">+ RW_FWID_A@0x410000 0x40</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ RW_SECTION_B@0x410040 0x410040 {</span><br><span style="color: hsl(120, 100%, 40%);">+ VBLOCK_B@0x0 0x10000</span><br><span style="color: hsl(120, 100%, 40%);">+ FW_MAIN_B(CBFS)@0x10000 0x400000</span><br><span style="color: hsl(120, 100%, 40%);">+ RW_FWID_B@0x410000 0x40</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ RW_MRC_CACHE@0x820080 0x10000</span><br><span style="color: hsl(120, 100%, 40%);">+ RW_ELOG@0x830080 0x4000</span><br><span style="color: hsl(120, 100%, 40%);">+ RW_SHARED@0x834080 0x4000 {</span><br><span style="color: hsl(120, 100%, 40%);">+ SHARED_DATA@0x0 0x2000</span><br><span style="color: hsl(120, 100%, 40%);">+ VBLOCK_DEV@0x2000 0x2000</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ RW_VPD@0x838080 0x2000</span><br><span style="color: hsl(120, 100%, 40%);">+ UNUSED_HOLE@0x83A080 0x2C5F80</span><br><span style="color: hsl(120, 100%, 40%);">+ WP_RO@0xB00000 0x500000 {</span><br><span style="color: hsl(120, 100%, 40%);">+ RO_VPD@0x0 0x4000</span><br><span style="color: hsl(120, 100%, 40%);">+ RO_UNUSED@0x4000 0xc000</span><br><span style="color: hsl(120, 100%, 40%);">+ RO_SECTION@0x10000 0x2f0000 {</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 0x400000</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>diff --git a/src/mainboard/opencellular/rotundu/vboot-8M.fmd b/src/mainboard/opencellular/rotundu/vboot-8M.fmd</span><br><span>new file mode 100644</span><br><span>index 0000000..ea0c86a</span><br><span>--- /dev/null</span><br><span>+++ b/src/mainboard/opencellular/rotundu/vboot-8M.fmd</span><br><span>@@ -0,0 +1,31 @@</span><br><span style="color: hsl(120, 100%, 40%);">+FLASH 8M {</span><br><span style="color: hsl(120, 100%, 40%);">+ SI_ALL@0x0 0x300000 {</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 0x2ff000</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ SI_BIOS@0x300000 0x500000 {</span><br><span style="color: hsl(120, 100%, 40%);">+ RW_SECTION_A@0x0 0x1e6000 {</span><br><span style="color: hsl(120, 100%, 40%);">+ VBLOCK_A@0x0 0x10000</span><br><span style="color: hsl(120, 100%, 40%);">+ FW_MAIN_A(CBFS)@0x10000 0x1d5fc0</span><br><span style="color: hsl(120, 100%, 40%);">+ RW_FWID_A@0x1e5fc0 0x40</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ RW_MRC_CACHE@0x1e6000 0x10000</span><br><span style="color: hsl(120, 100%, 40%);">+ RW_ELOG@0x1f6000 0x4000</span><br><span style="color: hsl(120, 100%, 40%);">+ RW_SHARED@0x1fa000 0x4000 {</span><br><span style="color: hsl(120, 100%, 40%);">+ SHARED_DATA@0x0 0x2000</span><br><span style="color: hsl(120, 100%, 40%);">+ VBLOCK_DEV@0x2000 0x2000</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ RW_VPD@0x1fe000 0x2000</span><br><span style="color: hsl(120, 100%, 40%);">+ WP_RO@0x200000 0x300000 {</span><br><span style="color: hsl(120, 100%, 40%);">+ RO_VPD@0x0 0x4000</span><br><span style="color: hsl(120, 100%, 40%);">+ RO_UNUSED@0x4000 0xc000</span><br><span style="color: hsl(120, 100%, 40%);">+ RO_SECTION@0x10000 0x2f0000 {</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 0x200000</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/25084">change 25084</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/25084"/><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: I49d97a9d324207e45520d43b814b03a20005122a </div>
<div style="display:none"> Gerrit-Change-Number: 25084 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Philipp Deppenwiese <zaolin.daisuki@gmail.com> </div>