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/common | |
| 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/common')
| -rw-r--r-- | board/mpl/common/common_util.c | 4 | ||||
| -rw-r--r-- | board/mpl/common/memtst.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/board/mpl/common/common_util.c b/board/mpl/common/common_util.c index b4343d8..624c708 100644 --- a/board/mpl/common/common_util.c +++ b/board/mpl/common/common_util.c @@ -284,13 +284,13 @@ void set_backup_values(int overwrite) } } memcpy(back.signature,"MPL\0",4); - i = getenv_r("serial#",back.serial_name,16); + i = getenv_f("serial#",back.serial_name,16); if(i < 0) { puts("Not possible to write Backup\n"); return; } back.serial_name[16]=0; - i = getenv_r("ethaddr",back.eth_addr,20); + i = getenv_f("ethaddr",back.eth_addr,20); if(i < 0) { puts("Not possible to write Backup\n"); return; diff --git a/board/mpl/common/memtst.c b/board/mpl/common/memtst.c index 92c33ba..68973f9 100644 --- a/board/mpl/common/memtst.c +++ b/board/mpl/common/memtst.c @@ -29,7 +29,7 @@ int testdram (void) unsigned char s[32]; int i; - i = getenv_r ("testmem", s, 32); + i = getenv_f("testmem", s, 32); if (i != 0) { i = (int) simple_strtoul (s, NULL, 10); if ((i > 0) && (i < 0xf)) { |