mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Johannes Schneider <johannes.schneider@leica-geosystems.com>
To: barebox@lists.infradead.org
Cc: Johannes Schneider <johannes.schneider@leica-geosystems.com>
Subject: [PATCH v4] ARM: i.MX8M: smccc: allow SIP_BUILDINFO call on all imx8m variants
Date: Thu, 12 Jan 2023 09:15:30 +0100	[thread overview]
Message-ID: <20230112081530.2684687-1-johannes.schneider@leica-geosystems.com> (raw)

By adding a common config switch, the imx8m_init code becomes generic
for all board variants (and slightly less confusing).

Signed-off-by: Johannes Schneider <johannes.schneider@leica-geosystems.com>

---
v4: add missing common switch

v3: redid patch with suggested common config switch

v2: was:
[PATCH v2 1/1] ARM: i.MX8M: smccc: fix firmware_atf check

v1: or'ed all IS_ENABLED(FIRMWARE_IMX8M[mnpq]_ATF
---
 arch/arm/mach-imx/imx8m.c | 2 +-
 firmware/Kconfig          | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/arch/arm/mach-imx/imx8m.c b/arch/arm/mach-imx/imx8m.c
index 9758525b54..4399dc7dd5 100644
--- a/arch/arm/mach-imx/imx8m.c
+++ b/arch/arm/mach-imx/imx8m.c
@@ -61,7 +61,7 @@ static int imx8m_init(const char *cputypestr)
 	pr_info("%s unique ID: %llx\n", cputypestr, imx8m_uid());
 
 	if (IS_ENABLED(CONFIG_ARM_SMCCC) &&
-	    IS_ENABLED(CONFIG_FIRMWARE_IMX8MQ_ATF)) {
+	    IS_ENABLED(CONFIG_FIRMWARE_IMX8M_ATF)) {
 		arm_smccc_smc(IMX_SIP_BUILDINFO,
 			      IMX_SIP_BUILDINFO_GET_COMMITHASH,
 			      0, 0, 0, 0, 0, 0, &res);
diff --git a/firmware/Kconfig b/firmware/Kconfig
index b4a6fd9137..09ad85c539 100644
--- a/firmware/Kconfig
+++ b/firmware/Kconfig
@@ -12,17 +12,24 @@ config FIRMWARE_IMX_LPDDR4_PMU_TRAIN
 config FIRMWARE_IMX_DDR4_PMU_TRAIN
        	bool
 
+config FIRMWARE_IMX8M_ATF
+	bool
+
 config FIRMWARE_IMX8MM_ATF
         bool
+	select FIRMWARE_IMX8M_ATF
 
 config FIRMWARE_IMX8MN_ATF
         bool
+	select FIRMWARE_IMX8M_ATF
 
 config FIRMWARE_IMX8MP_ATF
         bool
+	select FIRMWARE_IMX8M_ATF
 
 config FIRMWARE_IMX8MQ_ATF
         bool
+	select FIRMWARE_IMX8M_ATF
 
 config FIRMWARE_CCBV2_OPTEE
 	bool
-- 
2.25.1




             reply	other threads:[~2023-01-12  8:17 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-01-12  8:15 Johannes Schneider [this message]
2023-01-12 12:56 ` Ahmad Fatoum
2023-01-12 13:57   ` SCHNEIDER Johannes
2023-01-12 15:14     ` 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=20230112081530.2684687-1-johannes.schneider@leica-geosystems.com \
    --to=johannes.schneider@leica-geosystems.com \
    --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