Marshall Dawson has uploaded this change for review. ( https://review.coreboot.org/21057
Change subject: soc/intel/apollolake: Fix CONFIG_FSP_CAR build error ......................................................................
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 --- M src/soc/intel/apollolake/bootblock/cache_as_ram_fsp.S M src/soc/intel/apollolake/exit_car_fsp.S 2 files changed, 0 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/57/21057/1
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 f55582a..4c4fa71 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 32c276c..92289a0 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.