MA-19022 Remove cmd_tbl_t typedef for imx

cmd_tbl_t typedef has been removed by below commit:
  commit 09140113108541b95d340f3c7b6ee597d31ccc73
  Author: Simon Glass <sjg@chromium.org>
  Date:   Sun May 10 11:40:03 2020 -0600

      command: Remove the cmd_tbl_t typedef
Sync this change for imx platforms.

Change-Id: Ia08287658a3471569a92438434f3163ac078a49c
Signed-off-by: Ji Luo <ji.luo@nxp.com>

diff --git a/arch/arm/mach-imx/cmd_mfgprot.c b/arch/arm/mach-imx/cmd_mfgprot.c
index 34a2c2f..b0d04f8 100644 (file)
--- a/arch/arm/mach-imx/cmd_mfgprot.c
+++ b/arch/arm/mach-imx/cmd_mfgprot.c
@@ -36,7 +36,7 @@ DECLARE_GLOBAL_DATA_PTR;
  */
 #ifdef CONFIG_IMX_CAAM_MFG_PROT
 
-static int do_mfgprot(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
+static int do_mfgprot(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 {
        u8 *m_ptr, *dgst_ptr, *c_ptr, *d_ptr, *dst_ptr;
        char *pubk, *sign, *sel;
@@ -150,7 +150,7 @@ free_m:
 #define SCU_SEC_SECURE_RAM_BASE                        (0x20800000UL)
 #define SEC_SECURE_RAM_BASE                    (0x31800000UL)
 
-static int do_mfgprot(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
+static int do_mfgprot(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 {
        u8 *m_ptr, *sign_ptr, *dst_ptr;
        char *pubk, *sign, *sel;

diff --git a/arch/arm/mach-imx/imx8/misc.c b/arch/arm/mach-imx/imx8/misc.c
index 0b86214..0f69570 100644 (file)
--- a/arch/arm/mach-imx/imx8/misc.c
+++ b/arch/arm/mach-imx/imx8/misc.c
@@ -143,7 +143,7 @@ void build_info(void)
 #define PSCI_SYSTEM_RESET2_AARCH64             0xc4000012
 #define PSCI_RESET2_SYSTEM_BOARD_RESET         0x80000002
 
-int do_board_reboot(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+int do_board_reboot(struct cmd_tbl *cmdtp, int flag, int argc, char * const argv[])
 {
        struct udevice *dev;
 

diff --git a/arch/arm/mach-imx/mx6/bee.c b/arch/arm/mach-imx/mx6/bee.c
index 641c038..0c6cc67 100644 (file)
--- a/arch/arm/mach-imx/mx6/bee.c
+++ b/arch/arm/mach-imx/mx6/bee.c
@@ -267,7 +267,7 @@ static int region_valid(u32 start, u32 size)
        return 0;
 }
 
-static int do_bee_init(cmd_tbl_t *cmdtp, int flag, int argc,
+static int do_bee_init(struct cmd_tbl *cmdtp, int flag, int argc,
                       char * const argv[])
 {
        u32 start, size;
@@ -374,7 +374,7 @@ static int do_bee_init(cmd_tbl_t *cmdtp, int flag, int argc,
        return CMD_RET_SUCCESS;
 }
 
-static int do_bee_test(cmd_tbl_t *cmdtp, int flag, int argc,
+static int do_bee_test(struct cmd_tbl *cmdtp, int flag, int argc,
                       char * const argv[])
 {
        int ret;
@@ -401,14 +401,14 @@ static int do_bee_test(cmd_tbl_t *cmdtp, int flag, int argc,
        return CMD_RET_SUCCESS;
 }
 
-static cmd_tbl_t cmd_bmp_sub[] = {
+static struct cmd_tbl cmd_bmp_sub[] = {
        U_BOOT_CMD_MKENT(init, 5, 0, do_bee_init, "", ""),
        U_BOOT_CMD_MKENT(test, 2, 0, do_bee_test, "", ""),
 };
 
-static int do_bee_ops(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+static int do_bee_ops(struct cmd_tbl *cmdtp, int flag, int argc, char * const argv[])
 {
-       cmd_tbl_t *c;
+       struct cmd_tbl *c;
 
        c = find_cmd_tbl(argv[1], &cmd_bmp_sub[0], ARRAY_SIZE(cmd_bmp_sub));
 

diff --git a/arch/arm/mach-imx/mx7/tamper.c b/arch/arm/mach-imx/mx7/tamper.c
index 89f6239..5cec690 100644 (file)
--- a/arch/arm/mach-imx/mx7/tamper.c
+++ b/arch/arm/mach-imx/mx7/tamper.c
@@ -318,7 +318,7 @@ static void clear_tamper_warning(void)
        writel(lptdsr, SNVS_LPTDSR);
 }
 
-static int do_tamper(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
+static int do_tamper(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 {
        const char *op = argc >= 2 ? argv[1] : NULL;
        unsigned int tx, rx, high;

diff --git a/arch/arm/mach-imx/priblob.c b/arch/arm/mach-imx/priblob.c
index 4c5ebda..7e2deb7 100644 (file)
--- a/arch/arm/mach-imx/priblob.c
+++ b/arch/arm/mach-imx/priblob.c
@@ -14,7 +14,7 @@
 #include <command.h>
 #include "../drivers/crypto/fsl_caam_internal.h"
 
-int do_priblob_write(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+int do_priblob_write(struct cmd_tbl *cmdtp, int flag, int argc, char * const argv[])
 {
        writel((readl(CAAM_SCFGR) & 0xFFFFFFFC) | 3, CAAM_SCFGR);
        printf("New priblob setting = 0x%x\n", readl(CAAM_SCFGR) & 0x3);

diff --git a/cmd/cmd_fsl_caam.c b/cmd/cmd_fsl_caam.c
index 468be54..b055013 100644 (file)
--- a/cmd/cmd_fsl_caam.c
+++ b/cmd/cmd_fsl_caam.c
@@ -22,7 +22,7 @@
 #include <command.h>
 #include <fsl_caam.h>
 
-static int do_caam(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+static int do_caam(struct cmd_tbl *cmdtp, int flag, int argc, char * const argv[])
 {
 
        int ret, i;

diff --git a/drivers/fastboot/fb_fsl/bcb.c b/drivers/fastboot/fb_fsl/bcb.c
index a698ec8..7226790 100644 (file)
--- a/drivers/fastboot/fb_fsl/bcb.c
+++ b/drivers/fastboot/fb_fsl/bcb.c
@@ -27,7 +27,7 @@ static ulong get_block_size(char *ifname, int dev)
        return dev_desc->blksz;
 }
 
-static int do_write(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+static int do_write(struct cmd_tbl *cmdtp, int flag, int argc, char * const argv[])
 {
        char *ep;
        struct blk_desc *dev_desc = NULL;

diff --git a/drivers/fastboot/fb_fsl/fb_fsl_boot.c b/drivers/fastboot/fb_fsl/fb_fsl_boot.c
index e865031..e4a7ca4 100644 (file)
--- a/drivers/fastboot/fb_fsl/fb_fsl_boot.c
+++ b/drivers/fastboot/fb_fsl/fb_fsl_boot.c
@@ -164,7 +164,7 @@ fail:
 
 
 #if defined(CONFIG_FASTBOOT_LOCK)
-int do_lock_status(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) {
+int do_lock_status(struct cmd_tbl *cmdtp, int flag, int argc, char * const argv[]) {
        FbLockState status = fastboot_get_lock_stat();
        if (status != FASTBOOT_LOCK_ERROR) {
                if (status == FASTBOOT_LOCK)
@@ -187,7 +187,7 @@ U_BOOT_CMD(
 #endif
 
 #if defined(CONFIG_FLASH_MCUFIRMWARE_SUPPORT) && defined(CONFIG_ARCH_IMX8M)
-static int do_bootmcu(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+static int do_bootmcu(struct cmd_tbl *cmdtp, int flag, int argc, char * const argv[])
 {
        int ret;
        size_t out_num_read;
@@ -564,7 +564,7 @@ bool __weak is_power_key_pressed(void) {
        return false;
 }
 
-int do_boota(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) {
+int do_boota(struct cmd_tbl *cmdtp, int flag, int argc, char * const argv[]) {
 
        ulong addr = 0;
        u32 avb_metric;
@@ -984,7 +984,7 @@ U_BOOT_CMD(
 
 #else /* CONFIG_AVB_SUPPORT */
 /* boota <addr> [ mmc0 | mmc1 [ <partition> ] ] */
-int do_boota(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+int do_boota(struct cmd_tbl *cmdtp, int flag, int argc, char * const argv[])
 {
        ulong addr = 0;
        char *ptn = "boot";

diff --git a/drivers/usb/gadget/f_fastboot.c b/drivers/usb/gadget/f_fastboot.c
index f92de33..0d2b6bc 100644 (file)
--- a/drivers/usb/gadget/f_fastboot.c
+++ b/drivers/usb/gadget/f_fastboot.c
@@ -509,7 +509,7 @@ static int fastboot_tx_write_str(const char *buffer)
 }
 
 #ifdef CONFIG_PSCI_BOARD_REBOOT
-int do_board_reboot(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]);
+int do_board_reboot(struct cmd_tbl *cmdtp, int flag, int argc, char * const argv[]);
 #endif
 
 static void compl_do_reset(struct usb_ep *ep, struct usb_request *req)