On Fri, Jun 10, 2022 at 06:50:57PM +0200, Uwe Kleine-König wrote:
> Callers of *_get_boot_source (e.g. start_atf() of
> nxp-imx8mm-evk or protonic-imx8m) expect src to hold the bootsource
> after return. So assign a value also for the "unknown" case.
>
> Fixes: ea55770308c0 ("ARM: i.MX: Add i.MX7 base architecture support")
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
> ---
> arch/arm/mach-imx/boot.c | 7 +++++++
> 1 file changed, 7 insertions(+)
Applied, thanks
Sascha
>
> diff --git a/arch/arm/mach-imx/boot.c b/arch/arm/mach-imx/boot.c
> index 63afdf1ef4ed..1b0bccb7fed8 100644
> --- a/arch/arm/mach-imx/boot.c
> +++ b/arch/arm/mach-imx/boot.c
> @@ -285,6 +285,8 @@ void imx53_get_boot_source(enum bootsource *src, int *instance)
> default:
> if (imx53_bootsource_nand(cfg1))
> *src = BOOTSOURCE_NAND;
> + else
> + *src = BOOTSOURCE_UNKNOWN;
> break;
> }
>
> @@ -464,6 +466,8 @@ void imx6_get_boot_source(enum bootsource *src, int *instance)
> default:
> if (imx53_bootsource_nand(bootmode))
> *src = BOOTSOURCE_NAND;
> + else
> + *src = BOOTSOURCE_UNKNOWN;
> break;
> }
> }
> @@ -526,6 +530,7 @@ static void __imx7_get_boot_source(enum bootsource *src, int *instance,
> *src = BOOTSOURCE_SERIAL;
> break;
> default:
> + *src = BOOTSOURCE_UNKNOWN;
> break;
> }
> }
> @@ -629,6 +634,8 @@ void vf610_get_boot_source(enum bootsource *src, int *instance)
> default:
> if (imx53_bootsource_nand(sbmr1))
> *src = BOOTSOURCE_NAND;
> + else
> + *src = BOOTSOURCE_UNKNOWN;
> break;
> }
> }
>
> base-commit: 345ef59aa0ea1a931629187449f63876501752cd
> --
> 2.36.1
>
>
> _______________________________________________
> barebox mailing list
> barebox@xxxxxxxxxxxxxxxxxxx
> 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@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
