diff options
Diffstat (limited to 'common')
| -rw-r--r-- | common/environment.c | 4 | ||||
| -rw-r--r-- | common/globalvar.c | 9 |
2 files changed, 11 insertions, 2 deletions
diff --git a/common/environment.c b/common/environment.c index 56a030eda0..aba6dcde48 100644 --- a/common/environment.c +++ b/common/environment.c @@ -277,9 +277,9 @@ int envfs_save(const char *filename, const char *dirname, unsigned flags) size = 0; /* force no content */ } else { /* first pass: calculate size */ - recursive_action(dirname, ACTION_RECURSE, file_action, + recursive_action(dirname, ACTION_RECURSE | ACTION_SORT, file_action, NULL, &data, 0); - recursive_action("/.defaultenv", ACTION_RECURSE, + recursive_action("/.defaultenv", ACTION_RECURSE | ACTION_SORT, file_remove_action, NULL, &data, 0); size = 0; diff --git a/common/globalvar.c b/common/globalvar.c index b9bfce7dac..1bea7425d4 100644 --- a/common/globalvar.c +++ b/common/globalvar.c @@ -99,6 +99,9 @@ void dev_param_init_from_nv(struct device_d *dev, const char *name) const char *val; int ret = 0; + if (!IS_ENABLED(CONFIG_NVVAR)) + return; + if (dev == &nv_device) return; if (dev == &global_device) @@ -138,6 +141,9 @@ static int nvvar_device_dispatch(const char *name, struct device_d **dev, const char *dot; int dotpos; + if (!IS_ENABLED(CONFIG_NVVAR)) + return -ENOSYS; + *dev = NULL; if (strncmp(name, "dev.", 4)) @@ -447,6 +453,9 @@ static void globalvar_nv_sync(const char *name) { const char *val; + if (!IS_ENABLED(CONFIG_NVVAR)) + return; + val = dev_get_param(&nv_device, name); if (val) dev_set_param(&global_device, name, val); |