imx-atf: update to NXP's lf-6.1.55-2.2.0 release for ccimx93

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
This commit is contained in:
Javier Viguera 2024-01-02 17:09:19 +01:00
parent 20809e6cbf
commit 9eefe05979
4 changed files with 7 additions and 7 deletions

View File

@ -12,10 +12,10 @@ Signed-off-by: Javier Viguera <javier.viguera@digi.com>
2 files changed, 14 insertions(+) 2 files changed, 14 insertions(+)
diff --git a/plat/imx/imx93/imx93_psci.c b/plat/imx/imx93/imx93_psci.c 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 --- a/plat/imx/imx93/imx93_psci.c
+++ b/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 { } else {
write_clusterpwrdn(DSU_CLUSTER_PWR_OFF); write_clusterpwrdn(DSU_CLUSTER_PWR_OFF);
} }
@ -27,7 +27,7 @@ index 0fd2bb7802df..461801afb126 100644
} }
if (is_local_state_retn(SYSTEM_PWR_STATE(target_state))) { 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); mmio_write_32(IMX_GPC_BASE + A55C0_CMC_OFFSET + 0x800 * 2 + CM_MODE_CTRL, CM_MODE_RUN);
/* clear L3 retention */ /* clear L3 retention */
mmio_clrbits_32(IMX_SRC_BASE + A55C0_MEM + 0x400 * 3 + 0x4, MEM_LP_RETENTION); mmio_clrbits_32(IMX_SRC_BASE + A55C0_MEM + 0x400 * 3 + 0x4, MEM_LP_RETENTION);

View File

@ -9,8 +9,8 @@ SRC_URI:append:ccimx8m = " \
file://0004-imx8mn-Disable-M7-debug-console.patch \ file://0004-imx8mn-Disable-M7-debug-console.patch \
" "
SRC_URI:append:ccimx93 = " \ SRC_URI:append:ccimx93 = " \
file://0005-ccimx93-use-UART6-for-the-default-console.patch \ file://0001-ccimx93-use-UART6-for-the-default-console.patch \
file://0006-imx93-bring-back-ELE-clock-workaround-for-soc-revisi.patch \ file://0002-imx93-bring-back-ELE-clock-workaround-for-soc-revisi.patch \
" "
BOOT_TOOLS = "imx-boot-tools" BOOT_TOOLS = "imx-boot-tools"

View File

@ -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}" SRC_URI = "git://github.com/nxp-imx/imx-atf.git;protocol=https;branch=${SRCBRANCH}"
SRCBRANCH = "lf_v2.8" SRCBRANCH = "lf_v2.8"
# Tag: lf-6.1.36-2.1.0 # Tag: lf-6.1.55-2.2.0
SRCREV = "1a3beeab6484343a4bd0ee08e947d142db4a5ae6" SRCREV = "08e9d4eef2262c0dd072b4325e8919e06d349e02"
COMPATIBLE_MACHINE = "(ccimx93)" COMPATIBLE_MACHINE = "(ccimx93)"