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/sh | |
| 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/sh')
| -rw-r--r-- | arch/sh/cpu/sh4/cpu.c | 2 | ||||
| -rw-r--r-- | arch/sh/lib/bootm.c | 4 | ||||
| -rw-r--r-- | arch/sh/lib/zimageboot.c | 5 |
3 files changed, 8 insertions, 3 deletions
diff --git a/arch/sh/cpu/sh4/cpu.c b/arch/sh/cpu/sh4/cpu.c index e94e980..f032d88 100644 --- a/arch/sh/cpu/sh4/cpu.c +++ b/arch/sh/cpu/sh4/cpu.c @@ -29,7 +29,7 @@ int cleanup_before_linux (void) return 0; } -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[]) { disable_interrupts(); reset_cpu(0); diff --git a/arch/sh/lib/bootm.c b/arch/sh/lib/bootm.c index 5f14a04..dc94f83 100644 --- a/arch/sh/lib/bootm.c +++ b/arch/sh/lib/bootm.c @@ -9,6 +9,7 @@ #include <common.h> #include <command.h> +#include <env.h> #include <image.h> #include <asm/byteorder.h> #include <asm/zimage.h> @@ -50,7 +51,8 @@ static unsigned long sh_check_cmd_arg(char *cmdline, char *key, int base) return val; } -int do_bootm_linux(int flag, int argc, char * const argv[], bootm_headers_t *images) +int do_bootm_linux(int flag, int argc, char *const argv[], + bootm_headers_t *images) { /* Linux kernel load address */ void (*kernel) (void) = (void (*)(void))images->ep; diff --git a/arch/sh/lib/zimageboot.c b/arch/sh/lib/zimageboot.c index 602776a..c38f093 100644 --- a/arch/sh/lib/zimageboot.c +++ b/arch/sh/lib/zimageboot.c @@ -10,11 +10,14 @@ */ #include <common.h> +#include <command.h> +#include <env.h> #include <irq_func.h> #include <asm/io.h> #include <asm/zimage.h> -int do_sh_zimageboot (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +int do_sh_zimageboot(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) { ulong (*zboot_entry)(int, char * const []) = NULL; char *s0, *s1; |