diff options
| author | Lucas Stach <l.stach@pengutronix.de> | 2014-12-09 12:05:42 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-12-17 11:02:42 +0100 |
| commit | 8f0493d43197f534c3bc6b6fd9f040680b32c88b (patch) | |
| tree | 7b2e6db5426a14ef3ff85822d827d95c6a107bed | |
| parent | 631be8e6cbe003f469a7e6b54046a743b710d989 (diff) | |
| download | barebox-8f0493d43197f534c3bc6b6fd9f040680b32c88b.tar.gz barebox-8f0493d43197f534c3bc6b6fd9f040680b32c88b.tar.xz | |
usb: gadget: fastboot: allow to build without BOOTM
This will disable the capability to boot an uploaded image directly,
but keeps other fastboot functionality. This seems like a valid config.
Fixes:
In function `do_bootm_on_complete': undefined reference to `bootm_boot'
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | drivers/usb/gadget/f_fastboot.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/usb/gadget/f_fastboot.c b/drivers/usb/gadget/f_fastboot.c index 92a1a218c6..76879db1f1 100644 --- a/drivers/usb/gadget/f_fastboot.c +++ b/drivers/usb/gadget/f_fastboot.c @@ -653,7 +653,8 @@ static void do_bootm_on_complete(struct usb_ep *ep, struct usb_request *req) pr_err("Booting failed\n"); } -static void cb_boot(struct usb_ep *ep, struct usb_request *req, const char *opt) +static void __maybe_unused cb_boot(struct usb_ep *ep, struct usb_request *req, + const char *opt) { struct f_fastboot *f_fb = req->context; @@ -857,9 +858,11 @@ static const struct cmd_dispatch_info cmd_dispatch_info[] = { }, { .cmd = "download:", .cb = cb_download, +#if defined(CONFIG_BOOTM) }, { .cmd = "boot", .cb = cb_boot, +#endif }, { .cmd = "flash:", .cb = cb_flash, |