diff options
| author | Tom Rini <trini@konsulko.com> | 2020-04-27 17:50:43 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-04-27 17:50:43 -0400 |
| commit | 08977f873f4034307796173784fc17a11188a0cb (patch) | |
| tree | 8045cbf4733f1ff77d9b313a2d4ae48cb949babb /tools | |
| parent | 9b20a794a71151a3a690242b5161b4ca5effd3e7 (diff) | |
| parent | 0015e6defe66022b38c4fe0e2c793728ab2c3cdd (diff) | |
| download | u-boot-08977f873f4034307796173784fc17a11188a0cb.zip u-boot-08977f873f4034307796173784fc17a11188a0cb.tar.gz u-boot-08977f873f4034307796173784fc17a11188a0cb.tar.bz2 | |
Merge branch '2020-04-27-master-imports'
- Assorted bugfixes.
- Documentation improvements including support for https://u-boot.readthedocs.io/
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/env/fw_env.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c index 381739d..8734663 100644 --- a/tools/env/fw_env.c +++ b/tools/env/fw_env.c @@ -1647,6 +1647,9 @@ static int check_device_config(int dev) goto err; } DEVTYPE(dev) = mtdinfo.type; + if (DEVESIZE(dev) == 0 && ENVSECTORS(dev) == 0 && + mtdinfo.type == MTD_NORFLASH) + DEVESIZE(dev) = mtdinfo.erasesize; if (DEVESIZE(dev) == 0) /* Assume the erase size is the same as the env-size */ DEVESIZE(dev) = ENVSIZE(dev); |