summaryrefslogtreecommitdiff
path: root/src/soc
diff options
context:
space:
mode:
authorAaron Durbin <adurbin@chromium.org>2016-04-08 21:28:11 -0500
committerMartin Roth <martinroth@google.com>2016-04-11 16:14:46 +0200
commit01dfdc5369de3899731982a015ce708184552ac6 (patch)
tree5fe41283b1f0de1230da962d43bc0331a37abd30 /src/soc
parent711bfa97108989d8c273315ceae6b3d8351c4ac6 (diff)
cpu/x86/tsc: compile same code for all stages
The delay_tsc.c code took different paths depending __PRE_RAM__ being defined or not. Also, timer_monotonic_get() was only compiled in a !__PRE_RAM__ environment. Clean up the code paths by employing CAR_GLOBAL for the global state which allows the same code to be used in all stages. Lastly, handle apollolake fallout now that init_timer() is not needed in placeholders.c. Change-Id: Ia769fa71e2c9d8b11201a3896d117097f2cb7c56 Signed-off-by: Aaron Durbin <adurbin@chromium.org> Reviewed-on: https://review.coreboot.org/14301 Tested-by: build bot (Jenkins) Reviewed-by: Furquan Shaikh <furquan@google.com> Reviewed-by: Andrey Petrov <andrey.petrov@intel.com>
Diffstat (limited to 'src/soc')
-rw-r--r--src/soc/intel/apollolake/placeholders.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/soc/intel/apollolake/placeholders.c b/src/soc/intel/apollolake/placeholders.c
index 808bd5490b..9e58c11dd0 100644
--- a/src/soc/intel/apollolake/placeholders.c
+++ b/src/soc/intel/apollolake/placeholders.c
@@ -6,9 +6,3 @@
void southbridge_smi_set_eos(void)
{
}
-
-#if ENV_BOOTBLOCK
-void init_timer(void)
-{
-}
-#endif