Merge branch 'Freescale:master' into port-imx-sc-firmware-1.19.0

3 files changed, 2 insertions, 76 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
deleted file mode 100644
index f475cf334..000000000
--- a/recipes-bsp/imx-atf/imx-atf/0001-imx93-trdc-Fix-header-guard.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From e82cafa7823cb2cad6ce933862b9ffdb880dba49 Mon Sep 17 00:00:00 2001
-From: Tom Hochstein <tom.hochstein@nxp.com>
-Date: Tue, 10 Jun 2025 15:04:32 -0700
-Subject: [PATCH] imx93: trdc: Fix header guard
-
-```
-| 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
-```
-
-Upstream-Status: Submitted [https://github.com/nxp-imx/imx-atf/pull/2]
-Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
----
- 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 7a6200c8d..8c759c65d 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)
--- 
-2.34.1
-
diff --git a/recipes-bsp/imx-atf/imx-atf/0001-scmi-imx9-Remove-unused-tmp-pointer.patch b/recipes-bsp/imx-atf/imx-atf/0001-scmi-imx9-Remove-unused-tmp-pointer.patch
deleted file mode 100644
index 347b33725..000000000
--- a/recipes-bsp/imx-atf/imx-atf/0001-scmi-imx9-Remove-unused-tmp-pointer.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 455e501513345b98ff93d9c214f2f17629edd318 Mon Sep 17 00:00:00 2001
-From: Franz Schnyder <franz.schnyder@toradex.com>
-Date: Fri, 29 May 2026 11:04:45 +0200
-Subject: [PATCH] scmi: imx9: Remove unused tmp pointer
-
-The scmi_per_lpm_mode_set function declares a tmp pointer but is never
-read. The newer GCC version 16.1.0 treats the unused pointer as
--Wunused-but-set-variable. With -Werror, this breaks the build.
-
-Upstream-Status: Pending
-Signed-off-by: Franz Schnyder <franz.schnyder@toradex.com>
----
- drivers/nxp/scmi/vendor/scmi_imx9.c | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/drivers/nxp/scmi/vendor/scmi_imx9.c b/drivers/nxp/scmi/vendor/scmi_imx9.c
-index 36c043e..e0fc7ee 100644
---- a/drivers/nxp/scmi/vendor/scmi_imx9.c
-+++ b/drivers/nxp/scmi/vendor/scmi_imx9.c
-@@ -409,7 +409,6 @@ int scmi_per_lpm_mode_set(void *p, uint32_t cpu_id, uint32_t num_configs,
-        unsigned int token = 0U;
-        int ret;
-        scmi_channel_t *ch = (scmi_channel_t *)p;
--       struct scmi_per_lpm_config *tmp = cfg;
- 
-        validate_scmi_channel(ch);
- 
-@@ -442,7 +441,6 @@ int scmi_per_lpm_mode_set(void *p, uint32_t cpu_id, uint32_t num_configs,
- 
-                if (num_configs > MAX_PER_LPI_CONFIGS_PER_CMD) {
-                        num_configs -= MAX_PER_LPI_CONFIGS_PER_CMD;
--                       tmp += MAX_PER_LPI_CONFIGS_PER_CMD;
-                } else {
-                        break;
-                }
--- 
-2.43.0
diff --git a/recipes-bsp/imx-atf/imx-atf_2.14.bb b/recipes-bsp/imx-atf/imx-atf_2.14.bb
index 03cc2f381..407808b40 100644
--- a/recipes-bsp/imx-atf/imx-atf_2.14.bb
+++ b/recipes-bsp/imx-atf/imx-atf_2.14.bb
@@ -24,12 +24,10 @@ DEPENDS:append:toolchain-clang = " clang-cross-${TARGET_ARCH}"
 
 PV .= "+git${SRCPV}"
 
-SRC_URI = "${ATF_SRC};branch=${SRCBRANCH} \
-           file://0001-scmi-imx9-Remove-unused-tmp-pointer.patch \
-"
+SRC_URI = "${ATF_SRC};branch=${SRCBRANCH}"
 ATF_SRC ?= "git://github.com/nxp-imx/imx-atf.git;protocol=https"
 SRCBRANCH = "lf_v2.14"
-SRCREV = "0779f89a5475a03193f7707f3bbb50cec11707c0"
+SRCREV = "af9eb2c1748ee3abc0ead7dc76e462f50c573036"
 
 inherit deploy