summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/arch/x86/Kconfig7
-rw-r--r--src/arch/x86/bootblock_crt0.S9
2 files changed, 16 insertions, 0 deletions
diff --git a/src/arch/x86/Kconfig b/src/arch/x86/Kconfig
index 724c4dba61..8609e20136 100644
--- a/src/arch/x86/Kconfig
+++ b/src/arch/x86/Kconfig
@@ -117,6 +117,13 @@ config PC80_SYSTEM
bool
default y if ARCH_X86
+config BOOTBLOCK_DEBUG_SPINLOOP
+ bool
+ default n
+ help
+ Add a spin (JMP .) in bootblock_crt0.S during early bootblock to wait
+ for a JTAG debugger to break into the execution sequence.
+
config BOOTBLOCK_MAINBOARD_INIT
string
diff --git a/src/arch/x86/bootblock_crt0.S b/src/arch/x86/bootblock_crt0.S
index 9fbce5dbb5..8ae82b4368 100644
--- a/src/arch/x86/bootblock_crt0.S
+++ b/src/arch/x86/bootblock_crt0.S
@@ -32,6 +32,15 @@
#include <cpu/x86/16bit/reset16.inc>
#include <cpu/x86/32bit/entry32.inc>
+#if IS_ENABLED(CONFIG_BOOTBLOCK_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
bootblock_protected_mode_entry:
/* Save BIST result */