diff options
author | Wolfgang Denk <wd@denx.de> | 2010-06-30 10:10:32 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2010-06-30 10:10:32 +0200 |
commit | 39ddd10b046fb791f47281ffb2100be01909ad72 (patch) | |
tree | cec01ecc6502a65cbbbda406dfac23b93c093899 /common/env_common.c | |
parent | 55357b7846237d12aa5f07aec657c5dbfaf790ed (diff) | |
parent | 0a9463e93537a68e7246714f43fb69eca0b7b214 (diff) | |
download | u-boot-imx-39ddd10b046fb791f47281ffb2100be01909ad72.zip u-boot-imx-39ddd10b046fb791f47281ffb2100be01909ad72.tar.gz u-boot-imx-39ddd10b046fb791f47281ffb2100be01909ad72.tar.bz2 |
Merge branch 'master' of ssh://gemini/home/wd/git/u-boot/master
Diffstat (limited to 'common/env_common.c')
-rw-r--r-- | common/env_common.c | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/common/env_common.c b/common/env_common.c index 439a4a9..82e4936 100644 --- a/common/env_common.c +++ b/common/env_common.c @@ -32,11 +32,6 @@ DECLARE_GLOBAL_DATA_PTR; -#ifdef CONFIG_AMIGAONEG3SE - extern void enable_nvram(void); - extern void disable_nvram(void); -#endif - #undef DEBUG_ENV #ifdef DEBUG_ENV #define DEBUGF(fmt,args...) printf(fmt ,##args) @@ -159,20 +154,6 @@ static uchar env_get_char_init (int index) return (c); } -#ifdef CONFIG_AMIGAONEG3SE -uchar env_get_char_memory (int index) -{ - uchar retval; - enable_nvram(); - if (gd->env_valid) { - retval = ( *((uchar *)(gd->env_addr + index)) ); - } else { - retval = ( default_environment[index] ); - } - disable_nvram(); - return retval; -} -#else uchar env_get_char_memory (int index) { if (gd->env_valid) { @@ -181,7 +162,6 @@ uchar env_get_char_memory (int index) return ( default_environment[index] ); } } -#endif uchar env_get_char (int index) { @@ -229,10 +209,6 @@ void env_relocate (void) gd->reloc_off); #endif -#ifdef CONFIG_AMIGAONEG3SE - enable_nvram(); -#endif - #ifdef ENV_IS_EMBEDDED /* * The environment buffer is embedded with the text segment, @@ -263,10 +239,6 @@ void env_relocate (void) env_relocate_spec (); } gd->env_addr = (ulong)&(env_ptr->data); - -#ifdef CONFIG_AMIGAONEG3SE - disable_nvram(); -#endif } #ifdef CONFIG_AUTO_COMPLETE |