environment: cleanup prototype declarations of env functions.

Signed-off-by: Wolfgang Denk <wd@denx.de>

diff --git a/api/api.c b/api/api.c
index 1ee7c68f7afc64b74263e51c611e2604f91b291f..19c71540c0387f46dc480989404ed6394ee7b9cb 100644 (file)
--- a/api/api.c
+++ b/api/api.c
@@ -30,6 +30,7 @@
 #include <command.h>
 #include <common.h>
 #include <malloc.h>
+#include <environment.h>
 #include <linux/types.h>
 #include <api_public.h>
 
@@ -40,8 +41,6 @@
 
 /* U-Boot routines needed */
 extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
-extern uchar (*env_get_char)(int);
-extern uchar *env_get_addr(int);
 
 /*****************************************************************************
  *

diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c
index cab727f76ca21dd9cbf79836886b24f04bd5c943..9c5d1fcb9059e40b0f01ed29e88d2824e9fa8b3a 100644 (file)
--- a/common/cmd_nvedit.c
+++ b/common/cmd_nvedit.c
@@ -68,19 +68,6 @@ DECLARE_GLOBAL_DATA_PTR;
 /************************************************************************
 ************************************************************************/
 
-/* Function that returns a character from the environment */
-extern uchar (*env_get_char)(int);
-
-/* Function that returns a pointer to a value from the environment */
-/* (Only memory version supported / needed). */
-extern uchar *env_get_addr(int);
-
-/* Function that updates CRC of the enironment */
-extern void env_crc_update (void);
-
-/************************************************************************
-************************************************************************/
-
 /*
  * Table with supported baudrates (defined in config_xyz.h)
  */

diff --git a/common/env_eeprom.c b/common/env_eeprom.c
index 2adc129c67799cee1ecbf7124862d4b4a1d9a1d0..9e1a20194d7392c38ef05d38b0ac11c8b5339d13 100644 (file)
--- a/common/env_eeprom.c
+++ b/common/env_eeprom.c
@@ -38,10 +38,6 @@ env_t *env_ptr = NULL;
 
 char * env_name_spec = "EEPROM";
 
-extern uchar (*env_get_char)(int);
-extern uchar env_get_char_memory (int index);
-
-
 uchar env_get_char_spec (int index)
 {
        uchar c;

diff --git a/common/env_nvram.c b/common/env_nvram.c
index 7c18896cb04fa88b42ec92275547eacfa1d18406..fa77719123db8454b5d0a33567d204e1fa4ec40c 100644 (file)
--- a/common/env_nvram.c
+++ b/common/env_nvram.c
@@ -63,9 +63,6 @@ char * env_name_spec = "NVRAM";
 extern uchar default_environment[];
 extern int default_environment_size;
 
-extern uchar (*env_get_char)(int);
-extern uchar env_get_char_memory (int index);
-
 #ifdef CONFIG_AMIGAONEG3SE
 uchar env_get_char_spec (int index)
 {

diff --git a/common/ft_build.c b/common/ft_build.c
index 0e5699a95b84698d6adc30143ce67b5beb5db8d3..b951178a1df634a4cec274f9eb24acb3c18a8950 100644 (file)
--- a/common/ft_build.c
+++ b/common/ft_build.c
@@ -396,9 +396,6 @@ void *ft_get_prop(void *bphp, const char *propname, int *szp)
 
 /********************************************************************/
 
-/* Function that returns a character from the environment */
-extern uchar(*env_get_char) (int);
-
 void ft_setup(void *blob, bd_t * bd, ulong initrd_start, ulong initrd_end)
 {
        u32 *p;

diff --git a/include/environment.h b/include/environment.h
index c4f7c33be6b868c2daff5a44ea51dfb1ecad7c8e..946a393e30ef100347ea8a8164967a9d5bbd77b4 100644 (file)
--- a/include/environment.h
+++ b/include/environment.h
@@ -107,4 +107,14 @@ typedef    struct environment_s {
        unsigned char   data[ENV_SIZE]; /* Environment data             */
 } env_t;
 
+/* Function that returns a character from the environment */
+unsigned char (*env_get_char)(int);
+
+/* Function that returns a pointer to a value from the environment */
+unsigned char *env_get_addr(int);
+unsigned char env_get_char_memory (int index);
+
+/* Function that updates CRC of the enironment */
+void env_crc_update (void);
+
 #endif /* _ENVIRONMENT_H_ */