[PATCH 0/2] Boot fixup

[PATCH 0/2] Boot fixup

[Manorit Chawdhry]

This series addresses some regression caused by commit 0d72b0f2f83b and
additionally fixes the commit as well to do what it was intented to do.

Boot logs: https://gist.github.com/manorit2001/dfb8d92bb737d774c4296cefa765ba10

Signed-off-by: Manorit Chawdhry <m-chawdhry@ti.com>
---
Manorit Chawdhry (2):
      include: env: ti: ti_common: Fix a missing semicolon
      include: env: ti: add default for do_main_cpsw0_qsgmii_phyinit

 include/env/ti/ti_common.env | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
---
base-commit: 2b28c3b871cd5d55b19f0a86cef970139f8ab952
change-id: 20240105-b4-upstream-fix-semicolon-b672d1a5b598

Best regards,
-- 
Manorit Chawdhry <m-chawdhry@ti.com>

[PATCH 1/2] include: env: ti: ti_common: Fix a missing semicolon

[Manorit Chawdhry]

Fix a missing semicolon that leads to syntax error while booting j721s2.

    Importing environment from mmc1 ...
    syntax error at 'run'HUSH died!

Fixes: 0d72b0f2f83b ("include: env: ti: ti_common: Run main_cpsw0_qsgmii_phyinit conditionally")

Signed-off-by: Manorit Chawdhry <m-chawdhry@ti.com>
---
 include/env/ti/ti_common.env | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/env/ti/ti_common.env b/include/env/ti/ti_common.env
index f0f89a228767..5473f633aa7d 100644
--- a/include/env/ti/ti_common.env
+++ b/include/env/ti/ti_common.env
@@ -27,7 +27,7 @@ bootcmd_ti_mmc=
 #if CONFIG_CMD_REMOTEPROC
 	if test ${do_main_cpsw0_qsgmii_phyinit} -eq 1;
 		then run main_cpsw0_qsgmii_phyinit;
-	fi
+	fi;
 	run boot_rprocs;
 #endif
 	if test ${boot_fit} -eq 1;

-- 
2.43.0

[PATCH 2/2] include: env: ti: add default for do_main_cpsw0_qsgmii_phyinit

[Manorit Chawdhry]

By default this variable is unset and this causes the test condition to
fail on devices that don't have this defined. Set a default value for
this.

   => boot
   ## Error: "main_cpsw0_qsgmii_phyinit" not defined
   [...]

Fixes: 0d72b0f2f83b ("include: env: ti: ti_common: Run main_cpsw0_qsgmii_phyinit conditionally")

Signed-off-by: Manorit Chawdhry <m-chawdhry@ti.com>
---
 include/env/ti/ti_common.env | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/env/ti/ti_common.env b/include/env/ti/ti_common.env
index 5473f633aa7d..02b410c3adc4 100644
--- a/include/env/ti/ti_common.env
+++ b/include/env/ti/ti_common.env
@@ -22,6 +22,7 @@ get_fit_overlaystring=
 	done;
 get_fit_config=setexpr name_fit_config gsub / _ conf-${fdtfile}
 run_fit=run get_fit_config; bootm ${addr_fit}#${name_fit_config}${overlaystring}
+do_main_cpsw0_qsgmii_phyinit=0
 bootcmd_ti_mmc=
 	run findfdt; run init_${boot};
 #if CONFIG_CMD_REMOTEPROC

-- 
2.43.0

Re: [PATCH 1/2] include: env: ti: ti_common: Fix a missing semicolon

[Mattijs Korpershoek]

Hi Manorit,

Thank you for the patch.

On lun., janv. 08, 2024 at 13:48, Manorit Chawdhry <m-chawdhry@ti.com> wrote:

> Fix a missing semicolon that leads to syntax error while booting j721s2.
>
>     Importing environment from mmc1 ...
>     syntax error at 'run'HUSH died!
>
> Fixes: 0d72b0f2f83b ("include: env: ti: ti_common: Run main_cpsw0_qsgmii_phyinit conditionally")
>
> Signed-off-by: Manorit Chawdhry <m-chawdhry@ti.com>

