From: Sascha Hauer <sha@pengutronix.de>
To: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
Cc: barebox@lists.infradead.org, "Jürgen Borleis" <jbe@pengutronix.de>
Subject: Re: [PATCH] ARM: i.MX: Make sure *_get_boot_source always assignes *src
Date: Tue, 14 Jun 2022 10:50:21 +0200 [thread overview]
Message-ID: <20220614085021.GS1615@pengutronix.de> (raw)
In-Reply-To: <20220610165057.86722-1-u.kleine-koenig@pengutronix.de>
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@pengutronix.de>
> ---
> 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@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
prev parent reply other threads:[~2022-06-14 9:10 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-10 16:50 Uwe Kleine-König
2022-06-10 17:34 ` Ahmad Fatoum
2022-06-10 20:41 ` Uwe Kleine-König
2022-06-14 8:50 ` 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=20220614085021.GS1615@pengutronix.de \
--to=sha@pengutronix.de \
--cc=barebox@lists.infradead.org \
--cc=jbe@pengutronix.de \
--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