commit 2287e642e48e4392ce178f030225154aadd9cc66
author Fuchsia firmware team <fuchsia-firmware@google.com> Mon May 08 18:26:41 2023 +0000
committer Austin Schreiber <acschreiber@google.com> Tue Jan 23 16:47:20 2024 +0000
tree d23249cc9f4bfd975aa50c3e57407608f41a207c
parent fa592dc41635cc5b1d4643d57aff74b40dd30c5c

[astro] 12.20230611.1.67 u-boot source

GitOrigin-RevId: 105c236598b656325ae4b6a2e747f8ddc1a59d72
Change-Id: I621380f533977501a2f01bd00f066fe97d35e975
Reviewed-on: https://turquoise-internal-review.googlesource.com/c/third_party/u-boot/+/788110
Reviewed-by: David Pursell <dpursell@google.com>

drivers/usb/gadget/f_fastboot.c

diff --git a/drivers/usb/gadget/f_fastboot.c b/drivers/usb/gadget/f_fastboot.c
index dc1b0ee..4640df3 100644
--- a/drivers/usb/gadget/f_fastboot.c
+++ b/drivers/usb/gadget/f_fastboot.c
@@ -739,8 +739,8 @@
 static const char *get_bootloader_min_versions(const char *arg)
 {
 	snprintf(getvar_response_buffer, GETVAR_RESPONSE_BUFFER_LEN, "%d",
-		 antirollback_get_mvn_fip());
-	append_bl_version(antirollback_get_mvn_bl2());
+		 antirollback_get_mvn_bl2());
+	append_bl_version(antirollback_get_mvn_fip());
 	append_bl_version(antirollback_get_mvn_bl30());
 	append_bl_version(antirollback_get_mvn_bl31());
 	append_bl_version(antirollback_get_mvn_bl32());
@@ -1132,6 +1132,9 @@
 
 static void do_bootm_on_complete(struct usb_ep *ep, struct usb_request *req)
 {
+	// Performs a full USB reset to remove the fastboot interface descriptor.
+	run_command("usb reset", 0);
+
 	puts("RAM-booting kernel..\n");
 	run_command("run ramboot", 0);
 
@@ -1214,6 +1217,9 @@
 
 static void do_exit_on_complete(struct usb_ep *ep, struct usb_request *req)
 {
+	// Performs a full USB reset to remove the fastboot interface descriptor.
+	run_command("usb reset", 0);
+
 	puts("Booting kernel..\n");
 	run_command("run storeboot", 0);