<p>Arthur Heymans has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/27141">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">soc/intel/skylake: Improve Kconfig<br><br>Kabylake always uses FSP2.0 so this should not be an option for<br>mainboards.<br><br>SKIP_FSP_CAR is only meaningful for FSP1.1.<br>FSP_CAR is only meaningful for FSP2.0.<br><br>Change-Id: I3868b7688322cc7c0099058fc64106468aa82c32<br>Signed-off-by: Arthur Heymans <arthur@aheymans.xyz><br>---<br>M src/mainboard/google/eve/Kconfig<br>M src/mainboard/google/fizz/Kconfig<br>M src/mainboard/google/poppy/Kconfig<br>M src/soc/intel/skylake/Kconfig<br>4 files changed, 6 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/41/27141/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/mainboard/google/eve/Kconfig b/src/mainboard/google/eve/Kconfig</span><br><span>index 9205651..0c740da 100644</span><br><span>--- a/src/mainboard/google/eve/Kconfig</span><br><span>+++ b/src/mainboard/google/eve/Kconfig</span><br><span>@@ -18,7 +18,6 @@</span><br><span> select MAINBOARD_HAS_CHROMEOS</span><br><span> select MAINBOARD_HAS_I2C_TPM_CR50</span><br><span> select MAINBOARD_HAS_TPM2</span><br><span style="color: hsl(0, 100%, 40%);">- select MAINBOARD_USES_FSP2_0</span><br><span> select SOC_INTEL_KABYLAKE</span><br><span> </span><br><span> config VBOOT</span><br><span>diff --git a/src/mainboard/google/fizz/Kconfig b/src/mainboard/google/fizz/Kconfig</span><br><span>index 7b3ba45..a26aa30 100644</span><br><span>--- a/src/mainboard/google/fizz/Kconfig</span><br><span>+++ b/src/mainboard/google/fizz/Kconfig</span><br><span>@@ -13,7 +13,6 @@</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_USES_FSP2_0</span><br><span> select NO_FADT_8042</span><br><span> select SOC_INTEL_KABYLAKE</span><br><span> select MAINBOARD_HAS_SPI_TPM_CR50</span><br><span>diff --git a/src/mainboard/google/poppy/Kconfig b/src/mainboard/google/poppy/Kconfig</span><br><span>index 2d9c187..66d2212 100644</span><br><span>--- a/src/mainboard/google/poppy/Kconfig</span><br><span>+++ b/src/mainboard/google/poppy/Kconfig</span><br><span>@@ -11,7 +11,6 @@</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_USES_FSP2_0</span><br><span> select SOC_INTEL_KABYLAKE</span><br><span> select MAINBOARD_HAS_TPM2</span><br><span> </span><br><span>diff --git a/src/soc/intel/skylake/Kconfig b/src/soc/intel/skylake/Kconfig</span><br><span>index 3e0158b..7f84023 100644</span><br><span>--- a/src/soc/intel/skylake/Kconfig</span><br><span>+++ b/src/soc/intel/skylake/Kconfig</span><br><span>@@ -78,6 +78,7 @@</span><br><span> config MAINBOARD_USES_FSP2_0</span><br><span> bool</span><br><span> default n</span><br><span style="color: hsl(120, 100%, 40%);">+ default y if SOC_INTEL_KABYLAKE</span><br><span> </span><br><span> config USE_FSP2_0_DRIVER</span><br><span> def_bool y</span><br><span>@@ -269,6 +270,8 @@</span><br><span> help</span><br><span> Include DSP firmware settings for DA7219 headset codec.</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+if USE_FSP2_0_DRIVER</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> choice</span><br><span> prompt "Cache-as-ram implementation"</span><br><span> default USE_SKYLAKE_CAR_NEM_ENHANCED</span><br><span>@@ -295,9 +298,12 @@</span><br><span> </span><br><span> endchoice</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+endif</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> config SKIP_FSP_CAR</span><br><span> bool "Skip cache as RAM setup in FSP"</span><br><span> default y</span><br><span style="color: hsl(120, 100%, 40%);">+ depends on USE_FSP1_1_DRIVER</span><br><span> help</span><br><span> Skip Cache as RAM setup in FSP.</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/27141">change 27141</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/27141"/><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: I3868b7688322cc7c0099058fc64106468aa82c32 </div>
<div style="display:none"> Gerrit-Change-Number: 27141 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Arthur Heymans <arthur@aheymans.xyz> </div>