From cdb749778aa3a8f8d2a41dd4ad811ef822aecfe6 Mon Sep 17 00:00:00 2001 From: Wolfgang Denk Date: Sat, 24 Jul 2010 21:55:43 +0200 Subject: Rename getenv_r() into getenv_f() While running from flash, i. e. before relocation, we have only a limited C runtime environment without writable data segment. In this phase, some configurations (for example with environment in EEPROM) must not use the normal getenv(), but a special function. This function had been called getenv_r(), with the idea that the "_r" suffix would mean the same as in the _r_eentrant versions of some of the C library functions (for example getdate vs. getdate_r, getgrent vs. getgrent_r, etc.). Unfortunately this was a misleading name, as in U-Boot the "_r" generally means "running from RAM", i. e. _after_ relocation. To avoid confusion, rename into getenv_f() [as "running from flash"] Signed-off-by: Wolfgang Denk Acked-by: Detlev Zundel --- include/common.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/common.h') diff --git a/include/common.h b/include/common.h index eddec22752..6a79ec2aad 100644 --- a/include/common.h +++ b/include/common.h @@ -256,7 +256,7 @@ int env_init (void); void env_relocate (void); int envmatch (uchar *, int); char *getenv (char *); -int getenv_r (char *name, char *buf, unsigned len); +int getenv_f (char *name, char *buf, unsigned len); int saveenv (void); #ifdef CONFIG_PPC /* ARM version to be fixed! */ int inline setenv (char *, char *); -- cgit