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 /cmd | |
| parent | 35affd7a2ff9a77b9946bf93b616228fcf218d60 (diff) | |
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 'cmd')
| -rw-r--r-- | cmd/elf.c | 2 | ||||
| -rw-r--r-- | cmd/mtdparts.c | 6 | ||||
| -rw-r--r-- | cmd/net.c | 2 |
3 files changed, 5 insertions, 5 deletions
@@ -300,7 +300,7 @@ int do_bootvx(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) ptr += sprintf(build_buf + ptr, "e=%s", tmp); tmp = env_get("netmask"); if (tmp) { - u32 mask = getenv_ip("netmask").s_addr; + u32 mask = env_get_ip("netmask").s_addr; ptr += sprintf(build_buf + ptr, ":%08x ", ntohl(mask)); } else { diff --git a/cmd/mtdparts.c b/cmd/mtdparts.c index a72668119d..615aa7459a 100644 --- a/cmd/mtdparts.c +++ b/cmd/mtdparts.c @@ -1533,7 +1533,7 @@ static int spread_partitions(void) * @param buf temporary buffer pointer MTDPARTS_MAXLEN long * @return mtdparts variable string, NULL if not found */ -static const char *getenv_mtdparts(char *buf) +static const char *env_get_mtdparts(char *buf) { if (gd->flags & GD_FLG_ENV_READY) return env_get("mtdparts"); @@ -1565,7 +1565,7 @@ static int parse_mtdparts(const char *const mtdparts) } /* re-read 'mtdparts' variable, mtd_devices_init may be updating env */ - p = getenv_mtdparts(tmp_parts); + p = env_get_mtdparts(tmp_parts); if (!p) p = mtdparts; @@ -1742,7 +1742,7 @@ int mtdparts_init(void) /* get variables */ ids = env_get("mtdids"); - parts = getenv_mtdparts(tmp_parts); + parts = env_get_mtdparts(tmp_parts); current_partition = env_get("partition"); /* save it for later parsing, cannot rely on current partition pointer @@ -331,7 +331,7 @@ int do_sntp(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) char *toff; if (argc < 2) { - net_ntp_server = getenv_ip("ntpserverip"); + net_ntp_server = env_get_ip("ntpserverip"); if (net_ntp_server.s_addr == 0) { printf("ntpserverip not set\n"); return CMD_RET_FAILURE; |