mirror of
https://github.com/linux-sunxi/u-boot-sunxi.git
synced 2024-02-12 11:16:03 +08:00
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>
This commit is contained in:
@ -469,7 +469,7 @@ step2:
|
||||
#define CTLR_INTLV_MASK 0x20000000
|
||||
/* Perform build-in test on memory. Three-way interleaving is not yet
|
||||
* supported by this code. */
|
||||
if (getenv_f("ddr_bist", buffer, CONFIG_SYS_CBSIZE) >= 0) {
|
||||
if (env_get_f("ddr_bist", buffer, CONFIG_SYS_CBSIZE) >= 0) {
|
||||
puts("Running BIST test. This will take a while...");
|
||||
cs0_config = ddr_in32(&ddr->cs0_config);
|
||||
cs0_bnds = ddr_in32(&ddr->cs0_bnds);
|
||||
|
@ -1861,7 +1861,7 @@ int fsl_ddr_interactive_env_var_exists(void)
|
||||
{
|
||||
char buffer[CONFIG_SYS_CBSIZE];
|
||||
|
||||
if (getenv_f("ddr_interactive", buffer, CONFIG_SYS_CBSIZE) >= 0)
|
||||
if (env_get_f("ddr_interactive", buffer, CONFIG_SYS_CBSIZE) >= 0)
|
||||
return 1;
|
||||
|
||||
return 0;
|
||||
@ -1891,11 +1891,11 @@ unsigned long long fsl_ddr_interactive(fsl_ddr_info_t *pinfo, int var_is_set)
|
||||
};
|
||||
|
||||
if (var_is_set) {
|
||||
if (getenv_f("ddr_interactive", buffer2, CONFIG_SYS_CBSIZE) > 0) {
|
||||
if (env_get_f("ddr_interactive", buffer2,
|
||||
CONFIG_SYS_CBSIZE) > 0)
|
||||
p = buffer2;
|
||||
} else {
|
||||
else
|
||||
var_is_set = 0;
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
|
@ -18,7 +18,7 @@
|
||||
* Use our own stack based buffer before relocation to allow accessing longer
|
||||
* hwconfig strings that might be in the environment before we've relocated.
|
||||
* This is pretty fragile on both the use of stack and if the buffer is big
|
||||
* enough. However we will get a warning from getenv_f for the later.
|
||||
* enough. However we will get a warning from env_get_f() for the latter.
|
||||
*/
|
||||
|
||||
/* Board-specific functions defined in each board's ddr.c */
|
||||
@ -755,7 +755,7 @@ unsigned int populate_memctl_options(const common_timing_params_t *common_dimm,
|
||||
* Extract hwconfig from environment since we have not properly setup
|
||||
* the environment but need it for ddr config params
|
||||
*/
|
||||
if (getenv_f("hwconfig", buffer, sizeof(buffer)) > 0)
|
||||
if (env_get_f("hwconfig", buffer, sizeof(buffer)) > 0)
|
||||
buf = buffer;
|
||||
|
||||
#if defined(CONFIG_SYS_FSL_DDR3) || \
|
||||
@ -1399,7 +1399,7 @@ int fsl_use_spd(void)
|
||||
* Extract hwconfig from environment since we have not properly setup
|
||||
* the environment but need it for ddr config params
|
||||
*/
|
||||
if (getenv_f("hwconfig", buffer, sizeof(buffer)) > 0)
|
||||
if (env_get_f("hwconfig", buffer, sizeof(buffer)) > 0)
|
||||
buf = buffer;
|
||||
|
||||
/* if hwconfig is not enabled, or "sdram" is not defined, use spd */
|
||||
|
Reference in New Issue
Block a user