Patchwork [U-Boot,02/17] common: move extern char console_buffer[] to common.h

login
register
mail settings
Submitter Igor Grinberg
Date Nov. 7, 2011, 11:13 a.m.
Message ID <1320664451-2678-3-git-send-email-grinberg@compulab.co.il>
Download mbox | patch
Permalink /patch/124058/
State Accepted
Commit e3150460a4fd3a7126bcbf1e225610e0d494c8fe
Delegated to: Stefano Babic
Headers show

Comments

Igor Grinberg - Nov. 7, 2011, 11:13 a.m.
Extract all extern declarations for console_buffer[] out of c files into
the common.h header.

Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
Cc: Frank Gottschling <fgottschling@eltec.de>
Cc: Murray Jensen <Murray.Jensen@csiro.au>
---
 board/amcc/yucca/cmd_yucca.c |    1 -
 board/eltec/bab7xx/misc.c    |    1 -
 board/eltec/elppc/misc.c     |    1 -
 board/eltec/mhpc/mhpc.c      |    3 ---
 board/hymod/input.c          |    3 ---
 common/cmd_bedbug.c          |    1 -
 common/cmd_dcr.c             |    1 -
 common/cmd_i2c.c             |    1 -
 common/cmd_mem.c             |    1 -
 common/cmd_nvedit.c          |    1 -
 common/cmd_pci.c             |    1 -
 common/hush.c                |    1 -
 common/modem.c               |    1 -
 include/common.h             |    1 +
 14 files changed, 1 insertions(+), 17 deletions(-)

Patch

