diff options
| author | Simon Glass <[email protected]> | 2017-08-03 12:22:12 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2017-08-16 08:30:24 -0400 |
| commit | 00caae6d47645e68d6e5277aceb69592b49381a6 (patch) | |
| tree | c361aa0cea3093b93c1118266fe9e2b44ac6e453 /common/spl | |
| parent | fd1e959e91d2b0b2e853d09dd9167dfff18a616c (diff) | |
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 <[email protected]>
Signed-off-by: Simon Glass <[email protected]>
Diffstat (limited to 'common/spl')
| -rw-r--r-- | common/spl/Kconfig | 2 | ||||
| -rw-r--r-- | common/spl/spl_dfu.c | 2 | ||||
| -rw-r--r-- | common/spl/spl_ext.c | 4 | ||||
| -rw-r--r-- | common/spl/spl_fat.c | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/common/spl/Kconfig b/common/spl/Kconfig index 3c887b34050..582b685dad3 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -278,7 +278,7 @@ config SPL_ENV_SUPPORT needed in SPL as it has a much simpler task with less configuration. But some boards use this to support 'Falcon' boot on EXT2 and FAT, where SPL boots directly into Linux without - starting U-Boot first. Enabling this option will make getenv() + starting U-Boot first. Enabling this option will make env_get() and env_set() available in SPL. config SPL_SAVEENV diff --git a/common/spl/spl_dfu.c b/common/spl/spl_dfu.c index f5ec0fb396b..2c974735b11 100644 --- a/common/spl/spl_dfu.c +++ b/common/spl/spl_dfu.c @@ -40,7 +40,7 @@ int spl_dfu_cmd(int usbctrl, char *dfu_alt_info, char *interface, char *devstr) /* set default environment */ set_default_env(0); - str_env = getenv(dfu_alt_info); + str_env = env_get(dfu_alt_info); if (!str_env) { error("\"dfu_alt_info\" env variable not defined!\n"); return -EINVAL; diff --git a/common/spl/spl_ext.c b/common/spl/spl_ext.c index f17c6b94941..559ba0b7971 100644 --- a/common/spl/spl_ext.c +++ b/common/spl/spl_ext.c @@ -89,7 +89,7 @@ int spl_load_image_ext_os(struct spl_image_info *spl_image, return -1; } #if defined(CONFIG_SPL_ENV_SUPPORT) - file = getenv("falcon_args_file"); + file = env_get("falcon_args_file"); if (file) { err = ext4fs_open(file, &filelen); if (err < 0) { @@ -102,7 +102,7 @@ int spl_load_image_ext_os(struct spl_image_info *spl_image, file, err); goto defaults; } - file = getenv("falcon_image_file"); + file = env_get("falcon_image_file"); if (file) { err = spl_load_image_ext(spl_image, block_dev, partition, file); diff --git a/common/spl/spl_fat.c b/common/spl/spl_fat.c index 5e312160d95..60b85f082d4 100644 --- a/common/spl/spl_fat.c +++ b/common/spl/spl_fat.c @@ -113,7 +113,7 @@ int spl_load_image_fat_os(struct spl_image_info *spl_image, return err; #if defined(CONFIG_SPL_ENV_SUPPORT) && defined(CONFIG_SPL_OS_BOOT) - file = getenv("falcon_args_file"); + file = env_get("falcon_args_file"); if (file) { err = file_fat_read(file, (void *)CONFIG_SYS_SPL_ARGS_ADDR, 0); if (err <= 0) { @@ -121,7 +121,7 @@ int spl_load_image_fat_os(struct spl_image_info *spl_image, file, err); goto defaults; } - file = getenv("falcon_image_file"); + file = env_get("falcon_image_file"); if (file) { err = spl_load_image_fat(spl_image, block_dev, partition, file); |