diff options
author | Simon Glass <sjg@chromium.org> | 2020-05-10 11:40:03 -0600 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2020-05-18 18:36:55 -0400 |
commit | 09140113108541b95d340f3c7b6ee597d31ccc73 (patch) | |
tree | 4b4241b799bbbb2eeef4164392442b193af1703f /arch/arm | |
parent | 691d719db7183dfb1d1360efed4c5e9f6899095f (diff) | |
download | u-boot-09140113108541b95d340f3c7b6ee597d31ccc73.zip u-boot-09140113108541b95d340f3c7b6ee597d31ccc73.tar.gz u-boot-09140113108541b95d340f3c7b6ee597d31ccc73.tar.bz2 |
command: Remove the cmd_tbl_t typedef
We should not use typedefs in U-Boot. They cannot be used as forward
declarations which means that header files must include the full header to
access them.
Drop the typedef and rename the struct to remove the _s suffix which is
now not useful.
This requires quite a few header-file additions.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch/arm')
47 files changed, 136 insertions, 83 deletions
diff --git a/arch/arm/cpu/arm1136/mx35/generic.c b/arch/arm/cpu/arm1136/mx35/generic.c index 4c45810..e6fff5b 100644 --- a/arch/arm/cpu/arm1136/mx35/generic.c +++ b/arch/arm/cpu/arm1136/mx35/generic.c @@ -8,6 +8,7 @@ #include <common.h> #include <clock_legacy.h> +#include <command.h> #include <div64.h> #include <init.h> #include <net.h> @@ -379,8 +380,8 @@ u32 imx_get_fecclk(void) } #endif -int do_mx35_showclocks(cmd_tbl_t *cmdtp, - int flag, int argc, char * const argv[]) +int do_mx35_showclocks(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) { u32 cpufreq = get_mcu_main_clk(); printf("mx35 cpu clock: %dMHz\n", cpufreq / 1000000); diff --git a/arch/arm/cpu/arm926ejs/mxs/mxs.c b/arch/arm/cpu/arm926ejs/mxs/mxs.c index 7298841..d742c0f 100644 --- a/arch/arm/cpu/arm926ejs/mxs/mxs.c +++ b/arch/arm/cpu/arm926ejs/mxs/mxs.c @@ -10,6 +10,7 @@ */ #include <common.h> +#include <command.h> #include <cpu_func.h> #include <hang.h> #include <init.h> @@ -187,7 +188,8 @@ int print_cpuinfo(void) } #endif -int do_mx28_showclocks(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) +int do_mx28_showclocks(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) { printf("CPU: %3d MHz\n", mxc_get_clock(MXC_ARM_CLK) / 1000000); printf("BUS: %3d MHz\n", mxc_get_clock(MXC_AHB_CLK) / 1000000); diff --git a/arch/arm/cpu/arm926ejs/spear/cpu.c b/arch/arm/cpu/arm926ejs/spear/cpu.c index f519224..2106541 100644 --- a/arch/arm/cpu/arm926ejs/spear/cpu.c +++ b/arch/arm/cpu/arm926ejs/spear/cpu.c @@ -5,6 +5,7 @@ */ #include <common.h> +#include <command.h> #include <init.h> #include <asm/io.h> #include <asm/arch/hardware.h> @@ -81,7 +82,7 @@ int print_cpuinfo(void) #endif #if !defined(CONFIG_SPL_BUILD) && defined(CONFIG_NAND_ECC_BCH) && defined(CONFIG_NAND_FSMC) -static int do_switch_ecc(cmd_tbl_t *cmdtp, int flag, int argc, +static int do_switch_ecc(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { if (argc != 2) diff --git a/arch/arm/cpu/arm926ejs/spear/spr_misc.c b/arch/arm/cpu/arm926ejs/spear/spr_misc.c index d5be646..998423b 100644 --- a/arch/arm/cpu/arm926ejs/spear/spr_misc.c +++ b/arch/arm/cpu/arm926ejs/spear/spr_misc.c @@ -182,7 +182,8 @@ static int write_mac(uchar *mac) } #endif -int do_chip_config(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +int do_chip_config(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) { void (*sram_setfreq) (unsigned int, unsigned int); unsigned int frequency; diff --git a/arch/arm/cpu/armv7/vf610/generic.c b/arch/arm/cpu/armv7/vf610/generic.c index da43e34..fd2ab37 100644 --- a/arch/arm/cpu/armv7/vf610/generic.c +++ b/arch/arm/cpu/armv7/vf610/generic.c @@ -5,6 +5,7 @@ #include <common.h> #include <clock_legacy.h> +#include <command.h> #include <cpu_func.h> #include <init.h> #include <net.h> @@ -240,8 +241,8 @@ unsigned int mxc_get_clock(enum mxc_clock clk) } /* Dump some core clocks */ -int do_vf610_showclocks(cmd_tbl_t *cmdtp, int flag, int argc, - char * const argv[]) +int do_vf610_showclocks(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) { printf("\n"); printf("cpu clock : %8d MHz\n", mxc_get_clock(MXC_ARM_CLK) / 1000000); diff --git a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c index d143864..07a47d5 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c @@ -5,6 +5,7 @@ */ #include <common.h> +#include <env.h> #include <asm/io.h> #include <linux/errno.h> #include <asm/arch/fsl_serdes.h> diff --git a/arch/arm/cpu/armv8/fsl-layerscape/mp.c b/arch/arm/cpu/armv8/fsl-layerscape/mp.c index 4ef2a30..31536b8 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/mp.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/mp.c @@ -260,7 +260,7 @@ int cpu_status(u32 nr) return 0; } -int cpu_release(u32 nr, int argc, char * const argv[]) +int cpu_release(u32 nr, int argc, char *const argv[]) { u64 boot_addr; u64 *table = (u64 *)get_spin_tbl_addr(); diff --git a/arch/arm/include/asm/arch-mx6/clock.h b/arch/arm/include/asm/arch-mx6/clock.h index 7699176..8ae4971 100644 --- a/arch/arm/include/asm/arch-mx6/clock.h +++ b/arch/arm/include/asm/arch-mx6/clock.h @@ -21,7 +21,7 @@ #define MXC_CLK32 32768 #endif -struct cmd_tbl_s; +struct cmd_tbl; enum mxc_clock { MXC_ARM_CLK = 0, @@ -82,6 +82,6 @@ void enable_thermal_clk(void); void mxs_set_lcdclk(u32 base_addr, u32 freq); void select_ldb_di_clock_source(enum ldb_di_clock clk); void enable_eim_clk(unsigned char enable); -int do_mx6_showclocks(struct cmd_tbl_s *cmdtp, int flag, int argc, +int do_mx6_showclocks(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); #endif /* __ASM_ARCH_CLOCK_H */ diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c index 68beea2..0facd0c 100644 --- a/arch/arm/lib/bootm.c +++ b/arch/arm/lib/bootm.c @@ -422,7 +422,7 @@ static void boot_jump_linux(bootm_headers_t *images, int flag) * DIFFERENCE: Instead of calling prep and go at the end * they are called if subcommand is equal 0. */ -int do_bootm_linux(int flag, int argc, char * const argv[], +int do_bootm_linux(int flag, int argc, char *const argv[], bootm_headers_t *images) { /* No need for those on ARM */ diff --git a/arch/arm/lib/cmd_boot.c b/arch/arm/lib/cmd_boot.c index 03dde84..c905ecc 100644 --- a/arch/arm/lib/cmd_boot.c +++ b/arch/arm/lib/cmd_boot.c @@ -32,7 +32,7 @@ * instructions, otherwise a fault occurs." */ unsigned long do_go_exec(ulong (*entry)(int, char * const []), - int argc, char * const argv[]) + int argc, char *const argv[]) { ulong addr = (ulong)entry | 1; entry = (void *)addr; diff --git a/arch/arm/lib/reset.c b/arch/arm/lib/reset.c index 835a40e..65b4be2 100644 --- a/arch/arm/lib/reset.c +++ b/arch/arm/lib/reset.c @@ -21,6 +21,7 @@ */ #include <common.h> +#include <command.h> #include <cpu_func.h> #include <irq_func.h> @@ -28,11 +29,11 @@ __weak void reset_misc(void) { } -int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +int do_reset(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { puts ("resetting ...\n"); - udelay (50000); /* wait 50 ms */ + mdelay(50); /* wait 50 ms */ disable_interrupts(); diff --git a/arch/arm/lib/semihosting.c b/arch/arm/lib/semihosting.c index 2658026..1b365a9 100644 --- a/arch/arm/lib/semihosting.c +++ b/arch/arm/lib/semihosting.c @@ -13,6 +13,7 @@ */ #include <common.h> #include <command.h> +#include <env.h> #define SYSOPEN 0x01 #define SYSCLOSE 0x02 @@ -180,7 +181,8 @@ static int smh_load_file(const char * const name, ulong load_addr, return 0; } -static int do_smhload(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +static int do_smhload(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) { if (argc == 3 || argc == 4) { ulong load_addr; diff --git a/arch/arm/mach-imx/cmd_bmode.c b/arch/arm/mach-imx/cmd_bmode.c index 2d4d6efe..19bfd9f 100644 --- a/arch/arm/mach-imx/cmd_bmode.c +++ b/arch/arm/mach-imx/cmd_bmode.c @@ -54,8 +54,8 @@ static int create_usage(char *dest) return size; } -static int do_boot_mode(cmd_tbl_t *cmdtp, int flag, int argc, - char * const argv[]) +static int do_boot_mode(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) { const struct boot_mode *p; int reset_requested = 1; @@ -87,7 +87,7 @@ void add_board_boot_modes(const struct boot_mode *p) int size; char *dest; - cmd_tbl_t *entry = ll_entry_get(cmd_tbl_t, bmode, cmd); + struct cmd_tbl *entry = ll_entry_get(struct cmd_tbl, bmode, cmd); if (entry->usage) { free(entry->usage); diff --git a/arch/arm/mach-imx/cmd_dek.c b/arch/arm/mach-imx/cmd_dek.c index 1b111ba..5f21d2b 100644 --- a/arch/arm/mach-imx/cmd_dek.c +++ b/arch/arm/mach-imx/cmd_dek.c @@ -54,7 +54,8 @@ static int blob_encap_dek(const u8 *src, u8 *dst, u32 len) * Returns zero on success, CMD_RET_USAGE in case of misuse and negative * on error. */ -static int do_dek_blob(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) +static int do_dek_blob(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) { uint32_t src_addr, dst_addr, len; uint8_t *src_ptr, *dst_ptr; diff --git a/arch/arm/mach-imx/cmd_hdmidet.c b/arch/arm/mach-imx/cmd_hdmidet.c index 6aa7d82..e2571ad 100644 --- a/arch/arm/mach-imx/cmd_hdmidet.c +++ b/arch/arm/mach-imx/cmd_hdmidet.c @@ -3,11 +3,13 @@ * Copyright (C) 2012 Boundary Devices Inc. */ #include <common.h> +#include <command.h> #include <asm/arch/imx-regs.h> #include <asm/arch/mxc_hdmi.h> #include <asm/io.h> -static int do_hdmidet(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +static int do_hdmidet(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) { struct hdmi_regs *hdmi = (struct hdmi_regs *)HDMI_ARB_BASE_ADDR; return (readb(&hdmi->phy_stat0) & HDMI_DVI_STAT) ? 0 : 1; diff --git a/arch/arm/mach-imx/cmd_nandbcb.c b/arch/arm/mach-imx/cmd_nandbcb.c index 94cae14..cc4c890 100644 --- a/arch/arm/mach-imx/cmd_nandbcb.c +++ b/arch/arm/mach-imx/cmd_nandbcb.c @@ -12,6 +12,7 @@ */ #include <common.h> +#include <command.h> #include <malloc.h> #include <nand.h> #include <dm/devres.h> @@ -1048,7 +1049,7 @@ err: return ret; } -static int do_nandbcb_bcbonly(int argc, char * const argv[]) +static int do_nandbcb_bcbonly(int argc, char *const argv[]) { struct fcb_block *fcb; struct dbbt_block *dbbt; @@ -1458,8 +1459,8 @@ static int do_nandbcb_init(int argc, char * const argv[]) return ret == 0 ? CMD_RET_SUCCESS : CMD_RET_FAILURE; } -static int do_nandbcb(cmd_tbl_t *cmdtp, int flag, int argc, - char * const argv[]) +static int do_nandbcb(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) { const char *cmd; int ret = 0; diff --git a/arch/arm/mach-imx/hab.c b/arch/arm/mach-imx/hab.c index 30db820..d0757d8 100644 --- a/arch/arm/mach-imx/hab.c +++ b/arch/arm/mach-imx/hab.c @@ -4,6 +4,7 @@ */ #include <common.h> +#include <command.h> #include <config.h> #include <fuse.h> #include <mapmem.h> @@ -291,8 +292,8 @@ static int get_hab_status(void) return 0; } -static int do_hab_status(cmd_tbl_t *cmdtp, int flag, int argc, - char * const argv[]) +static int do_hab_status(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) { if ((argc != 1)) { cmd_usage(cmdtp); @@ -324,8 +325,8 @@ static ulong get_image_ivt_offset(ulong img_addr) } } -static int do_authenticate_image(cmd_tbl_t *cmdtp, int flag, int argc, - char * const argv[]) +static int do_authenticate_image(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) { ulong addr, length, ivt_offset; int rcode = 0; @@ -349,8 +350,8 @@ static int do_authenticate_image(cmd_tbl_t *cmdtp, int flag, int argc, return rcode; } -static int do_hab_failsafe(cmd_tbl_t *cmdtp, int flag, int argc, - char * const argv[]) +static int do_hab_failsafe(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) { hab_rvt_failsafe_t *hab_rvt_failsafe; @@ -365,8 +366,8 @@ static int do_hab_failsafe(cmd_tbl_t *cmdtp, int flag, int argc, return 0; } -static int do_hab_version(cmd_tbl_t *cmdtp, int flag, int argc, - char * const argv[]) +static int do_hab_version(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) { struct hab_hdr *hdr = (struct hab_hdr *)HAB_RVT_BASE; @@ -380,8 +381,8 @@ static int do_hab_version(cmd_tbl_t *cmdtp, int flag, int argc, return 0; } -static int do_authenticate_image_or_failover(cmd_tbl_t *cmdtp, int flag, - int argc, char * const argv[]) +static int do_authenticate_image_or_failover(struct cmd_tbl *cmdtp, int flag, + int argc, char *const argv[]) { int ret = CMD_RET_FAILURE; diff --git a/arch/arm/mach-imx/imx8/ahab.c b/arch/arm/mach-imx/imx8/ahab.c index 6d25abe..6439447 100644 --- a/arch/arm/mach-imx/imx8/ahab.c +++ b/arch/arm/mach-imx/imx8/ahab.c @@ -4,6 +4,7 @@ */ #include <common.h> +#include <command.h> #include <errno.h> #include <asm/io.h> #include <asm/arch/sci/sci.h> @@ -149,8 +150,8 @@ exit: return ret; } -static int do_authenticate(cmd_tbl_t *cmdtp, int flag, int argc, - char * const argv[]) +static int do_authenticate(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) { ulong addr; @@ -250,8 +251,8 @@ static void display_ahab_auth_event(u32 event) } } -static int do_ahab_status(cmd_tbl_t *cmdtp, int flag, int argc, - char * const argv[]) +static int do_ahab_status(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) { int err; u8 idx = 0U; @@ -297,8 +298,8 @@ static int confirm_close(void) return 0; } -static int do_ahab_close(cmd_tbl_t *cmdtp, int flag, int argc, - char * const argv[]) +static int do_ahab_close(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) { int err; u16 lc; diff --git a/arch/arm/mach-imx/imx8/snvs_security_sc.c b/arch/arm/mach-imx/imx8/snvs_security_sc.c index 73f5651..564d1bf 100644 --- a/arch/arm/mach-imx/imx8/snvs_security_sc.c +++ b/arch/arm/mach-imx/imx8/snvs_security_sc.c @@ -626,7 +626,8 @@ static char snvs_cfg_help_text[] = "ALL values should be in hexadecimal format"; #define NB_REGISTERS 18 -static int do_snvs_cfg(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) +static int do_snvs_cfg(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) { int err = 0; u32 idx = 0; @@ -677,7 +678,7 @@ static char snvs_dgo_cfg_help_text[] = "\n" "ALL values should be in hexadecimal format"; -static int do_snvs_dgo_cfg(cmd_tbl_t *cmdtp, int flag, int argc, +static int do_snvs_dgo_cfg(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { int err = 0; @@ -713,7 +714,7 @@ static char tamper_pin_cfg_help_text[] = "\n" "ALL values should be in hexadecimal format"; -static int do_tamper_pin_cfg(cmd_tbl_t *cmdtp, int flag, int argc, +static int do_tamper_pin_cfg(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { int err = 0; @@ -748,8 +749,8 @@ static char snvs_clear_status_help_text[] = "Write the status registers with the value provided," " clearing the status"; -static int do_snvs_clear_status(cmd_tbl_t *cmdtp, int flag, int argc, - char *const argv[]) +static int do_snvs_clear_status(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) { int scierr = 0; u32 idx = 0; @@ -788,7 +789,7 @@ static char snvs_sec_status_help_text[] = "snvs_sec_status\n" "Display information about the security related to tamper and secvio"; -static int do_snvs_sec_status(cmd_tbl_t *cmdtp, int flag, int argc, +static int do_snvs_sec_status(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { int scierr; diff --git a/arch/arm/mach-imx/imx8m/clock_imx8mq.c b/arch/arm/mach-imx/imx8m/clock_imx8mq.c index ee18cde..52205b0 100644 --- a/arch/arm/mach-imx/imx8m/clock_imx8mq.c +++ b/arch/arm/mach-imx/imx8m/clock_imx8mq.c @@ -6,6 +6,7 @@ */ #include <common.h> +#include <command.h> #include <asm/arch/clock.h> #include <asm/arch/imx-regs.h> #include <asm/io.h> @@ -755,8 +756,8 @@ int clock_init(void) * Dump some clockes. */ #ifndef CONFIG_SPL_BUILD -static int do_imx8m_showclocks(cmd_tbl_t *cmdtp, int flag, int argc, - char * const argv[]) +static int do_imx8m_showclocks(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) { u32 freq; diff --git a/arch/arm/mach-imx/imx_bootaux.c b/arch/arm/mach-imx/imx_bootaux.c index ec0da11..ca823e6 100644 --- a/arch/arm/mach-imx/imx_bootaux.c +++ b/arch/arm/mach-imx/imx_bootaux.c @@ -92,7 +92,8 @@ int arch_auxiliary_core_check_up(u32 core_id) * The TCMUL is mapped to (M4_BOOTROM_BASE_ADDR) at A core side for * accessing the M4 TCMUL. */ -static int do_bootaux(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +static int do_bootaux(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) { ulong addr; int ret, up; diff --git a/arch/arm/mach-imx/mx5/clock.c b/arch/arm/mach-imx/mx5/clock.c index 2fabdd2..09c4c89 100644 --- a/arch/arm/mach-imx/mx5/clock.c +++ b/arch/arm/mach-imx/mx5/clock.c @@ -7,6 +7,7 @@ */ #include <common.h> +#include <command.h> #include <asm/io.h> #include <linux/errno.h> #include <asm/arch/imx-regs.h> @@ -943,7 +944,8 @@ void mxc_set_sata_internal_clock(void) /* * Dump some core clockes. */ -static int do_mx5_showclocks(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +static int do_mx5_showclocks(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) { u32 freq; diff --git a/arch/arm/mach-imx/mx6/clock.c b/arch/arm/mach-imx/mx6/clock.c index 6a9e673..9f3d62f 100644 --- a/arch/arm/mach-imx/mx6/clock.c +++ b/arch/arm/mach-imx/mx6/clock.c @@ -4,6 +4,7 @@ */ #include <common.h> +#include <command.h> #include <div64.h> #include <asm/io.h> #include <linux/errno.h> @@ -1305,7 +1306,8 @@ void disable_ipu_clock(void) /* * Dump some core clockes. */ -int do_mx6_showclocks(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +int do_mx6_showclocks(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) { u32 freq; freq = decode_pll(PLL_SYS, MXC_HCLK); diff --git a/arch/arm/mach-imx/mx7/clock.c b/arch/arm/mach-imx/mx7/clock.c index 75be4f8..f552037 100644 --- a/arch/arm/mach-imx/mx7/clock.c +++ b/arch/arm/mach-imx/mx7/clock.c @@ -8,6 +8,7 @@ #include <common.h> #include <clock_legacy.h> +#include <command.h> #include <div64.h> #include <asm/io.h> #include <linux/errno.h> @@ -1100,7 +1101,8 @@ void epdc_clock_disable(void) /* * Dump some core clockes. */ -int do_mx7_showclocks(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +int do_mx7_showclocks(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) { u32 freq; freq = decode_pll(PLL_CORE, MXC_HCLK); diff --git a/arch/arm/mach-imx/mx7ulp/clock.c b/arch/arm/mach-imx/mx7ulp/clock.c index 3c0bccc..a987ff2 100644 --- a/arch/arm/mach-imx/mx7ulp/clock.c +++ b/arch/arm/mach-imx/mx7ulp/clock.c @@ -5,6 +5,7 @@ #include <common.h> #include <clock_legacy.h> +#include <command.h> #include <div64.h> #include <asm/io.h> #include <errno.h> @@ -329,7 +330,8 @@ void hab_caam_clock_enable(unsigned char enable) /* * Dump some core clockes. */ -int do_mx7_showclocks(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +int do_mx7_showclocks(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) { u32 addr = 0; u32 freq; diff --git a/arch/arm/mach-keystone/cmd_clock.c b/arch/arm/mach-keystone/cmd_clock.c index 667826b..7165d66 100644 --- a/arch/arm/mach-keystone/cmd_clock.c +++ b/arch/arm/mach-keystone/cmd_clock.c @@ -19,7 +19,7 @@ struct pll_init_data cmd_pll_data = { .pll_od = 2, }; -int do_pll_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +int do_pll_cmd(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { if (argc != 5) goto pll_cmd_usage; @@ -63,7 +63,8 @@ U_BOOT_CMD( PLLSET_CMD_LIST " <mult> <div> <OD>\n" ); -int do_getclk_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +int do_getclk_cmd(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) { unsigned int clk; unsigned long freq; @@ -92,7 +93,7 @@ U_BOOT_CMD( CLOCK_INDEXES_LIST ); -int do_psc_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +int do_psc_cmd(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { int psc_module; int res; diff --git a/arch/arm/mach-keystone/cmd_mon.c b/arch/arm/mach-keystone/cmd_mon.c index 8142039..049d573 100644 --- a/arch/arm/mach-keystone/cmd_mon.c +++ b/arch/arm/mach-keystone/cmd_mon.c @@ -12,8 +12,8 @@ #include <mach/mon.h> asm(".arch_extension sec\n\t"); -static int do_mon_install(cmd_tbl_t *cmdtp, int flag, int argc, - char * const argv[]) +static int do_mon_install(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) { u32 addr, dpsc_base = 0x1E80000, freq, load_addr, size; int rcode = 0; @@ -65,8 +65,8 @@ static void core_spin(void) } } -int do_mon_power(cmd_tbl_t *cmdtp, int flag, int argc, - char * const argv[]) +int do_mon_power(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) { int rcode = 0, core_id, on; void (*fn)(void); diff --git a/arch/arm/mach-keystone/cmd_poweroff.c b/arch/arm/mach-keystone/cmd_poweroff.c index 89b1851..f0ad917 100644 --- a/arch/arm/mach-keystone/cmd_poweroff.c +++ b/arch/arm/mach-keystone/cmd_poweroff.c @@ -12,7 +12,7 @@ #include <asm/arch/psc_defs.h> #include <asm/arch/hardware.h> -int do_poweroff(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +int do_poweroff(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { mon_power_off(0); diff --git a/arch/arm/mach-keystone/ddr3.c b/arch/arm/mach-keystone/ddr3.c index 23ff064..9ab6b53 100644 --- a/arch/arm/mach-keystone/ddr3.c +++ b/arch/arm/mach-keystone/ddr3.c @@ -7,6 +7,7 @@ */ #include <cpu_func.h> +#include <env.h> #include <asm/io.h> #include <common.h> #include <asm/arch/msmc.h> diff --git a/arch/arm/mach-keystone/keystone.c b/arch/arm/mach-keystone/keystone.c index 1d79927..efaabca 100644 --- a/arch/arm/mach-keystone/keystone.c +++ b/arch/arm/mach-keystone/keystone.c @@ -7,6 +7,7 @@ */ #include <common.h> +#include <env.h> #include <init.h> #include <asm/io.h> #include <asm/arch/psc_defs.h> diff --git a/arch/arm/mach-meson/sm.c b/arch/arm/mach-meson/sm.c index dacc897..725897a 100644 --- a/arch/arm/mach-meson/sm.c +++ b/arch/arm/mach-meson/sm.c @@ -6,6 +6,8 @@ */ #include <common.h> +#include <command.h> +#include <env.h> #include <asm/arch/sm.h> #include <asm/cache.h> #include <linux/err.h> @@ -117,7 +119,7 @@ int meson_sm_get_reboot_reason(void) return FIELD_GET(REBOOT_REASON_MASK, reason); } -static int do_sm_serial(cmd_tbl_t *cmdtp, int flag, int argc, +static int do_sm_serial(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { ulong address; @@ -153,8 +155,8 @@ static const char *reboot_reasons[MAX_REBOOT_REASONS] = { [REBOOT_REASON_WATCHDOG_REBOOT] = "watchdog_reboot", }; -static int do_sm_reboot_reason(cmd_tbl_t *cmdtp, int flag, int argc, - char *const argv[]) +static int do_sm_reboot_reason(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) { const char *reason_str; char *destarg = NULL; @@ -181,15 +183,15 @@ static int do_sm_reboot_reason(cmd_tbl_t *cmdtp, int flag, int argc, return CMD_RET_SUCCESS; } -static cmd_tbl_t cmd_sm_sub[] = { +static struct cmd_tbl cmd_sm_sub[] = { U_BOOT_CMD_MKENT(serial, 2, 1, do_sm_serial, "", ""), U_BOOT_CMD_MKENT(reboot_reason, 1, 1, do_sm_reboot_reason, "", ""), }; -static int do_sm(cmd_tbl_t *cmdtp, int flag, int argc, +static int do_sm(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { - cmd_tbl_t *c; + struct cmd_tbl *c; if (argc < 2) return CMD_RET_USAGE; diff --git a/arch/arm/mach-omap2/omap3/board.c b/arch/arm/mach-omap2/omap3/board.c index b893fb7..f08c8ab 100644 --- a/arch/arm/mach-omap2/omap3/board.c +++ b/arch/arm/mach-omap2/omap3/board.c @@ -16,6 +16,7 @@ * */ #include <common.h> +#include <command.h> #include <dm.h> #include <init.h> #include <spl.h> @@ -280,7 +281,8 @@ void abort(void) /****************************************************************************** * OMAP3 specific command to switch between NAND HW and SW ecc *****************************************************************************/ -static int do_switch_ecc(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) +static int do_switch_ecc(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) { int hw, strength = 1; diff --git a/arch/arm/mach-omap2/sec-common.c b/arch/arm/mach-omap2/sec-common.c index 28b929f..edfb40f 100644 --- a/arch/arm/mach-omap2/sec-common.c +++ b/arch/arm/mach-omap2/sec-common.c @@ -13,6 +13,7 @@ */ #include <common.h> +#include <command.h> #include <cpu_func.h> #include <hang.h> #include <init.h> diff --git a/arch/arm/mach-rockchip/boot_mode.c b/arch/arm/mach-rockchip/boot_mode.c index 7598fe4..349c064 100644 --- a/arch/arm/mach-rockchip/boot_mode.c +++ b/arch/arm/mach-rockchip/boot_mode.c @@ -5,6 +5,8 @@ #include <common.h> #include <adc.h> +#include <command.h> +#include <env.h> #include <asm/io.h> #include <asm/arch-rockchip/boot_mode.h> #include <dm/device.h> diff --git a/arch/arm/mach-rockchip/cpu-info.c b/arch/arm/mach-rockchip/cpu-info.c index 08b7d35..21ca9de 100644 --- a/arch/arm/mach-rockchip/cpu-info.c +++ b/arch/arm/mach-rockchip/cpu-info.c @@ -5,6 +5,7 @@ */ #include <common.h> +#include <env.h> #include <init.h> #include <asm/io.h> #include <asm/arch-rockchip/clock.h> diff --git a/arch/arm/mach-rockchip/rk3288/rk3288.c b/arch/arm/mach-rockchip/rk3288/rk3288.c index 812f3bd..804abe8 100644 --- a/arch/arm/mach-rockchip/rk3288/rk3288.c +++ b/arch/arm/mach-rockchip/rk3288/rk3288.c @@ -3,6 +3,7 @@ * Copyright (c) 2016 Rockchip Electronics Co., Ltd */ #include <common.h> +#include <command.h> #include <dm.h> #include <env.h> #include <clk.h> @@ -114,8 +115,8 @@ int rk_board_late_init(void) return rk3288_board_late_init(); } -static int do_clock(cmd_tbl_t *cmdtp, int flag, int argc, - char * const argv[]) +static int do_clock(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) { static const struct { char *name; diff --git a/arch/arm/mach-socfpga/clock_manager.c b/arch/arm/mach-socfpga/clock_manager.c index 0a6025f..a4a97b6 100644 --- a/arch/arm/mach-socfpga/clock_manager.c +++ b/arch/arm/mach-socfpga/clock_manager.c @@ -4,6 +4,7 @@ */ #include <common.h> +#include <command.h> #include <init.h> #include <wait_bit.h> #include <asm/io.h> @@ -62,7 +63,8 @@ int set_cpu_clk_info(void) } #ifndef CONFIG_SPL_BUILD -static int do_showclocks(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +static int do_showclocks(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) { cm_print_clock_quick_summary(); return 0; diff --git a/arch/arm/mach-socfpga/misc.c b/arch/arm/mach-socfpga/misc.c index 557305c..ac2b891 100644 --- a/arch/arm/mach-socfpga/misc.c +++ b/arch/arm/mach-socfpga/misc.c @@ -4,6 +4,7 @@ */ #include <common.h> +#include <command.h> #include <cpu_func.h> #include <hang.h> #include <asm/cache.h> @@ -178,7 +179,8 @@ int arch_cpu_init(void) } #ifndef CONFIG_SPL_BUILD -static int do_bridge(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +static int do_bridge(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) { unsigned int mask = ~0; diff --git a/arch/arm/mach-stm32mp/cmd_stm32key.c b/arch/arm/mach-stm32mp/cmd_stm32key.c index f1f26e7..f191085 100644 --- a/arch/arm/mach-stm32mp/cmd_stm32key.c +++ b/arch/arm/mach-stm32mp/cmd_stm32key.c @@ -66,8 +66,8 @@ static int confirm_prog(void) return 0; } -static int do_stm32key(cmd_tbl_t *cmdtp, int flag, int argc, - char * const argv[]) +static int do_stm32key(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) { u32 addr; const char *op = argc >= 2 ? argv[1] : NULL; diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c b/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c index 6bebea7..0722e4a 100644 --- a/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c +++ b/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c @@ -38,7 +38,7 @@ static void enable_vidconsole(void) #endif } -static int do_stm32prog(cmd_tbl_t *cmdtp, int flag, int argc, +static int do_stm32prog(struct cmd_tbl *cmdtp, int flag, int argc, char * const argv[]) { ulong addr, size; diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c index 65cb12d..c5b8841 100644 --- a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c +++ b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c @@ -3,7 +3,7 @@ * Copyright (C) 2020, STMicroelectronics - All Rights Reserved */ -#include <common.h> +#include <command.h> #include <console.h> #include <dfu.h> #include <malloc.h> diff --git a/arch/arm/mach-tegra/cmd_enterrcm.c b/arch/arm/mach-tegra/cmd_enterrcm.c index b2252f3..110d441 100644 --- a/arch/arm/mach-tegra/cmd_enterrcm.c +++ b/arch/arm/mach-tegra/cmd_enterrcm.c @@ -25,13 +25,14 @@ */ #include <common.h> +#include <command.h> #include <cpu_func.h> #include <irq_func.h> #include <asm/arch/tegra.h> #include <asm/arch-tegra/pmc.h> -static int do_enterrcm(cmd_tbl_t *cmdtp, int flag, int argc, - char * const argv[]) +static int do_enterrcm(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) { puts("Entering RCM...\n"); udelay(50000); diff --git a/arch/arm/mach-uniphier/boot-device/boot-device.c b/arch/arm/mach-uniphier/boot-device/boot-device.c index 83f8c6a..7779469 100644 --- a/arch/arm/mach-uniphier/boot-device/boot-device.c +++ b/arch/arm/mach-uniphier/boot-device/boot-device.c @@ -5,6 +5,7 @@ */ #include <common.h> +#include <command.h> #include <spl.h> #include <stdio.h> #include <linux/io.h> @@ -205,7 +206,8 @@ int uniphier_boot_from_backend(void) #ifndef CONFIG_SPL_BUILD -static int do_pinmon(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +static int do_pinmon(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) { const struct uniphier_boot_device_info *info; u32 pinmon; diff --git a/arch/arm/mach-uniphier/dram/cmd_ddrmphy.c b/arch/arm/mach-uniphier/dram/cmd_ddrmphy.c index 9a25bba..a6c0735 100644 --- a/arch/arm/mach-uniphier/dram/cmd_ddrmphy.c +++ b/arch/arm/mach-uniphier/dram/cmd_ddrmphy.c @@ -5,6 +5,7 @@ */ #include <common.h> +#include <command.h> #include <stdio.h> #include <linux/io.h> #include <linux/printk.h> @@ -291,7 +292,8 @@ static void reg_dump(const struct uniphier_ddrmphy_param *param) } } -static int do_ddrm(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +static int do_ddrm(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) { const struct uniphier_ddrmphy_param *param; char *cmd; diff --git a/arch/arm/mach-uniphier/dram/cmd_ddrphy.c b/arch/arm/mach-uniphier/dram/cmd_ddrphy.c index a616a2a..476c5b3 100644 --- a/arch/arm/mach-uniphier/dram/cmd_ddrphy.c +++ b/arch/arm/mach-uniphier/dram/cmd_ddrphy.c @@ -6,6 +6,7 @@ */ #include <common.h> +#include <command.h> #include <stdio.h> #include <linux/io.h> #include <linux/printk.h> @@ -261,7 +262,8 @@ static void reg_dump(const struct uniphier_ddrphy_param *param) } } -static int do_ddr(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +static int do_ddr(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) { const struct uniphier_ddrphy_param *param; char *cmd; diff --git a/arch/arm/mach-uniphier/mmc-first-dev.c b/arch/arm/mach-uniphier/mmc-first-dev.c index e2f4f4e..7f29b6b 100644 --- a/arch/arm/mach-uniphier/mmc-first-dev.c +++ b/arch/arm/mach-uniphier/mmc-first-dev.c @@ -5,6 +5,7 @@ */ #include <common.h> +#include <command.h> #include <env.h> #include <mmc.h> #include <linux/errno.h> @@ -28,7 +29,8 @@ int mmc_get_env_dev(void) return find_first_mmc_device(false); } -static int do_mmcsetn(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +static int do_mmcsetn(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) { int dev; @@ -46,7 +48,8 @@ U_BOOT_CMD( "" ); -static int do_sdsetn(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +static int do_sdsetn(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) { int dev; diff --git a/arch/arm/mach-zynqmp/mp.c b/arch/arm/mach-zynqmp/mp.c index fbb5511..cc07db4 100644 --- a/arch/arm/mach-zynqmp/mp.c +++ b/arch/arm/mach-zynqmp/mp.c @@ -221,7 +221,7 @@ void initialize_tcm(bool mode) } } -int cpu_release(u32 nr, int argc, char * const argv[]) +int cpu_release(u32 nr, int argc, char *const argv[]) { if (nr >= ZYNQMP_CORE_APU0 && nr <= ZYNQMP_CORE_APU3) { u64 boot_addr = simple_strtoull(argv[0], NULL, 16); |