colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

armv8: fsl-layerscape: Set env_loc to ENVL_NOWHERE with CONFIG_ENV_IS_NOWHERE.

Browse Source 
ENVL_NOWHERE is dependent on CONFIG_ENV_IS_NOWHERE and not on
CONFIG_CHAIN_OF_TRUST so return ENVL_NOWHERE when CONFIG_ENV_IS_NOWHERE
is enabled

Signed-off-by: Udit Agarwal <udit.agarwal@nxp.com>
Reviewed-by: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>
This commit is contained in:
Udit Agarwal
2019-04-23 06:06:04 +00:00
committed by Prabhakar Kushwaha
parent 78c58082a9
commit d9532e8092
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
arch/arm/cpu/armv8/fsl-layerscape/cpu.c
View File

@@ -808,12 +808,8 @@ enum env_location env_get_location(enum env_operation op, int prio)
if (prio) if (prio)
return ENVL_UNKNOWN; return ENVL_UNKNOWN;
#ifdef CONFIG_CHAIN_OF_TRUST #ifdef CONFIG_ENV_IS_NOWHERE
/* Check Boot Mode return env_loc;
* If Boot Mode is Secure, return ENVL_NOWHERE
*/
if (fsl_check_boot_mode_secure() == 1)
goto done;
#endif #endif
switch (src) { switch (src) {
@@ -843,9 +839,6 @@ enum env_location env_get_location(enum env_operation op, int prio)
break; break;
} }
#ifdef CONFIG_CHAIN_OF_TRUST
done:
#endif
return env_loc; return env_loc;
} }
#endif /* CONFIG_TFABOOT */ #endif /* CONFIG_TFABOOT */