diff options
| author | Tom Rini <trini@konsulko.com> | 2020-07-07 14:00:44 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-07-07 14:00:44 -0400 |
| commit | 1e88e78177da80fa8e9fa9fc7613657478d61d1e (patch) | |
| tree | 9b713c7aab282891762ed8cdd6c1fffa195bd1ac /cmd/nvedit.c | |
| parent | c4df37bfa916d6516d67dde6ef9d1b18b36041d3 (diff) | |
| parent | 6c393e8c0fae98a3a6e2909fc79697075552a152 (diff) | |
Merge tag 'u-boot-stm32-20200707' of https://gitlab.denx.de/u-boot/custodians/u-boot-stm
- arch and board update for stm32mp15:
- use OPP information in device tree for 800MHz/650MHz support
- ram: inprovments of test command
- solve boot on closed chip when access to DBGMCU_IDC is protected
- stm32prog command: Add "device anme" during USB enumeration
- update configs: activate WATCHDOG and 'env erase' command,
increase teed partition, support SD card after NOR boot by default and
use env info in env_check
- some sboard cleanups: gpio hog in dh board, specific driver for
type-c stusb1600 controller code in a driver move part of code in spl.c
and in common directory
- fix STM32 compatible for dwc_eth_qos driver
- support of new pinctrl ops get_dir_flags/set_dir_flags in stm32 and stmfx
drivers
- vrefbuf: fix a possible overshoot when re-enabling
Diffstat (limited to 'cmd/nvedit.c')
| -rw-r--r-- | cmd/nvedit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmd/nvedit.c b/cmd/nvedit.c index 08d49df220a..49338b4d364 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 |