Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash

[platform/kernel/u-boot.git] / common / env_nowhere.c

diff --git a/common/env_nowhere.c b/common/env_nowhere.c
index ee4237c..ccc068b 100644 (file)
--- a/common/env_nowhere.c
+++ b/common/env_nowhere.c
@@ -25,17 +25,15 @@
  */
 
 #include <common.h>
-
-#if defined(CFG_ENV_IS_NOWHERE) /* Environment is nowhere */
-
 #include <command.h>
 #include <environment.h>
 #include <linux/stddef.h>
 
+DECLARE_GLOBAL_DATA_PTR;
+
 env_t *env_ptr = NULL;
 
 extern uchar default_environment[];
-extern int default_environment_size;
 
 
 void env_relocate_spec (void)
@@ -44,8 +42,6 @@ void env_relocate_spec (void)
 
 uchar env_get_char_spec (int index)
 {
-       DECLARE_GLOBAL_DATA_PTR;
-
        return ( *((uchar *)(gd->env_addr + index)) );
 }
 
@@ -56,12 +52,8 @@ uchar env_get_char_spec (int index)
  */
 int  env_init(void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
-
        gd->env_addr  = (ulong)&default_environment[0];
        gd->env_valid = 0;
 
        return (0);
 }
-
-#endif /* CFG_ENV_IS_NOWHERE) */