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/kup/kup4k | |
parent | 78e1e8467795d681b3f5f75140ba175e79954273 (diff) |
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/kup/kup4k')
-rw-r--r-- | board/kup/kup4k/kup4k.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/board/kup/kup4k/kup4k.c b/board/kup/kup4k/kup4k.c index 98f5f5a30a..607fd7903e 100644 --- a/board/kup/kup4k/kup4k.c +++ b/board/kup/kup4k/kup4k.c @@ -314,7 +314,7 @@ void lcd_logo (bd_t * bd) } - n = getenv_r ("lcd", tmp, sizeof (tmp)); + n = getenv_f("lcd", tmp, sizeof (tmp)); if (n > 0) { if (!strcmp ("tft", tmp)) tft = 1; @@ -342,7 +342,7 @@ void lcd_logo (bd_t * bd) ((S1D_VALUE *) fb_info.RegAddr)[s1dReg / sizeof(S1D_VALUE)] = s1dValue; } - n = getenv_r ("contrast", tmp, sizeof (tmp)); + n = getenv_f("contrast", tmp, sizeof (tmp)); ((S1D_VALUE *) fb_info.RegAddr)[0xB3] = (n > 0) ? (uchar) simple_strtoul (tmp, NULL, 10) * 255 / 100 : 0xA0; switch (bd->bi_busfreq) { |