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/snmc/qs850/qs850.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'board/snmc/qs850') diff --git a/board/snmc/qs850/qs850.c b/board/snmc/qs850/qs850.c index cc8eaad88c..43f7495e46 100644 --- a/board/snmc/qs850/qs850.c +++ b/board/snmc/qs850/qs850.c @@ -100,7 +100,7 @@ int checkboard (void) char buf[64]; int i; - i = getenv_r("serial#", buf, sizeof(buf)); + i = getenv_f("serial#", buf, sizeof(buf)); s = (i>0) ? buf : NULL; if (!s || strncmp(s, BOARD_IDENTITY, 5)) { -- cgit v1.2.1