[U-Boot] [PATCH 1/2] ls1046ardb: Add CONFIG_ENV_ADDR to init env in qspi boot

[U-Boot] [PATCH 1/2] ls1046ardb: Add CONFIG_ENV_ADDR to init env in qspi boot

[Pankit Garg]

Signed-off-by: Pankit Garg <pankit.garg@nxp.com>
---
Changes for v2:
 - add NXP copyright

 include/configs/ls1046ardb.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/include/configs/ls1046ardb.h b/include/configs/ls1046ardb.h
index f22e863..fa90953 100644
--- a/include/configs/ls1046ardb.h
+++ b/include/configs/ls1046ardb.h
@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright 2016 Freescale Semiconductor
+ * Copyright 2019 NXP
  */
 
 #ifndef __LS1046ARDB_H__
@@ -162,6 +163,8 @@
 #define CONFIG_ENV_SIZE			0x2000		/* 8KB */
 #define CONFIG_ENV_OFFSET		0x500000	/* 5MB */
 #define CONFIG_ENV_SECT_SIZE		0x40000		/* 256KB */
+#define CONFIG_SYS_FSL_QSPI_BASE        0x40000000
+#define CONFIG_ENV_ADDR CONFIG_SYS_FSL_QSPI_BASE + CONFIG_ENV_OFFSET
 #else
 #if defined(CONFIG_SD_BOOT)
 #define CONFIG_SYS_MMC_ENV_DEV		0
-- 
1.9.1

[U-Boot] [PATCH 2/2] armv8: fsl-layerscape: Change bootcmd update logic

[Pankit Garg]

Change bootcmd update logic when CONFIG_ENV_ADDR is not defined

Signed-off-by: Pankit Garg <pankit.garg@nxp.com>
---
Changes for v2:
 - add NXP copyright

 arch/arm/cpu/armv8/fsl-layerscape/soc.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/arch/arm/cpu/armv8/fsl-layerscape/soc.c b/arch/arm/cpu/armv8/fsl-layerscape/soc.c
index aeaf7b8..a4b6faf 100644
--- 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>
@@ -874,7 +875,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();
 	}
-- 
1.9.1

[U-Boot] [PATCH 2/2] armv8: fsl-layerscape: Change bootcmd update logic

[Prabhakar Kushwaha]

> -----Original Message-----
> From: Pankit Garg
> Sent: Thursday, May 30, 2019 5:34 PM
> To: u-boot at lists.denx.de
> Cc: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>; Jagdish Gediya
> <jagdish.gediya@nxp.com>
> Subject: [PATCH 2/2] armv8: fsl-layerscape: Change bootcmd update logic
> 
> Change bootcmd update logic when CONFIG_ENV_ADDR is not defined
> 
> Signed-off-by: Pankit Garg <pankit.garg@nxp.com>
> ---
This patch has been applied to fsl-qoriq master, awaiting upstream.

--pk

[U-Boot] [PATCH 1/2] ls1046ardb: Add CONFIG_ENV_ADDR to init env in qspi boot

[Prabhakar Kushwaha]

> -----Original Message-----
> From: Pankit Garg
> Sent: Thursday, May 30, 2019 5:34 PM
> To: u-boot at lists.denx.de
> Cc: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>; Jagdish Gediya
> <jagdish.gediya@nxp.com>
> Subject: [PATCH 1/2] ls1046ardb: Add CONFIG_ENV_ADDR to init env in qspi
> boot
> 
> Signed-off-by: Pankit Garg <pankit.garg@nxp.com>
> ---

This patch has been applied to fsl-qoriq master, awaiting upstream.

--pk

[U-Boot] [PATCH 2/2] armv8: fsl-layerscape: Change bootcmd update logic

[Pankit Garg]

Change bootcmd update logic when CONFIG_ENV_ADDR is not defined

Signed-off-by: Pankit Garg <pankit.garg@nxp.com>
---
 arch/arm/cpu/armv8/fsl-layerscape/soc.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/arch/arm/cpu/armv8/fsl-layerscape/soc.c b/arch/arm/cpu/armv8/fsl-layerscape/soc.c
index aeaf7b8..09f6413 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/soc.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/soc.c
@@ -874,7 +874,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();
 	}
-- 
1.9.1