From 9eefe059793fbf08b0d25b6f96896f0985bb973b Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Tue, 2 Jan 2024 17:09:19 +0100 Subject: [PATCH] imx-atf: update to NXP's lf-6.1.55-2.2.0 release for ccimx93 Signed-off-by: Javier Viguera --- ...=> 0001-ccimx93-use-UART6-for-the-default-console.patch} | 0 ...93-bring-back-ELE-clock-workaround-for-soc-revisi.patch} | 6 +++--- .../freescale-layer/recipes-bsp/imx-atf/imx-atf_%.bbappend | 4 ++-- .../freescale-layer/recipes-bsp/imx-atf/imx-atf_2.8.bb | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) rename meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-atf/imx-atf/{0005-ccimx93-use-UART6-for-the-default-console.patch => 0001-ccimx93-use-UART6-for-the-default-console.patch} (100%) rename meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-atf/imx-atf/{0006-imx93-bring-back-ELE-clock-workaround-for-soc-revisi.patch => 0002-imx93-bring-back-ELE-clock-workaround-for-soc-revisi.patch} (91%) diff --git a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-atf/imx-atf/0005-ccimx93-use-UART6-for-the-default-console.patch b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-atf/imx-atf/0001-ccimx93-use-UART6-for-the-default-console.patch similarity index 100% rename from meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-atf/imx-atf/0005-ccimx93-use-UART6-for-the-default-console.patch rename to meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-atf/imx-atf/0001-ccimx93-use-UART6-for-the-default-console.patch diff --git a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-atf/imx-atf/0006-imx93-bring-back-ELE-clock-workaround-for-soc-revisi.patch b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-atf/imx-atf/0002-imx93-bring-back-ELE-clock-workaround-for-soc-revisi.patch similarity index 91% rename from meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-atf/imx-atf/0006-imx93-bring-back-ELE-clock-workaround-for-soc-revisi.patch rename to meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-atf/imx-atf/0002-imx93-bring-back-ELE-clock-workaround-for-soc-revisi.patch index d3f1fc80c..31d1aa891 100644 --- a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-atf/imx-atf/0006-imx93-bring-back-ELE-clock-workaround-for-soc-revisi.patch +++ b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-atf/imx-atf/0002-imx93-bring-back-ELE-clock-workaround-for-soc-revisi.patch @@ -12,10 +12,10 @@ Signed-off-by: Javier Viguera 2 files changed, 14 insertions(+) diff --git a/plat/imx/imx93/imx93_psci.c b/plat/imx/imx93/imx93_psci.c -index 0fd2bb7802df..461801afb126 100644 +index 6a21ee970079..b9c4e0a1752b 100644 --- a/plat/imx/imx93/imx93_psci.c +++ b/plat/imx/imx93/imx93_psci.c -@@ -783,6 +783,11 @@ void imx_pwr_domain_suspend(const psci_power_state_t *target_state) +@@ -794,6 +794,11 @@ void imx_pwr_domain_suspend(const psci_power_state_t *target_state) } else { write_clusterpwrdn(DSU_CLUSTER_PWR_OFF); } @@ -27,7 +27,7 @@ index 0fd2bb7802df..461801afb126 100644 } if (is_local_state_retn(SYSTEM_PWR_STATE(target_state))) { -@@ -902,6 +907,11 @@ void imx_pwr_domain_suspend_finish(const psci_power_state_t *target_state) +@@ -924,6 +929,11 @@ void imx_pwr_domain_suspend_finish(const psci_power_state_t *target_state) mmio_write_32(IMX_GPC_BASE + A55C0_CMC_OFFSET + 0x800 * 2 + CM_MODE_CTRL, CM_MODE_RUN); /* clear L3 retention */ mmio_clrbits_32(IMX_SRC_BASE + A55C0_MEM + 0x400 * 3 + 0x4, MEM_LP_RETENTION); diff --git a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-atf/imx-atf_%.bbappend b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-atf/imx-atf_%.bbappend index ced0c15a8..91dd55397 100644 --- a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-atf/imx-atf_%.bbappend +++ b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-atf/imx-atf_%.bbappend @@ -9,8 +9,8 @@ SRC_URI:append:ccimx8m = " \ file://0004-imx8mn-Disable-M7-debug-console.patch \ " SRC_URI:append:ccimx93 = " \ - file://0005-ccimx93-use-UART6-for-the-default-console.patch \ - file://0006-imx93-bring-back-ELE-clock-workaround-for-soc-revisi.patch \ + file://0001-ccimx93-use-UART6-for-the-default-console.patch \ + file://0002-imx93-bring-back-ELE-clock-workaround-for-soc-revisi.patch \ " BOOT_TOOLS = "imx-boot-tools" diff --git a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-atf/imx-atf_2.8.bb b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-atf/imx-atf_2.8.bb index 162111c5b..96ea44870 100644 --- a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-atf/imx-atf_2.8.bb +++ b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-atf/imx-atf_2.8.bb @@ -7,7 +7,7 @@ require recipes-bsp/imx-atf/imx-atf_2.6.bb SRC_URI = "git://github.com/nxp-imx/imx-atf.git;protocol=https;branch=${SRCBRANCH}" SRCBRANCH = "lf_v2.8" -# Tag: lf-6.1.36-2.1.0 -SRCREV = "1a3beeab6484343a4bd0ee08e947d142db4a5ae6" +# Tag: lf-6.1.55-2.2.0 +SRCREV = "08e9d4eef2262c0dd072b4325e8919e06d349e02" COMPATIBLE_MACHINE = "(ccimx93)"