summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xhikey-optee4
-rwxr-xr-xhikey-optee-kernel-4.44
2 files changed, 6 insertions, 2 deletions
diff --git a/hikey-optee b/hikey-optee
index e9961e8..1b68822 100755
--- a/hikey-optee
+++ b/hikey-optee
@@ -24,7 +24,7 @@ apply --linaro device/linaro/hikey 16834/3
## Add OP TEE packages, test and TA to system image
## http://android-review.linaro.org/16803
-apply --linaro device/linaro/hikey 16803/8
+apply --linaro device/linaro/hikey 16803/9
## http://android-review.linaro.org/16789
## Add tee-supplicant to Android services
@@ -32,4 +32,4 @@ apply --linaro device/linaro/hikey 16789/2
## OPTEE: add OP TEE 2.0 ARM trusted firmware
## http://android-review.linaro.org/16883
-apply --linaro device/linaro/hikey 16883/3
+apply --linaro device/linaro/hikey 16883/4
diff --git a/hikey-optee-kernel-4.4 b/hikey-optee-kernel-4.4
index 8f62643..717de96 100755
--- a/hikey-optee-kernel-4.4
+++ b/hikey-optee-kernel-4.4
@@ -59,3 +59,7 @@ apply --linaro --local kernel/linaro/hisilicon kernel/hikey-linaro 16801/1
## ARM64: Add OPTEE to hikey defconfig
## http://android-review.linaro.org/16802
apply --linaro --local kernel/linaro/hisilicon kernel/hikey-linaro 16802/1
+
+## optee: avoid delayed release of shm
+## http://android-review.linaro.org/17000
+apply --linaro --local kernel/linaro/hisilicon kernel/hikey-linaro 17000/1