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 /include/bootm.h | |
| parent | 691d719db7183dfb1d1360efed4c5e9f6899095f (diff) | |
| download | u-boot-09140113108541b95d340f3c7b6ee597d31ccc73.tar.gz u-boot-09140113108541b95d340f3c7b6ee597d31ccc73.tar.xz u-boot-09140113108541b95d340f3c7b6ee597d31ccc73.zip | |
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 'include/bootm.h')
| -rw-r--r-- | include/bootm.h | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/include/bootm.h b/include/bootm.h index edeeacb0df..1e7f29e134 100644 --- a/include/bootm.h +++ b/include/bootm.h @@ -7,9 +7,10 @@ #ifndef _BOOTM_H #define _BOOTM_H -#include <command.h> #include <image.h> +struct cmd_tbl; + #define BOOTM_ERR_RESET (-1) #define BOOTM_ERR_OVERLAP (-2) #define BOOTM_ERR_UNIMPLEMENTED (-3) @@ -31,13 +32,13 @@ * @return 1 on error. On success the OS boots so this function does * not return. */ -typedef int boot_os_fn(int flag, int argc, char * const argv[], +typedef int boot_os_fn(int flag, int argc, char *const argv[], bootm_headers_t *images); extern boot_os_fn do_bootm_linux; extern boot_os_fn do_bootm_vxworks; -int do_bootelf(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]); +int do_bootelf(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); void lynxkdi_boot(image_header_t *hdr); boot_os_fn *bootm_os_get_boot_func(int os); @@ -46,16 +47,17 @@ boot_os_fn *bootm_os_get_boot_func(int os); int bootm_host_load_images(const void *fit, int cfg_noffset); #endif -int boot_selected_os(int argc, char * const argv[], int state, +int boot_selected_os(int argc, char *const argv[], int state, bootm_headers_t *images, boot_os_fn *boot_fn); ulong bootm_disable_interrupts(void); /* This is a special function used by booti/bootz */ -int bootm_find_images(int flag, int argc, char * const argv[]); +int bootm_find_images(int flag, int argc, char *const argv[]); -int do_bootm_states(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[], - int states, bootm_headers_t *images, int boot_progress); +int do_bootm_states(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[], int states, bootm_headers_t *images, + int boot_progress); void arch_preboot_os(void); |