X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=common%2Fenv_nowhere.c;h=75ef78de87753e36bf314eaf6ae1784ec79d27e0;hb=0caac5f4155a1db6c5ce921c7f9294b6b46e7744;hp=ee4237c7e906889fe6833baab2d8425a04b6d79d;hpb=038ccac511214b062c56f22b9413f784b86bcd87;p=oweals%2Fu-boot.git

diff --git a/common/env_nowhere.c b/common/env_nowhere.c
index ee4237c7e9..75ef78de87 100644
--- a/common/env_nowhere.c
+++ b/common/env_nowhere.c
@@ -1,5 +1,5 @@
 /*
- * (C) Copyright 2000-2002
+ * (C) Copyright 2000-2010
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  *
  * (C) Copyright 2001 Sysgo Real-Time Solutions, GmbH <www.elinos.com>
@@ -25,43 +25,34 @@
  */
 
 #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)
+void env_relocate_spec(void)
 {
 }
 
-uchar env_get_char_spec (int index)
+uchar env_get_char_spec(int index)
 {
-	DECLARE_GLOBAL_DATA_PTR;
-
 	return ( *((uchar *)(gd->env_addr + index)) );
 }
 
-/************************************************************************
+/*
  * Initialize Environment use
  *
  * We are still running from ROM, so data use is limited
  */
-int  env_init(void)
+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) */