From: Roland Hieber <r.hieber@pengutronix.de>
To: Ahmad Fatoum <a.fatoum@pengutronix.de>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH master 2/2] ARM: omap: fix cpu_is_omap on CONFIG_ARM_MULTIARCH configurations
Date: Tue, 20 May 2025 14:29:32 +0200 [thread overview]
Message-ID: <1747744156-e08557b230f005e12053606c@pty> (raw)
In-Reply-To: <20250520121738.42686-2-a.fatoum@pengutronix.de>
On Tue, May 20, 2025 at 02:17:38PM +0200, Ahmad Fatoum wrote:
> Normally, <mach/omap/generic.h> would only be included if we are running
> on some OMAP SoC. This doesn't hold true anymore with CONFIG_ARM_MULTIARCH
> or CONFIG_BOARD_ARM_GENERIC_DT, because we could have CONFIG_ARCH_AM33XX
> enabled, but running on some other SoC, which the header doesn't know about.
>
> This cpu_type scheme is only used on one other SoC and that's the i.MX
> and there, there is a final #ifdef clause to fix this, so follow suit.
>
> Reported-by: Roland Hieber <r.hieber@pengutronix.de>
> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Thanks!
Tested-by: Roland Hieber <rhi@pengutronix.de>
> ---
> include/mach/omap/generic.h | 9 +++++++++
> 1 file changed, 9 insertions(+)
>
> diff --git a/include/mach/omap/generic.h b/include/mach/omap/generic.h
> index 2961c530bc93..9802087bf295 100644
> --- a/include/mach/omap/generic.h
> +++ b/include/mach/omap/generic.h
> @@ -56,6 +56,15 @@ extern unsigned int __omap_cpu_type;
> # define cpu_is_am33xx() (0)
> #endif
>
> +#if defined(CONFIG_ARCH_MULTIARCH) || defined(CONFIG_BOARD_ARM_GENERIC_DT)
> +# ifdef omap_cpu_type
> +# undef omap_cpu_type
> +# define omap_cpu_type __omap_cpu_type
> +# else
> +# define omap_cpu_type 0
> +# endif
> +#endif
> +
> #ifdef omap_cpu_type
> #define cpu_is_omap() (omap_cpu_type > 0)
> #else
> --
> 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:30 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-20 12:17 [PATCH master 1/2] ARM: i.MX: fix cpu_is_imx " 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 [this message]
2025-05-20 12:28 ` [PATCH master 1/2] ARM: i.MX: fix cpu_is_imx " Roland Hieber
2025-05-21 7:35 ` 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=1747744156-e08557b230f005e12053606c@pty \
--to=r.hieber@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