armv8: fsl-layerscape: Change bootcmd update logic

Change bootcmd update logic when CONFIG_ENV_ADDR is not defined

Signed-off-by: Pankit Garg <[email protected]>
Reviewed-by: Prabhakar Kushwaha <[email protected]>

diff --git a/arch/arm/cpu/armv8/fsl-layerscape/soc.c b/arch/arm/cpu/armv8/fsl-layerscape/soc.c
index c53131f74af27bd0b6757a92aa6128d4abfade35..7414215208cba49e8271fbb8d9db5de0b447c319 100644 (file)
--- a/arch/arm/cpu/armv8/fsl-layerscape/soc.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/soc.c
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright 2014-2015 Freescale Semiconductor
+ * Copyright 2019 NXP
  */
 
 #include <common.h>
@@ -823,7 +824,11 @@ int board_late_init(void)
         * check if gd->env_addr is default_environment; then setenv bootcmd
         * and mcinitcmd.
         */
+#if !defined(CONFIG_ENV_ADDR) || defined(ENV_IS_EMBEDDED)
+       if (gd->env_addr == (ulong)&default_environment[0]) {
+#else
        if (gd->env_addr + gd->reloc_off == (ulong)&default_environment[0]) {
+#endif
                fsl_setenv_bootcmd();
                fsl_setenv_mcinitcmd();
        }