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 --- board/cray/L1/L1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'board/cray/L1/L1.c') diff --git a/board/cray/L1/L1.c b/board/cray/L1/L1.c index 1656e8ac03..33f2089c80 100644 --- a/board/cray/L1/L1.c +++ b/board/cray/L1/L1.c @@ -245,7 +245,7 @@ int testdram (void) uint *pend = (uint *) L1_MEMSIZE; uint *p; - if (getenv_r("booted",NULL,0) <= 0) + if (getenv_f("booted",NULL,0) <= 0) { printf ("testdram.."); /*AA*/ -- cgit v1.2.1