colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

env: Drop the env_name_spec global

Browse Source 
Add a name to the driver and use that instead of the global variable
declared by each driver.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Simon Glass
2017-08-03 12:22:03 -06:00
committed by Tom Rini
parent 7938822a6b
commit ac358beb85
17 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
include/environment.h
View File

@@ -143,10 +143,6 @@ extern unsigned long nand_env_oob_offset;
# define ENV_HEADER_SIZE (sizeof(uint32_t))
#endif
#if defined(CONFIG_CMD_SAVEENV) && !defined(CONFIG_ENV_IS_NOWHERE)
extern char *env_name_spec;
#endif
#ifdef CONFIG_ENV_AES
/* Make sure the payload is multiple of AES block size */
#define ENV_SIZE ((CONFIG_ENV_SIZE - ENV_HEADER_SIZE) & ~(16 - 1))
@@ -224,6 +220,7 @@ enum env_location {
};
struct env_driver {
const char *name;
enum env_location location;
/**
@@ -269,6 +266,13 @@ struct env_driver {
#define U_BOOT_ENV_LOCATION(__name) \
ll_entry_declare(struct env_driver, __name, env_driver)
/* Declare the name of a location */
#ifdef CONFIG_CMD_SAVEENV
#define ENV_NAME(_name) .name = _name,
#else
#define ENV_NAME(_name)
#endif
#ifdef CONFIG_CMD_SAVEENV
#define env_save_ptr(x) x
#else
@@ -303,6 +307,13 @@ 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);
#endif /* DO_DEPS_ONLY */
#endif /* _ENVIRONMENT_H_ */