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

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

diff --git a/common/env_nowhere.c b/common/env_nowhere.c
index 78e8f8eb4e4c8e63eef2669879dc5a09d614310b..8a3ca1978ff329b87d33a2ea01cdf14105a9c294 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>
@@ -31,30 +31,26 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-env_t *env_ptr = NULL;
+env_t *env_ptr;
 
-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)
 {
-       return ( *((uchar *)(gd->env_addr + 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;
 }