X-Git-Url: https://git.kernelconcepts.de/?a=blobdiff_plain;f=common%2Fenv_nowhere.c;h=ccc068b8e8427c4fd8b4fbdd995d6a75b7ed3e4d;hb=8515f081e4d5e1f22ee7d12ae72e3bf22eb88a76;hp=b274c0355747d6669257a424576bd2fc42f062de;hpb=0bc4a1ac8198c46355b984cd91c749da2753baa4;p=karo-tx-uboot.git

diff --git a/common/env_nowhere.c b/common/env_nowhere.c
index b274c03557..ccc068b8e8 100644
--- a/common/env_nowhere.c
+++ b/common/env_nowhere.c
@@ -25,18 +25,15 @@
  */
 
 #include <common.h>
-
-#if defined(CFG_ENV_IS_NOWHERE) /* Environment is nowhere */
-
 #include <command.h>
 #include <environment.h>
 #include <linux/stddef.h>
-#include <malloc.h>
+
+DECLARE_GLOBAL_DATA_PTR;
 
 env_t *env_ptr = NULL;
 
 extern uchar default_environment[];
-extern int default_environment_size;
 
 
 void env_relocate_spec (void)
@@ -45,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)) );
 }
 
@@ -57,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) */