Commit d91e719fc830e011b182abb9712ed09b76f1d400
Committed by
Ye Li
1 parent
887f338901
Exists in
smarc_8mm-imx_v2019.04_4.19.35_1.1.0
and in
1 other branch
MLK-22836 imx8m: soc: Fix secure boot support for i.MX8MM and i.MX8MN targets
Since commit c98b47f1ff60 ("MLK-22749 imx8mq: Add workaround to fix sticky bits lock up") it's not possible to build i.MX8MM and i.MX8MN targets with CONFIG_SECURE_BOOT enabled: CC cmd/version.o arch/arm/mach-imx/imx8m/soc.c:326:23: error: ‘CONFIG_IMX_UNIQUE_ID’ undeclared \ (first use in this function); did you mean ‘CONFIG_IMX_VIDEO_SKIP’? if (!is_uid_matched(CONFIG_IMX_UNIQUE_ID)) ^~~~~~~~~~~~~~~~~~~~ The OCOTP sticky bit workaround is only needed for i.MX8MQ devices, other devices should not build the secure_lockup() function. Add CONFIG_IMX8MQ to the conditional compilation to avoid such issue. Fixes: c98b47f1ff60 ("MLK-22749 imx8mq: Add workaround to fix sticky bits lock up") Signed-off-by: Breno Lima <breno.lima@nxp.com> Reviewed-by: Ye Li <ye.li@nxp.com> (cherry picked from commit be033bff3c718e8bd7d4ac5ecfe4361892fc6e61)
Showing 1 changed file with 2 additions and 2 deletions Side-by-side Diff
arch/arm/mach-imx/imx8m/soc.c
... | ... | @@ -280,7 +280,7 @@ |
280 | 280 | writew(enable, &wdog3->wmcr); |
281 | 281 | } |
282 | 282 | |
283 | -#ifdef CONFIG_SECURE_BOOT | |
283 | +#if defined(CONFIG_SECURE_BOOT) && defined(CONFIG_IMX8MQ) | |
284 | 284 | static bool is_hdmi_fused(void) { |
285 | 285 | struct ocotp_regs *ocotp = (struct ocotp_regs *)OCOTP_BASE_ADDR; |
286 | 286 | struct fuse_bank *bank = &ocotp->bank[1]; |
... | ... | @@ -345,7 +345,7 @@ |
345 | 345 | clock_init(); |
346 | 346 | imx_set_wdog_powerdown(false); |
347 | 347 | |
348 | -#ifdef CONFIG_SECURE_BOOT | |
348 | +#if defined(CONFIG_SECURE_BOOT) && defined(CONFIG_IMX8MQ) | |
349 | 349 | secure_lockup(); |
350 | 350 | #endif |
351 | 351 | if (is_imx8md() || is_imx8mmd() || is_imx8mmdl() || is_imx8mms() || is_imx8mmsl() || |