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/esd/otc570 | |
| parent | 78e1e8467795d681b3f5f75140ba175e79954273 (diff) | |
| download | blackbird-obmc-uboot-cdb749778aa3a8f8d2a41dd4ad811ef822aecfe6.tar.gz blackbird-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/esd/otc570')
| -rw-r--r-- | board/esd/otc570/otc570.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/board/esd/otc570/otc570.c b/board/esd/otc570/otc570.c index 07d9c62977..410d8b48a1 100644 --- a/board/esd/otc570/otc570.c +++ b/board/esd/otc570/otc570.c @@ -258,7 +258,7 @@ int checkboard(void) char str[32]; puts("Board: esd ARM9 HMI Panel - OTC570"); - if (getenv_r("serial#", str, sizeof(str)) > 0) { + if (getenv_f("serial#", str, sizeof(str)) > 0) { puts(", serial# "); puts(str); } @@ -308,7 +308,7 @@ int misc_init_r(void) printf("USART0: "); - if (getenv_r("usart0", str, sizeof(str)) == -1) { + if (getenv_f("usart0", str, sizeof(str)) == -1) { printf("No entry - assuming 1-wire\n"); /* CTS pin, works as mode select pin (0 = 1-wire; 1 = RS485) */ at91_set_pio_output(AT91_PIO_PORTA, 29, 0); |
