summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMona Hossain <mhossain@codeaurora.org>2013-12-19 20:06:52 -0800
committerMona Hossain <mhossain@codeaurora.org>2013-12-19 20:07:20 -0800
commitac9bbb26df178a096b49316968f1d2e4a10e2971 (patch)
tree77221b640f153f465aa498380bc50817547911cd
parent76d338e2bca8201632ae1e789bd650b1126855e7 (diff)
downloadandroid_hardware_qcom_keymaster-ac9bbb26df178a096b49316968f1d2e4a10e2971.tar.gz
android_hardware_qcom_keymaster-ac9bbb26df178a096b49316968f1d2e4a10e2971.tar.bz2
android_hardware_qcom_keymaster-ac9bbb26df178a096b49316968f1d2e4a10e2971.zip
keymaster: Add support for loading keymaste image
If keymaster image is not found in vendor/* look for keymaste image file in firmware/image. Change-Id: I8c5df5c585e23c2387a6f4eb94d968532b397eed
-rw-r--r--keymaster_qcom.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/keymaster_qcom.cpp b/keymaster_qcom.cpp
index 490e909..a8a96a1 100644
--- a/keymaster_qcom.cpp
+++ b/keymaster_qcom.cpp
@@ -763,6 +763,10 @@ static int qcom_km_open(const hw_module_t* module, const char* name,
ret = (*km_handle->QSEECom_start_app)((struct QSEECom_handle **)&km_handle->qseecom,
"/vendor/firmware/keymaster", "keymaster", 4096*2);
if (ret) {
+ ret = (*km_handle->QSEECom_start_app)((struct QSEECom_handle **)&km_handle->qseecom,
+ "/firmware/image", "keymaste", 4096*2);
+ }
+ if (ret) {
ALOGE("Loading keymaster app failied");
free(km_handle);
dev->context = NULL;