From: Roland Hieber <rhi@pengutronix.de>
To: Ahmad Fatoum <a.fatoum@pengutronix.de>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH master 1/2] ARM: i.MX: fix cpu_is_imx on CONFIG_ARM_MULTIARCH configurations
Date: Tue, 20 May 2025 14:28:28 +0200 [thread overview]
Message-ID: <1747744095-cab02f12977b1707d35cb4e5@pty> (raw)
In-Reply-To: <20250520121738.42686-1-a.fatoum@pengutronix.de>
On Tue, May 20, 2025 at 02:17:37PM +0200, Ahmad Fatoum wrote:
> CONFIG_BOARD_ARM_GENERIC_DT is not the only way an i.MX initcall could
> run on a non-i.MX SoC. Since the addition of the multiarch (really
> multiplatform) support, this can also happen with native images.
>
> Therefore check for both config options.
>
> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Tested-by: Roland Hieber <rhi@pengutronix.de>
> ---
> include/mach/imx/generic.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/include/mach/imx/generic.h b/include/mach/imx/generic.h
> index 04086a2ea88d..a0f65391686b 100644
> --- a/include/mach/imx/generic.h
> +++ b/include/mach/imx/generic.h
> @@ -293,7 +293,7 @@ static __always_inline void imx_set_cpu_type(unsigned int cpu_type)
> # define cpu_is_vf610() (0)
> #endif
>
> -#ifdef CONFIG_BOARD_ARM_GENERIC_DT
> +#if defined(CONFIG_ARCH_MULTIARCH) || defined(CONFIG_BOARD_ARM_GENERIC_DT)
> # ifdef imx_cpu_type
> # undef imx_cpu_type
> # define imx_cpu_type __imx_cpu_type
> --
> 2.39.5
>
>
>
--
Roland Hieber, Pengutronix e.K. | rhi@pengutronix.de |
Steuerwalder Str. 21 | https://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
next prev parent reply other threads:[~2025-05-20 12:29 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-20 12:17 Ahmad Fatoum
2025-05-20 12:17 ` [PATCH master 2/2] ARM: omap: fix cpu_is_omap " Ahmad Fatoum
2025-05-20 12:29 ` Roland Hieber
2025-05-20 12:28 ` Roland Hieber [this message]
2025-05-21 7:35 ` [PATCH master 1/2] ARM: i.MX: fix cpu_is_imx " Sascha Hauer
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=1747744095-cab02f12977b1707d35cb4e5@pty \
--to=rhi@pengutronix.de \
--cc=a.fatoum@pengutronix.de \
--cc=barebox@lists.infradead.org \
/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