[PATCH 1/5] usb: gadget: fastboot: allow to build without BOOTM

Lucas Stach l.stach at pengutronix.de
Tue Dec 9 03:05:42 PST 2014


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 at pengutronix.de>
---
 drivers/usb/gadget/f_fastboot.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/usb/gadget/f_fastboot.c b/drivers/usb/gadget/f_fastboot.c
index 92a1a218c643..76879db1f15d 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,
-- 
2.1.3




More information about the barebox mailing list