mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH v2] usb: gadget: allow to actually enable sparse fastboot support
Date: Wed, 8 Aug 2018 09:32:16 +0200	[thread overview]
Message-ID: <20180808073216.ecu3tbbhbnnz4tl2@pengutronix.de> (raw)
In-Reply-To: <20180807142344.26219-1-u.kleine-koenig@pengutronix.de>

On Tue, Aug 07, 2018 at 04:23:44PM +0200, Uwe Kleine-König wrote:
> When sparse support was (intended to be) made optional it was
> effectively unconditionally disabled because
> 
> 	IS_ENABLED(USB_GADGET_FASTBOOT_SPARSE)
> 
> always evaluates to 0. To actually make use of the introduced kconfig
> symbol the CONFIG_ prefix must not be skipped.
> 
> Fixes: f4b5d3eeb607 ("usb: gadget: fastboot: Make sparse support optional")
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> ---
> Huh, I failed to commit the third IS_ENABLED hunk in (implicit) v1.
> 
>  drivers/usb/gadget/f_fastboot.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)

Applied, thanks

Sascha

> 
> diff --git a/drivers/usb/gadget/f_fastboot.c b/drivers/usb/gadget/f_fastboot.c
> index 7ccf22771493..40a78987e46c 100644
> --- a/drivers/usb/gadget/f_fastboot.c
> +++ b/drivers/usb/gadget/f_fastboot.c
> @@ -337,7 +337,7 @@ static int fastboot_bind(struct usb_configuration *c, struct usb_function *f)
>  	fb_setvar(var, "0.4");
>  	var = fb_addvar(f_fb, "bootloader-version");
>  	fb_setvar(var, release_string);
> -	if (IS_ENABLED(USB_GADGET_FASTBOOT_SPARSE)) {
> +	if (IS_ENABLED(CONFIG_USB_GADGET_FASTBOOT_SPARSE)) {
>  		var = fb_addvar(f_fb, "max-download-size");
>  		fb_setvar(var, "%u", fastboot_max_download_size);
>  	}
> @@ -947,7 +947,7 @@ static void cb_flash(struct f_fastboot *f_fb, const char *cmd)
>  	filename = fentry->filename;
>  
>  	if (filetype == filetype_android_sparse) {
> -		if (!IS_ENABLED(USB_GADGET_FASTBOOT_SPARSE)) {
> +		if (!IS_ENABLED(CONFIG_USB_GADGET_FASTBOOT_SPARSE)) {
>  			fastboot_tx_print(f_fb, "FAILsparse image not supported");
>  			ret = -EOPNOTSUPP;
>  			goto out;
> @@ -1233,7 +1233,7 @@ done:
>  
>  static int fastboot_globalvars_init(void)
>  {
> -	if (IS_ENABLED(USB_GADGET_FASTBOOT_SPARSE))
> +	if (IS_ENABLED(CONFIG_USB_GADGET_FASTBOOT_SPARSE))
>  		globalvar_add_simple_int("usbgadget.fastboot_max_download_size",
>  				 &fastboot_max_download_size, "%u");
>  
> -- 
> 2.18.0
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

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

      parent reply	other threads:[~2018-08-08  7:32 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-08-07 14:17 [PATCH] " Uwe Kleine-König
2018-08-07 14:23 ` [PATCH v2] " Uwe Kleine-König
2018-08-07 14:59   ` Schenk, Gavin
2018-08-08  7:32   ` Sascha Hauer [this message]

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=20180808073216.ecu3tbbhbnnz4tl2@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    --cc=u.kleine-koenig@pengutronix.de \
    /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