Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-24 21:54:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

cmd: nvedit: Get rid of the env lookup

Browse source 
The nvedit command is the only user of env_driver_lookup_default outside of
the environment code itself, and it uses it only to print the environment
it's about to save to during env save.

As we're about to rework the environment to be able to handle multiple
environment sources, we might not have an idea of what environment backend
is going to be used before trying (and possibly failing for some).

Therefore, it makes sense to remove that message and move it to the
env_save function itself. As a side effect, we also can get rid of the call
to env_driver_lookup_default that is also about to get refactored.

Reviewed-by: Andre Przywara <andre.przywara@arm.com>
Reviewed-by: Lukasz Majewski <lukma@denx.de>
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
This commit is contained in:
Maxime Ripard 2018-01-23 21:16:50 +01:00 committed by Tom Rini
parent 748277c415
commit 9c24dfb2b8
3 changed files with 3 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cmd/nvedit.c
View file

@ -708,10 +708,6 @@ ulong env_get_ulong(const char *name, int base, ulong default_val)
static int do_env_save(cmd_tbl_t *cmdtp, int flag, int argc,
char * const argv[])
{
struct env_driver *env = env_driver_lookup_default();
printf("Saving Environment to %s...\n", env->name);
return env_save() ? 1 : 0;
}

4
env/env.c vendored
View file

@ -54,7 +54,7 @@ static enum env_location env_get_default_location(void)
return ENVL_UNKNOWN;
}
struct env_driver *env_driver_lookup_default(void)
static struct env_driver *env_driver_lookup_default(void)
{
enum env_location loc = env_get_default_location();
struct env_driver *drv;
@ -117,6 +117,8 @@ int env_save(void)
return -ENODEV;
if (!drv->save)
return -ENOSYS;
printf("Saving Environment to %s...\n", drv->name);
ret = drv->save();
if (ret) {
debug("%s: Environment failed to save (err=%d)\n", __func__,

7
include/environment.h
View file

@ -292,13 +292,6 @@ int env_export(env_t *env_out);
int env_import_redund(const char *buf1, const char *buf2);
#endif
/**
* env_driver_lookup_default() - Look up the default environment driver
*
* @return pointer to driver, or NULL if none (which should not happen)
*/
struct env_driver *env_driver_lookup_default(void);
/**
* env_get_char() - Get a character from the early environment
*