diff options
| author | Greg Bellows <greg.bellows@linaro.org> | 2014-12-03 14:50:21 -0600 |
|---|---|---|
| committer | Greg Bellows <greg.bellows@linaro.org> | 2014-12-03 14:50:21 -0600 |
| commit | 1eef639d65e8ab9f44089866d6880d982701b771 (patch) | |
| tree | 69d0f2a5f16559c97ea90a56110c3ec8b2a1e61b | |
| parent | 3ed3ede2a3efd86789982286993282f29bb3a030 (diff) | |
Make security extension check non-debugtest
This commit removes the DEBUG conditional from the security extension check so
that the test fails regardless of DEBUG build.
Signed-off-by: Greg Bellows <greg.bellows@linaro.org>
| -rw-r--r-- | arm/secure_init.S | 2 | ||||
| -rw-r--r-- | arm/secure_svc.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/arm/secure_init.S b/arm/secure_init.S index c09499b..c77838f 100644 --- a/arm/secure_init.S +++ b/arm/secure_init.S @@ -135,12 +135,10 @@ secure_remap_vecs: orr r10, r10, #0x2000 @ SCTLR.V = 1 mcr p15, 0, r10, c1, c0, 0 -#ifdef DEBUG /* Check that are entry state makes sense before initializing the monitor * mode. */ bl secure_check_init -#endif secure_init_monitor: /* Call monitor mode initialization and pass to it the non-secure execution diff --git a/arm/secure_svc.c b/arm/secure_svc.c index c8a723e..3ba4471 100644 --- a/arm/secure_svc.c +++ b/arm/secure_svc.c @@ -94,7 +94,7 @@ void secure_check_init() printf("FAILED\n"); DEBUG_MSG("current IDPFR1 (%d) != expected IDPFR1 (%d)\n", (idpfr1 & 0xf0), 0x10); - assert(0x10 == (idpfr1 & 0xf0)); + exit(1); } else { printf("PASSED\n"); } |