env: move extern default_environment[] to environment.h

Extract all extern declarations for default_environment[] out of c files into the environment.h header. Signed-off-by: Igor Grinberg <grinberg@compulab.co.il> Cc: Stefan Roese <sr@denx.de> Acked-by: Stefan Roese <sr@denx.de>

env: move extern default_environment[] to environment.h
Extract all extern declarations for default_environment[] out of c files into the environment.h header. Signed-off-by: Igor Grinberg <grinberg@compulab.co.il> Cc: Stefan Roese <sr@denx.de> Acked-by: Stefan Roese <sr@denx.de>
Igor Grinberg · Stefano Babic
1 parent e3150460a4
Showing 11 changed files with 2 additions and 24 deletions Side-by-side Diff
board/zeus/zeus.c
common/env_dataflash.c
common/env_flash.c
common/env_mgdisk.c
common/env_mmc.c
common/env_nand.c
common/env_nowhere.c
common/env_nvram.c
common/env_onenand.c
common/env_sf.c
include/environment.h
@@ -40,7 +40,6 @@
  
 extern flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS]; /* info for FLASH chips	*/
 extern env_t *env_ptr;
-extern uchar default_environment[];
  
 ulong flash_get_size(ulong base, int banknum);
 void env_crc_update(void);
@@ -37,8 +37,6 @@
 	unsigned long addr_src, unsigned long size);
 extern int AT91F_DataflashInit(void);
  
-extern uchar default_environment[];
-
 uchar env_get_char_spec(int index)
 {
 	uchar c;
@@ -74,8 +74,6 @@
 static ulong end_addr_new = CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SECT_SIZE - 1;
 #endif /* CONFIG_ENV_ADDR_REDUND */
  
-extern const uchar default_environment[];
-
  
 uchar env_get_char_spec(int index)
 {
@@ -27,9 +27,6 @@
 #include <linux/stddef.h>
 #include <mg_disk.h>
  
-/* references to names in env_common.c */
-extern uchar default_environment[];
-
 char *env_name_spec = "MG_DISK";
  
 env_t *env_ptr = 0;
@@ -32,9 +32,6 @@
 #include <search.h>
 #include <errno.h>
  
-/* references to names in env_common.c */
-extern uchar default_environment[];
-
 char *env_name_spec = "MMC";
  
 #ifdef ENV_IS_EMBEDDED
@@ -55,9 +55,6 @@
 #define CONFIG_ENV_RANGE	CONFIG_ENV_SIZE
 #endif
  
-/* references to names in env_common.c */
-extern uchar default_environment[];
-
 char *env_name_spec = "NAND";
  
  
@@ -33,8 +33,6 @@
  
 env_t *env_ptr = NULL;
  
-extern uchar default_environment[];
-
 void env_relocate_spec(void)
 {
 }
@@ -59,8 +59,6 @@
  
 char * env_name_spec = "NVRAM";
  
-extern uchar default_environment[];
-
 uchar env_get_char_spec(int index)
 {
 #ifdef CONFIG_SYS_NVRAM_ACCESS_ROUTINE
@@ -39,9 +39,6 @@
 extern struct mtd_info onenand_mtd;
 extern struct onenand_chip onenand_chip;
  
-/* References to names in env_common.c */
-extern uchar default_environment[];
-
 char *env_name_spec = "OneNAND";
  
 #define ONENAND_MAX_ENV_SIZE	4096
@@ -55,9 +55,6 @@
  
 DECLARE_GLOBAL_DATA_PTR;
  
-/* references to names in env_common.c */
-extern uchar default_environment[];
-
 char * env_name_spec = "SPI Flash";
  
 static struct spi_flash *env_flash;
@@ -154,6 +154,8 @@
 	unsigned char	data[ENV_SIZE]; /* Environment data		*/
 } env_t;
  
+extern const unsigned char default_environment[];
+
 #ifndef DO_DEPS_ONLY
  
 #include <search.h>
...	...	@@ -40,7 +40,6 @@
40	40
41	41	extern flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS]; /* info for FLASH chips */
42	42	extern env_t *env_ptr;
43		-extern uchar default_environment[];
44	43
45	44	ulong flash_get_size(ulong base, int banknum);
46	45	void env_crc_update(void);
...	...	@@ -37,8 +37,6 @@
37	37	unsigned long addr_src, unsigned long size);
38	38	extern int AT91F_DataflashInit(void);
39	39
40		-extern uchar default_environment[];
41		-
42	40	uchar env_get_char_spec(int index)
43	41	{
44	42	uchar c;
...	...	@@ -74,8 +74,6 @@
74	74	static ulong end_addr_new = CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SECT_SIZE - 1;
75	75	#endif /* CONFIG_ENV_ADDR_REDUND */
76	76
77		-extern const uchar default_environment[];
78		-
79	77
80	78	uchar env_get_char_spec(int index)
81	79	{
...	...	@@ -27,9 +27,6 @@
27	27	#include <linux/stddef.h>
28	28	#include <mg_disk.h>
29	29
30		-/* references to names in env_common.c */
31		-extern uchar default_environment[];
32		-
33	30	char *env_name_spec = "MG_DISK";
34	31
35	32	env_t *env_ptr = 0;
...	...	@@ -32,9 +32,6 @@
32	32	#include <search.h>
33	33	#include <errno.h>
34	34
35		-/* references to names in env_common.c */
36		-extern uchar default_environment[];
37		-
38	35	char *env_name_spec = "MMC";
39	36
40	37	#ifdef ENV_IS_EMBEDDED
...	...	@@ -55,9 +55,6 @@
55	55	#define CONFIG_ENV_RANGE CONFIG_ENV_SIZE
56	56	#endif
57	57
58		-/* references to names in env_common.c */
59		-extern uchar default_environment[];
60		-
61	58	char *env_name_spec = "NAND";
62	59
63	60
...	...	@@ -33,8 +33,6 @@
33	33
34	34	env_t *env_ptr = NULL;
35	35
36		-extern uchar default_environment[];
37		-
38	36	void env_relocate_spec(void)
39	37	{
40	38	}
...	...	@@ -59,8 +59,6 @@
59	59
60	60	char * env_name_spec = "NVRAM";
61	61
62		-extern uchar default_environment[];
63		-
64	62	uchar env_get_char_spec(int index)
65	63	{
66	64	#ifdef CONFIG_SYS_NVRAM_ACCESS_ROUTINE
...	...	@@ -39,9 +39,6 @@
39	39	extern struct mtd_info onenand_mtd;
40	40	extern struct onenand_chip onenand_chip;
41	41
42		-/* References to names in env_common.c */
43		-extern uchar default_environment[];
44		-
45	42	char *env_name_spec = "OneNAND";
46	43
47	44	#define ONENAND_MAX_ENV_SIZE 4096
...	...	@@ -55,9 +55,6 @@
55	55
56	56	DECLARE_GLOBAL_DATA_PTR;
57	57
58		-/* references to names in env_common.c */
59		-extern uchar default_environment[];
60		-
61	58	char * env_name_spec = "SPI Flash";
62	59
63	60	static struct spi_flash *env_flash;