summaryrefslogtreecommitdiff
path: root/src/arch
diff options
context:
space:
mode:
Diffstat (limited to 'src/arch')
-rw-r--r--src/arch/x86/assembly_entry.S4
-rw-r--r--src/arch/x86/car.ld6
2 files changed, 9 insertions, 1 deletions
diff --git a/src/arch/x86/assembly_entry.S b/src/arch/x86/assembly_entry.S
index fb48469c55..0d8307bb1f 100644
--- a/src/arch/x86/assembly_entry.S
+++ b/src/arch/x86/assembly_entry.S
@@ -49,6 +49,10 @@ debug_spinloop:
#if CONFIG(IDT_IN_EVERY_STAGE)
call exception_init
#endif
+
+#if CONFIG(ASAN_IN_ROMSTAGE)
+ call asan_init
+#endif
call car_stage_entry
/* Expect to never return. */
diff --git a/src/arch/x86/car.ld b/src/arch/x86/car.ld
index 17b774845b..eabe87380a 100644
--- a/src/arch/x86/car.ld
+++ b/src/arch/x86/car.ld
@@ -72,8 +72,12 @@
*(.sbss.*)
. = ALIGN(ARCH_POINTER_ALIGN_SIZE);
_ebss = .;
- _car_unallocated_start = .;
+#if ENV_ROMSTAGE && CONFIG(ASAN_IN_ROMSTAGE)
+ _shadow_size = (_ebss - _car_region_start) >> 3;
+ REGION(asan_shadow, ., _shadow_size, ARCH_POINTER_ALIGN_SIZE)
+#endif
+ _car_unallocated_start = .;
_car_region_end = . + CONFIG_DCACHE_RAM_SIZE - (. - _car_region_start);
}
. = _car_region_end;