do_reset: unify duplicate prototypes
Subsystems (6)
PATCH 1/1 do_reset: unify duplicate prototypes
The duplication of the do_reset prototype has gotten out of hand, and they're not all in sync. Unify them all in command.h.
Signed-off-by Mike Frysinger <[email protected]>
--- api/api.c | 3 --- arch/m68k/cpu/mcf5227x/cpu.c | 2 +- arch/m68k/cpu/mcf523x/cpu.c | 2 +- arch/m68k/cpu/mcf52x2/cpu.c | 14 +++++++------- arch/m68k/cpu/mcf532x/cpu.c | 2 +- arch/m68k/cpu/mcf5445x/cpu.c | 2 +- arch/m68k/cpu/mcf547x_8x/cpu.c | 2 +- arch/nios2/cpu/cpu.c | 2 +- arch/powerpc/cpu/mpc85xx/cpu.c | 2 +- arch/powerpc/cpu/ppc4xx/44x_spd_ddr2.c | 1 - arch/powerpc/lib/bootm.c | 1 - board/eltec/bab7xx/bab7xx.c | 3 ++- board/esd/apc405/apc405.c | 1 - board/esd/ar405/ar405.c | 2 -- board/esd/ash405/ash405.c | 1 - board/esd/canbt/canbt.c | 4 ---- board/esd/cpci405/cpci405.c | 1 - board/esd/cpciiser4/cpciiser4.c | 3 --- board/esd/du405/du405.c | 3 --- board/esd/hh405/hh405.c | 1 - board/esd/pci405/pci405.c | 1 - board/esd/plu405/plu405.c | 1 - board/esd/tasreg/tasreg.c | 1 - board/esd/voh405/voh405.c | 1 - board/esd/wuh405/wuh405.c | 2 -- board/freescale/m5249evb/m5249evb.c | 4 ---- board/funkwerk/vovpn-gw/vovpn-gw.c | 2 +- board/prodrive/pdnb3/pdnb3.c | 3 --- board/sacsng/sacsng.c | 2 -- .../xilinx/microblaze-generic/microblaze-generic.c | 3 ++- board/zeus/zeus.c | 1 - common/cmd_boot.c | 2 -- common/cmd_bootm.c | 1 - common/hush.c | 4 +--- common/main.c | 4 ---- include/command.h | 1 + include/exports.h | 1 - lib/vsprintf.c | 2 -- 38 files changed, 21 insertions(+), 67 deletions(-)
api/api.c +0 -3
@@ -36,9 +36,6 @@#define DEBUG #undef DEBUG -/* U-Boot routines needed */ -extern int do_reset (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]); -/***************************************************************************** * * This is the API core.
arch/m68k/cpu/mcf5227x/cpu.c +1 -1
@@ -33,7 +33,7 @@DECLARE_GLOBAL_DATA_PTR ; -int do_reset (cmd_tbl_t * cmdtp,bd_t * bd,int flag,int argc,char *const argv[]) +int do_reset (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]) {volatile rcm_t *rcm = (rcm_t *) (MMAP_RCM );udelay (1000 );
arch/m68k/cpu/mcf523x/cpu.c +1 -1
@@ -34,7 +34,7 @@DECLARE_GLOBAL_DATA_PTR ; -int do_reset (cmd_tbl_t * cmdtp,bd_t * bd,int flag,int argc,char *const argv[]) +int do_reset (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]) {volatile ccm_t *ccm = (ccm_t *)MMAP_CCM ;
arch/m68k/cpu/mcf52x2/cpu.c +7 -7
@@ -38,7 +38,7 @@DECLARE_GLOBAL_DATA_PTR ;#ifdef CONFIG_M5208 -int do_reset (cmd_tbl_t *cmdtp,bd_t *bd,int flag,int argc,char *const argv[]) +int do_reset (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]) {volatile rcm_t *rcm = (rcm_t *)(MMAP_RCM );
@@ -142,7 +142,7 @@ int checkcpu(void)return 0 ; } -int do_reset (cmd_tbl_t * cmdtp,bd_t * bd,int flag,int argc,char *const argv[]) +int do_reset (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]) {/* Call the board specific reset actions first. */ if (board_reset) {
@@ -177,7 +177,7 @@ int watchdog_init(void)#endif #ifdef CONFIG_M5272 -int do_reset (cmd_tbl_t * cmdtp,bd_t * bd,int flag,int argc,char *const argv[]) +int do_reset (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]) {volatile wdog_t *wdp = (wdog_t *) (MMAP_WDOG );
@@ -257,7 +257,7 @@ int watchdog_init(void)#endif /* #ifdef CONFIG_M5272 */ #ifdef CONFIG_M5275 -int do_reset (cmd_tbl_t *cmdtp,bd_t *bd,int flag,int argc,char *const argv[]) +int do_reset (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]) {volatile rcm_t *rcm = (rcm_t *)(MMAP_RCM );
@@ -337,7 +337,7 @@ int checkcpu(void)return 0 ; } -int do_reset (cmd_tbl_t * cmdtp,bd_t * bd,int flag,int argc,char *const argv[]) +int do_reset (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]) {MCFRESET_RCR =MCFRESET_RCR_SOFTRST ;return 0 ;
@@ -354,7 +354,7 @@ int checkcpu(void)return 0 ; } -int do_reset (cmd_tbl_t * cmdtp,bd_t * bd,int flag,int argc,char *const argv[]) +int do_reset (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]) {/* enable watchdog, set timeout to 0 and wait */ mbar_writeByte (MCFSIM_SYPCR ,0xc0 );
@@ -384,7 +384,7 @@ int checkcpu(void)return 0 ; } -int do_reset (cmd_tbl_t * cmdtp,bd_t * bd,int flag,int argc,char *const argv[]) +int do_reset (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]) {/* enable watchdog, set timeout to 0 and wait */ mbar_writeByte (SIM_SYPCR ,0xc0 );
arch/m68k/cpu/mcf532x/cpu.c +1 -1
@@ -34,7 +34,7 @@DECLARE_GLOBAL_DATA_PTR ; -int do_reset (cmd_tbl_t * cmdtp,bd_t * bd,int flag,int argc,char *const argv[]) +int do_reset (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]) {volatile rcm_t *rcm = (rcm_t *) (MMAP_RCM );
arch/m68k/cpu/mcf5445x/cpu.c +1 -1
@@ -34,7 +34,7 @@DECLARE_GLOBAL_DATA_PTR ; -int do_reset (cmd_tbl_t * cmdtp,bd_t * bd,int flag,int argc,char *const argv[]) +int do_reset (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]) {volatile rcm_t *rcm = (rcm_t *) (MMAP_RCM );udelay (1000 );
arch/m68k/cpu/mcf547x_8x/cpu.c +1 -1
@@ -34,7 +34,7 @@DECLARE_GLOBAL_DATA_PTR ; -int do_reset (cmd_tbl_t * cmdtp,bd_t * bd,int flag,int argc,char *const argv[]) +int do_reset (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]) {volatile gptmr_t *gptmr = (gptmr_t *) (MMAP_GPTMR );
arch/nios2/cpu/cpu.c +1 -1
@@ -40,7 +40,7 @@ int checkcpu (void)return (0 ); } -int do_reset (void ) +int do_reset (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]) {disable_interrupts ();/* indirect call to go beyond 256MB limitation of toolchain */
arch/powerpc/cpu/mpc85xx/cpu.c +1 -1
@@ -196,7 +196,7 @@ int checkcpu (void)/* ------------------------------------------------------------------------- */ -int do_reset (cmd_tbl_t *cmdtp,bd_t *bd,int flag,int argc,char *const argv[]) +int do_reset (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]) {/* Everything after the first generation of PQ3 parts has RSTCR */ #if defined(CONFIG_MPC8540) || defined(CONFIG_MPC8541) || \
arch/powerpc/cpu/ppc4xx/44x_spd_ddr2.c +0 -1
@@ -418,7 +418,6 @@ static void test(void);static void DQS_calibration_process (void );#endif #endif -int do_reset (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]);static unsigned char spd_read (uchar chip,uint addr) {
arch/powerpc/lib/bootm.c +0 -1
@@ -47,7 +47,6 @@DECLARE_GLOBAL_DATA_PTR ; -extern int do_reset (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]);extern ulong get_effective_memsize (void );static ulong get_sp (void );static void set_clocks_in_mhz (bd_t *kbd);
board/eltec/bab7xx/bab7xx.c +2 -1
@@ -184,7 +184,7 @@ void after_reloc (ulong dest_addr)* do_reset is done here because in this case it is board specific, since the * 7xx CPUs can only be reset by external HW (the RTC in this case). */ -void do_reset (cmd_tbl_t * cmdtp,bd_t * bd,int flag,int argc,char *const argv[]) +int do_reset (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]) {#if defined(CONFIG_RTC_MK48T59 )/* trigger watchdog immediately */
@@ -192,6 +192,7 @@ void do_reset (cmd_tbl_t * cmdtp, bd_t * bd, int flag, int argc, char * const ar#else #error "You must define the macro CONFIG_RTC_MK48T59."#endif +return 0 ; }/* ------------------------------------------------------------------------- */
board/esd/apc405/apc405.c +0 -1
@@ -38,7 +38,6 @@ DECLARE_GLOBAL_DATA_PTR;#undef FPGA_DEBUG -extern int do_reset (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]);extern void lxt971_no_sleep (void );/* fpga configuration data - gzip compressed and generated by bin2c */
board/esd/ar405/ar405.c +0 -2
@@ -29,8 +29,6 @@DECLARE_GLOBAL_DATA_PTR ; -/*cmd_boot.c*/ -extern int do_reset (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]);extern void lxt971_no_sleep (void );/* ------------------------------------------------------------------------- */
board/esd/ash405/ash405.c +0 -1
@@ -33,7 +33,6 @@#define FPGA_DEBUG #endif -extern int do_reset (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]);extern void lxt971_no_sleep (void );/* fpga configuration data - gzip compressed and generated by bin2c */
board/esd/canbt/canbt.c +0 -4
@@ -29,10 +29,6 @@DECLARE_GLOBAL_DATA_PTR ; -/*cmd_boot.c*/ -extern int do_reset (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]); - -/* ------------------------------------------------------------------------- */ #if 0
board/esd/cpci405/cpci405.c +0 -1
@@ -32,7 +32,6 @@DECLARE_GLOBAL_DATA_PTR ; -extern int do_reset (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]);extern void __ft_board_setup (void *blob,bd_t *bd);#undef FPGA_DEBUG
board/esd/cpciiser4/cpciiser4.c +0 -3
@@ -28,9 +28,6 @@DECLARE_GLOBAL_DATA_PTR ; -/*cmd_boot.c*/ - -extern int do_reset (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]);extern void lxt971_no_sleep (void );
board/esd/du405/du405.c +0 -3
@@ -30,9 +30,6 @@DECLARE_GLOBAL_DATA_PTR ; -/*cmd_boot.c*/ - -extern int do_reset (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]);extern void lxt971_no_sleep (void );
board/esd/hh405/hh405.c +0 -1
@@ -236,7 +236,6 @@ static const SMI_REGS init_regs_1024x768 [] =#define FPGA_DEBUG #endif -extern int do_reset (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]);extern void lxt971_no_sleep (void );/* fpga configuration data - gzip compressed and generated by bin2c */
board/esd/pci405/pci405.c +0 -1
@@ -34,7 +34,6 @@DECLARE_GLOBAL_DATA_PTR ;/* Prototypes */ -int do_reset (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]);unsigned long fpga_done_state (void );unsigned long fpga_init_state (void );
board/esd/plu405/plu405.c +0 -1
@@ -32,7 +32,6 @@DECLARE_GLOBAL_DATA_PTR ; -extern int do_reset (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]);extern void lxt971_no_sleep (void );/* fpga configuration data - gzip compressed and generated by bin2c */
board/esd/tasreg/tasreg.c +0 -1
@@ -29,7 +29,6 @@/* Prototypes */ -int do_reset (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]);int i2c_write (uchar chip,uint addr,int alen,uchar *buffer,int len);int i2c_read (uchar chip,uint addr,int alen,uchar *buffer,int len);
board/esd/voh405/voh405.c +0 -1
@@ -33,7 +33,6 @@#define FPGA_DEBUG #endif -extern int do_reset (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]);extern void lxt971_no_sleep (void );/* fpga configuration data - gzip compressed and generated by bin2c */
board/esd/wuh405/wuh405.c +0 -2
@@ -32,8 +32,6 @@#define FPGA_DEBUG #endif -extern int do_reset (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]); -/* fpga configuration data - gzip compressed and generated by bin2c */ const unsigned char fpgadata[] = {
board/freescale/m5249evb/m5249evb.c +0 -4
@@ -26,10 +26,6 @@#include <malloc.h> #include <asm/immap.h> - -/* Prototypes */ -int do_reset (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]); -int checkboard (void ) {ulong val;uchar val8;
board/funkwerk/vovpn-gw/vovpn-gw.c +1 -1
@@ -306,7 +306,7 @@ int misc_init_r (void)#if defined(CONFIG_HAVE_OWN_RESET )int -do_reset (void *cmdtp,int flag,int argc,char *const argv[]) +do_reset (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]) {volatile ioport_t *iop;
board/prodrive/pdnb3/pdnb3.c +0 -3
@@ -28,9 +28,6 @@DECLARE_GLOBAL_DATA_PTR ; -/* Prototypes */ -int do_reset (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]); -/* predefine these here for FPGA programming (before including fpga.c) */ #define SET_FPGA (data) *IXP425_GPIO_GPOUTR = (data)#define FPGA_DONE_STATE (*IXP425_GPIO_GPINR & CONFIG_SYS_FPGA_DONE)
board/sacsng/sacsng.c +0 -2
@@ -38,8 +38,6 @@extern void eth_loopback_test (void );#endif /* CONFIG_ETHER_LOOPBACK_TEST */ -extern int do_reset (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]); -#include "clkinit.h" #include "ioconfig.h" /* I/O configuration table */
board/xilinx/microblaze-generic/microblaze-generic.c +2 -1
@@ -31,7 +31,7 @@#include <asm/microblaze_intc.h> #include <asm/asm.h> -void do_reset (void ) +int do_reset (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]) {#ifdef CONFIG_SYS_GPIO_0 *((unsigned long *)(CONFIG_SYS_GPIO_0_ADDR)) =
@@ -41,6 +41,7 @@ void do_reset (void)puts ("Reseting board\n" ); asm ("bra r0" );#endif +return 0 ; }int gpio_init (void )
board/zeus/zeus.c +0 -1
@@ -44,7 +44,6 @@ extern uchar default_environment[];ulong flash_get_size (ulong base,int banknum);void env_crc_update (void ); -int do_reset (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]);static u32 start_time;
common/cmd_boot.c +0 -2
@@ -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",
common/cmd_bootm.c +0 -1
@@ -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:
common/hush.c +1 -3
@@ -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 ();
common/main.c +0 -4
@@ -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 */
include/command.h +1 -0
@@ -99,6 +99,7 @@ extern int cmd_get_data_size(char* arg, int default_size);extern int do_bootd (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]);#endif extern int do_bootm (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]); +extern int do_reset (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]);#endif /* __ASSEMBLY__ */
include/exports.h +0 -1
@@ -19,7 +19,6 @@ void free(void*);void __udelay (unsigned long );unsigned long get_timer (unsigned long );int vprintf (const char *,va_list ); -void do_reset (void );unsigned long simple_strtoul (const char *cp,char **endp,unsigned int base);char *getenv (char *name);int setenv (char *varname,char *varvalue);
lib/vsprintf.c +0 -2
@@ -17,8 +17,6 @@#include <common.h> #if !defined (CONFIG_PANIC_HANG )#include <command.h> -/*cmd_boot.c*/ -extern int do_reset (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]);#endif #include <div64.h>
Signature · 1 line
1.7.3.1
Wolfgang Denk
AppliedPATCH 1/1 do_reset: unify duplicate prototypes
Dear Mike Frysinger,
Quoted 36 lines · In message <[email protected]> you wrote:
The duplication of the
do_resetprototype has gotten out of hand, and they're not all in sync. Unify them all incommand.h.Signed-off-by Mike Frysinger <[email protected]>--- api/api.c | 3 --- arch/m68k/cpu/mcf5227x/cpu.c | 2 +- arch/m68k/cpu/mcf523x/cpu.c | 2 +- arch/m68k/cpu/mcf52x2/cpu.c | 14 +++++++------- arch/m68k/cpu/mcf532x/cpu.c | 2 +- arch/m68k/cpu/mcf5445x/cpu.c | 2 +- arch/m68k/cpu/mcf547x_8x/cpu.c | 2 +- arch/nios2/cpu/cpu.c | 2 +- arch/powerpc/cpu/mpc85xx/cpu.c | 2 +- arch/powerpc/cpu/ppc4xx/44x_spd_ddr2.c | 1 - arch/powerpc/lib/bootm.c | 1 - board/eltec/bab7xx/bab7xx.c | 3 ++- board/esd/apc405/apc405.c | 1 - board/esd/ar405/ar405.c | 2 -- board/esd/ash405/ash405.c | 1 - board/esd/canbt/canbt.c | 4 ---- board/esd/cpci405/cpci405.c | 1 - board/esd/cpciiser4/cpciiser4.c | 3 --- board/esd/du405/du405.c | 3 --- board/esd/hh405/hh405.c | 1 - board/esd/pci405/pci405.c | 1 - board/esd/plu405/plu405.c | 1 - board/esd/tasreg/tasreg.c | 1 - board/esd/voh405/voh405.c | 1 - board/esd/wuh405/wuh405.c | 2 -- board/freescale/m5249evb/m5249evb.c | 4 ---- board/funkwerk/vovpn-gw/vovpn-gw.c | 2 +- board/prodrive/pdnb3/pdnb3.c | 3 --- board/sacsng/sacsng.c | 2 -- .../xilinx/microblaze-generic/microblaze-generic.c | 3 ++- board/zeus/zeus.c | 1 -
Quoted 8 lines
common/cmd_boot.c | 2 -- common/cmd_bootm.c | 1 - common/hush.c | 4 +--- common/main.c | 4 ---- include/command.h | 1 + include/exports.h | 1 - lib/vsprintf.c | 2 -- 38 files changed, 21 insertions(+), 67 deletions(-)
Applied to "next" branch, thanks.
Best regards,
Wolfgang Denk
Signature · 7 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
"I knew then (in 1970) that a 4-kbyte minicomputer would cost as much
as a house. So I reasoned that after college, I'd have to live
cheaply in an apartment and put all my money into owning a computer."
- Apple co-founder Steve Wozniak, EE Times, June 6, 1988, pg 45