diff options
Diffstat (limited to 'common')
| -rw-r--r-- | common/cmd_boot.c | 2 | ||||
| -rw-r--r-- | common/cmd_bootm.c | 1 | ||||
| -rw-r--r-- | common/hush.c | 4 | ||||
| -rw-r--r-- | common/main.c | 4 | 
4 files changed, 1 insertions, 10 deletions
| diff --git a/common/cmd_boot.c b/common/cmd_boot.c index 72dacaaf7..7b603d350 100644 --- a/common/cmd_boot.c +++ b/common/cmd_boot.c @@ -67,8 +67,6 @@ U_BOOT_CMD(  	"      passing 'arg' as arguments"  ); -extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]); -  U_BOOT_CMD(  	reset, 1, 0,	do_reset,  	"Perform RESET of the CPU", diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index 1a024f168..9873ee7de 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -93,7 +93,6 @@ static int fit_check_kernel (const void *fit, int os_noffset, int verify);  static void *boot_get_kernel (cmd_tbl_t *cmdtp, int flag,int argc, char * const argv[],  		bootm_headers_t *images, ulong *os_data, ulong *os_len); -extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]);  /*   *  Continue booting an OS image; caller already has: diff --git a/common/hush.c b/common/hush.c index 0f101bff1..8021a6844 100644 --- a/common/hush.c +++ b/common/hush.c @@ -1021,9 +1021,7 @@ static void get_user_input(struct in_str *i)  	static char the_command[CONFIG_SYS_CBSIZE];  #ifdef CONFIG_BOOT_RETRY_TIME -#  ifdef CONFIG_RESET_TO_RETRY -	extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]); -#  else +#  ifndef CONFIG_RESET_TO_RETRY  #	error "This currently only works with CONFIG_RESET_TO_RETRY enabled"  #  endif  	reset_cmd_timeout(); diff --git a/common/main.c b/common/main.c index bbb208b92..878cffd81 100644 --- a/common/main.c +++ b/common/main.c @@ -50,10 +50,6 @@ DECLARE_GLOBAL_DATA_PTR;  void inline __show_boot_progress (int val) {}  void show_boot_progress (int val) __attribute__((weak, alias("__show_boot_progress"))); -#if defined(CONFIG_BOOT_RETRY_TIME) && defined(CONFIG_RESET_TO_RETRY) -extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]);		/* for do_reset() prototype */ -#endif -  #if defined(CONFIG_UPDATE_TFTP)  void update_tftp (void);  #endif /* CONFIG_UPDATE_TFTP */ |