summaryrefslogtreecommitdiff
path: root/src/arch/armv7
diff options
context:
space:
mode:
authorGabe Black <gabeblack@chromium.org>2013-04-10 14:32:56 -0700
committerGabe Black <gabeblack@chromium.org>2013-04-11 04:12:16 +0200
commit514f20293957666d10f1ae3f946dc6f94d635364 (patch)
tree7a0b2dbf4f6f047b4d0dcfc8d82d394ff8498d87 /src/arch/armv7
parent8d80a3fb9fe88fd5017c147786ccb51b00e935f1 (diff)
downloadcoreboot-514f20293957666d10f1ae3f946dc6f94d635364.tar.xz
ARM: Unmask aborts very early in the bootblock.
It's better to recognize aborts when they occur than to mask them to discover them later without knowing where they actually came from. Change-Id: Ic8f5321415f411afac94b5ef9dd440790df6d82c Signed-off-by: Gabe Black <gabeblack@chromium.org> Reviewed-on: http://review.coreboot.org/3065 Reviewed-by: Ronald G. Minnich <rminnich@gmail.com> Tested-by: build bot (Jenkins)
Diffstat (limited to 'src/arch/armv7')
-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
/*