diff options
| author | Haoran.Wang <elven.wang@nxp.com> | 2018-09-25 18:47:15 +0800 |
|---|---|---|
| committer | Ye Li <ye.li@nxp.com> | 2018-09-29 00:35:23 -0700 |
| commit | a8bb0fa49e6d55ae8e38387a62b0d85710a7d2ae (patch) | |
| tree | 9ce774bba3138903bc1dd41cf3ae48680bacf43c | |
| parent | bbc39e56bbce703f40d676587ca59129766370eb (diff) | |
MA-12886 Set keymaster HAL to trusty when use Trusty OS
When use Trusty OS, set the property keymaster HAL to
use the Trusty OS backed one.
This patch make the bootloader able to control the Android
Keymaster HAL.
Change-Id: I0a533c12b99824ef499ce642cf87c22d72b51503
Signed-off-by: Haoran.Wang <elven.wang@nxp.com>
(cherry picked from commit a0759c1bd75fab610f595fd9cd6b7c494ba5177e)
| -rw-r--r-- | common/image-android.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/common/image-android.c b/common/image-android.c index 90fd3ca7f3..35a91fbf2d 100644 --- a/common/image-android.c +++ b/common/image-android.c @@ -194,6 +194,12 @@ int android_image_get_kernel(const struct andr_img_hdr *hdr, int verify, } #endif +#ifdef CONFIG_IMX_TRUSTY_OS + char *bootargs_trusty = "androidboot.keystore=trusty"; + strncat(commandline, " ", sizeof(commandline) - strlen(commandline)); + strncat(commandline, bootargs_trusty, sizeof(commandline) - strlen(commandline)); +#endif + /* Add 'append_bootargs' to hold some paramemters which need to be appended * to bootargs */ char *append_bootargs = env_get("append_bootargs"); |