From 99475c5dcc14123dda51bda32d21753f0b4c357d Mon Sep 17 00:00:00 2001 From: Ye Li Date: Tue, 2 Feb 2021 20:06:40 -0800 Subject: [PATCH] feat(imx8mq): add version for B2 iMX8MQ B2 chip uses same OCOTP magic value with B1. So read the ROM version to distinguish it with B1. Signed-off-by: Ye Li Reviewed-by: Jacky Bai Change-Id: I3e6865922deeb66816a0dddb49d986405e802b6f --- plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c b/plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c index 4706c20fc..264d920f7 100644 --- a/plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c +++ b/plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2022, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2018-2023, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -82,7 +82,11 @@ 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; } } -- 2.39.5