mirror of
https://xff.cz/git/u-boot/
synced 2025-09-01 00:32:04 +02:00
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>
This commit is contained in:
@@ -21,7 +21,7 @@
|
||||
|
||||
DECLARE_GLOBAL_DATA_PTR;
|
||||
|
||||
static int do_bootm_standalone(int flag, int argc, char * const argv[],
|
||||
static int do_bootm_standalone(int flag, int argc, char *const argv[],
|
||||
bootm_headers_t *images)
|
||||
{
|
||||
char *s;
|
||||
@@ -43,7 +43,7 @@ static int do_bootm_standalone(int flag, int argc, char * const argv[],
|
||||
/*******************************************************************/
|
||||
|
||||
#if defined(CONFIG_BOOTM_NETBSD) || defined(CONFIG_BOOTM_PLAN9)
|
||||
static void copy_args(char *dest, int argc, char * const argv[], char delim)
|
||||
static void copy_args(char *dest, int argc, char *const argv[], char delim)
|
||||
{
|
||||
int i;
|
||||
|
||||
@@ -57,8 +57,8 @@ static void copy_args(char *dest, int argc, char * const argv[], char delim)
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_BOOTM_NETBSD
|
||||
static int do_bootm_netbsd(int flag, int argc, char * const argv[],
|
||||
bootm_headers_t *images)
|
||||
static int do_bootm_netbsd(int flag, int argc, char *const argv[],
|
||||
bootm_headers_t *images)
|
||||
{
|
||||
void (*loader)(bd_t *, image_header_t *, char *, char *);
|
||||
image_header_t *os_hdr, *hdr;
|
||||
@@ -129,8 +129,8 @@ static int do_bootm_netbsd(int flag, int argc, char * const argv[],
|
||||
#endif /* CONFIG_BOOTM_NETBSD*/
|
||||
|
||||
#ifdef CONFIG_LYNXKDI
|
||||
static int do_bootm_lynxkdi(int flag, int argc, char * const argv[],
|
||||
bootm_headers_t *images)
|
||||
static int do_bootm_lynxkdi(int flag, int argc, char *const argv[],
|
||||
bootm_headers_t *images)
|
||||
{
|
||||
image_header_t *hdr = &images->legacy_hdr_os_copy;
|
||||
|
||||
@@ -151,8 +151,8 @@ static int do_bootm_lynxkdi(int flag, int argc, char * const argv[],
|
||||
#endif /* CONFIG_LYNXKDI */
|
||||
|
||||
#ifdef CONFIG_BOOTM_RTEMS
|
||||
static int do_bootm_rtems(int flag, int argc, char * const argv[],
|
||||
bootm_headers_t *images)
|
||||
static int do_bootm_rtems(int flag, int argc, char *const argv[],
|
||||
bootm_headers_t *images)
|
||||
{
|
||||
void (*entry_point)(bd_t *);
|
||||
|
||||
@@ -184,8 +184,8 @@ static int do_bootm_rtems(int flag, int argc, char * const argv[],
|
||||
#endif /* CONFIG_BOOTM_RTEMS */
|
||||
|
||||
#if defined(CONFIG_BOOTM_OSE)
|
||||
static int do_bootm_ose(int flag, int argc, char * const argv[],
|
||||
bootm_headers_t *images)
|
||||
static int do_bootm_ose(int flag, int argc, char *const argv[],
|
||||
bootm_headers_t *images)
|
||||
{
|
||||
void (*entry_point)(void);
|
||||
|
||||
@@ -217,8 +217,8 @@ static int do_bootm_ose(int flag, int argc, char * const argv[],
|
||||
#endif /* CONFIG_BOOTM_OSE */
|
||||
|
||||
#if defined(CONFIG_BOOTM_PLAN9)
|
||||
static int do_bootm_plan9(int flag, int argc, char * const argv[],
|
||||
bootm_headers_t *images)
|
||||
static int do_bootm_plan9(int flag, int argc, char *const argv[],
|
||||
bootm_headers_t *images)
|
||||
{
|
||||
void (*entry_point)(void);
|
||||
char *s;
|
||||
@@ -324,7 +324,7 @@ static void do_bootvx_fdt(bootm_headers_t *images)
|
||||
puts("## vxWorks terminated\n");
|
||||
}
|
||||
|
||||
static int do_bootm_vxworks_legacy(int flag, int argc, char * const argv[],
|
||||
static int do_bootm_vxworks_legacy(int flag, int argc, char *const argv[],
|
||||
bootm_headers_t *images)
|
||||
{
|
||||
if (flag != BOOTM_STATE_OS_GO)
|
||||
@@ -342,7 +342,7 @@ static int do_bootm_vxworks_legacy(int flag, int argc, char * const argv[],
|
||||
return 1;
|
||||
}
|
||||
|
||||
int do_bootm_vxworks(int flag, int argc, char * const argv[],
|
||||
int do_bootm_vxworks(int flag, int argc, char *const argv[],
|
||||
bootm_headers_t *images)
|
||||
{
|
||||
char *bootargs;
|
||||
@@ -379,8 +379,8 @@ int do_bootm_vxworks(int flag, int argc, char * const argv[],
|
||||
#endif
|
||||
|
||||
#if defined(CONFIG_CMD_ELF)
|
||||
static int do_bootm_qnxelf(int flag, int argc, char * const argv[],
|
||||
bootm_headers_t *images)
|
||||
static int do_bootm_qnxelf(int flag, int argc, char *const argv[],
|
||||
bootm_headers_t *images)
|
||||
{
|
||||
char *local_args[2];
|
||||
char str[16];
|
||||
@@ -417,8 +417,8 @@ static int do_bootm_qnxelf(int flag, int argc, char * const argv[],
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_INTEGRITY
|
||||
static int do_bootm_integrity(int flag, int argc, char * const argv[],
|
||||
bootm_headers_t *images)
|
||||
static int do_bootm_integrity(int flag, int argc, char *const argv[],
|
||||
bootm_headers_t *images)
|
||||
{
|
||||
void (*entry_point)(void);
|
||||
|
||||
@@ -450,8 +450,8 @@ static int do_bootm_integrity(int flag, int argc, char * const argv[],
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_BOOTM_OPENRTOS
|
||||
static int do_bootm_openrtos(int flag, int argc, char * const argv[],
|
||||
bootm_headers_t *images)
|
||||
static int do_bootm_openrtos(int flag, int argc, char *const argv[],
|
||||
bootm_headers_t *images)
|
||||
{
|
||||
void (*entry_point)(void);
|
||||
|
||||
@@ -476,7 +476,7 @@ static int do_bootm_openrtos(int flag, int argc, char * const argv[],
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_BOOTM_OPTEE
|
||||
static int do_bootm_tee(int flag, int argc, char * const argv[],
|
||||
static int do_bootm_tee(int flag, int argc, char *const argv[],
|
||||
bootm_headers_t *images)
|
||||
{
|
||||
int ret;
|
||||
@@ -504,7 +504,7 @@ static int do_bootm_tee(int flag, int argc, char * const argv[],
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_BOOTM_EFI
|
||||
static int do_bootm_efi(int flag, int argc, char * const argv[],
|
||||
static int do_bootm_efi(int flag, int argc, char *const argv[],
|
||||
bootm_headers_t *images)
|
||||
{
|
||||
int ret;
|
||||
@@ -607,7 +607,7 @@ __weak void board_preboot_os(void)
|
||||
/* please define board specific board_preboot_os() */
|
||||
}
|
||||
|
||||
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)
|
||||
{
|
||||
arch_preboot_os();
|
||||
|
Reference in New Issue
Block a user