projects
/
platform
/
kernel
/
linux-amlogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9b26ee0
)
Revert "tee: open tee loading under optee"
author
Pengfei He
<pengfei.he@amlogic.com>
Tue, 31 Oct 2017 13:25:22 +0000
(21:25 +0800)
committer
Jianxin Pan
<jianxin.pan@amlogic.com>
Tue, 31 Oct 2017 14:03:47 +0000
(07:03 -0700)
This reverts commit
190a64cb3af9beb2ee5eac79d01da59483c32473
.
Change-Id: I712f5a1abf4e63197bc5c7ed320c888901dca7c8
Signed-off-by: Pengfei He <pengfei.he@amlogic.com>
drivers/amlogic/tee/tee.c
patch
|
blob
|
history
diff --git
a/drivers/amlogic/tee/tee.c
b/drivers/amlogic/tee/tee.c
index
eb846d2
..
49ee586
100644
(file)
--- a/
drivers/amlogic/tee/tee.c
+++ b/
drivers/amlogic/tee/tee.c
@@
-146,6
+146,7
@@
bool tee_enabled(void)
{
struct arm_smccc_res res;
+ return false; /*disable tee load temporary*/
arm_smccc_smc(TEE_SMC_CALLS_UID, 0, 0, 0, 0, 0, 0, 0, &res);
if (res.a0 == TEE_MSG_UID_0 && res.a1 == TEE_MSG_UID_1 &&