diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2013-12-23 11:57:36 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2013-12-23 11:57:36 -0800 |
| commit | 3eed9032d989c31e9c50cb744b22391cdf4db498 (patch) | |
| tree | 2ac290085786a9213c028c056160f7807d6881bc | |
| parent | 3b8a50bfc67e6ac381ddbc02a022197992d141c7 (diff) | |
| parent | ac9bbb26df178a096b49316968f1d2e4a10e2971 (diff) | |
| download | android_hardware_qcom_keymaster-3eed9032d989c31e9c50cb744b22391cdf4db498.tar.gz android_hardware_qcom_keymaster-3eed9032d989c31e9c50cb744b22391cdf4db498.tar.bz2 android_hardware_qcom_keymaster-3eed9032d989c31e9c50cb744b22391cdf4db498.zip | |
Merge "keymaster: Add support for loading keymaste image"
| -rw-r--r-- | keymaster_qcom.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/keymaster_qcom.cpp b/keymaster_qcom.cpp index 3eb9da3..ebbcb97 100644 --- a/keymaster_qcom.cpp +++ b/keymaster_qcom.cpp @@ -762,6 +762,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; |