summaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorSiva Durga Prasad Paladugu <siva.durga.paladugu@xilinx.com>2015-04-16 10:38:34 +0200
committerMarek Vasut <marex@denx.de>2015-09-07 13:41:03 +0200
commit41d237de6acbd5d3a8fac106dbea2d00f044c4f9 (patch)
tree804e229102b9c80776dadb0709d91452ebd559e8 /drivers/usb
parent1bf73bdeae43f253f432489f6fe71e3bfa763706 (diff)
downloadtalos-obmc-uboot-41d237de6acbd5d3a8fac106dbea2d00f044c4f9.tar.gz
talos-obmc-uboot-41d237de6acbd5d3a8fac106dbea2d00f044c4f9.zip
f_thor: Dont perform reset at the end of thor
Dont perform reset at the end of thor download if configured to do reset off. Reset may not be required in all cases and hence provided an option to do so. The case would be to download the images to DDR instead of flash device. Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/gadget/f_thor.c7
-rw-r--r--drivers/usb/gadget/f_thor.h3
2 files changed, 10 insertions, 0 deletions
diff --git a/drivers/usb/gadget/f_thor.c b/drivers/usb/gadget/f_thor.c
index 6346370cd6..2596b2ee4a 100644
--- a/drivers/usb/gadget/f_thor.c
+++ b/drivers/usb/gadget/f_thor.c
@@ -123,6 +123,9 @@ static int process_rqt_cmd(const struct rqt_box *rqt)
send_rsp(rsp);
g_dnl_unregister();
dfu_free_entities();
+#ifdef CONFIG_THOR_RESET_OFF
+ return RESET_DONE;
+#endif
run_command("reset", 0);
break;
case RQT_CMD_POWEROFF:
@@ -728,6 +731,10 @@ int thor_handle(void)
if (ret > 0) {
ret = process_data();
+#ifdef CONFIG_THOR_RESET_OFF
+ if (ret == RESET_DONE)
+ break;
+#endif
if (ret < 0)
return ret;
} else {
diff --git a/drivers/usb/gadget/f_thor.h b/drivers/usb/gadget/f_thor.h
index 833a9d24ae..83412851dd 100644
--- a/drivers/usb/gadget/f_thor.h
+++ b/drivers/usb/gadget/f_thor.h
@@ -121,4 +121,7 @@ struct f_thor {
#define F_NAME_BUF_SIZE 32
#define THOR_PACKET_SIZE SZ_1M /* 1 MiB */
#define THOR_STORE_UNIT_SIZE SZ_32M /* 32 MiB */
+#ifdef CONFIG_THOR_RESET_OFF
+#define RESET_DONE 0xFFFFFFFF
+#endif
#endif /* _USB_THOR_H_ */
OpenPOWER on IntegriCloud