diff options
author | Wolfgang Denk <wd@denx.de> | 2010-07-24 21:55:43 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2010-08-04 00:45:36 +0200 |
commit | cdb749778aa3a8f8d2a41dd4ad811ef822aecfe6 (patch) | |
tree | fd0b779d80dd4ef0c7de0cdc7f5ad09563bb355e /board/ip860 | |
parent | 78e1e8467795d681b3f5f75140ba175e79954273 (diff) | |
download | u-boot-imx-cdb749778aa3a8f8d2a41dd4ad811ef822aecfe6.zip u-boot-imx-cdb749778aa3a8f8d2a41dd4ad811ef822aecfe6.tar.gz u-boot-imx-cdb749778aa3a8f8d2a41dd4ad811ef822aecfe6.tar.bz2 |
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 <wd@denx.de>
Acked-by: Detlev Zundel <dzu@denx.de>
Diffstat (limited to 'board/ip860')
-rw-r--r-- | board/ip860/ip860.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/board/ip860/ip860.c b/board/ip860/ip860.c index e2a1851..adff2b2 100644 --- a/board/ip860/ip860.c +++ b/board/ip860/ip860.c @@ -114,7 +114,7 @@ int checkboard (void) puts ("Board: "); - i = getenv_r ("serial#", (char *)buf, sizeof (buf)); + i = getenv_f("serial#", (char *)buf, sizeof (buf)); s = (i > 0) ? buf : NULL; if (!s || strncmp ((char *)s, "IP860", 5)) { |