* Patch by Hans-Joerg Frieden, 06 Dec 2002
  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
diff --git a/common/env_common.c b/common/env_common.c
index bd22e15..4f618d6 100644
--- a/common/env_common.c
+++ b/common/env_common.c
@@ -156,9 +156,24 @@
 	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;
 
 	if (gd->env_valid) {
 		return ( *((uchar *)(gd->env_addr + index)) );
@@ -166,6 +181,7 @@
 		return ( default_environment[index] );
 	}
 }
+#endif
 
 uchar *env_get_addr (int index)
 {