commit d0ddf80cedc51eae83efa2bec76c09b071ce0fca
author danh-arm <dan.handley@arm.com> Mon Jun 13 11:27:31 2016 +0100
committer GitHub <noreply@github.com> Mon Jun 13 11:27:31 2016 +0100
tree 60b0373932b86dacc8690a813f329366b622cd7e
parent eae9d912503844e8ab8ac5851a638edd7fa7ac33
parent 29464f13f6f940abf7fb6218df05e38b0bb3f80f

Merge pull request #648 from ashutoshksingh/integration

opteed: assume aarch64 for optee

services/spd/opteed/opteed_main.c

diff --git a/services/spd/opteed/opteed_main.c b/services/spd/opteed/opteed_main.c
index 6b4b14a..9770fb9 100644
--- a/services/spd/opteed/opteed_main.c
+++ b/services/spd/opteed/opteed_main.c
@@ -148,7 +148,7 @@
 	 * state i.e whether AArch32 or AArch64. Assuming it's AArch32
 	 * for the time being.
 	 */
-	opteed_rw = OPTEE_AARCH32;
+	opteed_rw = OPTEE_AARCH64;
 	opteed_init_optee_ep_state(optee_ep_info,
 				opteed_rw,
 				optee_ep_info->pc,