From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 05 Dec 2025 23:23:31 +0100 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1vReD5-008LJA-0f for lore@lore.pengutronix.de; Fri, 05 Dec 2025 23:23:31 +0100 Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1vReD4-0004QH-KA; Fri, 05 Dec 2025 23:23:30 +0100 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1vReCy-0004Lo-Da; Fri, 05 Dec 2025 23:23:24 +0100 Received: from dude04.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::ac]) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1vReCy-004Bz5-0c; Fri, 05 Dec 2025 23:23:24 +0100 Received: from rhi by dude04.red.stw.pengutronix.de with local (Exim 4.98.2) (envelope-from ) id 1vReCy-00000009UOa-0W2D; Fri, 05 Dec 2025 23:23:24 +0100 From: Roland Hieber To: distrokit@pengutronix.de Date: Fri, 5 Dec 2025 23:22:53 +0100 Message-ID: <20251205222320.2261758-4-rhi@pengutronix.de> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251205222320.2261758-1-rhi@pengutronix.de> References: <20251205222320.2261758-1-rhi@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [DistroKit] [PATCH 4/6] v8a: tf-a: make it compile with GCC 15 X-BeenThere: distrokit@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: DistroKit Mailinglist List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Roland Hieber Sender: "DistroKit" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: distrokit-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false 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 --- ...0003-fix-nxp-imx_trdc.h-header-guard.patch | 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 diff --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 +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 +[rhi: cherry-picked from upstream commit v2.12.0-1121-g2e9198d0e0cb ] +Signed-off-by: Roland Hieber +--- + 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