mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: barebox@lists.infradead.org
Cc: Ahmad Fatoum <a.fatoum@pengutronix.de>
Subject: [PATCH] fixup! fastboot/dfu: use system partitions as fall back
Date: Fri, 30 Apr 2021 19:57:02 +0200	[thread overview]
Message-ID: <20210430175702.30410-1-a.fatoum@pengutronix.de> (raw)
In-Reply-To: <20210430132949.14617-12-a.fatoum@pengutronix.de>

For configuration where DFU is disabled, opts->dfu_opts.files would
contain the system partitions and multi-gadget auto start would
fail. Ignore dfu == true when support is not compiled in.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 common/usbgadget.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/usbgadget.c b/common/usbgadget.c
index bdbb4d794889..489b3b801630 100644
--- a/common/usbgadget.c
+++ b/common/usbgadget.c
@@ -53,7 +53,7 @@ int usbgadget_register(bool dfu, const char *dfu_opts,
 	opts = xzalloc(sizeof(*opts));
 	opts->release = usb_multi_opts_release;
 
-	if (dfu)
+	if (IS_ENABLED(CONFIG_USB_GADGET_DFU) && dfu)
 		opts->dfu_opts.files = dfu_opts ? parse(dfu_opts)
 			: get_dfu_function();
 
-- 
2.29.2


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


  reply	other threads:[~2021-04-30 17:58 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-30 13:29 [PATCH v2 00/15] USB: gadget: refactor to allow easier extension Ahmad Fatoum
2021-04-30 13:29 ` [PATCH v2 01/15] show_progress: add system wide progress stage notifier Ahmad Fatoum
2021-04-30 13:29 ` [PATCH v2 02/15] common: console: add log_writefile to write log into new file Ahmad Fatoum
2021-04-30 13:29 ` [PATCH v2 03/15] string: implement strstarts along with strends Ahmad Fatoum
2021-04-30 13:29 ` [PATCH v2 04/15] vsprintf: introduce %m shorthand for "%s", strerror(errno) Ahmad Fatoum
2021-04-30 13:29 ` [PATCH v2 05/15] param: introduce file-list parameter type Ahmad Fatoum
2021-04-30 13:29 ` [PATCH v2 06/15] common: add generic system partitions interface Ahmad Fatoum
2021-04-30 13:39   ` [PATCH] fixup! " Ahmad Fatoum
2021-04-30 13:29 ` [PATCH v2 07/15] fastboot: handle ill-named partitions gracefully Ahmad Fatoum
2021-04-30 13:29 ` [PATCH v2 08/15] usb: gadget: dfu: change status message to info log level Ahmad Fatoum
2021-04-30 13:29 ` [PATCH v2 09/15] usbgadget: autostart: fix indeterminism around usbgadget.autostart Ahmad Fatoum
2021-04-30 13:29 ` [PATCH v2 10/15] usbgadget: allow DFU and Fastboot functions to coexist Ahmad Fatoum
2021-04-30 13:29 ` [PATCH v2 11/15] fastboot/dfu: use system partitions as fall back Ahmad Fatoum
2021-04-30 17:57   ` Ahmad Fatoum [this message]
2021-04-30 13:29 ` [PATCH v2 12/15] bbu: add function to directly add handlers into file_list Ahmad Fatoum
2021-04-30 13:29 ` [PATCH v2 13/15] file_list: add file_list_detect_all() Ahmad Fatoum
2021-04-30 13:29 ` [PATCH v2 14/15] common: make FILE_LIST feature unconditional Ahmad Fatoum
2021-04-30 13:29 ` [PATCH v2 15/15] fs: error out when writing on read-only file system Ahmad Fatoum
2021-05-03 11:48 [PATCH 12/16] fastboot/dfu: use system partitions as fall back Ahmad Fatoum
2021-05-03 12:30 ` [PATCH] fixup! " Ahmad Fatoum

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=20210430175702.30410-1-a.fatoum@pengutronix.de \
    --to=a.fatoum@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