[PATCH] armv8: fsl : create bootcmd and mcinitcmd as per boot source

[PATCH] armv8: fsl : create bootcmd and mcinitcmd as per boot source

[Wasim Khan]

From: Wasim Khan <wasim.khan@nxp.com>

NXP platforms expect custom bootcmd and mcinitcmd to be
updated as per boot source with default environment.
Check env variable fsl_bootcmd_mcinitcmd_set to prepare
bootcmd and mcinitcmd

Fixes cbf77d2018

Suggested-by: Alban Bedel <alban.bedel@aerq.com>
Signed-off-by: Wasim Khan <wasim.khan@nxp.com>
---
 arch/arm/cpu/armv8/fsl-layerscape/soc.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/arch/arm/cpu/armv8/fsl-layerscape/soc.c b/arch/arm/cpu/armv8/fsl-layerscape/soc.c
index c3cd6c7ac7..f804a7f68d 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/soc.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/soc.c
@@ -953,12 +953,15 @@ int board_late_init(void)
 #endif
 #ifdef CONFIG_TFABOOT
 	/*
-	 * Set bootcmd and mcinitcmd if they don't exist in the environment.
+	 * Set bootcmd and mcinitcmd if "fsl_bootcmd_mcinitcmd_set" does
+	 * not exists in env
 	 */
-	if (!env_get("bootcmd"))
+	if (env_get_yesno("fsl_bootcmd_mcinitcmd_set") <= 0) {
+		// Set bootcmd and mcinitcmd as per boot source
 		fsl_setenv_bootcmd();
-	if (!env_get("mcinitcmd"))
 		fsl_setenv_mcinitcmd();
+		env_set("fsl_bootcmd_mcinitcmd_set", "y");
+	}
 #endif
 #ifdef CONFIG_QSPI_AHB_INIT
 	qspi_ahb_init();
-- 
2.25.1

RE: [PATCH] armv8: fsl : create bootcmd and mcinitcmd as per boot source

[Priyanka Jain]

>-----Original Message-----
>From: Wasim Khan (OSS) <wasim.khan@oss.nxp.com>
>Sent: Thursday, July 8, 2021 12:36 PM
>To: Priyanka Jain <priyanka.jain@nxp.com>; Varun Sethi <V.Sethi@nxp.com>;
>Bedel, Alban <alban.bedel@aerq.com>
>Cc: u-boot@lists.denx.de; Wasim Khan <wasim.khan@nxp.com>
>Subject: [PATCH] armv8: fsl : create bootcmd and mcinitcmd as per boot
>source
>
>From: Wasim Khan <wasim.khan@nxp.com>
>
>NXP platforms expect custom bootcmd and mcinitcmd to be updated as per
>boot source with default environment.
>Check env variable fsl_bootcmd_mcinitcmd_set to prepare bootcmd and
>mcinitcmd
>
>Fixes cbf77d2018
>
>Suggested-by: Alban Bedel <alban.bedel@aerq.com>
>Signed-off-by: Wasim Khan <wasim.khan@nxp.com>
>---
> arch/arm/cpu/armv8/fsl-layerscape/soc.c | 9 ++++++---
> 1 file changed, 6 insertions(+), 3 deletions(-)
>
>diff --git a/arch/arm/cpu/armv8/fsl-layerscape/soc.c
>b/arch/arm/cpu/armv8/fsl-layerscape/soc.c
>index c3cd6c7ac7..f804a7f68d 100644
>--- a/arch/arm/cpu/armv8/fsl-layerscape/soc.c
>+++ b/arch/arm/cpu/armv8/fsl-layerscape/soc.c
>@@ -953,12 +953,15 @@ int board_late_init(void)  #endif  #ifdef
>CONFIG_TFABOOT
> 	/*
>-	 * Set bootcmd and mcinitcmd if they don't exist in the environment.
>+	 * Set bootcmd and mcinitcmd if "fsl_bootcmd_mcinitcmd_set" does
>+	 * not exists in env
> 	 */
>-	if (!env_get("bootcmd"))
>+	if (env_get_yesno("fsl_bootcmd_mcinitcmd_set") <= 0) {
>+		// Set bootcmd and mcinitcmd as per boot source
> 		fsl_setenv_bootcmd();
>-	if (!env_get("mcinitcmd"))
> 		fsl_setenv_mcinitcmd();
>+		env_set("fsl_bootcmd_mcinitcmd_set", "y");
>+	}
> #endif
> #ifdef CONFIG_QSPI_AHB_INIT
> 	qspi_ahb_init();
>--
>2.25.1

Alban,

Is it possible for you to test this if it works fine in your environment?

Regards
Priyanka

RE: [PATCH] armv8: fsl : create bootcmd and mcinitcmd as per boot source

[Priyanka Jain]

>-----Original Message-----
>From: U-Boot <u-boot-bounces@lists.denx.de> On Behalf Of Priyanka Jain
>Sent: Monday, July 12, 2021 1:37 PM
>To: Wasim Khan (OSS) <wasim.khan@oss.nxp.com>; Varun Sethi
><V.Sethi@nxp.com>; Bedel, Alban <alban.bedel@aerq.com>
>Cc: u-boot@lists.denx.de; Wasim Khan <wasim.khan@nxp.com>
>Subject: RE: [PATCH] armv8: fsl : create bootcmd and mcinitcmd as per boot
>source
>
>
>
>>-----Original Message-----
>>From: Wasim Khan (OSS) <wasim.khan@oss.nxp.com>
>>Sent: Thursday, July 8, 2021 12:36 PM
>>To: Priyanka Jain <priyanka.jain@nxp.com>; Varun Sethi
>><V.Sethi@nxp.com>; Bedel, Alban <alban.bedel@aerq.com>
>>Cc: u-boot@lists.denx.de; Wasim Khan <wasim.khan@nxp.com>
>>Subject: [PATCH] armv8: fsl : create bootcmd and mcinitcmd as per boot
>>source
>>
>>From: Wasim Khan <wasim.khan@nxp.com>
>>
>>NXP platforms expect custom bootcmd and mcinitcmd to be updated as per
>>boot source with default environment.
>>Check env variable fsl_bootcmd_mcinitcmd_set to prepare bootcmd and
>>mcinitcmd
>>
>>Fixes cbf77d2018
>>
<snip>
Kindly update commit it with commit details as well as per patch guidelines.


Regards
Priyanka