hc
2023-11-06 9df731a176aab8e03b984b681b1bea01ccff6644
u-boot/lib/avb/rk_avb_user/rk_avb_ops_user.c
....@@ -158,6 +158,7 @@
158158 int rk_avb_read_lock_state(uint8_t *lock_state)
159159 {
160160 #ifdef CONFIG_OPTEE_CLIENT
161
+ uint8_t vboot_flag = 0;
161162 int ret;
162163
163164 ret = trusty_read_lock_state(lock_state);
....@@ -167,7 +168,16 @@
167168 case TEE_ERROR_GENERIC:
168169 case TEE_ERROR_NO_DATA:
169170 case TEE_ERROR_ITEM_NOT_FOUND:
170
- *lock_state = 1;
171
+ if (trusty_read_vbootkey_enable_flag(&vboot_flag)) {
172
+ printf("Can't read vboot flag\n");
173
+ return -1;
174
+ }
175
+
176
+ if (vboot_flag)
177
+ *lock_state = 0;
178
+ else
179
+ *lock_state = 1;
180
+
171181 if (rk_avb_write_lock_state(*lock_state)) {
172182 printf("avb_write_lock_state error!");
173183 ret = -1;