diff options
| author | Simon Glass <sjg@chromium.org> | 2017-08-03 12:22:15 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-08-16 08:31:11 -0400 |
| commit | 723806cc5bea9f8b37323dfd7568603f99af6a06 (patch) | |
| tree | 886eeb28ac54536f60ad0979f9a4404ff4b29bda /include | |
| parent | 35affd7a2ff9a77b9946bf93b616228fcf218d60 (diff) | |
| download | u-boot-723806cc5bea9f8b37323dfd7568603f99af6a06.tar.gz | |
env: Rename some other getenv()-related functions
We are now using an env_ prefix for environment functions. Rename these
other functions as well, for consistency:
getenv_vlan()
getenv_bootm_size()
getenv_bootm_low()
getenv_bootm_mapsize()
env_get_default()
Suggested-by: Wolfgang Denk <wd@denx.de>
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/common.h | 2 | ||||
| -rw-r--r-- | include/environment.h | 2 | ||||
| -rw-r--r-- | include/image.h | 6 | ||||
| -rw-r--r-- | include/net.h | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/include/common.h b/include/common.h index eb44c9ef42..aaed131671 100644 --- a/include/common.h +++ b/include/common.h @@ -749,7 +749,7 @@ int zzip(void *dst, unsigned long *lenp, unsigned char *src, /* lib/net_utils.c */ #include <net.h> -static inline struct in_addr getenv_ip(char *var) +static inline struct in_addr env_get_ip(char *var) { return string_to_ip(env_get(var)); } diff --git a/include/environment.h b/include/environment.h index a055e3fa89..9a44215235 100644 --- a/include/environment.h +++ b/include/environment.h @@ -282,7 +282,7 @@ extern struct hsearch_data env_htab; void env_crc_update(void); /* Look up the variable from the default environment */ -char *getenv_default(const char *name); +char *env_get_default(const char *name); /* [re]set to the default environment */ void set_default_env(const char *s); diff --git a/include/image.h b/include/image.h index c4fe4cfb8b..1f4bfda2f3 100644 --- a/include/image.h +++ b/include/image.h @@ -769,9 +769,9 @@ static inline void image_set_name(image_header_t *hdr, const char *name) int image_check_hcrc(const image_header_t *hdr); int image_check_dcrc(const image_header_t *hdr); #ifndef USE_HOSTCC -ulong getenv_bootm_low(void); -phys_size_t getenv_bootm_size(void); -phys_size_t getenv_bootm_mapsize(void); +ulong env_get_bootm_low(void); +phys_size_t env_get_bootm_size(void); +phys_size_t env_get_bootm_mapsize(void); #endif void memmove_wd(void *to, void *from, size_t len, ulong chunksz); diff --git a/include/net.h b/include/net.h index a6f9082653..455b48f6c7 100644 --- a/include/net.h +++ b/include/net.h @@ -834,7 +834,7 @@ void vlan_to_string(ushort x, char *s); ushort string_to_vlan(const char *s); /* read a VLAN id from an environment variable */ -ushort getenv_vlan(char *); +ushort env_get_vlan(char *); /* copy a filename (allow for "..." notation, limit length) */ void copy_filename(char *dst, const char *src, int size); |