summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Scott <mike@foundries.io>2021-01-13 12:08:25 -0800
committerJérôme Forissier <jerome@forissier.org>2021-01-15 15:17:04 +0100
commit955968a866f9360b2fbadbbf29984e0ca5cc9722 (patch)
treec570322b581675c5cf1678411a908bb01e55b2ae
parentccb9ae9018f72fce467d799572833111c8d323db (diff)
core: imx: remove security check for i.MX6DQ
Recent commit cfff3778dae0 ("core: imx: remove security check for i.MX6SDL") fixed an issue where i.MX6SDL SoC does not expose the security configuration in the HPSR registers correctly. This issue also affects i.MX6DQ. Let's add a check for this SoC family in the same place. Acked-by: Rouven Czerwinski <r.czerwinski@pengutronix.de> Acked-by: Clement Faure <clement.faure@nxp.com> Signed-off-by: Michael Scott <mike@foundries.io> Signed-off-by: Ricardo Salveti <ricardo@foundries.io>
-rw-r--r--core/arch/arm/plat-imx/drivers/imx_snvs.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/arch/arm/plat-imx/drivers/imx_snvs.c b/core/arch/arm/plat-imx/drivers/imx_snvs.c
index 52310d3d..9f0eb384 100644
--- a/core/arch/arm/plat-imx/drivers/imx_snvs.c
+++ b/core/arch/arm/plat-imx/drivers/imx_snvs.c
@@ -18,11 +18,11 @@ bool plat_rpmb_key_is_ready(void)
mode == SNVS_SSM_MODE_SECURE);
/*
- * On i.MX6SDL, the security cfg always returns
+ * On i.MX6SDL and i.MX6DQ, the security cfg always returns
* SNVS_SECURITY_CFG_FAB (000), therefore we ignore the security
* configuration for this SoC.
*/
- if (soc_is_imx6sdl())
+ if (soc_is_imx6sdl() || soc_is_imx6dq())
return ssm_secure;
return ssm_secure && (security == SNVS_SECURITY_CFG_CLOSED);