summaryrefslogtreecommitdiffstats
path: root/board/mpl/pati/pati.c
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/mpl/pati/pati.c
parent78e1e8467795d681b3f5f75140ba175e79954273 (diff)
downloadtalos-obmc-uboot-cdb749778aa3a8f8d2a41dd4ad811ef822aecfe6.tar.gz
talos-obmc-uboot-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/mpl/pati/pati.c')
-rw-r--r--board/mpl/pati/pati.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/board/mpl/pati/pati.c b/board/mpl/pati/pati.c
index e12bc423f4..7f1164a5c7 100644
--- a/board/mpl/pati/pati.c
+++ b/board/mpl/pati/pati.c
@@ -353,7 +353,7 @@ int checkboard (void)
puts ("\nBoard: ");
reg=in32(PLD_CONFIG_BASE+PLD_BOARD_TIMING);
rev=(char)(SYSCNTR_BREV(reg)+'A');
- i = getenv_r ("serial#", s, 32);
+ i = getenv_f("serial#", s, 32);
if ((i == -1)) {
puts ("### No HW ID - assuming " BOARD_NAME);
printf(" Rev. %c\n",rev);
OpenPOWER on IntegriCloud