fastboot: fastboot upgrade fail [1/1]
PD#SWPL-185493
Problem:
set unlock_ability, the device cannot be unlocked
Solution:
delete unlock_ability judgment
Verify:
ohm
Change-Id: I85f24d4277fc62e0ec518fc05f03458c9e641c6b
Signed-off-by: hao.qi <hao.qi@amlogic.com>
diff --git a/drivers/fastboot/fb_command.c b/drivers/fastboot/fb_command.c
index a52ad0c3..c2db22f 100644
--- a/drivers/fastboot/fb_command.c
+++ b/drivers/fastboot/fb_command.c
@@ -1388,32 +1388,26 @@
} else if (!strcmp_l1("lock_bootloader", cmd)) {
info.lock_bootloader = 1;
} else if (!strcmp_l1("unlock", cmd)) {
- if (info.unlock_ability == 1) {
#if defined(CONFIG_AML_ANTIROLLBACK) || defined(CONFIG_AML_AVB2_ANTIROLLBACK)
- u32 rpmb_lock_state = 0;
- bool ret = get_avb_lock_state(&rpmb_lock_state);
+ u32 rpmb_lock_state = 0;
+ bool ret = get_avb_lock_state(&rpmb_lock_state);
- if (info.lock_state == 1 || (ret && rpmb_lock_state == 1)) {
+ if (info.lock_state == 1 || (ret && rpmb_lock_state == 1)) {
#else
- if (info.lock_state == 1) {
+ if (info.lock_state == 1) {
#endif
- char *avb_s;
+ char *avb_s;
- run_command("get_avb_mode;", 0);
- avb_s = env_get("avb2");
- printf("avb2: %s\n", avb_s);
- if (strcmp(avb_s, "1") == 0) {
- try_unlock_dev(rc);
- }
- }
- info.lock_state = 0;
- info.lock_critical_state = 0;
- env_set("lock_state", "green");
- fastboot_okay(NULL, response);
- } else {
- printf("unlock_ability is 0, can not unlock, please set it in android setting\n");
- fastboot_response("FAIL", response, "%s", "unlock_ability is 0, can not unlock");
+ run_command("get_avb_mode;", 0);
+ avb_s = env_get("avb2");
+ printf("avb2: %s\n", avb_s);
+ if (strcmp(avb_s, "1") == 0)
+ try_unlock_dev(rc);
}
+ info.lock_state = 0;
+ info.lock_critical_state = 0;
+ env_set("lock_state", "green");
+ fastboot_okay(NULL, response);
} else if (!strcmp_l1("lock", cmd)) {
#if defined(CONFIG_AML_ANTIROLLBACK) || defined(CONFIG_AML_AVB2_ANTIROLLBACK)
u32 rpmb_lock_state = 0;