Vladimir Serbinenko has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/81506?usp=email )
Change subject: Disable NULL breakpoint at the end of bootblock ......................................................................
Disable NULL breakpoint at the end of bootblock
If stage is older then it will not be able to correctly disable it when needed. New stages will reenable breakpoint early
Change-Id: I6d83dfd8c84ccdd97c1899f206519ada91c990d5 Signed-off-by: Vladimir Serbinenko phcoder@gmail.com --- M src/lib/prog_loaders.c 1 file changed, 9 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/06/81506/1
diff --git a/src/lib/prog_loaders.c b/src/lib/prog_loaders.c index b2abbff..ee74c40 100644 --- a/src/lib/prog_loaders.c +++ b/src/lib/prog_loaders.c @@ -14,6 +14,9 @@ #include <stage_cache.h> #include <symbols.h> #include <timestamp.h> +#if CONFIG(DEBUG_NULL_DEREF_BREAKPOINTS_IN_ALL_STAGES) +#include <arch/null_breakpoint.h> +#endif
void run_romstage(void) { @@ -39,6 +42,12 @@ goto fail; }
+#if CONFIG(DEBUG_NULL_DEREF_BREAKPOINTS_IN_ALL_STAGES) + /* When going from bootblock disable null breakpoint as romstage + might not have this enabled or be too old. */ + null_breakpoint_disable(); +#endif + timestamp_add_now(TS_COPYROM_END);
console_time_report();