From: Lucas Stach <l.stach@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH 1/5] usb: gadget: fastboot: allow to build without BOOTM
Date: Tue, 9 Dec 2014 12:05:42 +0100 [thread overview]
Message-ID: <1418123146-13235-1-git-send-email-l.stach@pengutronix.de> (raw)
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
next reply other threads:[~2014-12-09 11:06 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-09 11:05 Lucas Stach [this message]
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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1418123146-13235-1-git-send-email-l.stach@pengutronix.de \
--to=l.stach@pengutronix.de \
--cc=barebox@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox