[PATCH v3 1/2] fastboot: always try barebox_update handler for bbu- partitions

Sascha Hauer sha at pengutronix.de
Fri Jun 10 01:35:23 PDT 2022


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



More information about the barebox mailing list