summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/arch/armv7/bootblock.inc5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/arch/armv7/bootblock.inc b/src/arch/armv7/bootblock.inc
index faf5475819..8db31b4508 100644
--- a/src/arch/armv7/bootblock.inc
+++ b/src/arch/armv7/bootblock.inc
@@ -53,11 +53,14 @@ _cbfs_master_header:
reset:
/*
- * set the cpu to SVC32 mode
+ * Set the cpu to SVC32 mode and unmask aborts. Aborts might happen
+ * before logging is turned on and may crash the machine, but at least
+ * the problem will show up near the code that causes it.
*/
mrs r0, cpsr
bic r0, r0, #0x1f
orr r0, r0, #0xd3
+ bic r0, r0, #0x100
msr cpsr_cxsf,r0
/*