summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarshall Dawson <marshalldawson3rd@gmail.com>2017-08-16 15:49:50 -0600
committerAaron Durbin <adurbin@chromium.org>2017-08-17 17:51:51 +0000
commitd0269a636dedbb5ea219f20b5dfa1bebb60720eb (patch)
tree90ff1a03746a82471b2261ead521e3e822e47b64
parente6aab7f1208123b2e0e3afb633572ca094358091 (diff)
downloadcoreboot-d0269a636dedbb5ea219f20b5dfa1bebb60720eb.tar.xz
soc/intel/apollolake: Fix CONFIG_FSP_CAR build error
Remove cpu.h from the cache-as-ram setup and teardown files that rely on the FSP implementation. The struct device statement causes a build failure and there appears to be nothing needed from cpu.h in the two .S files. TEST: Build Google Reef with FSP_CAR selected on Chipset menu and add FSP binaries on the Generic Drivers menu. Change-Id: I560b730c18d7ec73b65f2e195b790e7dcacfd6bb Signed-off-by: Marshall Dawson <marshalldawson3rd@gmail.com> Reviewed-on: https://review.coreboot.org/21057 Reviewed-by: Aaron Durbin <adurbin@chromium.org> Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
-rw-r--r--src/soc/intel/apollolake/bootblock/cache_as_ram_fsp.S1
-rw-r--r--src/soc/intel/apollolake/exit_car_fsp.S1
2 files changed, 0 insertions, 2 deletions
diff --git a/src/soc/intel/apollolake/bootblock/cache_as_ram_fsp.S b/src/soc/intel/apollolake/bootblock/cache_as_ram_fsp.S
index f55582a706..4c4fa71b50 100644
--- a/src/soc/intel/apollolake/bootblock/cache_as_ram_fsp.S
+++ b/src/soc/intel/apollolake/bootblock/cache_as_ram_fsp.S
@@ -19,7 +19,6 @@
#include <cpu/x86/cache.h>
#include <cpu/x86/cr.h>
#include <cpu/x86/post_code.h>
-#include <soc/cpu.h>
#include <../../../arch/x86/walkcbfs.S>
diff --git a/src/soc/intel/apollolake/exit_car_fsp.S b/src/soc/intel/apollolake/exit_car_fsp.S
index 32c276c5eb..92289a0145 100644
--- a/src/soc/intel/apollolake/exit_car_fsp.S
+++ b/src/soc/intel/apollolake/exit_car_fsp.S
@@ -16,7 +16,6 @@
#include <cpu/x86/mtrr.h>
#include <cpu/x86/cr.h>
-#include <soc/cpu.h>
/*
* This path for CAR teardown is taken when CONFIG_FSP_CAR is employed.