qiurui
/
rv1126-uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lib: avb: independent on optee client 

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I1bab69baf97b5174024db25278cf30efafd3e34e
This commit is contained in:
Joseph Chen 2020-11-09 16:27:24 +08:00
parent 80b8cdeb0b
commit ae205b953a
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/avb/libavb_user/avb_ops_user.c
View File

@ -252,8 +252,13 @@ static AvbIOResult read_rollback_index(AvbOps *ops,
} }
return ret; return ret;
#else
*out_rollback_index = 0;
return AVB_IO_RESULT_OK;
#endif #endif
} }
return AVB_IO_RESULT_ERROR_IO; return AVB_IO_RESULT_ERROR_IO;
} }
@ -304,6 +309,10 @@ static AvbIOResult read_is_device_unlocked(AvbOps *ops, bool *out_is_unlocked)
printf("%s: trusty_read_lock_state failed\n", __FILE__); printf("%s: trusty_read_lock_state failed\n", __FILE__);
} }
return ret; return ret;
#else
*out_is_unlocked = 1;
return AVB_IO_RESULT_OK;
#endif #endif
} }
return AVB_IO_RESULT_ERROR_IO; return AVB_IO_RESULT_ERROR_IO;

7
lib/avb/rk_avb_user/rk_avb_ops_user.c
View File

@ -370,13 +370,10 @@ out:
int rk_avb_read_bootloader_locked_flag(uint8_t *flag) int rk_avb_read_bootloader_locked_flag(uint8_t *flag)
{ {
#ifdef CONFIG_OPTEE_CLIENT #ifdef CONFIG_OPTEE_CLIENT
if (trusty_read_vbootkey_enable_flag(flag)) { if (trusty_read_vbootkey_enable_flag(flag))
return -1; return -1;
}
return 0;
#else
return -1;
#endif #endif
return 0;
} }
#ifdef CONFIG_SUPPORT_EMMC_RPMB #ifdef CONFIG_SUPPORT_EMMC_RPMB