diff options
| author | Stefano Babic <sbabic@denx.de> | 2016-05-17 17:51:44 +0200 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2016-05-17 17:51:44 +0200 |
| commit | 52b1eaf93d6b55e1467f97b8eefdc2f8b6031c43 (patch) | |
| tree | 73357539a8382b406c29b1826dc17012f267f2cb /tools/env/fw_env.c | |
| parent | aaeadd3f7b248aeb1c72c36183ab9c6e77da6ce2 (diff) | |
| parent | aeaec0e682f45b9e0c62c522fafea353931f73ed (diff) | |
| download | talos-obmc-uboot-52b1eaf93d6b55e1467f97b8eefdc2f8b6031c43.tar.gz talos-obmc-uboot-52b1eaf93d6b55e1467f97b8eefdc2f8b6031c43.zip | |
Merge branch 'master' of git://git.denx.de/u-boot
Diffstat (limited to 'tools/env/fw_env.c')
| -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 1420ac58a3..06cf63daa4 100644 --- a/tools/env/fw_env.c +++ b/tools/env/fw_env.c @@ -1325,6 +1325,9 @@ static int parse_config () struct stat st; #if defined(CONFIG_FILE) + if (!common_args.config_file) + common_args.config_file = CONFIG_FILE; + /* Fills in DEVNAME(), ENVSIZE(), DEVESIZE(). Or don't. */ if (get_config(common_args.config_file)) { fprintf(stderr, "Cannot parse config file '%s': %m\n", |
