* Patch by Hans-Joerg Frieden, 06 Dec 2002

[karo-tx-uboot.git] / common / env_common.c

diff --git a/common/env_common.c b/common/env_common.c
index bd22e154281b26cbe4ff7af243c100db3c20d9c5..4f618d633fd76811406d35d35519ff8322c6dd57 100644 (file)
--- a/common/env_common.c
+++ b/common/env_common.c
@@ -156,6 +156,21 @@ static uchar env_get_char_init (int index)
        return (c);
 }
 
        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;
 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] );
        }
 }
                return ( default_environment[index] );
        }
 }

+#endif

 
 uchar *env_get_addr (int index)
 {
 
 uchar *env_get_addr (int index)
 {