summaryrefslogtreecommitdiff
path: root/common/env_common.c
diff options
context:
space:
mode:
authorwdenk <wdenk>2002-12-07 00:20:59 +0000
committerwdenk <wdenk>2002-12-07 00:20:59 +0000
commit7c7a23bd5a0bc149d2edd665ec46381726b24e0c (patch)
treed859f82ea2561180db2ffd7569f0b9007d710769 /common/env_common.c
parent1f53a41603b9093c59741f4208fef0ab3790d6ce (diff)
* Patch by Hans-Joerg Frieden, 06 Dec 2002LABEL_2002_12_07_0120
Fix misc problems with AmigaOne support * Patch by Chris Hallinan, 3 Dec 2002: minor cleanup to the MPC8245 EPIC driver * Patch by Pierre Aubert , 28 Nov 2002 Add support for external (SIU) interrupts on MPC8xx * Patch by Pierre Aubert , 28 Nov 2002 Fix nested syscalls bug in standalone applications * Patch by David Müller, 27 Nov 2002: fix output of "pciinfo" command for CardBus bridge devices. * Fix bug in TQM8260 board detection - boards got stuck when board ID was not readable
Diffstat (limited to 'common/env_common.c')
-rw-r--r--common/env_common.c16
1 files changed, 16 insertions, 0 deletions
diff --git a/common/env_common.c b/common/env_common.c
index bd22e154281..4f618d633fd 100644
--- a/common/env_common.c
+++ b/common/env_common.c
@@ -156,6 +156,21 @@ static uchar env_get_char_init (int index)
return (c);
}
+#ifdef CONFIG_AMIGAONEG3SE
+uchar env_get_char_memory (int index)
+{
+ DECLARE_GLOBAL_DATA_PTR;
+ 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)
{
DECLARE_GLOBAL_DATA_PTR;
@@ -166,6 +181,7 @@ uchar env_get_char_memory (int index)
return ( default_environment[index] );
}
}
+#endif
uchar *env_get_addr (int index)
{