cmd: env: use ENV_IS_IN_DEVICE in env info
Subsystems (3)
PATCH v2 1/2 cmd: env: use ENV_IS_IN_DEVICE in env info
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.
Changes in v2:
- correct commit message (commit-notes) and add review by Patrice
cmd/nvedit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
cmd/nvedit.c +1 -1
@@ -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
Signature · 1 line
2.17.1
PATCH v2 2/2 stm32mp1: use the command env info in env_check
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.
Changes in v2:
- correct commit message (commit-notes) and add review by Patrice
arch/arm/mach-stm32mp/Kconfig | 1 + include/configs/stm32mp1.h | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-)
arch/arm/mach-stm32mp/Kconfig +1 -0
@@ -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
include/configs/stm32mp1.h +1 -3
@@ -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"
Signature · 1 line
2.17.1
PATCH v2 2/2 stm32mp1: use the command env info in env_check
Hi Patrick
Quoted 40 lines · Patrick Delaunay
Activate
CMD_NVEDIT_INFOand use the new command "env info -d -p -q" to automatically save the environment on first boot.This patch allows to remove the
env_defaultvariable.Signed-off-by Patrick Delaunay <[email protected]>---
Previously sent in serie
cmd: env: add option for quiet output on env info
http://patchwork.ozlabs.org/project/uboot/list/?series=158105Resend as separate serie without the "-q" option.
Changes in v2:
- correct commit message (commit-notes) and add review by Patricearch/arm/mach-stm32mp/Kconfig | 1 + include/configs/stm32mp1.h | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-)arch/arm/mach-stm32mp/Kconfig +1
-0@@ -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 helpinclude/configs/stm32mp1.h +0
-0
include/configs/stm32mp1.h line 161
Quoted 10 lines
include/configs/stm32mp1.h +1
-3@@ -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"
Thanks
PATCH v2 1/2 cmd: env: use ENV_IS_IN_DEVICE in env info
In reply to Patrick DelaunayQuoted 10 lines · Patrick Delaunay
Use the define
ENV_IS_IN_DEVICEto test if one theCONFIG_ENV_IS_IN_... is defined and correct the detection of persistent storage support in the command "env info" ifCONFIG_ENV_IS_NOWHEREis activated.Since commit
60d5ed2593c9("env: allowENV_IS_NOWHEREwith other storage target") testCONFIG_ENV_IS_NOWHEREis not enough; see also commit953db29a1e9c6("env: enable saveenv command when oneCONFIG_ENV_IS_INis activated").
Quoted 5 lines
This patch avoids issue for this command in stm32mp1 platform.
Signed-off-by Patrick Delaunay <[email protected]>Reviewed-by Simon Glass <[email protected]>Reviewed-by Patrice Chotard <[email protected]>
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200707/937dc30e/attachment.sig>