summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Hochstein <tom.hochstein@nxp.com>2025-06-10 15:10:22 -0700
committerTom Hochstein <tom.hochstein@nxp.com>2025-06-10 15:10:22 -0700
commit27fd0694c5f3e80eb50413fde909765e360e587c (patch)
tree3f9b04b776aa171d950bbbd4c7142df41f57488e
parentfee9d5ef198290b054b98fc961b5686f7bb7dc2d (diff)
downloadmeta-freescale-27fd0694c5f3e80eb50413fde909765e360e587c.tar.gz
imx-atf: Fix header guard error
``` | 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] | 7 | #ifndef IMX_TRDC_H | include/drivers/nxp/trdc/imx_trdc.h:8: note: 'IMX_XRDC_H' is defined here; did you mean 'IMX_TRDC_H'? | 8 | #define IMX_XRDC_H ``` Fixes: #2301 Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
-rw-r--r--recipes-bsp/imx-atf/imx-atf/0001-imx93-trdc-Fix-header-guard.patch35
-rw-r--r--recipes-bsp/imx-atf/imx-atf_2.10.bb3
2 files changed, 37 insertions, 1 deletions
diff --git a/recipes-bsp/imx-atf/imx-atf/0001-imx93-trdc-Fix-header-guard.patch b/recipes-bsp/imx-atf/imx-atf/0001-imx93-trdc-Fix-header-guard.patch
new file mode 100644
index 00000000..f475cf33
--- /dev/null
+++ b/recipes-bsp/imx-atf/imx-atf/0001-imx93-trdc-Fix-header-guard.patch
@@ -0,0 +1,35 @@
1From e82cafa7823cb2cad6ce933862b9ffdb880dba49 Mon Sep 17 00:00:00 2001
2From: Tom Hochstein <tom.hochstein@nxp.com>
3Date: Tue, 10 Jun 2025 15:04:32 -0700
4Subject: [PATCH] imx93: trdc: Fix header guard
5
6```
7| In file included from drivers/nxp/trdc/imx_trdc.c:13:
8| include/drivers/nxp/trdc/imx_trdc.h:7: error: header guard 'IMX_TRDC_H' followed by '#define' of a different macro [-Werror=header-guard]
9| 7 | #ifndef IMX_TRDC_H
10| include/drivers/nxp/trdc/imx_trdc.h:8: note: 'IMX_XRDC_H' is defined here; did you mean 'IMX_TRDC_H'?
11| 8 | #define IMX_XRDC_H
12```
13
14Upstream-Status: Submitted [https://github.com/nxp-imx/imx-atf/pull/2]
15Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
16---
17 include/drivers/nxp/trdc/imx_trdc.h | 2 +-
18 1 file changed, 1 insertion(+), 1 deletion(-)
19
20diff --git a/include/drivers/nxp/trdc/imx_trdc.h b/include/drivers/nxp/trdc/imx_trdc.h
21index 7a6200c8d..8c759c65d 100644
22--- a/include/drivers/nxp/trdc/imx_trdc.h
23+++ b/include/drivers/nxp/trdc/imx_trdc.h
24@@ -5,7 +5,7 @@
25 */
26
27 #ifndef IMX_TRDC_H
28-#define IMX_XRDC_H
29+#define IMX_TRDC_H
30
31 #define MBC_BLK_ALL U(255)
32 #define MRC_REG_ALL U(16)
33--
342.34.1
35
diff --git a/recipes-bsp/imx-atf/imx-atf_2.10.bb b/recipes-bsp/imx-atf/imx-atf_2.10.bb
index 8eacc1cf..13478bbe 100644
--- a/recipes-bsp/imx-atf/imx-atf_2.10.bb
+++ b/recipes-bsp/imx-atf/imx-atf_2.10.bb
@@ -7,7 +7,8 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/BSD-3-Clause;m
7 7
8PV .= "+git${SRCPV}" 8PV .= "+git${SRCPV}"
9 9
10SRC_URI = "git://github.com/nxp-imx/imx-atf.git;protocol=https;branch=${SRCBRANCH}" 10SRC_URI = "git://github.com/nxp-imx/imx-atf.git;protocol=https;branch=${SRCBRANCH} \
11 file://0001-imx93-trdc-Fix-header-guard.patch"
11SRCBRANCH = "lf_v2.10" 12SRCBRANCH = "lf_v2.10"
12SRCREV = "78a14c75a06dea39036c44ae0f9d23acc7bcaef2" 13SRCREV = "78a14c75a06dea39036c44ae0f9d23acc7bcaef2"
13 14