aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--api/api.c3
-rw-r--r--common/cmd_nvedit.c13
-rw-r--r--common/env_eeprom.c4
-rw-r--r--common/env_nvram.c3
-rw-r--r--common/ft_build.c3
-rw-r--r--include/environment.h10
6 files changed, 11 insertions, 25 deletions
diff --git a/api/api.c b/api/api.c
index 1ee7c68f7a..19c71540c0 100644
--- a/api/api.c
+++ b/api/api.c
@@ -30,6 +30,7 @@
30#include <command.h> 30#include <command.h>
31#include <common.h> 31#include <common.h>
32#include <malloc.h> 32#include <malloc.h>
33#include <environment.h>
33#include <linux/types.h> 34#include <linux/types.h>
34#include <api_public.h> 35#include <api_public.h>
35 36
@@ -40,8 +41,6 @@
40 41
41/* U-Boot routines needed */ 42/* U-Boot routines needed */
42extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); 43extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
43extern uchar (*env_get_char)(int);
44extern uchar *env_get_addr(int);
45 44
46/***************************************************************************** 45/*****************************************************************************
47 * 46 *
diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c
index cab727f76c..9c5d1fcb90 100644
--- a/common/cmd_nvedit.c
+++ b/common/cmd_nvedit.c
@@ -68,19 +68,6 @@ DECLARE_GLOBAL_DATA_PTR;
68/************************************************************************ 68/************************************************************************
69************************************************************************/ 69************************************************************************/
70 70
71/* Function that returns a character from the environment */
72extern uchar (*env_get_char)(int);
73
74/* Function that returns a pointer to a value from the environment */
75/* (Only memory version supported / needed). */
76extern uchar *env_get_addr(int);
77
78/* Function that updates CRC of the enironment */
79extern void env_crc_update (void);
80
81/************************************************************************
82************************************************************************/
83
84/* 71/*
85 * Table with supported baudrates (defined in config_xyz.h) 72 * Table with supported baudrates (defined in config_xyz.h)
86 */ 73 */
diff --git a/common/env_eeprom.c b/common/env_eeprom.c
index 2adc129c67..9e1a20194d 100644
--- a/common/env_eeprom.c
+++ b/common/env_eeprom.c
@@ -38,10 +38,6 @@ env_t *env_ptr = NULL;
38 38
39char * env_name_spec = "EEPROM"; 39char * env_name_spec = "EEPROM";
40 40
41extern uchar (*env_get_char)(int);
42extern uchar env_get_char_memory (int index);
43
44
45uchar env_get_char_spec (int index) 41uchar env_get_char_spec (int index)
46{ 42{
47 uchar c; 43 uchar c;
diff --git a/common/env_nvram.c b/common/env_nvram.c
index 7c18896cb0..fa77719123 100644
--- a/common/env_nvram.c
+++ b/common/env_nvram.c
@@ -63,9 +63,6 @@ char * env_name_spec = "NVRAM";
63extern uchar default_environment[]; 63extern uchar default_environment[];
64extern int default_environment_size; 64extern int default_environment_size;
65 65
66extern uchar (*env_get_char)(int);
67extern uchar env_get_char_memory (int index);
68
69#ifdef CONFIG_AMIGAONEG3SE 66#ifdef CONFIG_AMIGAONEG3SE
70uchar env_get_char_spec (int index) 67uchar env_get_char_spec (int index)
71{ 68{
diff --git a/common/ft_build.c b/common/ft_build.c
index 0e5699a95b..b951178a1d 100644
--- 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)
396 396
397/********************************************************************/ 397/********************************************************************/
398 398
399/* Function that returns a character from the environment */
400extern uchar(*env_get_char) (int);
401
402void ft_setup(void *blob, bd_t * bd, ulong initrd_start, ulong initrd_end) 399void ft_setup(void *blob, bd_t * bd, ulong initrd_start, ulong initrd_end)
403{ 400{
404 u32 *p; 401 u32 *p;
diff --git a/include/environment.h b/include/environment.h
index c4f7c33be6..946a393e30 100644
--- a/include/environment.h
+++ b/include/environment.h
@@ -107,4 +107,14 @@ typedef struct environment_s {
107 unsigned char data[ENV_SIZE]; /* Environment data */ 107 unsigned char data[ENV_SIZE]; /* Environment data */
108} env_t; 108} env_t;
109 109
110/* Function that returns a character from the environment */
111unsigned char (*env_get_char)(int);
112
113/* Function that returns a pointer to a value from the environment */
114unsigned char *env_get_addr(int);
115unsigned char env_get_char_memory (int index);
116
117/* Function that updates CRC of the enironment */
118void env_crc_update (void);
119
110#endif /* _ENVIRONMENT_H_ */ 120#endif /* _ENVIRONMENT_H_ */