From: Roland Hieber <rhi@pengutronix.de>
To: distrokit@pengutronix.de
Cc: Roland Hieber <rhi@pengutronix.de>
Subject: [DistroKit] [PATCH 4/6] v8a: tf-a: make it compile with GCC 15
Date: Fri, 5 Dec 2025 23:22:53 +0100 [thread overview]
Message-ID: <20251205222320.2261758-4-rhi@pengutronix.de> (raw)
In-Reply-To: <20251205222320.2261758-1-rhi@pengutronix.de>
Due to -Wall, GCC 15 complains about the header guard:
CC plat/imx/imx93/trdc.c
In file included from drivers/nxp/trdc/imx_trdc.c:13:
include/drivers/nxp/trdc/imx_trdc.h:7: error: header guard 'IMX_TRDC_H' followed by '#define' of a different macro [-Werror=header-guard]
include/drivers/nxp/trdc/imx_trdc.h:8: note: 'IMX_XRDC_H' is defined here; did you mean 'IMX_TRDC_H'?
cc1: all warnings being treated as errors
Cherry-pick a patch from upstream to fix this.
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
| 30 +++++++++++++++++++
.../platform-v8a/patches/tf-a-v2.12/series | 1 +
2 files changed, 31 insertions(+)
create mode 100644 configs/platform-v8a/patches/tf-a-v2.12/0003-fix-nxp-imx_trdc.h-header-guard.patch
--git a/configs/platform-v8a/patches/tf-a-v2.12/0003-fix-nxp-imx_trdc.h-header-guard.patch b/configs/platform-v8a/patches/tf-a-v2.12/0003-fix-nxp-imx_trdc.h-header-guard.patch
new file mode 100644
index 000000000000..f583436b9305
--- /dev/null
+++ b/configs/platform-v8a/patches/tf-a-v2.12/0003-fix-nxp-imx_trdc.h-header-guard.patch
@@ -0,0 +1,30 @@
+From: Peter Robinson <pbrobinson@gmail.com>
+Date: Wed, 29 Jan 2025 09:40:15 +0000
+Subject: [PATCH] fix(nxp): imx_trdc.h header guard
+
+The header guard define is IMX_XRDC_H where everything
+else is IMX_TRDC_H, gcc-15 complains about this so
+update the define to what it should be.
+
+Fixes: 293529100 ("feat(imx93): add the trdc driver")
+Change-Id: I4767dc4d1c26ebe95d417be724f5cb848f54a524
+Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
+[rhi: cherry-picked from upstream commit v2.12.0-1121-g2e9198d0e0cb ]
+Signed-off-by: Roland Hieber <rhi@pengutronix.de>
+---
+ include/drivers/nxp/trdc/imx_trdc.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/drivers/nxp/trdc/imx_trdc.h b/include/drivers/nxp/trdc/imx_trdc.h
+index 0b41fcf451ac..3ee60f991578 100644
+--- a/include/drivers/nxp/trdc/imx_trdc.h
++++ b/include/drivers/nxp/trdc/imx_trdc.h
+@@ -5,7 +5,7 @@
+ */
+
+ #ifndef IMX_TRDC_H
+-#define IMX_XRDC_H
++#define IMX_TRDC_H
+
+ #define MBC_BLK_ALL U(255)
+ #define MRC_REG_ALL U(16)
diff --git a/configs/platform-v8a/patches/tf-a-v2.12/series b/configs/platform-v8a/patches/tf-a-v2.12/series
index e9a737739bc2..dcb2e47ba885 100644
--- a/configs/platform-v8a/patches/tf-a-v2.12/series
+++ b/configs/platform-v8a/patches/tf-a-v2.12/series
@@ -1,2 +1,3 @@
0001-fix-imx8mq-fix-imx8mq-build-break-due-to-hab.patch
0002-fix-imx8m-fix-imx8mq-build-break.patch
+0003-fix-nxp-imx_trdc.h-header-guard.patch
--
2.47.3
next prev parent reply other threads:[~2025-12-05 22:23 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-12-05 22:22 [DistroKit] [PATCH 1/6] v8a: barebox-r5: sync config file changes Roland Hieber
2025-12-05 22:22 ` [DistroKit] [PATCH 2/6] v8a: barebox-r5: clean up recipe Roland Hieber
2025-12-05 22:22 ` [DistroKit] [PATCH 3/6] v7a: at91bootstrap: version bump 4.0.6-rc1 -> 4.0.12 Roland Hieber
2025-12-05 22:22 ` Roland Hieber [this message]
2025-12-05 22:22 ` [DistroKit] [PATCH 5/6] v8a: tf-a: re-export patch queue with 'git ptx-patches' Roland Hieber
2025-12-05 22:22 ` [DistroKit] [PATCH 6/6] toolchains: version bump 2024.11.1 -> 2025.11.0 Roland Hieber
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=20251205222320.2261758-4-rhi@pengutronix.de \
--to=rhi@pengutronix.de \
--cc=distrokit@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