env: factor out the env_get_char_spec() function

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

diff --git a/common/env_nowhere.c b/common/env_nowhere.c
index 8dd4867f1faf352312276543b8a172cfb8e505e6..18fcf2ca41da7e70d9d899b10402296675119e78 100644 (file)
--- 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,41 +25,27 @@
  */
 
 #include <common.h>
-
-#if defined(CONFIG_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;
+env_t *env_ptr;
 
-
-void env_relocate_spec (void)
+void env_relocate_spec(void)
 {
 }
 
-uchar env_get_char_spec (int index)
-{
-       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)
 {
-       gd->env_addr  = (ulong)&default_environment[0];
-       gd->env_valid = 0;
+       gd->env_addr    = (ulong)&default_environment[0];
+       gd->env_valid   = 0;
 
-       return (0);
+       return 0;
 }
-
-#endif /* CONFIG_ENV_IS_NOWHERE) */