<p>Furquan Shaikh has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/25340">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mb/google/octopus: Select TPM options only if mocktpm is not selected<br><br>This change adds a new Kconfig option for mainboard octopus "HAS_TPM"<br>that auto-selects all TPM related options only if VBOOT_MOCK_SECDATA<br>is not selected.<br><br>BUG=b:76203913<br>TEST=Compiles fine with mocktpm.<br><br>Change-Id: Ib28fc47a70be58cd9a9ec65ce3b1cda68d558437<br>Signed-off-by: Furquan Shaikh <furquan@google.com><br>---<br>M src/mainboard/google/octopus/Kconfig<br>1 file changed, 9 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/40/25340/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/mainboard/google/octopus/Kconfig b/src/mainboard/google/octopus/Kconfig</span><br><span>index 0e58215..60c98c0 100644</span><br><span>--- a/src/mainboard/google/octopus/Kconfig</span><br><span>+++ b/src/mainboard/google/octopus/Kconfig</span><br><span>@@ -10,14 +10,11 @@</span><br><span>       select EC_GOOGLE_CHROMEEC</span><br><span>    select EC_GOOGLE_CHROMEEC_BOARDID</span><br><span>    select EC_GOOGLE_CHROMEEC_LPC</span><br><span style="color: hsl(120, 100%, 40%);">+ select HAS_TPM if !VBOOT_MOCK_SECDATA</span><br><span>        select HAVE_ACPI_RESUME</span><br><span>      select HAVE_ACPI_TABLES</span><br><span>      select MAINBOARD_HAS_CHROMEOS</span><br><span style="color: hsl(0, 100%, 40%);">-   select MAINBOARD_HAS_TPM2</span><br><span style="color: hsl(0, 100%, 40%);">-       select MAINBOARD_HAS_SPI_TPM_CR50</span><br><span>    select SOC_ESPI</span><br><span style="color: hsl(0, 100%, 40%);">- select SPI_TPM</span><br><span style="color: hsl(0, 100%, 40%);">-  select TPM2</span><br><span> </span><br><span> if BOARD_GOOGLE_BASEBOARD_OCTOPUS</span><br><span> </span><br><span>@@ -63,6 +60,14 @@</span><br><span>        default "BIP TEST 5732" if BOARD_GOOGLE_BIP</span><br><span>        default "OCTOPUS TEST 6859" if BOARD_GOOGLE_OCTOPUS</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+config HAS_TPM</span><br><span style="color: hsl(120, 100%, 40%);">+     bool</span><br><span style="color: hsl(120, 100%, 40%);">+  default n</span><br><span style="color: hsl(120, 100%, 40%);">+     select MAINBOARD_HAS_SPI_TPM_CR50</span><br><span style="color: hsl(120, 100%, 40%);">+     select MAINBOARD_HAS_TPM2</span><br><span style="color: hsl(120, 100%, 40%);">+     select SPI_TPM</span><br><span style="color: hsl(120, 100%, 40%);">+        select TPM2</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> config MAX_CPUS</span><br><span>     int</span><br><span>  default 4</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/25340">change 25340</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/25340"/><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: Ib28fc47a70be58cd9a9ec65ce3b1cda68d558437 </div>
<div style="display:none"> Gerrit-Change-Number: 25340 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Furquan Shaikh <furquan@google.com> </div>