From: Sascha Hauer <s.hauer@pengutronix.de>
To: Barebox List <barebox@lists.infradead.org>
Subject: [PATCH 8/8] ARM: i.MX: When generic DT image is enabled do not hardcode SoC
Date: Mon, 19 Aug 2019 15:38:47 +0200 [thread overview]
Message-ID: <20190819133847.17015-9-s.hauer@pengutronix.de> (raw)
In-Reply-To: <20190819133847.17015-1-s.hauer@pengutronix.de>
When only a single i.MX SoC is selected the cpu_is_mx?() macros expand
to static 0 or 1. With the generic DT image enabled it could be though
that the SoC is not a i.MX at all, so make sure that with the generic
DT image enabled the cpu_is_mx?() macros always compare against
__imx_cpu_type
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
arch/arm/mach-imx/include/mach/generic.h | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/arch/arm/mach-imx/include/mach/generic.h b/arch/arm/mach-imx/include/mach/generic.h
index ac066e3f17..5102c34e4c 100644
--- a/arch/arm/mach-imx/include/mach/generic.h
+++ b/arch/arm/mach-imx/include/mach/generic.h
@@ -223,6 +223,15 @@ extern unsigned int __imx_cpu_type;
# define cpu_is_vf610() (0)
#endif
+#ifdef CONFIG_BOARD_ARM_GENERIC_DT
+# ifdef imx_cpu_type
+# undef imx_cpu_type
+# define imx_cpu_type __imx_cpu_type
+# else
+# define imx_cpu_type 0
+# endif
+#endif
+
#define cpu_is_mx23() (0)
#define cpu_is_mx28() (0)
--
2.20.1
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
prev parent reply other threads:[~2019-08-19 13:38 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-19 13:38 [PATCH 0/8] Add support for a generic DT based 2nd stage ARM image Sascha Hauer
2019-08-19 13:38 ` [PATCH 1/8] dtc: Update update-dtc-source.sh from Linux Sascha Hauer
2019-08-19 13:48 ` Roland Hieber
2019-08-19 13:38 ` [PATCH 2/8] scripts/dtc: Update to upstream version v1.5.0 Sascha Hauer
2019-08-19 13:52 ` Roland Hieber
2019-08-19 13:56 ` Sascha Hauer
2019-08-19 14:09 ` Roland Hieber
2019-09-23 13:39 ` Ahmad Fatoum
2019-08-19 13:38 ` [PATCH 3/8] pbl: Implement strrchr Sascha Hauer
2019-08-19 13:38 ` [PATCH 4/8] Compile libfdt for barebox Sascha Hauer
2019-08-19 13:38 ` [PATCH 5/8] common: return "none" when board unset Sascha Hauer
2019-08-19 13:38 ` [PATCH 6/8] ARM: Add generic device tree 2nd stage support Sascha Hauer
2019-11-19 8:26 ` Ahmad Fatoum
2019-11-19 9:41 ` Oleksij Rempel
2019-11-19 10:21 ` Ahmad Fatoum
2019-11-25 7:47 ` Sascha Hauer
2019-08-19 13:38 ` [PATCH 7/8] ARM: i.MX: Do not hang() on unknown SoCs Sascha Hauer
2019-08-19 13:38 ` 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=20190819133847.17015-9-s.hauer@pengutronix.de \
--to=s.hauer@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