diff --git a/board/amcc/yucca/cmd_yucca.c b/board/amcc/yucca/cmd_yucca.c
index e9cd333..f45325e 100644
--- a/board/amcc/yucca/cmd_yucca.c
+++ b/board/amcc/yucca/cmd_yucca.c
@@ -51,7 +51,6 @@  static int setBootStrapClock(cmd_tbl_t *cmdtp, int incrflag, int flag,
 	uchar	chip;
 	ulong	data;
 	int	nbytes;
-	extern char console_buffer[];
 
 	char sysClock[4];
 	char cpuClock[4];
diff --git a/board/eltec/bab7xx/misc.c b/board/eltec/bab7xx/misc.c
index bc6eb40..d05e226 100644
--- a/board/eltec/bab7xx/misc.c
+++ b/board/eltec/bab7xx/misc.c
@@ -31,7 +31,6 @@ 
 #include "srom.h"
 
 /* imports  */
-extern char console_buffer[CONFIG_SYS_CBSIZE];
 extern int l2_cache_enable (int l2control);
 extern void *nvram_read (void *dest, const short src, size_t count);
 extern void nvram_write (short dest, const void *src, size_t count);
diff --git a/board/eltec/elppc/misc.c b/board/eltec/elppc/misc.c
index cbaf10b..d476cd5 100644
--- a/board/eltec/elppc/misc.c
+++ b/board/eltec/elppc/misc.c
@@ -29,7 +29,6 @@ 
 #include "srom.h"
 
 /* imports  */
-extern char console_buffer[CONFIG_SYS_CBSIZE];
 extern int l2_cache_enable (int l2control);
 extern int eepro100_write_eeprom (struct eth_device *dev, int location,
 				  int addr_len, unsigned short data);
diff --git a/board/eltec/mhpc/mhpc.c b/board/eltec/mhpc/mhpc.c
index 7cca6b2..e806b3e 100644
--- a/board/eltec/mhpc/mhpc.c
+++ b/board/eltec/mhpc/mhpc.c
@@ -35,9 +35,6 @@ 
 #include "mpc8xx.h"
 #include <video_fb.h>
 
-/* imports from common/main.c */
-extern char console_buffer[CONFIG_SYS_CBSIZE];
-
 extern void eeprom_init (void);
 extern int eeprom_read (unsigned dev_addr, unsigned offset,
 			unsigned char *buffer, unsigned cnt);
diff --git a/board/hymod/input.c b/board/hymod/input.c
index 998132d..075076d 100644
--- a/board/hymod/input.c
+++ b/board/hymod/input.c
@@ -23,9 +23,6 @@ 
 
 #include <common.h>
 
-/* imports from common/main.c */
-extern char console_buffer[CONFIG_SYS_CBSIZE];
-
 int
 hymod_get_serno (const char *prompt)
 {
diff --git a/common/cmd_bedbug.c b/common/cmd_bedbug.c
index 2bd62e2..87b108f 100644
--- a/common/cmd_bedbug.c
+++ b/common/cmd_bedbug.c
@@ -15,7 +15,6 @@  DECLARE_GLOBAL_DATA_PTR;
 
 extern void show_regs __P ((struct pt_regs *));
 extern int run_command __P ((const char *, int));
-extern char console_buffer[];
 
 ulong dis_last_addr = 0;	/* Last address disassembled   */
 ulong dis_last_len = 20;	/* Default disassembler length */
diff --git a/common/cmd_dcr.c b/common/cmd_dcr.c
index 45fe66a..568e226 100644
--- a/common/cmd_dcr.c
+++ b/common/cmd_dcr.c
@@ -68,7 +68,6 @@  int do_setdcr (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
 
 	/* DCR's value */
 	int nbytes;
-	extern char console_buffer[];
 
 	/* Validate arguments */
 	if (argc < 2)
diff --git a/common/cmd_i2c.c b/common/cmd_i2c.c
index 3ea75f7..bb69f63 100644
--- a/common/cmd_i2c.c
+++ b/common/cmd_i2c.c
@@ -449,7 +449,6 @@  mod_i2c_mem(cmd_tbl_t *cmdtp, int incrflag, int flag, int argc, char * const arg
 	ulong	data;
 	int	size = 1;
 	int	nbytes;
-	extern char console_buffer[];
 
 	if (argc != 3)
 		return cmd_usage(cmdtp);
diff --git a/common/cmd_mem.c b/common/cmd_mem.c
index 461ee19..9ad932c 100644
--- a/common/cmd_mem.c
+++ b/common/cmd_mem.c
@@ -982,7 +982,6 @@  mod_mem(cmd_tbl_t *cmdtp, int incrflag, int flag, int argc, char * const argv[])
 {
 	ulong	addr, i;
 	int	nbytes, size;
-	extern char console_buffer[];
 
 	if (argc != 2)
 		return cmd_usage(cmdtp);
diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c
index 396a171..85b1750 100644
--- a/common/cmd_nvedit.c
+++ b/common/cmd_nvedit.c
@@ -423,7 +423,6 @@  int do_env_set(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 #if defined(CONFIG_CMD_ASKENV)
 int do_env_ask(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
-	extern char console_buffer[CONFIG_SYS_CBSIZE];
 	char message[CONFIG_SYS_CBSIZE];
 	int size = CONFIG_SYS_CBSIZE - 1;
 	int i, len, pos;
diff --git a/common/cmd_pci.c b/common/cmd_pci.c
index 92631ea..1e477bc 100644
--- a/common/cmd_pci.c
+++ b/common/cmd_pci.c
@@ -341,7 +341,6 @@  pci_cfg_modify (pci_dev_t bdf, ulong addr, ulong size, ulong value, int incrflag
 {
 	ulong	i;
 	int	nbytes;
-	extern char console_buffer[];
 	uint	val4;
 	ushort  val2;
 	u_char	val1;
diff --git a/common/hush.c b/common/hush.c
index 2495a6d..e8e24d7 100644
--- a/common/hush.c
+++ b/common/hush.c
@@ -1000,7 +1000,6 @@  static void get_user_input(struct in_str *i)
 	fflush(stdout);
 	i->p = the_command;
 #else
-	extern char console_buffer[];
 	int n;
 	static char the_command[CONFIG_SYS_CBSIZE];
 
diff --git a/common/modem.c b/common/modem.c
index a017b29..e37e1ea 100644
--- a/common/modem.c
+++ b/common/modem.c
@@ -62,7 +62,6 @@  int mdm_init (void)
 	char env_str[16];
 	char *init_str;
 	int i;
-	extern char console_buffer[];
 	extern void enable_putc(void);
 	extern int hwflow_onoff(int);
 
diff --git a/include/common.h b/include/common.h
index 5ca8820..05a658c 100644
--- a/include/common.h
+++ b/include/common.h
@@ -272,6 +272,7 @@  void	reset_cmd_timeout(void);
 #ifdef CONFIG_MENU
 int	abortboot(int bootdelay);
 #endif
+extern char console_buffer[];
 
 /* arch/$(ARCH)/lib/board.c */
 void	board_init_f  (ulong) __attribute__ ((noreturn));