| Message ID | 20200702154345.8436-1-patrick.delaunay@st.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v2,1/2] cmd: env: use ENV_IS_IN_DEVICE in env info | expand |
On Thu, Jul 02, 2020 at 05:43:44PM +0200, 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. > > Signed-off-by: Patrick Delaunay <patrick.delaunay at st.com> > Reviewed-by: Simon Glass <sjg at chromium.org> > Reviewed-by: Patrice Chotard <patrice.chotard at st.com> Reviewed-by: Tom Rini <trini at konsulko.com>
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
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. Signed-off-by: Patrick Delaunay <patrick.delaunay at st.com> Reviewed-by: Simon Glass <sjg at chromium.org> Reviewed-by: Patrice Chotard <patrice.chotard at st.com> --- 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(-)