summaryrefslogtreecommitdiffstats
path: root/board/siemens
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/siemens
parent78e1e8467795d681b3f5f75140ba175e79954273 (diff)
downloadu-boot-cdb749778aa3a8f8d2a41dd4ad811ef822aecfe6.tar.gz
u-boot-cdb749778aa3a8f8d2a41dd4ad811ef822aecfe6.tar.xz
u-boot-cdb749778aa3a8f8d2a41dd4ad811ef822aecfe6.zip
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/siemens')
-rw-r--r--board/siemens/CCM/ccm.c2
-rw-r--r--board/siemens/SCM/scm.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/board/siemens/CCM/ccm.c b/board/siemens/CCM/ccm.c
index 8053da481a..e91ceb079a 100644
--- a/board/siemens/CCM/ccm.c
+++ b/board/siemens/CCM/ccm.c
@@ -102,7 +102,7 @@ int checkboard (void)
unsigned char *s;
unsigned char buf[64];
- s = (getenv_r ("serial#", (char *)&buf, sizeof(buf)) > 0) ? buf : NULL;
+ s = (getenv_f("serial#", (char *)&buf, sizeof(buf)) > 0) ? buf : NULL;
puts ("Board: Siemens CCM");
diff --git a/board/siemens/SCM/scm.c b/board/siemens/SCM/scm.c
index e0611fe370..926e491271 100644
--- a/board/siemens/SCM/scm.c
+++ b/board/siemens/SCM/scm.c
@@ -209,7 +209,7 @@ const iop_conf_t iop_conf_tab[4][32] = {
int checkboard (void)
{
char str[64];
- int i = getenv_r ("serial#", str, sizeof (str));
+ int i = getenv_f("serial#", str, sizeof (str));
puts ("Board: ");