commit 92cad5fa4bb4f7662574350df91196bb8017a820
author Antonio Nino Diaz <antonio.ninodiaz@arm.com> Thu Oct 19 16:55:48 2017 +0100
committer Antonio Nino Diaz <antonio.ninodiaz@arm.com> Wed Nov 08 18:05:14 2017 +0000
tree 12ab5f570d95869fd4cecdf3775d1db5ded84fb4
parent f9a6db0f4804834930c4d4facfade0d850491eab

spd: Use `ENABLE_ASSERTIONS` instead of `DEBUG`

A line in the upstream SPDs is only compiled in in `DEBUG` builds. This
line is used to help with assertions and so assertion failures can
happen in release builds with assertions enabled. Use
`ENABLE_ASSERTIONS` instead of `DEBUG`.

This bug was introduced in commit aa61368eb5, which introduced the build
option `ENABLE_ASSERTIONS`.

Change-Id: I7977df9c89c68677b00099b2a1926fa3cb0937c6
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>

services/spd/opteed/opteed_common.c

diff --git a/services/spd/opteed/opteed_common.c b/services/spd/opteed/opteed_common.c
index 2693e7d..e5e2be7 100644
--- a/services/spd/opteed/opteed_common.c
+++ b/services/spd/opteed/opteed_common.c
@@ -78,7 +78,7 @@
 	cm_set_next_eret_context(SECURE);
 
 	rc = opteed_enter_sp(&optee_ctx->c_rt_ctx);
-#if DEBUG
+#if ENABLE_ASSERTIONS
 	optee_ctx->c_rt_ctx = 0;
 #endif