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>
This commit is contained in:
@@ -132,7 +132,7 @@ int checkboard (void)
|
||||
char buf[64];
|
||||
int i;
|
||||
|
||||
i = getenv_r ("board_id", buf, sizeof (buf));
|
||||
i = getenv_f("board_id", buf, sizeof (buf));
|
||||
s = (i > 0) ? buf : NULL;
|
||||
|
||||
if (s) {
|
||||
@@ -141,7 +141,7 @@ int checkboard (void)
|
||||
printf ("<unknown> ");
|
||||
}
|
||||
|
||||
i = getenv_r ("serial#", buf, sizeof (buf));
|
||||
i = getenv_f("serial#", buf, sizeof (buf));
|
||||
s = (i > 0) ? buf : NULL;
|
||||
|
||||
if (s) {
|
||||
@@ -276,7 +276,7 @@ int last_stage_init (void)
|
||||
/*
|
||||
* Read the environment to see what to do with the beeper
|
||||
*/
|
||||
i = getenv_r ("beeper", buf, sizeof (buf));
|
||||
i = getenv_f("beeper", buf, sizeof (buf));
|
||||
if (i > 0) {
|
||||
do_beeper (buf);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user