Reviewed-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>

> ---
>  include/env/ti/ti_common.env | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/include/env/ti/ti_common.env b/include/env/ti/ti_common.env
> index f0f89a228767..5473f633aa7d 100644
> --- a/include/env/ti/ti_common.env
> +++ b/include/env/ti/ti_common.env
> @@ -27,7 +27,7 @@ bootcmd_ti_mmc=
>  #if CONFIG_CMD_REMOTEPROC
>  	if test ${do_main_cpsw0_qsgmii_phyinit} -eq 1;
>  		then run main_cpsw0_qsgmii_phyinit;
> -	fi
> +	fi;
>  	run boot_rprocs;
>  #endif
>  	if test ${boot_fit} -eq 1;
>
> -- 
> 2.43.0

Re: [PATCH 2/2] include: env: ti: add default for do_main_cpsw0_qsgmii_phyinit

[Mattijs Korpershoek]

Hi Manorit,

Thank you for the patch.

On lun., janv. 08, 2024 at 13:48, Manorit Chawdhry <m-chawdhry@ti.com> wrote:

> By default this variable is unset and this causes the test condition to
> fail on devices that don't have this defined. Set a default value for
> this.
>
>    => boot
>    ## Error: "main_cpsw0_qsgmii_phyinit" not defined
>    [...]
>
> Fixes: 0d72b0f2f83b ("include: env: ti: ti_common: Run main_cpsw0_qsgmii_phyinit conditionally")
>
> Signed-off-by: Manorit Chawdhry <m-chawdhry@ti.com>

Reviewed-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>

> ---
>  include/env/ti/ti_common.env | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/include/env/ti/ti_common.env b/include/env/ti/ti_common.env
> index 5473f633aa7d..02b410c3adc4 100644
> --- a/include/env/ti/ti_common.env
> +++ b/include/env/ti/ti_common.env
> @@ -22,6 +22,7 @@ get_fit_overlaystring=
>  	done;
>  get_fit_config=setexpr name_fit_config gsub / _ conf-${fdtfile}
>  run_fit=run get_fit_config; bootm ${addr_fit}#${name_fit_config}${overlaystring}
> +do_main_cpsw0_qsgmii_phyinit=0
>  bootcmd_ti_mmc=
>  	run findfdt; run init_${boot};
>  #if CONFIG_CMD_REMOTEPROC
>
> -- 
> 2.43.0

Re: [PATCH 1/2] include: env: ti: ti_common: Fix a missing semicolon

[Tom Rini]

[-- Attachment #1: Type: text/plain, Size: 507 bytes --]

On Mon, Jan 08, 2024 at 01:48:48PM +0530, Manorit Chawdhry wrote:

> Fix a missing semicolon that leads to syntax error while booting j721s2.
> 
>     Importing environment from mmc1 ...
>     syntax error at 'run'HUSH died!
> 
> Fixes: 0d72b0f2f83b ("include: env: ti: ti_common: Run main_cpsw0_qsgmii_phyinit conditionally")
> 
> Signed-off-by: Manorit Chawdhry <m-chawdhry@ti.com>
> Reviewed-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>

Applied to u-boot/master, thanks!

-- 
Tom

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

Re: [PATCH 2/2] include: env: ti: add default for do_main_cpsw0_qsgmii_phyinit

[Tom Rini]

[-- Attachment #1: Type: text/plain, Size: 588 bytes --]

On Mon, Jan 08, 2024 at 01:48:49PM +0530, Manorit Chawdhry wrote:

> By default this variable is unset and this causes the test condition to
> fail on devices that don't have this defined. Set a default value for
> this.
> 
>    => boot
>    ## Error: "main_cpsw0_qsgmii_phyinit" not defined
>    [...]
> 
> Fixes: 0d72b0f2f83b ("include: env: ti: ti_common: Run main_cpsw0_qsgmii_phyinit conditionally")
> 
> Signed-off-by: Manorit Chawdhry <m-chawdhry@ti.com>
> Reviewed-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>

Applied to u-boot/master, thanks!

-- 
Tom

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]