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/mpl/vcma9/vcma9.c | |
| 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/mpl/vcma9/vcma9.c')
| -rw-r--r-- | board/mpl/vcma9/vcma9.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/board/mpl/vcma9/vcma9.c b/board/mpl/vcma9/vcma9.c index 1835677..eaeec82 100644 --- a/board/mpl/vcma9/vcma9.c +++ b/board/mpl/vcma9/vcma9.c @@ -295,7 +295,7 @@ int checkboard(void) int i; backup_t *b = (backup_t *) s; - i = getenv_r("serial#", s, 32); + i = getenv_f("serial#", s, 32); if ((i < 0) || strncmp (s, "VCMA9", 5)) { get_backup_values (b); if (strncmp (b->signature, "MPL\0", 4) != 0) { @@ -340,7 +340,7 @@ void print_vcma9_info(void) char s[50]; int i; - if ((i = getenv_r("serial#", s, 32)) < 0) { + if ((i = getenv_f("serial#", s, 32)) < 0) { puts ("### No HW ID - assuming VCMA9"); printf("i %d", i*24); } else { |