mail archive of the barebox mailing list
 help / color / mirror / Atom feed
* [PATCH 1/5] usb: gadget: fastboot: allow to build without BOOTM
@ 2014-12-09 11:05 Lucas Stach
  2014-12-09 11:05 ` [PATCH 2/5] video: imx-hdmi: search for DDC node only when EDID support is enabled Lucas Stach
                   ` (4 more replies)
  0 siblings, 5 replies; 10+ messages in thread
From: Lucas Stach @ 2014-12-09 11:05 UTC (permalink / raw)
  To: barebox

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>
---
 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


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2014-12-17 10:03 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-12-09 11:05 [PATCH 1/5] usb: gadget: fastboot: allow to build without BOOTM Lucas Stach
2014-12-09 11:05 ` [PATCH 2/5] video: imx-hdmi: search for DDC node only when EDID support is enabled Lucas Stach
2014-12-09 11:05 ` [PATCH 3/5] imd: provide dummy imd_command_setenv Lucas Stach
2014-12-10  9:05   ` Lucas Stach
2014-12-09 11:05 ` [PATCH 4/5] fdt: don't strip const qualifier Lucas Stach
2014-12-11  7:37   ` Sascha Hauer
2014-12-09 11:05 ` [PATCH 5/5] Revert "ARM: i.MX: Make NAND related Kconfig options depend on MTD" Lucas Stach
2014-12-11  7:36 ` [PATCH 1/5] usb: gadget: fastboot: allow to build without BOOTM Sascha Hauer
2014-12-15 11:35   ` Lucas Stach
2014-12-17 10:03     ` Sascha Hauer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox