From 53af3d0aedeb077853fc3f39260c022dc909c6da Mon Sep 17 00:00:00 2001
From: sanshan zhang <sanshan.zhang@nxp.com>
Date: Fri, 5 May 2017 10:00:03 +0800
Subject: [PATCH] MA-9524 [Android_MX7ULP1_EVK] Some fastboot parameters do not
work
It will failed when "fastboot getvar secure\unlocked" if we did not
enable lock&unlock.
system will return 'no' when get secure\unlocked if not enable
lock&unlock.
Change-Id: I1415e978c017931f73ea0cbba886dfa95d70b774
Signed-off-by: sanshan zhang <sanshan.zhang@nxp.com>
---
drivers/usb/gadget/f_fastboot.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/drivers/usb/gadget/f_fastboot.c b/drivers/usb/gadget/f_fastboot.c
index 0157533368..3c0cca5266 100644
--- a/drivers/usb/gadget/f_fastboot.c
+++ b/drivers/usb/gadget/f_fastboot.c
@@ -62,10 +62,9 @@
#ifdef CONFIG_FASTBOOT_LOCK
#include "fastboot_lock_unlock.h"
-#define FASTBOOT_VAR_SECURE "yes"
+#endif
#define FASTBOOT_VAR_YES "yes"
#define FASTBOOT_VAR_NO "no"
-#endif
#define ANDROID_GPT_OFFSET 0
#define ANDROID_GPT_SIZE 0x100000
@@ -3016,7 +3015,7 @@ static void cb_getvar(struct usb_ep *ep, struct usb_request *req)
}
#ifdef CONFIG_FASTBOOT_LOCK
else if (!strcmp_l1("secure", cmd)) {
- strncat(response, FASTBOOT_VAR_SECURE, chars_left);
+ strncat(response, FASTBOOT_VAR_YES, chars_left);
} else if (!strcmp_l1("unlocked",cmd)) {
int status = fastboot_get_lock_stat();
if (status == FASTBOOT_UNLOCK) {
@@ -3025,6 +3024,12 @@ static void cb_getvar(struct usb_ep *ep, struct usb_request *req)
strncat(response, FASTBOOT_VAR_NO, chars_left);
}
}
+#else
+ else if (!strcmp_l1("secure", cmd)) {
+ strncat(response, FASTBOOT_VAR_NO, chars_left);
+ } else if (!strcmp_l1("unlocked",cmd)) {
+ strncat(response, FASTBOOT_VAR_NO, chars_left);
+ }
#endif
else if (is_slotvar(cmd)) {
#ifdef CONFIG_AVB_SUPPORT
--
GitLab