From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rajesh Bhagat Date: Wed, 3 Oct 2018 17:07:36 +0530 Subject: [U-Boot] [PATCH 53/53] armv8: skip setenv if gd->env_addr is not default env. In-Reply-To: <20181003113736.14981-1-rajesh.bhagat@nxp.com> References: <20181003113736.14981-1-rajesh.bhagat@nxp.com> Message-ID: <20181003113736.14981-54-rajesh.bhagat@nxp.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de From: Pankit Garg Set mc and bootcmd env variables only when gd->env_addr is default environment. Signed-off-by: Rajesh Bhagat Signed-off-by: Pankit Garg --- arch/arm/cpu/armv8/fsl-layerscape/soc.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/arch/arm/cpu/armv8/fsl-layerscape/soc.c b/arch/arm/cpu/armv8/fsl-layerscape/soc.c index cbf0f20332..b3063fa9a6 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/soc.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/soc.c @@ -24,6 +24,11 @@ #include #endif #include +#ifdef CONFIG_TFABOOT +#include +DECLARE_GLOBAL_DATA_PTR; +#endif + bool soc_has_dp_ddr(void) { @@ -800,8 +805,14 @@ int board_late_init(void) fsl_setenv_chain_of_trust(); #endif #ifdef CONFIG_TFABOOT - fsl_setenv_bootcmd(); - fsl_setenv_mcinitcmd(); + /* + * check if gd->env_addr is default_environment; then setenv bootcmd + * and mcinitcmd + */ + if (gd->env_addr + gd->reloc_off == (ulong)&default_environment[0]) { + fsl_setenv_bootcmd(); + fsl_setenv_mcinitcmd(); + } #endif #ifdef CONFIG_QSPI_AHB_INIT qspi_ahb_init(); -- 2.17.1