[PATCH 1/2] cmd: env: use ENV_IS_IN_DEVICE in env info

[PATCH 1/2] cmd: env: use ENV_IS_IN_DEVICE in env info

[Patrick Delaunay]

Use the define ENV_IS_IN_DEVICE to test if one the
CONFIG_ENV_IS_IN_...  is defined and correct the detection of
persistent storage support in the command "env info"
if CONFIG_ENV_IS_NOWHERE is activated.

Since commit 60d5ed2593c9 ("env: allow ENV_IS_NOWHERE with
other storage target") test CONFIG_ENV_IS_NOWHERE is not
enough; see also commit 953db29a1e9c6 ("env: enable saveenv
command when one CONFIG_ENV_IS_IN is activated").

This patch avoids issue for this command in stm32mp1 platform.

Previously sent in serie
cmd: env: add option for quiet output on env info
http://patchwork.ozlabs.org/project/uboot/list/?series=158105

Resend as separate serie.

END

Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
---

 cmd/nvedit.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmd/nvedit.c b/cmd/nvedit.c
index 08d49df220..49338b4d36 100644
--- a/cmd/nvedit.c
+++ b/cmd/nvedit.c
@@ -1265,7 +1265,7 @@ static int do_env_info(struct cmd_tbl *cmdtp, int flag,
 
 	/* evaluate whether environment can be persisted */
 	if (eval_flags & ENV_INFO_IS_PERSISTED) {
-#if defined(CONFIG_CMD_SAVEENV) && !defined(CONFIG_ENV_IS_NOWHERE)
+#if defined(CONFIG_CMD_SAVEENV) && defined(ENV_IS_IN_DEVICE)
 		printf("Environment can be persisted\n");
 		eval_results |= ENV_INFO_IS_PERSISTED;
 #else
-- 
2.17.1

[PATCH 2/2] stm32mp1: use the command env info in env_check

[Patrick Delaunay]

Activate CMD_NVEDIT_INFO and use the new command "env info -d -p -q"
to automatically save the environment on first boot.

This patch allows to remove the env_default variable.



Previously sent in serie
cmd: env: add option for quiet output on env info
http://patchwork.ozlabs.org/project/uboot/list/?series=158105

Resend as separate serie without the "-q" option.

END

Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
---

 arch/arm/mach-stm32mp/Kconfig | 1 +
 include/configs/stm32mp1.h    | 4 +---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/arch/arm/mach-stm32mp/Kconfig b/arch/arm/mach-stm32mp/Kconfig
index 6c995ed8d8..478fd2f17d 100644
--- a/arch/arm/mach-stm32mp/Kconfig
+++ b/arch/arm/mach-stm32mp/Kconfig
@@ -46,6 +46,7 @@ config STM32MP15x
 	select STM32_RESET
 	select STM32_SERIAL
 	select SYS_ARCH_TIMER
+	imply CMD_NVEDIT_INFO
 	imply SYSRESET_PSCI if TFABOOT
 	imply SYSRESET_SYSCON if !TFABOOT
 	help
diff --git a/include/configs/stm32mp1.h b/include/configs/stm32mp1.h
index f271b84a59..e927787be0 100644
--- a/include/configs/stm32mp1.h
+++ b/include/configs/stm32mp1.h
@@ -155,9 +155,7 @@
 	"splashimage=0xc4300000\0"  \
 	"ramdisk_addr_r=0xc4400000\0" \
 	"altbootcmd=run bootcmd\0" \
-	"env_default=1\0" \
-	"env_check=if test $env_default -eq 1;"\
-		" then env set env_default 0;env save;fi\0" \
+	"env_check=if env info -p -d; then env save; fi\0" \
 	STM32MP_BOOTCMD \
 	BOOTENV \
 	"boot_net_usb_start=true\0"
-- 
2.17.1

[PATCH 1/2] cmd: env: use ENV_IS_IN_DEVICE in env info

[Patrice CHOTARD]

Hi Patrick

On 6/15/20 12:02 PM, Patrick Delaunay wrote:
> Use the define ENV_IS_IN_DEVICE to test if one the
> CONFIG_ENV_IS_IN_...  is defined and correct the detection of
> persistent storage support in the command "env info"
> if CONFIG_ENV_IS_NOWHERE is activated.
>
> Since commit 60d5ed2593c9 ("env: allow ENV_IS_NOWHERE with
> other storage target") test CONFIG_ENV_IS_NOWHERE is not
> enough; see also commit 953db29a1e9c6 ("env: enable saveenv
> command when one CONFIG_ENV_IS_IN is activated").
>
> This patch avoids issue for this command in stm32mp1 platform.
>
> Previously sent in serie
> cmd: env: add option for quiet output on env info
> http://patchwork.ozlabs.org/project/uboot/list/?series=158105
>
> Resend as separate serie.
>
> END
Remove END
>
> Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
> Reviewed-by: Simon Glass <sjg@chromium.org>
> ---
>
>  cmd/nvedit.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/cmd/nvedit.c b/cmd/nvedit.c
> index 08d49df220..49338b4d36 100644
> --- a/cmd/nvedit.c
> +++ b/cmd/nvedit.c
> @@ -1265,7 +1265,7 @@ static int do_env_info(struct cmd_tbl *cmdtp, int flag,
>  
>  	/* evaluate whether environment can be persisted */
>  	if (eval_flags & ENV_INFO_IS_PERSISTED) {
> -#if defined(CONFIG_CMD_SAVEENV) && !defined(CONFIG_ENV_IS_NOWHERE)
> +#if defined(CONFIG_CMD_SAVEENV) && defined(ENV_IS_IN_DEVICE)
>  		printf("Environment can be persisted\n");
>  		eval_results |= ENV_INFO_IS_PERSISTED;
>  #else

Reviewed-by: Patrice Chotard <patrice.chotard@st.com>

Thanks

[PATCH 2/2] stm32mp1: use the command env info in env_check

[Patrice CHOTARD]

On 6/15/20 12:02 PM, Patrick Delaunay wrote:
> Activate CMD_NVEDIT_INFO and use the new command "env info -d -p -q"
> to automatically save the environment on first boot.
>
> This patch allows to remove the env_default variable.
>
>
>
> Previously sent in serie
> cmd: env: add option for quiet output on env info
> http://patchwork.ozlabs.org/project/uboot/list/?series=158105
>
> Resend as separate serie without the "-q" option.
>
> END

Remove END

You can add my reviewed-by when commit will be fixed

Thanks

>
> Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
> ---
>
>  arch/arm/mach-stm32mp/Kconfig | 1 +
>  include/configs/stm32mp1.h    | 4 +---
>  2 files changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm/mach-stm32mp/Kconfig b/arch/arm/mach-stm32mp/Kconfig
> index 6c995ed8d8..478fd2f17d 100644
> --- a/arch/arm/mach-stm32mp/Kconfig
> +++ b/arch/arm/mach-stm32mp/Kconfig
> @@ -46,6 +46,7 @@ config STM32MP15x
>  	select STM32_RESET
>  	select STM32_SERIAL
>  	select SYS_ARCH_TIMER
> +	imply CMD_NVEDIT_INFO
>  	imply SYSRESET_PSCI if TFABOOT
>  	imply SYSRESET_SYSCON if !TFABOOT
>  	help
> diff --git a/include/configs/stm32mp1.h b/include/configs/stm32mp1.h
> index f271b84a59..e927787be0 100644
> --- a/include/configs/stm32mp1.h
> +++ b/include/configs/stm32mp1.h
> @@ -155,9 +155,7 @@
>  	"splashimage=0xc4300000\0"  \
>  	"ramdisk_addr_r=0xc4400000\0" \
>  	"altbootcmd=run bootcmd\0" \
> -	"env_default=1\0" \
> -	"env_check=if test $env_default -eq 1;"\
> -		" then env set env_default 0;env save;fi\0" \
> +	"env_check=if env info -p -d; then env save; fi\0" \
>  	STM32MP_BOOTCMD \
>  	BOOTENV \
>  	"boot_net_usb_start=true\0"