diff options
| author | Simon Glass <sjg@chromium.org> | 2017-08-03 21:22:01 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-08-16 03:50:27 +0300 |
| commit | e5bce247b01ae057f05cc80178f0df28ec1d27a7 (patch) | |
| tree | 98a5f6c12ce94369f76db33a6347791392003241 /env/nand.c | |
| parent | c9d728dd33fe7c45711395c72b2113ea7c18fc72 (diff) | |
| download | u-boot-e5bce247b01ae057f05cc80178f0df28ec1d27a7.tar.xz | |
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/nand.c')
| -rw-r--r-- | env/nand.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/env/nand.c b/env/nand.c index 07edabab79..596bdd3980 100644 --- a/env/nand.c +++ b/env/nand.c @@ -64,7 +64,7 @@ DECLARE_GLOBAL_DATA_PTR; * This way the SPL loads not only the U-Boot image from NAND but * also the environment. */ -int env_init(void) +static int env_nand_init(void) { #if defined(ENV_IS_EMBEDDED) || defined(CONFIG_NAND_ENV_DST) int crc1_ok = 0, crc2_ok = 0; @@ -185,7 +185,7 @@ static int erase_and_write_env(const struct nand_env_location *location, return ret; } -int saveenv(void) +static int env_nand_save(void) { int ret = 0; ALLOC_CACHE_ALIGN_BUFFER(env_t, env_new, 1); @@ -317,7 +317,7 @@ int get_nand_env_oob(struct mtd_info *mtd, unsigned long *result) #endif #ifdef CONFIG_ENV_OFFSET_REDUND -void env_relocate_spec(void) +static void env_nand_load(void) { #if !defined(ENV_IS_EMBEDDED) int read1_fail = 0, read2_fail = 0; @@ -365,7 +365,7 @@ done: * device i.e., nand_dev_desc + 0. This is also the behaviour using * the new NAND code. */ -void env_relocate_spec(void) +static void env_nand_load(void) { #if !defined(ENV_IS_EMBEDDED) int ret; @@ -398,9 +398,9 @@ void env_relocate_spec(void) U_BOOT_ENV_LOCATION(nand) = { .location = ENVL_NAND, - .load = env_relocate_spec, + .load = env_nand_load, #if defined(CMD_SAVEENV) - .save = env_save_ptr(saveenv), + .save = env_save_ptr(env_nand_save), #endif - .init = env_init, + .init = env_nand_init, }; |