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 /arch/powerpc/cpu | |
| parent | 78e1e8467795d681b3f5f75140ba175e79954273 (diff) | |
| download | u-boot-midas-cdb749778aa3a8f8d2a41dd4ad811ef822aecfe6.tar.gz u-boot-midas-cdb749778aa3a8f8d2a41dd4ad811ef822aecfe6.tar.bz2 u-boot-midas-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 'arch/powerpc/cpu')
| -rw-r--r-- | arch/powerpc/cpu/mpc8xx/speed.c | 2 | ||||
| -rw-r--r-- | arch/powerpc/cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/cpu/mpc8xx/speed.c b/arch/powerpc/cpu/mpc8xx/speed.c index f309f29c04..6e13e5de02 100644 --- a/arch/powerpc/cpu/mpc8xx/speed.c +++ b/arch/powerpc/cpu/mpc8xx/speed.c @@ -266,7 +266,7 @@ int get_clocks_866 (void) long cpuclk = 0; long sccr_reg; - if (getenv_r ("cpuclk", tmp, sizeof (tmp)) > 0) + if (getenv_f("cpuclk", tmp, sizeof (tmp)) > 0) cpuclk = simple_strtoul (tmp, NULL, 10) * 1000000; if ((CONFIG_SYS_8xx_CPUCLK_MIN > cpuclk) || (CONFIG_SYS_8xx_CPUCLK_MAX < cpuclk)) diff --git a/arch/powerpc/cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c b/arch/powerpc/cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c index 2fee995690..2cfc37f752 100644 --- a/arch/powerpc/cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c +++ b/arch/powerpc/cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c @@ -985,7 +985,7 @@ u32 DQS_autocalibration(void) puts(str); #if defined(DEBUG_PPC4xx_DDR_AUTOCALIBRATION) - i = getenv_r("autocalib", tmp, sizeof(tmp)); + i = getenv_f("autocalib", tmp, sizeof(tmp)); if (i < 0) strcpy(tmp, CONFIG_AUTOCALIB); |