diff options
| author | Simon Glass <sjg@chromium.org> | 2017-08-03 12:22:12 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-08-16 08:30:24 -0400 |
| commit | 00caae6d47645e68d6e5277aceb69592b49381a6 (patch) | |
| tree | c361aa0cea3093b93c1118266fe9e2b44ac6e453 /common/autoboot.c | |
| parent | fd1e959e91d2b0b2e853d09dd9167dfff18a616c (diff) | |
| download | u-boot-00caae6d47645e68d6e5277aceb69592b49381a6.tar.gz | |
env: Rename getenv/_f() to env_get()
We are now using an env_ prefix for environment functions. Rename these
two functions for consistency. Also add function comments in common.h.
Quite a few places use getenv() in a condition context, provoking a
warning from checkpatch. These are fixed up in this patch also.
Suggested-by: Wolfgang Denk <wd@denx.de>
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'common/autoboot.c')
| -rw-r--r-- | common/autoboot.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/common/autoboot.c b/common/autoboot.c index 41f18208c3..35c1e972c6 100644 --- a/common/autoboot.c +++ b/common/autoboot.c @@ -50,7 +50,7 @@ static int slow_equals(u8 *a, u8 *b, int len) static int passwd_abort(uint64_t etime) { - const char *sha_env_str = getenv("bootstopkeysha256"); + const char *sha_env_str = env_get("bootstopkeysha256"); u8 sha_env[SHA256_SUM_LEN]; u8 sha[SHA256_SUM_LEN]; char presskey[MAX_DELAY_STOP_STR]; @@ -109,8 +109,8 @@ static int passwd_abort(uint64_t etime) int retry; } delaykey[] = { - { .str = getenv("bootdelaykey"), .retry = 1 }, - { .str = getenv("bootstopkey"), .retry = 0 }, + { .str = env_get("bootdelaykey"), .retry = 1 }, + { .str = env_get("bootstopkey"), .retry = 0 }, }; char presskey[MAX_DELAY_STOP_STR]; @@ -304,7 +304,7 @@ const char *bootdelay_process(void) bootlimit = getenv_ulong("bootlimit", 10, 0); #endif /* CONFIG_BOOTCOUNT_LIMIT */ - s = getenv("bootdelay"); + s = env_get("bootdelay"); bootdelay = s ? (int)simple_strtol(s, NULL, 10) : CONFIG_BOOTDELAY; #ifdef CONFIG_OF_CONTROL @@ -321,17 +321,17 @@ const char *bootdelay_process(void) #ifdef CONFIG_POST if (gd->flags & GD_FLG_POSTFAIL) { - s = getenv("failbootcmd"); + s = env_get("failbootcmd"); } else #endif /* CONFIG_POST */ #ifdef CONFIG_BOOTCOUNT_LIMIT if (bootlimit && (bootcount > bootlimit)) { printf("Warning: Bootlimit (%u) exceeded. Using altbootcmd.\n", (unsigned)bootlimit); - s = getenv("altbootcmd"); + s = env_get("altbootcmd"); } else #endif /* CONFIG_BOOTCOUNT_LIMIT */ - s = getenv("bootcmd"); + s = env_get("bootcmd"); process_fdt_options(gd->fdt_blob); stored_bootdelay = bootdelay; @@ -357,7 +357,7 @@ void autoboot_command(const char *s) #ifdef CONFIG_MENUKEY if (menukey == CONFIG_MENUKEY) { - s = getenv("menucmd"); + s = env_get("menucmd"); if (s) run_command_list(s, -1, 0); } |