summaryrefslogtreecommitdiff
path: root/src/cpu/intel/car
diff options
context:
space:
mode:
authorArthur Heymans <arthur@aheymans.xyz>2018-06-05 11:19:22 +0200
committerMartin Roth <martinroth@google.com>2019-04-21 23:31:26 +0000
commit8e646e74b3d5e1d4a5e8114f03046f3d7b6ad042 (patch)
tree1412f9f4cb0a07c145bc605b1087e96d4f62f8fc /src/cpu/intel/car
parentc4772b9fd7fcc29d09d7617dc8cff922118814d7 (diff)
cpu/intel/haswell: Use C_ENVIRONMENT_BOOTBLOCK
This puts the cache-as-ram init in the bootblock. Before setting up cache as ram the microcode updates are applied. This removes the possibility for a normal/fallback setup although implementing this should be quite easy. Tested on Google peppy (Acer C720). Setting up LPC in the bootblock to output console on SuperIOs is not done in this patch, hence BOOTBLOCK_CONSOLE is not yet enabled by default. Change-Id: Ia96499a9d478127f6b9d880883ac41397b58dbea Signed-off-by: Arthur Heymans <arthur@aheymans.xyz> Reviewed-on: https://review.coreboot.org/c/coreboot/+/26859 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Duncan Laurie <dlaurie@chromium.org>
Diffstat (limited to 'src/cpu/intel/car')
-rw-r--r--src/cpu/intel/car/non-evict/cache_as_ram.S5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/cpu/intel/car/non-evict/cache_as_ram.S b/src/cpu/intel/car/non-evict/cache_as_ram.S
index b2b915fe76..251714cb8f 100644
--- a/src/cpu/intel/car/non-evict/cache_as_ram.S
+++ b/src/cpu/intel/car/non-evict/cache_as_ram.S
@@ -33,6 +33,11 @@ _cache_as_ram_setup:
bootblock_pre_c_entry:
+#if CONFIG(C_ENVIRONMENT_BOOTBLOCK)
+ movl $cache_as_ram, %esp /* return address */
+ jmp check_mtrr /* Check if CPU properly reset */
+#endif
+
cache_as_ram:
post_code(0x20)