From c01d06fdb5032d055aeba7645ff254477f10ea9d Mon Sep 17 00:00:00 2001
From: Ondrej Jirman <megous@megous.com>
Date: Thu, 8 Oct 2020 02:29:41 +0200
Subject: [PATCH] Fix more compilation errors (cmd)

---
 cmd/axp.c         |  2 +-
 cmd/backlight.c   |  2 +-
 cmd/mydbg.c       |  2 +-
 cmd/sunxi-arisc.c |  6 +++---
 cmd/tmenu.c       |  8 ++++----
 cmd/touch.c       | 12 ++++++------
 6 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/cmd/axp.c b/cmd/axp.c
index 75deea64d74..5d73d86996a 100644
--- a/cmd/axp.c
+++ b/cmd/axp.c
@@ -7,7 +7,7 @@
 #include <cli_hush.h>
 #include <axp_pmic.h>
 
-static int do_axp(cmd_tbl_t *cmdtp, int flag, int argc,
+static int do_axp(struct cmd_tbl *cmdtp, int flag, int argc,
 		  char *const argv[])
 {
 	int ret = 0, val;
diff --git a/cmd/backlight.c b/cmd/backlight.c
index 47dffc91455..af8c8a45ef0 100644
--- a/cmd/backlight.c
+++ b/cmd/backlight.c
@@ -4,7 +4,7 @@
 #include <dm.h>
 #include <backlight.h>
 
-static int do_backlight(cmd_tbl_t *cmdtp, int flag, int argc,
+static int do_backlight(struct cmd_tbl *cmdtp, int flag, int argc,
 			char *const argv[])
 {
 	struct udevice *backlight;
diff --git a/cmd/mydbg.c b/cmd/mydbg.c
index d19fce01a52..cdcaaeb1ef3 100644
--- a/cmd/mydbg.c
+++ b/cmd/mydbg.c
@@ -98,7 +98,7 @@ static void dump_regs(void)
 */
 }
 
-static int do_mydbg(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
+static int do_mydbg(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 {
 	dump_regs();
 
diff --git a/cmd/sunxi-arisc.c b/cmd/sunxi-arisc.c
index 92dd9c2f6b0..f3a16168019 100644
--- a/cmd/sunxi-arisc.c
+++ b/cmd/sunxi-arisc.c
@@ -26,19 +26,19 @@ static void reset_cpus(int stop)
 	}
 }
 
-static int do_arisc_start(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
+static int do_arisc_start(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 {
 	reset_cpus(0);
 	return 0;
 }
 
-static int do_arisc_stop(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
+static int do_arisc_stop(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 {
 	reset_cpus(1);
 	return 0;
 }
 
-static int do_arisc_takeover(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
+static int do_arisc_takeover(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 {
 	reset_cpus(0);
 
diff --git a/cmd/tmenu.c b/cmd/tmenu.c
index ca40764b9f5..e7b017c0ca2 100644
--- a/cmd/tmenu.c
+++ b/cmd/tmenu.c
@@ -124,7 +124,7 @@ static void painter_char(struct painter* p, char ch, u32 color)
 
 // menu command
 
-static int handle_tmenu(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[], int no_touch)
+static int handle_tmenu(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[], int no_touch)
 {
 	struct udevice *vdev, *tdev;
 	struct video_priv *vpriv;
@@ -255,17 +255,17 @@ next:
 	return CMD_RET_SUCCESS;
 }
 
-static int do_tmenu_render(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
+static int do_tmenu_render(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 {
 	return handle_tmenu(cmdtp, flag, argc, argv, 1);
 }
 
-static int do_tmenu_input(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
+static int do_tmenu_input(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 {
 	return handle_tmenu(cmdtp, flag, argc, argv, 0);
 }
 
-static int do_tmenu(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
+static int do_tmenu(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 {
 	int ret;
 	
diff --git a/cmd/touch.c b/cmd/touch.c
index e3617d6916a..42845da7d05 100644
--- a/cmd/touch.c
+++ b/cmd/touch.c
@@ -8,7 +8,7 @@
 #include <dm.h>
 #include <touchpanel.h>
 
-static int do_touch_list(cmd_tbl_t *cmdtp, int flag, int argc,
+static int do_touch_list(struct cmd_tbl *cmdtp, int flag, int argc,
 		       char *const argv[])
 {
 	struct udevice *dev;
@@ -31,7 +31,7 @@ static int do_touch_list(cmd_tbl_t *cmdtp, int flag, int argc,
 	return CMD_RET_SUCCESS;
 }
 
-static int do_touch_info(cmd_tbl_t *cmdtp, int flag, int argc,
+static int do_touch_info(struct cmd_tbl *cmdtp, int flag, int argc,
 		       char *const argv[])
 {
 	struct touchpanel_priv *uc_priv;
@@ -56,7 +56,7 @@ static int do_touch_info(cmd_tbl_t *cmdtp, int flag, int argc,
 	return CMD_RET_SUCCESS;
 }
 
-static int do_touch_get(cmd_tbl_t *cmdtp, int flag, int argc,
+static int do_touch_get(struct cmd_tbl *cmdtp, int flag, int argc,
 			char *const argv[])
 {
 	//struct touchpanel_priv *uc_priv;
@@ -103,16 +103,16 @@ static int do_touch_get(cmd_tbl_t *cmdtp, int flag, int argc,
 	return CMD_RET_SUCCESS;
 }
 
-static cmd_tbl_t cmd_touch_sub[] = {
+static struct cmd_tbl cmd_touch_sub[] = {
 	U_BOOT_CMD_MKENT(list, 1, 1, do_touch_list, "", ""),
 	U_BOOT_CMD_MKENT(info, 2, 1, do_touch_info, "", ""),
 	U_BOOT_CMD_MKENT(get, 2, 1, do_touch_get, "", ""),
 };
 
-static int do_touch(cmd_tbl_t *cmdtp, int flag, int argc,
+static int do_touch(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;