| Message ID | 1424801402-9645-1-git-send-email-alexey_firago@mentor.com |
|---|---|
| State | Accepted |
| Delegated to: | Łukasz Majewski |
| Headers | show |
On Tue, Feb 24, 2015 at 12:10 PM, Alexey Firago <alexey_firago@mentor.com> wrote: > The "fastboot reboot-bootloader" command is defined to > re-enter into fastboot mode after rebooting into > bootloader. This command is usually used after updating > bootloader via fastboot. > > This commit implements only a generic side of the > command - setting of the reset flag and then resetting. > Setting of the reset flag is implemented using __weak > fb_set_reboot_flag() function. The actual setting and > checking of the reset flag should be implemented by > a boot script and/or board/SoC specific code. > > Signed-off-by: Alexey Firago <alexey_firago@mentor.com> Acked-by: Rob Herring <robh@kernel.org> > --- > > Changes in v2: > - return error in default fb_set_reboot_flag() > > drivers/usb/gadget/f_fastboot.c | 13 +++++++++++++ > 1 file changed, 13 insertions(+) > > diff --git a/drivers/usb/gadget/f_fastboot.c b/drivers/usb/gadget/f_fastboot.c > index 310175a..37f6a65 100644 > --- a/drivers/usb/gadget/f_fastboot.c > +++ b/drivers/usb/gadget/f_fastboot.c > @@ -122,6 +122,7 @@ static struct usb_gadget_strings *fastboot_strings[] = { > }; > > static void rx_handler_command(struct usb_ep *ep, struct usb_request *req); > +static int strcmp_l1(const char *s1, const char *s2); > > static void fastboot_complete(struct usb_ep *ep, struct usb_request *req) > { > @@ -317,8 +318,20 @@ static void compl_do_reset(struct usb_ep *ep, struct usb_request *req) > do_reset(NULL, 0, 0, NULL); > } > > +int __weak fb_set_reboot_flag(void) > +{ > + return -1; > +} > + > static void cb_reboot(struct usb_ep *ep, struct usb_request *req) > { > + char *cmd = req->buf; > + if (!strcmp_l1("reboot-bootloader", cmd)) { > + if (fb_set_reboot_flag()) { > + fastboot_tx_write_str("FAILCannot set reboot flag"); > + return; > + } > + } > fastboot_func->in_req->complete = compl_do_reset; > fastboot_tx_write_str("OKAY"); > } > -- > 1.9.1 > > _______________________________________________ > U-Boot mailing list > U-Boot@lists.denx.de > http://lists.denx.de/mailman/listinfo/u-boot
diff --git a/drivers/usb/gadget/f_fastboot.c b/drivers/usb/gadget/f_fastboot.c index 310175a..37f6a65 100644 --- a/drivers/usb/gadget/f_fastboot.c +++ b/drivers/usb/gadget/f_fastboot.c @@ -122,6 +122,7 @@ static struct usb_gadget_strings *fastboot_strings[] = { }; static void rx_handler_command(struct usb_ep *ep, struct usb_request *req); +static int strcmp_l1(const char *s1, const char *s2); static void fastboot_complete(struct usb_ep *ep, struct usb_request *req) { @@ -317,8 +318,20 @@ static void compl_do_reset(struct usb_ep *ep, struct usb_request *req) do_reset(NULL, 0, 0, NULL); } +int __weak fb_set_reboot_flag(void) +{ + return -1; +} + static void cb_reboot(struct usb_ep *ep, struct usb_request *req) { + char *cmd = req->buf; + if (!strcmp_l1("reboot-bootloader", cmd)) { + if (fb_set_reboot_flag()) { + fastboot_tx_write_str("FAILCannot set reboot flag"); + return; + } + } fastboot_func->in_req->complete = compl_do_reset; fastboot_tx_write_str("OKAY"); }
The "fastboot reboot-bootloader" command is defined to re-enter into fastboot mode after rebooting into bootloader. This command is usually used after updating bootloader via fastboot. This commit implements only a generic side of the command - setting of the reset flag and then resetting. Setting of the reset flag is implemented using __weak fb_set_reboot_flag() function. The actual setting and checking of the reset flag should be implemented by a boot script and/or board/SoC specific code. Signed-off-by: Alexey Firago <alexey_firago@mentor.com> --- Changes in v2: - return error in default fb_set_reboot_flag() drivers/usb/gadget/f_fastboot.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)