From 09140113108541b95d340f3c7b6ee597d31ccc73 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sun, 10 May 2020 11:40:03 -0600 Subject: 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 --- cmd/sysboot.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'cmd/sysboot.c') diff --git a/cmd/sysboot.c b/cmd/sysboot.c index 793d67d2f58..af6a2f1b7f1 100644 --- a/cmd/sysboot.c +++ b/cmd/sysboot.c @@ -8,7 +8,8 @@ static char *fs_argv[5]; -static int do_get_ext2(cmd_tbl_t *cmdtp, const char *file_path, char *file_addr) +static int do_get_ext2(struct cmd_tbl *cmdtp, const char *file_path, + char *file_addr) { #ifdef CONFIG_CMD_EXT2 fs_argv[0] = "ext2load"; @@ -21,7 +22,8 @@ static int do_get_ext2(cmd_tbl_t *cmdtp, const char *file_path, char *file_addr) return -ENOENT; } -static int do_get_fat(cmd_tbl_t *cmdtp, const char *file_path, char *file_addr) +static int do_get_fat(struct cmd_tbl *cmdtp, const char *file_path, + char *file_addr) { #ifdef CONFIG_CMD_FAT fs_argv[0] = "fatload"; @@ -34,7 +36,8 @@ static int do_get_fat(cmd_tbl_t *cmdtp, const char *file_path, char *file_addr) return -ENOENT; } -static int do_get_any(cmd_tbl_t *cmdtp, const char *file_path, char *file_addr) +static int do_get_any(struct cmd_tbl *cmdtp, const char *file_path, + char *file_addr) { #ifdef CONFIG_CMD_FS_GENERIC fs_argv[0] = "load"; @@ -52,7 +55,8 @@ static int do_get_any(cmd_tbl_t *cmdtp, const char *file_path, char *file_addr) * * Returns 0 on success, 1 on error. */ -static int do_sysboot(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +static int do_sysboot(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) { unsigned long pxefile_addr_r; struct pxe_menu *cfg; -- cgit v1.2.3