Merge branch '2020-06-15-misc-bugfixes'

[oweals/u-boot.git] / cmd / fastboot.c

diff --git a/cmd/fastboot.c b/cmd/fastboot.c
index 0be83b78ac130fda28873596fcee64274913f516..ad5c06491183a4ac30a5b4bc4a49bca8384651ec 100644 (file)
--- a/cmd/fastboot.c
+++ b/cmd/fastboot.c
@@ -13,6 +13,8 @@
 #include <fastboot.h>
 #include <net.h>
 #include <usb.h>
+#include <watchdog.h>
+#include <linux/stringify.h>
 
 static int do_fastboot_udp(int argc, char *const argv[],
                           uintptr_t buf_addr, size_t buf_size)
@@ -74,6 +76,7 @@ static int do_fastboot_usb(int argc, char *const argv[],
                        break;
                if (ctrlc())
                        break;
+               WATCHDOG_RESET();
                usb_gadget_handle_interrupts(controller_index);
        }
 
@@ -91,7 +94,8 @@ exit:
 #endif
 }
 
-static int do_fastboot(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
+static int do_fastboot(struct cmd_tbl *cmdtp, int flag, int argc,
+                      char *const argv[])
 {
        uintptr_t buf_addr = (uintptr_t)NULL;
        size_t buf_size = 0;