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/source.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'cmd/source.c') diff --git a/cmd/source.c b/cmd/source.c index 92f8f77ee6f..5b0b79aadba 100644 --- a/cmd/source.c +++ b/cmd/source.c @@ -160,7 +160,8 @@ int image_source_script(ulong addr, const char *fit_uname) /**************************************************/ #if defined(CONFIG_CMD_SOURCE) -static int do_source(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +static int do_source(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) { ulong addr; int rcode; -- cgit v1.2.3 From 3c7dded8e179ee213c8267c892720b84a7a59fd5 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sun, 10 May 2020 11:40:04 -0600 Subject: Fix some checkpatch warnings in calls to debug() Fix up some incorrect code style in calls to functions in the log.h header, mostly debug(). Signed-off-by: Simon Glass --- cmd/source.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'cmd/source.c') diff --git a/cmd/source.c b/cmd/source.c index 5b0b79aadba..cd58924eeba 100644 --- a/cmd/source.c +++ b/cmd/source.c @@ -154,7 +154,7 @@ int image_source_script(ulong addr, const char *fit_uname) return 1; } - debug ("** Script length: %ld\n", len); + debug("** Script length: %ld\n", len); return run_command_list((char *)data, len, 0); } @@ -170,16 +170,16 @@ static int do_source(struct cmd_tbl *cmdtp, int flag, int argc, /* Find script image */ if (argc < 2) { addr = CONFIG_SYS_LOAD_ADDR; - debug ("* source: default load address = 0x%08lx\n", addr); + debug("* source: default load address = 0x%08lx\n", addr); #if defined(CONFIG_FIT) } else if (fit_parse_subimage(argv[1], image_load_addr, &addr, &fit_uname)) { - debug ("* source: subimage '%s' from FIT image at 0x%08lx\n", - fit_uname, addr); + debug("* source: subimage '%s' from FIT image at 0x%08lx\n", + fit_uname, addr); #endif } else { addr = simple_strtoul(argv[1], NULL, 16); - debug ("* source: cmdline image address = 0x%08lx\n", addr); + debug("* source: cmdline image address = 0x%08lx\n", addr); } printf ("## Executing script at %08lx\n", addr); -- cgit v1.2.3 From f7ae49fc4f363a803dab3be078e93ead8e75a8e9 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sun, 10 May 2020 11:40:05 -0600 Subject: common: Drop log.h from common header Move this header out of the common header. Signed-off-by: Simon Glass --- cmd/source.c | 1 + 1 file changed, 1 insertion(+) (limited to 'cmd/source.c') diff --git a/cmd/source.c b/cmd/source.c index cd58924eeba..b6c709a3d25 100644 --- a/cmd/source.c +++ b/cmd/source.c @@ -18,6 +18,7 @@ #include #include #include +#include #include #include #include -- cgit v1.2.3