mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <sha@pengutronix.de>
To: Ahmad Fatoum <a.fatoum@pengutronix.de>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH v3 1/2] fastboot: always try barebox_update handler for bbu- partitions
Date: Fri, 10 Jun 2022 10:35:23 +0200	[thread overview]
Message-ID: <20220610083523.GJ1615@pengutronix.de> (raw)
In-Reply-To: <20220609130936.3616309-1-a.fatoum@pengutronix.de>

On Thu, Jun 09, 2022 at 03:09:35PM +0200, Ahmad Fatoum wrote:
> So far, fastboot barebox_update code was only entered when
> filetype_is_barebox_image() returned true, a function exclusively used
> for fastboot. Align this with normal barebox_update from the command
> line by leaving the decision on whether the image is correctly to the
> barebox_update handler if the user explicitly targets a bbu- fastboot
> partition.
> 
> We keep the old check OR-ed to maintain backwards-compatibility for
> invoking barebox_update for non bbu- fastboot partitions.
> 
> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
> ---
> v2 -> v3:
>   - no changes
> v1 -> v2:
>   - new patch (Sascha)
> ---
>  common/fastboot.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)

Applied (this patch), thanks

Sascha

> 
> diff --git a/common/fastboot.c b/common/fastboot.c
> index f8ed40c86e00..330a06f5a32f 100644
> --- a/common/fastboot.c
> +++ b/common/fastboot.c
> @@ -673,7 +673,8 @@ static void cb_flash(struct fastboot *fb, const char *cmd)
>  		goto out;
>  	}
>  
> -	if (IS_ENABLED(CONFIG_BAREBOX_UPDATE) && filetype_is_barebox_image(filetype)) {
> +	if (IS_ENABLED(CONFIG_BAREBOX_UPDATE) &&
> +	    (filetype_is_barebox_image(filetype) || strstarts(fentry->name, "bbu-"))) {
>  		void *buf;
>  		struct bbu_handler *handler;
>  		struct bbu_data data = {
> -- 
> 2.30.2
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
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:[~2022-06-10  8:36 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-06-09 13:09 Ahmad Fatoum
2022-06-09 13:09 ` [PATCH v3 2/2] fastboot: bail if update handler couldn't be found for bbu-partition Ahmad Fatoum
2022-06-09 13:11   ` [PATCH] fixup! " Ahmad Fatoum
2022-06-09 14:10   ` [PATCH v3 2/2] " Sascha Hauer
2022-06-09 14:12     ` Ahmad Fatoum
2022-06-10  6:36       ` Michael Olbrich
2022-06-10  6:57         ` Sascha Hauer
2022-06-10  8:35 ` 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=20220610083523.GJ1615@pengutronix.de \
    --to=sha@pengutronix.de \
    --cc=a.fatoum@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    --subject='Re: [PATCH v3 1/2] fastboot: always try barebox_update handler for bbu- partitions' \
    /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

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