diff options
author | Max Krummenacher <max.krummenacher@toradex.com> | 2021-05-03 21:28:55 +0200 |
---|---|---|
committer | Max Krummenacher <max.krummenacher@toradex.com> | 2021-05-03 21:30:40 +0200 |
commit | 835a8f67b2ca7aa3f2d05d6e6a1a51f7e1147266 (patch) | |
tree | 229385550c80485b4f31cdad8a78eda7d5fac26e /plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c | |
parent | 7f1187ba31cc1624f7dadd98998e010cb229926a (diff) | |
parent | 2a26786460edd4f0ec3111e7027c93c57fc572c1 (diff) |
Merge remote-tracking branch 'nxp/imx_5.4.70_2.3.0' into toradex_imx_5.4.70_2.3.0
Updates to 5.4.70_2.3.2
Related-to: ELB-3957
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Diffstat (limited to 'plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c')
-rw-r--r-- | plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c b/plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c index f4c45895..7b320f0e 100644 --- a/plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c +++ b/plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c @@ -94,7 +94,10 @@ static void imx8mq_soc_info_init(void) ocotp_val = mmio_read_32(IMX_OCOTP_BASE + OCOTP_SOC_INFO_B1); if (ocotp_val == 0xff0055aa) { imx_soc_revision &= ~0xff; - imx_soc_revision |= 0x21; + if (rom_version == 0x22) + imx_soc_revision |= 0x22; + else + imx_soc_revision |= 0x21; return; } } |