summaryrefslogtreecommitdiff
path: root/src/arch/x86
diff options
context:
space:
mode:
Diffstat (limited to 'src/arch/x86')
-rw-r--r--src/arch/x86/Kconfig14
-rw-r--r--src/arch/x86/assembly_entry.S11
2 files changed, 25 insertions, 0 deletions
diff --git a/src/arch/x86/Kconfig b/src/arch/x86/Kconfig
index 8609e20136..1fea99ac3b 100644
--- a/src/arch/x86/Kconfig
+++ b/src/arch/x86/Kconfig
@@ -179,3 +179,17 @@ config VERSTAGE_ADDR
# from a program loaded in ram and subsequently loading ramstage.
config POSTCAR_STAGE
def_bool n
+
+config VERSTAGE_DEBUG_SPINLOOP
+ bool
+ default n
+ help
+ Add a spin (JMP .) in assembly_entry.S during early verstage to wait
+ for a JTAG debugger to break into the execution sequence.
+
+config ROMSTAGE_DEBUG_SPINLOOP
+ bool
+ default n
+ help
+ Add a spin (JMP .) in assembly_entry.S during early romstage to wait
+ for a JTAG debugger to break into the execution sequence.
diff --git a/src/arch/x86/assembly_entry.S b/src/arch/x86/assembly_entry.S
index 86dbba4668..d1f5d61ce7 100644
--- a/src/arch/x86/assembly_entry.S
+++ b/src/arch/x86/assembly_entry.S
@@ -52,6 +52,17 @@ _start:
sub %edi, %ecx
rep stosl
+#if ((ENV_VERSTAGE && IS_ENABLED(CONFIG_VERSTAGE_DEBUG_SPINLOOP)) \
+ || (ENV_ROMSTAGE && IS_ENABLED(CONFIG_ROMSTAGE_DEBUG_SPINLOOP)))
+
+ /* Wait for a JTAG debugger to break in and set EBX non-zero */
+ xor %ebx, %ebx
+
+debug_spinloop:
+ cmp $0, %ebx
+ jz debug_spinloop
+#endif
+
jmp car_stage_entry
/* This is here for linking purposes. */