diff options
| author | Simon Glass | 2017-08-03 12:22:01 -0600 |
|---|---|---|
| committer | Tom Rini | 2017-08-15 20:50:27 -0400 |
| commit | e5bce247b01ae057f05cc80178f0df28ec1d27a7 (patch) | |
| tree | 98a5f6c12ce94369f76db33a6347791392003241 /env/ubi.c | |
| parent | c9d728dd33fe7c45711395c72b2113ea7c18fc72 (diff) | |
env: Switch over to use environment location drivers
Move over to use a the master implementation of the location drivers, with
each method calling out to the appropriate driver.
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'env/ubi.c')
| -rw-r--r-- | env/ubi.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/env/ubi.c b/env/ubi.c index d91fdbaa4ab..3b6344df7a3 100644 --- a/env/ubi.c +++ b/env/ubi.c @@ -22,7 +22,7 @@ env_t *env_ptr; DECLARE_GLOBAL_DATA_PTR; -int env_init(void) +static int env_ubi_init(void) { /* use default */ gd->env_addr = (ulong)&default_environment[0]; @@ -33,7 +33,7 @@ int env_init(void) #ifdef CONFIG_CMD_SAVEENV #ifdef CONFIG_SYS_REDUNDAND_ENVIRONMENT -int saveenv(void) +static int env_ubi_save(void) { ALLOC_CACHE_ALIGN_BUFFER(env_t, env_new, 1); int ret; @@ -75,7 +75,7 @@ int saveenv(void) return 0; } #else /* ! CONFIG_SYS_REDUNDAND_ENVIRONMENT */ -int saveenv(void) +static int env_ubi_save(void) { ALLOC_CACHE_ALIGN_BUFFER(env_t, env_new, 1); int ret; @@ -104,7 +104,7 @@ int saveenv(void) #endif /* CONFIG_CMD_SAVEENV */ #ifdef CONFIG_SYS_REDUNDAND_ENVIRONMENT -void env_relocate_spec(void) +static void env_ubi_load(void) { ALLOC_CACHE_ALIGN_BUFFER(char, env1_buf, CONFIG_ENV_SIZE); ALLOC_CACHE_ALIGN_BUFFER(char, env2_buf, CONFIG_ENV_SIZE); @@ -146,7 +146,7 @@ void env_relocate_spec(void) env_import_redund((char *)tmp_env1, (char *)tmp_env2); } #else /* ! CONFIG_SYS_REDUNDAND_ENVIRONMENT */ -void env_relocate_spec(void) +static void env_ubi_load(void) { ALLOC_CACHE_ALIGN_BUFFER(char, buf, CONFIG_ENV_SIZE); @@ -180,8 +180,7 @@ void env_relocate_spec(void) U_BOOT_ENV_LOCATION(ubi) = { .location = ENVL_UBI, - .get_char = env_get_char_spec, - .load = env_relocate_spec, - .save = env_save_ptr(saveenv), - .init = env_init, + .load = env_ubi_load, + .save = env_save_ptr(env_ubi_save), + .init = env_ubi_init, }; |