<p>Marshall Dawson has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/21057">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">soc/intel/apollolake: Fix CONFIG_FSP_CAR build error<br><br>Remove cpu.h from the cache-as-ram setup and teardown files that rely<br>on the FSP implementation.  The struct device statement causes a<br>build failure and there appears to be nothing needed from cpu.h in<br>the two .S files.<br><br>TEST: Build Google Reef with FSP_CAR selected on Chipset menu and add<br>      FSP binaries on the Generic Drivers menu.<br><br>Change-Id: I560b730c18d7ec73b65f2e195b790e7dcacfd6bb<br>Signed-off-by: Marshall Dawson <marshalldawson3rd@gmail.com><br>---<br>M src/soc/intel/apollolake/bootblock/cache_as_ram_fsp.S<br>M src/soc/intel/apollolake/exit_car_fsp.S<br>2 files changed, 0 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/57/21057/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/src/soc/intel/apollolake/bootblock/cache_as_ram_fsp.S b/src/soc/intel/apollolake/bootblock/cache_as_ram_fsp.S<br>index f55582a..4c4fa71 100644<br>--- a/src/soc/intel/apollolake/bootblock/cache_as_ram_fsp.S<br>+++ b/src/soc/intel/apollolake/bootblock/cache_as_ram_fsp.S<br>@@ -19,7 +19,6 @@<br> #include <cpu/x86/cache.h><br> #include <cpu/x86/cr.h><br> #include <cpu/x86/post_code.h><br>-#include <soc/cpu.h><br> <br> #include <../../../arch/x86/walkcbfs.S><br> <br>diff --git a/src/soc/intel/apollolake/exit_car_fsp.S b/src/soc/intel/apollolake/exit_car_fsp.S<br>index 32c276c..92289a0 100644<br>--- a/src/soc/intel/apollolake/exit_car_fsp.S<br>+++ b/src/soc/intel/apollolake/exit_car_fsp.S<br>@@ -16,7 +16,6 @@<br> <br> #include <cpu/x86/mtrr.h><br> #include <cpu/x86/cr.h><br>-#include <soc/cpu.h><br> <br> /*<br>  * This path for CAR teardown is taken when CONFIG_FSP_CAR is employed.<br></pre><p>To view, visit <a href="https://review.coreboot.org/21057">change 21057</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/21057"/><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: I560b730c18d7ec73b65f2e195b790e7dcacfd6bb </div>
<div style="display:none"> Gerrit-Change-Number: 21057 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Marshall Dawson <marshalldawson3rd@gmail.com> </div>