diff options
| author | Simon Glass <sjg@chromium.org> | 2017-08-03 12:22:01 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-08-15 20:50:27 -0400 |
| commit | e5bce247b01ae057f05cc80178f0df28ec1d27a7 (patch) | |
| tree | 98a5f6c12ce94369f76db33a6347791392003241 /env/sata.c | |
| parent | c9d728dd33fe7c45711395c72b2113ea7c18fc72 (diff) | |
| download | u-boot-e5bce247b01ae057f05cc80178f0df28ec1d27a7.tar.gz u-boot-e5bce247b01ae057f05cc80178f0df28ec1d27a7.tar.bz2 u-boot-e5bce247b01ae057f05cc80178f0df28ec1d27a7.zip | |
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/sata.c')
| -rw-r--r-- | env/sata.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/env/sata.c b/env/sata.c index f7b159a347..6f9099873d 100644 --- a/env/sata.c +++ b/env/sata.c @@ -33,7 +33,7 @@ __weak int sata_get_env_dev(void) return CONFIG_SYS_SATA_ENV_DEV; } -int env_init(void) +static int env_sata_init(void) { /* use default */ gd->env_addr = (ulong)&default_environment[0]; @@ -56,7 +56,7 @@ static inline int write_env(struct blk_desc *sata, unsigned long size, return (n == blk_cnt) ? 0 : -1; } -int saveenv(void) +static int env_sata_save(void) { ALLOC_CACHE_ALIGN_BUFFER(env_t, env_new, 1); struct blk_desc *sata = NULL; @@ -102,7 +102,7 @@ static inline int read_env(struct blk_desc *sata, unsigned long size, return (n == blk_cnt) ? 0 : -1; } -void env_relocate_spec(void) +static void env_sata_load(void) { ALLOC_CACHE_ALIGN_BUFFER(char, buf, CONFIG_ENV_SIZE); struct blk_desc *sata = NULL; @@ -128,8 +128,7 @@ void env_relocate_spec(void) U_BOOT_ENV_LOCATION(sata) = { .location = ENVL_ESATA, - .get_char = env_get_char_spec, - .load = env_relocate_spec, - .save = env_save_ptr(saveenv), - .init = env_init, + .load = env_sata_load, + .save = env_save_ptr(env_sata_save), + .init = env_sata_init, }; |