summaryrefslogtreecommitdiff
path: root/board/snmc
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2010-07-24 21:55:43 +0200
committerWolfgang Denk <wd@denx.de>2010-08-04 00:45:36 +0200
commitcdb749778aa3a8f8d2a41dd4ad811ef822aecfe6 (patch)
treefd0b779d80dd4ef0c7de0cdc7f5ad09563bb355e /board/snmc
parent78e1e8467795d681b3f5f75140ba175e79954273 (diff)
downloadu-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/snmc')
-rw-r--r--board/snmc/qs850/qs850.c2
-rw-r--r--board/snmc/qs860t/qs860t.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/board/snmc/qs850/qs850.c b/board/snmc/qs850/qs850.c
index cc8eaad..43f7495 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)) {
diff --git a/board/snmc/qs860t/qs860t.c b/board/snmc/qs860t/qs860t.c
index b272d80..fa88707 100644
--- a/board/snmc/qs860t/qs860t.c
+++ b/board/snmc/qs860t/qs860t.c
@@ -93,7 +93,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, "QS860T", 6)) {