diff options
| author | Tom Rini <trini@konsulko.com> | 2020-05-19 10:51:43 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-05-19 10:51:43 -0400 |
| commit | c2279d784e35fa25ee3a9fa28a74a1ba545f8c1e (patch) | |
| tree | 158fd30f3d06142f6a99cbae6ed8ccb0f3be567b /include | |
| parent | ed9a3aa6452f57af65eb74f73bd2a54c3a2f4b03 (diff) | |
| parent | cd93d625fd751d55c729c78b10f82109d56a5f1d (diff) | |
Merge branch '2020-05-18-reduce-size-of-common.h'
Bring in the latest round of Simon's changes to reduce what's in
<common.h> overall.
Diffstat (limited to 'include')
187 files changed, 508 insertions, 212 deletions
diff --git a/include/_exports.h b/include/_exports.h index 0dee05f077..1e9ba86108 100644 --- a/include/_exports.h +++ b/include/_exports.h @@ -29,7 +29,7 @@ EXPORT_FUNC(udelay, void, udelay, unsigned long) EXPORT_FUNC(get_timer, unsigned long, get_timer, unsigned long) EXPORT_FUNC(vprintf, int, vprintf, const char *, va_list) - EXPORT_FUNC(do_reset, int, do_reset, cmd_tbl_t *, + EXPORT_FUNC(do_reset, int, do_reset, struct cmd_tbl *, int , int , char * const []) EXPORT_FUNC(env_get, char *, env_get, const char*) EXPORT_FUNC(env_set, int, env_set, const char *, const char *) diff --git a/include/acpi/acpi_table.h b/include/acpi/acpi_table.h index 3681c5c8ed..fe9b29f3f8 100644 --- a/include/acpi/acpi_table.h +++ b/include/acpi/acpi_table.h @@ -13,6 +13,8 @@ #ifndef __ACPI_TABLE_H__ #define __ACPI_TABLE_H__ +#include <linux/bitops.h> + #define RSDP_SIG "RSD PTR " /* RSDP pointer signature */ #define OEM_ID "U-BOOT" /* U-Boot */ #define OEM_TABLE_ID "U-BOOTBL" /* U-Boot Table */ diff --git a/include/android_ab.h b/include/android_ab.h index 810906d22b..0941eb6b9c 100644 --- a/include/android_ab.h +++ b/include/android_ab.h @@ -6,7 +6,8 @@ #ifndef __ANDROID_AB_H #define __ANDROID_AB_H -#include <common.h> +struct blk_desc; +struct disk_partition; /* Android standard boot slot names are 'a', 'b', 'c', ... */ #define BOOT_SLOT_NAME(slot_num) ('a' + (slot_num)) @@ -29,6 +30,6 @@ * @param[in] part_info Place to store the partition information * @return The slot number (>= 0) on success, or a negative on error */ -int ab_select_slot(struct blk_desc *dev_desc, disk_partition_t *part_info); +int ab_select_slot(struct blk_desc *dev_desc, struct disk_partition *part_info); #endif /* __ANDROID_AB_H */ diff --git a/include/asm-generic/gpio.h b/include/asm-generic/gpio.h index 859f41a0d4..e16c2f31d9 100644 --- a/include/asm-generic/gpio.h +++ b/include/asm-generic/gpio.h @@ -8,6 +8,7 @@ #define _ASM_GENERIC_GPIO_H_ #include <dm/ofnode.h> +#include <linux/bitops.h> struct ofnode_phandle_args; diff --git a/include/asm-generic/u-boot.h b/include/asm-generic/u-boot.h index cc94d39069..6f749736f1 100644 --- a/include/asm-generic/u-boot.h +++ b/include/asm-generic/u-boot.h @@ -23,6 +23,7 @@ #ifndef __ASSEMBLY__ +#include <asm/types.h> #include <linux/types.h> typedef struct bd_info { diff --git a/include/atf_common.h b/include/atf_common.h index 3a7d40e5f0..fd5454c55b 100644 --- a/include/atf_common.h +++ b/include/atf_common.h @@ -177,6 +177,6 @@ struct bl2_to_bl31_params_mem { struct entry_point_info bl31_ep_info; }; -#endif /*__ASSEMBLY__*/ +#endif /*__ASSEMBLY__ */ #endif /* __BL_COMMON_H__ */ diff --git a/include/avb_verify.h b/include/avb_verify.h index 18278f829e..a8d7090f79 100644 --- a/include/avb_verify.h +++ b/include/avb_verify.h @@ -38,7 +38,7 @@ struct mmc_part { int dev_num; struct mmc *mmc; struct blk_desc *mmc_blk; - disk_partition_t info; + struct disk_partition info; }; enum mmc_io_type { diff --git a/include/bedbug/type.h b/include/bedbug/type.h index 3754c7f2b2..f7a719caf0 100644 --- a/include/bedbug/type.h +++ b/include/bedbug/type.h @@ -1,6 +1,8 @@ #ifndef _TYPE_BEDBUG_H #define _TYPE_BEDBUG_H +struct cmd_tbl; + /* Supporting routines */ int bedbug_puts (const char *); int bedbug_init(void); @@ -15,7 +17,8 @@ typedef struct { int current_bp; struct pt_regs *regs; - void (*do_break) (cmd_tbl_t *, int, int, char * const []); + void (*do_break)(struct cmd_tbl *cmd, int flags, int argc, + char *const argv[]); void (*break_isr) (struct pt_regs *); int (*find_empty) (void); int (*set) (int, unsigned long); diff --git a/include/bitfield.h b/include/bitfield.h index 579a69c856..d3ceeedccd 100644 --- a/include/bitfield.h +++ b/include/bitfield.h @@ -36,6 +36,7 @@ * tables which describe all bitfields in all registers. */ +#include <linux/bitops.h> #include <linux/types.h> /* Produces a mask of set bits covering a range of a uint value */ diff --git a/include/blk.h b/include/blk.h index 6f541bb2ba..abcd4bedbb 100644 --- a/include/blk.h +++ b/include/blk.h @@ -679,7 +679,7 @@ const char *blk_get_if_type_name(enum if_type if_type); * @cur_devnump: Current device number for this interface type * @return 0 if OK, CMD_RET_ERROR on error */ -int blk_common_cmd(int argc, char * const argv[], enum if_type if_type, +int blk_common_cmd(int argc, char *const argv[], enum if_type if_type, int *cur_devnump); #endif 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); diff --git a/include/bootstage.h b/include/bootstage.h index 82f0307ef1..f507271375 100644 --- a/include/bootstage.h +++ b/include/bootstage.h @@ -199,11 +199,11 @@ enum bootstage_id { BOOTSTAGE_ID_ACCUM_DECOMP, BOOTSTAGE_ID_ACCUM_OF_LIVE, BOOTSTAGE_ID_FPGA_INIT, - BOOTSTATE_ID_ACCUM_DM_SPL, - BOOTSTATE_ID_ACCUM_DM_F, - BOOTSTATE_ID_ACCUM_DM_R, - BOOTSTATE_ID_ACCUM_FSP_M, - BOOTSTATE_ID_ACCUM_FSP_S, + BOOTSTAGE_ID_ACCUM_DM_SPL, + BOOTSTAGE_ID_ACCUM_DM_F, + BOOTSTAGE_ID_ACCUM_DM_R, + BOOTSTAGE_ID_ACCUM_FSP_M, + BOOTSTAGE_ID_ACCUM_FSP_S, BOOTSTAGE_ID_ACCUM_MMAP_SPI, /* a few spare for the user, from here */ diff --git a/include/btrfs.h b/include/btrfs.h index 5be61e3264..a7605e1589 100644 --- a/include/btrfs.h +++ b/include/btrfs.h @@ -8,7 +8,11 @@ #ifndef __U_BOOT_BTRFS_H__ #define __U_BOOT_BTRFS_H__ -int btrfs_probe(struct blk_desc *, disk_partition_t *); +struct blk_desc; +struct disk_partition; + +int btrfs_probe(struct blk_desc *fs_dev_desc, + struct disk_partition *fs_partition); int btrfs_ls(const char *); int btrfs_exists(const char *); int btrfs_size(const char *, loff_t *); diff --git a/include/command.h b/include/command.h index d1063774ce..b9b5ec1afa 100644 --- a/include/command.h +++ b/include/command.h @@ -27,7 +27,7 @@ * Monitor Command Table */ -struct cmd_tbl_s { +struct cmd_tbl { char *name; /* Command Name */ int maxargs; /* maximum number of arguments */ /* @@ -38,54 +38,57 @@ struct cmd_tbl_s { * repeatable property different for * the main command and sub-commands. */ - int (*cmd_rep)(struct cmd_tbl_s *cmd, int flags, int argc, - char * const argv[], int *repeatable); + int (*cmd_rep)(struct cmd_tbl *cmd, int flags, int argc, + char *const argv[], int *repeatable); /* Implementation function */ - int (*cmd)(struct cmd_tbl_s *, int, int, char * const []); + int (*cmd)(struct cmd_tbl *cmd, int flags, int argc, + char *const argv[]); char *usage; /* Usage message (short) */ #ifdef CONFIG_SYS_LONGHELP char *help; /* Help message (long) */ #endif #ifdef CONFIG_AUTO_COMPLETE /* do auto completion on the arguments */ - int (*complete)(int argc, char * const argv[], char last_char, int maxv, char *cmdv[]); + int (*complete)(int argc, char *const argv[], + char last_char, int maxv, char *cmdv[]); #endif }; -typedef struct cmd_tbl_s cmd_tbl_t; - - #if defined(CONFIG_CMD_RUN) -extern int do_run(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]); +extern int do_run(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]); #endif /* common/command.c */ -int _do_help (cmd_tbl_t *cmd_start, int cmd_items, cmd_tbl_t * cmdtp, int - flag, int argc, char * const argv[]); -cmd_tbl_t *find_cmd(const char *cmd); -cmd_tbl_t *find_cmd_tbl (const char *cmd, cmd_tbl_t *table, int table_len); -int complete_subcmdv(cmd_tbl_t *cmdtp, int count, int argc, - char * const argv[], char last_char, int maxv, +int _do_help(struct cmd_tbl *cmd_start, int cmd_items, struct cmd_tbl *cmdtp, + int flag, int argc, char *const argv[]); +struct cmd_tbl *find_cmd(const char *cmd); +struct cmd_tbl *find_cmd_tbl(const char *cmd, struct cmd_tbl *table, + int table_len); +int complete_subcmdv(struct cmd_tbl *cmdtp, int count, int argc, + char *const argv[], char last_char, int maxv, char *cmdv[]); -extern int cmd_usage(const cmd_tbl_t *cmdtp); +extern int cmd_usage(const struct cmd_tbl *cmdtp); /* Dummy ->cmd and ->cmd_rep wrappers. */ -int cmd_always_repeatable(cmd_tbl_t *cmdtp, int flag, int argc, - char * const argv[], int *repeatable); -int cmd_never_repeatable(cmd_tbl_t *cmdtp, int flag, int argc, - char * const argv[], int *repeatable); -int cmd_discard_repeatable(cmd_tbl_t *cmdtp, int flag, int argc, - char * const argv[]); - -static inline bool cmd_is_repeatable(cmd_tbl_t *cmdtp) +int cmd_always_repeatable(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[], int *repeatable); +int cmd_never_repeatable(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[], int *repeatable); +int cmd_discard_repeatable(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]); + +static inline bool cmd_is_repeatable(struct cmd_tbl *cmdtp) { return cmdtp->cmd_rep == cmd_always_repeatable; } #ifdef CONFIG_AUTO_COMPLETE -extern int var_complete(int argc, char * const argv[], char last_char, int maxv, char *cmdv[]); -extern int cmd_auto_complete(const char *const prompt, char *buf, int *np, int *colp); +extern int var_complete(int argc, char *const argv[], char last_char, int maxv, + char *cmdv[]); +extern int cmd_auto_complete(const char *const prompt, char *buf, int *np, + int *colp); #endif /** @@ -97,14 +100,15 @@ extern int cmd_auto_complete(const char *const prompt, char *buf, int *np, int * * 1 (CMD_RET_FAILURE) if an error is found * -1 (CMD_RET_USAGE) if 'usage' error is found */ -int cmd_process_error(cmd_tbl_t *cmdtp, int err); +int cmd_process_error(struct cmd_tbl *cmdtp, int err); /* * Monitor Command * * All commands use a common argument format: * - * void function (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]); + * void function(struct cmd_tbl *cmdtp, int flag, int argc, + * char *const argv[]); */ #if defined(CONFIG_CMD_MEMORY) || \ @@ -117,36 +121,42 @@ extern int cmd_get_data_size(char* arg, int default_size); #endif #ifdef CONFIG_CMD_BOOTD -extern int do_bootd(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]); +extern int do_bootd(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]); #endif #ifdef CONFIG_CMD_BOOTM -extern int do_bootm(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]); -extern int bootm_maybe_autostart(cmd_tbl_t *cmdtp, const char *cmd); +extern int do_bootm(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]); +extern int bootm_maybe_autostart(struct cmd_tbl *cmdtp, const char *cmd); #else -static inline int bootm_maybe_autostart(cmd_tbl_t *cmdtp, const char *cmd) +static inline int bootm_maybe_autostart(struct cmd_tbl *cmdtp, const char *cmd) { return 0; } #endif -extern int do_bootz(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]); +extern int do_bootz(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]); -extern int do_booti(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]); +extern int do_booti(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]); -extern int common_diskboot(cmd_tbl_t *cmdtp, const char *intf, int argc, +extern int common_diskboot(struct cmd_tbl *cmdtp, const char *intf, int argc, char *const argv[]); -extern int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]); -extern int do_poweroff(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]); +extern int do_reset(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]); +extern int do_poweroff(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]); extern unsigned long do_go_exec(ulong (*entry)(int, char * const []), int argc, - char * const argv[]); + char *const argv[]); #if defined(CONFIG_CMD_NVEDIT_EFI) -extern int do_env_print_efi(cmd_tbl_t *cmdtp, int flag, int argc, - char * const argv[]); -extern int do_env_set_efi(cmd_tbl_t *cmdtp, int flag, int argc, - char * const argv[]); +extern int do_env_print_efi(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]); +extern int do_env_set_efi(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]); #endif /* @@ -177,10 +187,10 @@ enum command_ret_t { * number of ticks the command took to complete. * @return 0 if the command succeeded, 1 if it failed */ -int cmd_process(int flag, int argc, char * const argv[], - int *repeatable, unsigned long *ticks); +int cmd_process(int flag, int argc, char *const argv[], int *repeatable, + unsigned long *ticks); -void fixup_cmdtable(cmd_tbl_t *cmdtp, int size); +void fixup_cmdtable(struct cmd_tbl *cmdtp, int size); /** * board_run_command() - Fallback function to execute a command @@ -254,10 +264,11 @@ int run_command_list(const char *cmd, int len, int flag); #endif #define U_BOOT_SUBCMDS_DO_CMD(_cmdname) \ - static int do_##_cmdname(cmd_tbl_t *cmdtp, int flag, int argc, \ - char * const argv[], int *repeatable) \ + static int do_##_cmdname(struct cmd_tbl *cmdtp, int flag, \ + int argc, char *const argv[], \ + int *repeatable) \ { \ - cmd_tbl_t *subcmd; \ + struct cmd_tbl *subcmd; \ \ _cmdname##_subcmds_reloc(); \ \ @@ -280,7 +291,7 @@ int run_command_list(const char *cmd, int len, int flag); #ifdef CONFIG_AUTO_COMPLETE #define U_BOOT_SUBCMDS_COMPLETE(_cmdname) \ - static int complete_##_cmdname(int argc, char * const argv[], \ + static int complete_##_cmdname(int argc, char *const argv[], \ char last_char, int maxv, \ char *cmdv[]) \ { \ @@ -294,7 +305,7 @@ int run_command_list(const char *cmd, int len, int flag); #endif #define U_BOOT_SUBCMDS(_cmdname, ...) \ - static cmd_tbl_t _cmdname##_subcmds[] = { __VA_ARGS__ }; \ + static struct cmd_tbl _cmdname##_subcmds[] = { __VA_ARGS__ }; \ U_BOOT_SUBCMDS_RELOC(_cmdname) \ U_BOOT_SUBCMDS_DO_CMD(_cmdname) \ U_BOOT_SUBCMDS_COMPLETE(_cmdname) @@ -312,18 +323,18 @@ int run_command_list(const char *cmd, int len, int flag); _cmd, _usage, _CMD_HELP(_help) _CMD_COMPLETE(_comp) } #define U_BOOT_CMD_COMPLETE(_name, _maxargs, _rep, _cmd, _usage, _help, _comp) \ - ll_entry_declare(cmd_tbl_t, _name, cmd) = \ + ll_entry_declare(struct cmd_tbl, _name, cmd) = \ U_BOOT_CMD_MKENT_COMPLETE(_name, _maxargs, _rep, _cmd, \ _usage, _help, _comp); #define U_BOOT_CMDREP_COMPLETE(_name, _maxargs, _cmd_rep, _usage, \ _help, _comp) \ - ll_entry_declare(cmd_tbl_t, _name, cmd) = \ + ll_entry_declare(struct cmd_tbl, _name, cmd) = \ U_BOOT_CMDREP_MKENT_COMPLETE(_name, _maxargs, _cmd_rep, \ _usage, _help, _comp) #else -#define U_BOOT_SUBCMD_START(name) static cmd_tbl_t name[] = {}; +#define U_BOOT_SUBCMD_START(name) static struct cmd_tbl name[] = {}; #define U_BOOT_SUBCMD_END #define _CMD_REMOVE(_name, _cmd) \ diff --git a/include/common.h b/include/common.h index 0ef8505fc7..f0679ac705 100644 --- a/include/common.h +++ b/include/common.h @@ -16,30 +16,16 @@ #include <config.h> #include <errno.h> #include <time.h> -#include <asm-offsets.h> -#include <linux/bitops.h> -#include <linux/bug.h> -#include <linux/delay.h> #include <linux/types.h> #include <linux/printk.h> #include <linux/string.h> -#include <linux/stringify.h> -#include <asm/ptrace.h> #include <stdarg.h> #include <stdio.h> #include <linux/kernel.h> -#include <part.h> -#include <flash.h> -#include <image.h> -#include <log.h> #include <asm/u-boot.h> /* boot information for Linux kernel */ #include <asm/global_data.h> /* global data used for startup functions */ -#include <init.h> #include <display_options.h> -#include <uuid.h> #include <vsprintf.h> -#include <net.h> -#include <bootstage.h> #endif /* __ASSEMBLY__ */ /* Pull in stuff for the build system */ diff --git a/include/config_fsl_chain_trust.h b/include/config_fsl_chain_trust.h index 4f522dbecc..3922241be0 100644 --- a/include/config_fsl_chain_trust.h +++ b/include/config_fsl_chain_trust.h @@ -6,6 +6,8 @@ #ifndef __CONFIG_FSL_CHAIN_TRUST_H #define __CONFIG_FSL_CHAIN_TRUST_H +#include <linux/stringify.h> + #ifdef CONFIG_CHAIN_OF_TRUST #ifndef CONFIG_EXTRA_ENV diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h index 67639458b4..a515bf9530 100644 --- a/include/configs/B4860QDS.h +++ b/include/configs/B4860QDS.h @@ -6,6 +6,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#include <linux/stringify.h> + /* * B4860 QDS board configuration file */ diff --git a/include/configs/C29XPCIE.h b/include/configs/C29XPCIE.h index 62ad50bad5..9a8cba6b7c 100644 --- a/include/configs/C29XPCIE.h +++ b/include/configs/C29XPCIE.h @@ -10,6 +10,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#include <linux/stringify.h> + #ifdef CONFIG_SPIFLASH #define CONFIG_RAMBOOT_SPIFLASH #define CONFIG_RESET_VECTOR_ADDRESS 0x110bfffc diff --git a/include/configs/M52277EVB.h b/include/configs/M52277EVB.h index f110cac274..8261f4811c 100644 --- a/include/configs/M52277EVB.h +++ b/include/configs/M52277EVB.h @@ -13,6 +13,8 @@ #ifndef _M52277EVB_H #define _M52277EVB_H +#include <linux/stringify.h> + /* * High Level Configuration Options * (easy to change) diff --git a/include/configs/M5253DEMO.h b/include/configs/M5253DEMO.h index e79a7e98dc..69e3fbae78 100644 --- a/include/configs/M5253DEMO.h +++ b/include/configs/M5253DEMO.h @@ -6,6 +6,8 @@ #ifndef _M5253DEMO_H #define _M5253DEMO_H +#include <linux/stringify.h> + #define CONFIG_MCFTMR #define CONFIG_MCFUART diff --git a/include/configs/M5373EVB.h b/include/configs/M5373EVB.h index 6297aea143..f94cc02905 100644 --- a/include/configs/M5373EVB.h +++ b/include/configs/M5373EVB.h @@ -13,6 +13,8 @@ #ifndef _M5373EVB_H #define _M5373EVB_H +#include <linux/stringify.h> + /* * High Level Configuration Options * (easy to change) diff --git a/include/configs/M54418TWR.h b/include/configs/M54418TWR.h index cdf169f6a7..2866bfd85f 100644 --- a/include/configs/M54418TWR.h +++ b/include/configs/M54418TWR.h @@ -13,6 +13,8 @@ #ifndef _M54418TWR_H #define _M54418TWR_H +#include <linux/stringify.h> + /* * High Level Configuration Options * (easy to change) diff --git a/include/configs/M54451EVB.h b/include/configs/M54451EVB.h index 8d0b1db73e..ec4284216f 100644 --- a/include/configs/M54451EVB.h +++ b/include/configs/M54451EVB.h @@ -13,6 +13,8 @@ #ifndef _M54451EVB_H #define _M54451EVB_H +#include <linux/stringify.h> + /* * High Level Configuration Options * (easy to change) diff --git a/include/configs/M54455EVB.h b/include/configs/M54455EVB.h index 6e43522fda..291adeaf0d 100644 --- a/include/configs/M54455EVB.h +++ b/include/configs/M54455EVB.h @@ -13,6 +13,8 @@ #ifndef _M54455EVB_H #define _M54455EVB_H +#include <linux/stringify.h> + /* * High Level Configuration Options * (easy to change) diff --git a/include/configs/MPC8308RDB.h b/include/configs/MPC8308RDB.h index f55e9a0995..788a325b64 100644 --- a/include/configs/MPC8308RDB.h +++ b/include/configs/MPC8308RDB.h @@ -8,6 +8,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#include <linux/stringify.h> + /* * High Level Configuration Options */ diff --git a/include/configs/MPC8313ERDB_NAND.h b/include/configs/MPC8313ERDB_NAND.h index 6829853343..d8485f6fbd 100644 --- a/include/configs/MPC8313ERDB_NAND.h +++ b/include/configs/MPC8313ERDB_NAND.h @@ -9,6 +9,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#include <linux/stringify.h> + /* * High Level Configuration Options */ diff --git a/include/configs/MPC8313ERDB_NOR.h b/include/configs/MPC8313ERDB_NOR.h index 382c39ccb4..029d2f1ec3 100644 --- a/include/configs/MPC8313ERDB_NOR.h +++ b/include/configs/MPC8313ERDB_NOR.h @@ -18,6 +18,7 @@ #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */ #endif +#include <linux/stringify.h> #define CONFIG_PCI_INDIRECT_BRIDGE /* diff --git a/include/configs/MPC8323ERDB.h b/include/configs/MPC8323ERDB.h index 289cd9a860..ff18d10872 100644 --- a/include/configs/MPC8323ERDB.h +++ b/include/configs/MPC8323ERDB.h @@ -9,6 +9,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#include <linux/stringify.h> + /* * High Level Configuration Options */ diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h index 90046fd1ee..dd517639ea 100644 --- a/include/configs/MPC8349ITX.h +++ b/include/configs/MPC8349ITX.h @@ -52,6 +52,7 @@ #define CONFIG_SYS_USB_HOST /* use the EHCI USB controller */ #endif +#include <linux/stringify.h> #define CONFIG_RTC_DS1337 #define CONFIG_SYS_I2C diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h index 21bd9f09c1..8c2297a910 100644 --- a/include/configs/MPC837XERDB.h +++ b/include/configs/MPC837XERDB.h @@ -8,6 +8,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#include <linux/stringify.h> + /* * High Level Configuration Options */ diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h index fb115e2345..340574a985 100644 --- a/include/configs/MPC8536DS.h +++ b/include/configs/MPC8536DS.h @@ -10,6 +10,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#include <linux/stringify.h> + #include "../board/freescale/common/ics307_clk.h" #ifdef CONFIG_SDCARD diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h index 2092e3da15..c9f193fc46 100644 --- a/include/configs/MPC8544DS.h +++ b/include/configs/MPC8544DS.h @@ -22,6 +22,7 @@ #define CONFIG_INTERRUPTS /* enable pci, srio, ddr interrupts */ #ifndef __ASSEMBLY__ +#include <linux/stringify.h> extern unsigned long get_board_sys_clk(unsigned long dummy); #endif #define CONFIG_SYS_CLK_FREQ get_board_sys_clk(0) /* sysclk for MPC85xx */ diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h index 6e44a072db..de2bfd8f2f 100644 --- a/include/configs/MPC8548CDS.h +++ b/include/configs/MPC8548CDS.h @@ -27,6 +27,7 @@ #define CONFIG_FSL_VIA #ifndef __ASSEMBLY__ +#include <linux/stringify.h> extern unsigned long get_clock_freq(void); #endif #define CONFIG_SYS_CLK_FREQ get_clock_freq() /* sysclk for MPC85xx */ diff --git a/include/configs/MPC8560ADS.h b/include/configs/MPC8560ADS.h index 866049febf..97d8cc48ed 100644 --- a/include/configs/MPC8560ADS.h +++ b/include/configs/MPC8560ADS.h @@ -17,6 +17,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#include <linux/delay.h> + /* High Level Configuration Options */ #define CONFIG_CPM2 1 /* has CPM2 */ diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h index 65da3d7009..3243f39df4 100644 --- a/include/configs/MPC8572DS.h +++ b/include/configs/MPC8572DS.h @@ -10,6 +10,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#include <linux/stringify.h> + #include "../board/freescale/common/ics307_clk.h" #ifndef CONFIG_RESET_VECTOR_ADDRESS diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h index f3d603c634..eb85141702 100644 --- a/include/configs/MPC8610HPCD.h +++ b/include/configs/MPC8610HPCD.h @@ -10,6 +10,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#include <linux/stringify.h> + /* High Level Configuration Options */ #define CONFIG_LINUX_RESET_VEC 0x100 /* Reset vector used by Linux */ diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h index e97d780cea..edbeeefdd4 100644 --- a/include/configs/MPC8641HPCN.h +++ b/include/configs/MPC8641HPCN.h @@ -15,6 +15,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#include <linux/stringify.h> + /* High Level Configuration Options */ #define CONFIG_LINUX_RESET_VEC 0x100 /* Reset vector used by Linux */ #define CONFIG_ADDR_MAP 1 /* Use addr map */ diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index f578e0bd87..8f709a6cac 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -11,6 +11,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#include <linux/stringify.h> + #include <asm/config_mpc85xx.h> #define CONFIG_NAND_FSL_IFC diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h index e99d509a36..2b761078bc 100644 --- a/include/configs/P1022DS.h +++ b/include/configs/P1022DS.h @@ -8,6 +8,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#include <linux/stringify.h> + #include "../board/freescale/common/ics307_clk.h" #ifdef CONFIG_SDCARD diff --git a/include/configs/P1023RDB.h b/include/configs/P1023RDB.h index 2f3831e259..6bf3cd5950 100644 --- a/include/configs/P1023RDB.h +++ b/include/configs/P1023RDB.h @@ -9,6 +9,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#include <linux/stringify.h> + #ifndef CONFIG_SYS_MONITOR_BASE #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */ #endif diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h index 09427776e2..59404cbaf9 100644 --- a/include/configs/P2041RDB.h +++ b/include/configs/P2041RDB.h @@ -56,6 +56,7 @@ #ifndef __ASSEMBLY__ unsigned long get_board_sys_clk(unsigned long dummy); +#include <linux/stringify.h> #endif #define CONFIG_SYS_CLK_FREQ get_board_sys_clk(0) diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h index 5f358c13ea..53ae961837 100644 --- a/include/configs/T102xQDS.h +++ b/include/configs/T102xQDS.h @@ -11,6 +11,8 @@ #ifndef __T1024QDS_H #define __T1024QDS_H +#include <linux/stringify.h> + /* High Level Configuration Options */ #define CONFIG_SYS_BOOK3E_HV /* Category E.HV supported */ #define CONFIG_ENABLE_36BIT_PHYS diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index c96d6e5f35..f5d9657444 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -11,6 +11,8 @@ #ifndef __T1024RDB_H #define __T1024RDB_H +#include <linux/stringify.h> + /* High Level Configuration Options */ #define CONFIG_SYS_BOOK3E_HV /* Category E.HV supported */ #define CONFIG_ENABLE_36BIT_PHYS diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h index ca6ae776fa..7ad018b6d7 100644 --- a/include/configs/T1040QDS.h +++ b/include/configs/T1040QDS.h @@ -24,6 +24,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#include <linux/stringify.h> + /* * T1040 QDS board configuration file */ diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index aa7bf7d119..4237dfcd6c 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -7,6 +7,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#include <linux/stringify.h> + /* * T104x RDB board configuration file */ diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index aed2e87a1a..c54f7f53e5 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -11,6 +11,8 @@ #ifndef __T208xQDS_H #define __T208xQDS_H +#include <linux/stringify.h> + #define CONFIG_ICS307_REFCLK_HZ 25000000 /* ICS307 ref clk freq */ #if defined(CONFIG_ARCH_T2080) #define CONFIG_FSL_SATA_V2 diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index 619b287258..70eafc3e28 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -11,6 +11,8 @@ #ifndef __T2080RDB_H #define __T2080RDB_H +#include <linux/stringify.h> + #define CONFIG_ICS307_REFCLK_HZ 25000000 /* ICS307 ref clk freq */ #define CONFIG_FSL_SATA_V2 diff --git a/include/configs/T4240QDS.h b/include/configs/T4240QDS.h index 5f91a52bbe..d92af7202b 100644 --- a/include/configs/T4240QDS.h +++ b/include/configs/T4240QDS.h @@ -9,6 +9,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#include <linux/stringify.h> + #define CONFIG_FSL_SATA_V2 #define CONFIG_PCIE4 diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index f051998b0f..fcfd3b0b4b 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -10,6 +10,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#include <linux/stringify.h> + #define CONFIG_FSL_SATA_V2 #define CONFIG_PCIE4 diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h index 5086077afb..cfc9567332 100644 --- a/include/configs/UCP1020.h +++ b/include/configs/UCP1020.h @@ -13,6 +13,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#include <linux/stringify.h> + /*** Arcturus FirmWare Environment */ #define MAX_SERIAL_SIZE 15 diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h index 034eb07eaa..6f03058a78 100644 --- a/include/configs/apalis_imx6.h +++ b/include/configs/apalis_imx6.h @@ -8,6 +8,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#include <linux/stringify.h> + #include "mx6_common.h" #undef CONFIG_DISPLAY_BOARDINFO diff --git a/include/configs/apf27.h b/include/configs/apf27.h index c26cf89f5f..cecd485e20 100644 --- a/include/configs/apf27.h +++ b/include/configs/apf27.h @@ -9,6 +9,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#include <linux/stringify.h> + #define CONFIG_ENV_VERSION 10 #define CONFIG_BOARD_NAME apf27 diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h index 85bfacb7ac..51ecf4173b 100644 --- a/include/configs/at91sam9263ek.h +++ b/include/configs/at91sam9263ek.h @@ -10,6 +10,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#include <linux/stringify.h> + /* * SoC must be defined first, before hardware.h is included. * In this case SoC is defined in boards.cfg. @@ -178,6 +180,7 @@ AT91_WDT_MR_WDD(0xfff)) #endif +#include <linux/stringify.h> #endif /* NAND flash */ diff --git a/include/configs/bcmstb.h b/include/configs/bcmstb.h index ba5eb7a4a8..e58a9510de 100644 --- a/include/configs/bcmstb.h +++ b/include/configs/bcmstb.h @@ -15,6 +15,7 @@ #ifndef __ASSEMBLY__ +#include <linux/stringify.h> #include <linux/types.h> struct bcmstb_boot_parameters { diff --git a/include/configs/brppt1.h b/include/configs/brppt1.h index 3019b97d92..68931c1358 100644 --- a/include/configs/brppt1.h +++ b/include/configs/brppt1.h @@ -13,6 +13,7 @@ #include <configs/bur_cfg_common.h> #include <configs/bur_am335x_common.h> +#include <linux/stringify.h> /* ------------------------------------------------------------------------- */ /* memory */ #define CONFIG_SYS_MALLOC_LEN (5 * 1024 * 1024) diff --git a/include/configs/brsmarc1.h b/include/configs/brsmarc1.h index 4bff349a03..5aa68d1d46 100644 --- a/include/configs/brsmarc1.h +++ b/include/configs/brsmarc1.h @@ -14,6 +14,7 @@ #include <configs/bur_cfg_common.h> #include <configs/bur_am335x_common.h> +#include <linux/stringify.h> /* ------------------------------------------------------------------------- */ #define CONFIG_BOARD_TYPES diff --git a/include/configs/brxre1.h b/include/configs/brxre1.h index 006663373b..9db011358e 100644 --- a/include/configs/brxre1.h +++ b/include/configs/brxre1.h @@ -13,6 +13,7 @@ #include <configs/bur_cfg_common.h> #include <configs/bur_am335x_common.h> +#include <linux/stringify.h> /* ------------------------------------------------------------------------- */ #if !defined(CONFIG_AM335X_LCD) #define CONFIG_AM335X_LCD diff --git a/include/configs/cgtqmx6eval.h b/include/configs/cgtqmx6eval.h index bd4456aa02..fccc9b18c0 100644 --- a/include/configs/cgtqmx6eval.h +++ b/include/configs/cgtqmx6eval.h @@ -12,6 +12,8 @@ #ifndef __CONFIG_CGTQMX6EVAL_H #define __CONFIG_CGTQMX6EVAL_H +#include <linux/stringify.h> + #include "mx6_common.h" #define CONFIG_MACH_TYPE 4122 diff --git a/include/configs/clearfog.h b/include/configs/clearfog.h index 53ff830e81..459e0d9d5e 100644 --- a/include/configs/clearfog.h +++ b/include/configs/clearfog.h @@ -6,6 +6,8 @@ #ifndef _CONFIG_CLEARFOG_H #define _CONFIG_CLEARFOG_H +#include <linux/stringify.h> + /* * High Level Configuration Options (easy to change) */ diff --git a/include/configs/colibri-imx8x.h b/include/configs/colibri-imx8x.h index 03bb1701f9..da9226e2fb 100644 --- a/include/configs/colibri-imx8x.h +++ b/include/configs/colibri-imx8x.h @@ -8,6 +8,7 @@ #include <asm/arch/imx-regs.h> #include <linux/sizes.h> +#include <linux/stringify.h> #define CONFIG_REMAKE_ELF diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h index 2d649e6e21..3d248ef4ef 100644 --- a/include/configs/colibri_imx6.h +++ b/include/configs/colibri_imx6.h @@ -8,6 +8,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#include <linux/stringify.h> + #include "mx6_common.h" #undef CONFIG_DISPLAY_BOARDINFO diff --git a/include/configs/controlcenterd.h b/include/configs/controlcenterd.h index 5fbe773201..34d268e061 100644 --- a/include/configs/controlcenterd.h +++ b/include/configs/controlcenterd.h @@ -26,6 +26,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#include <linux/stringify.h> + #ifdef CONFIG_SDCARD #define CONFIG_RAMBOOT_SDCARD #endif diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h index 091f3c07d1..a49f9056c5 100644 --- a/include/configs/corenet_ds.h +++ b/include/configs/corenet_ds.h @@ -10,6 +10,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#include <linux/stringify.h> + #include "../board/freescale/common/ics307_clk.h" #ifdef CONFIG_RAMBOOT_PBL diff --git a/include/configs/cyrus.h b/include/configs/cyrus.h index 9ab92e699d..052e6018a3 100644 --- a/include/configs/cyrus.h +++ b/include/configs/cyrus.h @@ -6,6 +6,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#include <linux/stringify.h> + #if !defined(CONFIG_ARCH_P5020) && !defined(CONFIG_ARCH_P5040) #error Must call Cyrus CONFIG with a specific CPU enabled. #endif diff --git a/include/configs/dart_6ul.h b/include/configs/dart_6ul.h index 15d6884ca5..d933f79e34 100644 --- a/include/configs/dart_6ul.h +++ b/include/configs/dart_6ul.h @@ -7,6 +7,7 @@ #define __DART_6UL_H #include <linux/sizes.h> +#include <linux/stringify.h> #include "mx6_common.h" /* SPL options */ diff --git a/include/configs/el6x_common.h b/include/configs/el6x_common.h index fe63bcaaa6..f7b96e4825 100644 --- a/include/configs/el6x_common.h +++ b/include/configs/el6x_common.h @@ -8,6 +8,8 @@ #ifndef __EL6Q_COMMON_CONFIG_H #define __EL6Q_COMMON_CONFIG_H +#include <linux/stringify.h> + #define CONFIG_BOARD_NAME EL6Q #include "mx6_common.h" diff --git a/include/configs/exynos-common.h b/include/configs/exynos-common.h index 5ae2b427ca..bb34a9e83b 100644 --- a/include/configs/exynos-common.h +++ b/include/configs/exynos-common.h @@ -14,6 +14,7 @@ #include <asm/arch/cpu.h> /* get chip and board defs */ #include <linux/sizes.h> +#include <linux/stringify.h> #define CONFIG_SKIP_LOWLEVEL_INIT diff --git a/include/configs/gardena-smart-gateway-at91sam.h b/include/configs/gardena-smart-gateway-at91sam.h index f5ee65cb8a..78d2136248 100644 --- a/include/configs/gardena-smart-gateway-at91sam.h +++ b/include/configs/gardena-smart-gateway-at91sam.h @@ -9,6 +9,10 @@ #ifndef __CONFIG_H__ #define __CONFIG_H__ +#ifndef __ASSEMBLY__ +#include <linux/bitops.h> +#endif + /* ARM asynchronous clock */ #define CONFIG_SYS_AT91_SLOW_CLOCK 32768 #define CONFIG_SYS_AT91_MAIN_CLOCK 12000000 /* 12 MHz crystal */ diff --git a/include/configs/helios4.h b/include/configs/helios4.h index f0ca8e2f16..671c3d291d 100644 --- a/include/configs/helios4.h +++ b/include/configs/helios4.h @@ -7,6 +7,7 @@ #define _CONFIG_HELIOS4_H #include <linux/sizes.h> +#include <linux/stringify.h> /* * High Level Configuration Options (easy to change) diff --git a/include/configs/hrcon.h b/include/configs/hrcon.h index bf1feb8708..76c4ee9777 100644 --- a/include/configs/hrcon.h +++ b/include/configs/hrcon.h @@ -8,6 +8,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#include <linux/stringify.h> + /* * High Level Configuration Options */ diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h index 3274ff6437..bcd8aee7c3 100644 --- a/include/configs/ids8313.h +++ b/include/configs/ids8313.h @@ -11,6 +11,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#include <linux/stringify.h> + /* * High Level Configuration Options */ diff --git a/include/configs/imx6-engicam.h b/include/configs/imx6-engicam.h index 69b7f3378e..72ae89c5f6 100644 --- a/include/configs/imx6-engicam.h +++ b/include/configs/imx6-engicam.h @@ -10,6 +10,7 @@ #define __IMX6_ENGICAM_CONFIG_H #include <linux/sizes.h> +#include <linux/stringify.h> #include "mx6_common.h" /* Size of malloc() pool */ diff --git a/include/configs/imx8mm_evk.h b/include/configs/imx8mm_evk.h index 5982522eca..901a1bed6d 100644 --- a/include/configs/imx8mm_evk.h +++ b/include/configs/imx8mm_evk.h @@ -7,6 +7,7 @@ #define __IMX8MM_EVK_H #include <linux/sizes.h> +#include <linux/stringify.h> #include <asm/arch/imx-regs.h> #ifdef CONFIG_SECURE_BOOT diff --git a/include/configs/imx8mn_evk.h b/include/configs/imx8mn_evk.h index 395ddf5816..a07440c73b 100644 --- a/include/configs/imx8mn_evk.h +++ b/include/configs/imx8mn_evk.h @@ -7,6 +7,7 @@ #define __IMX8MN_EVK_H #include <linux/sizes.h> +#include <linux/stringify.h> #include <asm/arch/imx-regs.h> #ifdef CONFIG_SECURE_BOOT diff --git a/include/configs/imx8mp_evk.h b/include/configs/imx8mp_evk.h index 80e5738961..b346154fb3 100644 --- a/include/configs/imx8mp_evk.h +++ b/include/configs/imx8mp_evk.h @@ -7,6 +7,7 @@ #define __IMX8MP_EVK_H #include <linux/sizes.h> +#include <linux/stringify.h> #include <asm/arch/imx-regs.h> #ifdef CONFIG_SECURE_BOOT diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h index 724d572c22..632c4eaf77 100644 --- a/include/configs/imx8mq_evk.h +++ b/include/configs/imx8mq_evk.h @@ -7,6 +7,7 @@ #define __IMX8M_EVK_H #include <linux/sizes.h> +#include <linux/stringify.h> #include <asm/arch/imx-regs.h> #define CONFIG_SPL_MAX_SIZE (124 * 1024) diff --git a/include/configs/imx8qm_mek.h b/include/configs/imx8qm_mek.h index 22d80f1747..d7dd3e21a3 100644 --- a/include/configs/imx8qm_mek.h +++ b/include/configs/imx8qm_mek.h @@ -7,6 +7,7 @@ #define __IMX8QM_MEK_H #include <linux/sizes.h> +#include <linux/stringify.h> #include <asm/arch/imx-regs.h> #ifdef CONFIG_SPL_BUILD diff --git a/include/configs/imx8qm_rom7720.h b/include/configs/imx8qm_rom7720.h index b59641e37f..eebb8dc011 100644 --- a/include/configs/imx8qm_rom7720.h +++ b/include/configs/imx8qm_rom7720.h @@ -7,6 +7,7 @@ #define __IMX8QM_ROM7720_H #include <linux/sizes.h> +#include <linux/stringify.h> #include <asm/arch/imx-regs.h> #define CONFIG_REMAKE_ELF @@ -173,4 +174,5 @@ #define CONFIG_FEC_XCV_TYPE RGMII #define FEC_QUIRK_ENET_MAC +#include <linux/stringify.h> #endif /* __IMX8QM_ROM7720_H */ diff --git a/include/configs/imx8qxp_mek.h b/include/configs/imx8qxp_mek.h index 341e93e61e..a2046e1beb 100644 --- a/include/configs/imx8qxp_mek.h +++ b/include/configs/imx8qxp_mek.h @@ -7,6 +7,7 @@ #define __IMX8QXP_MEK_H #include <linux/sizes.h> +#include <linux/stringify.h> #include <asm/arch/imx-regs.h> #ifdef CONFIG_SPL_BUILD diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h index e690d8f39d..e9e3981060 100644 --- a/include/configs/km/keymile-common.h +++ b/include/configs/km/keymile-common.h @@ -7,6 +7,8 @@ #ifndef __CONFIG_KEYMILE_H #define __CONFIG_KEYMILE_H +#include <linux/stringify.h> + /* * Miscellaneous configurable options */ diff --git a/include/configs/km/km-mpc83xx.h b/include/configs/km/km-mpc83xx.h index dfb78c50f4..451baf8b80 100644 --- a/include/configs/km/km-mpc83xx.h +++ b/include/configs/km/km-mpc83xx.h @@ -1,6 +1,7 @@ /* * Internal Definitions */ +#include <linux/stringify.h> #define BOOTFLASH_START 0xF0000000 /* diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h index fa9d7b5dfa..79edfa728a 100644 --- a/include/configs/km/km_arm.h +++ b/include/configs/km/km_arm.h @@ -104,6 +104,8 @@ #ifndef __ASSEMBLY__ #include <asm/arch/gpio.h> +#include <linux/delay.h> +#include <linux/stringify.h> extern void __set_direction(unsigned pin, int high); void set_sda(int state); void set_scl(int state); diff --git a/include/configs/liteboard.h b/include/configs/liteboard.h index fa7d5896f5..f9a125fcb0 100644 --- a/include/configs/liteboard.h +++ b/include/configs/liteboard.h @@ -10,6 +10,7 @@ #include <asm/arch/imx-regs.h> #include <linux/sizes.h> +#include <linux/stringify.h> #include "mx6_common.h" /* SPL options */ diff --git a/include/configs/mpc8308_p1m.h b/include/configs/mpc8308_p1m.h index 97578cdb82..d6b21f11c3 100644 --- a/include/configs/mpc8308_p1m.h +++ b/include/configs/mpc8308_p1m.h @@ -8,6 +8,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#include <linux/stringify.h> + /* * High Level Configuration Options */ diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h index e3a00ed1cf..d61c90a431 100644 --- a/include/configs/mv-common.h +++ b/include/configs/mv-common.h @@ -16,6 +16,8 @@ #ifndef _MV_COMMON_H #define _MV_COMMON_H +#include <linux/stringify.h> + /* * High Level Configuration Options (easy to change) */ diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h index 07b1e06f4f..0715509ec8 100644 --- a/include/configs/mx6_common.h +++ b/include/configs/mx6_common.h @@ -6,6 +6,8 @@ #ifndef __MX6_COMMON_H #define __MX6_COMMON_H +#include <linux/stringify.h> + #if (defined(CONFIG_MX6UL) || defined(CONFIG_MX6ULL)) #define CONFIG_SC_TIMER_CLK 8000000 /* 8Mhz */ #define COUNTER_FREQUENCY CONFIG_SC_TIMER_CLK diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h index e10e7688e9..2ccf44e573 100644 --- a/include/configs/mx6cuboxi.h +++ b/include/configs/mx6cuboxi.h @@ -7,6 +7,8 @@ #ifndef __MX6CUBOXI_CONFIG_H #define __MX6CUBOXI_CONFIG_H +#include <linux/stringify.h> + #include "mx6_common.h" #include "imx6_spl.h" diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h index cb0253c306..6cea26a58d 100644 --- a/include/configs/mx6sabre_common.h +++ b/include/configs/mx6sabre_common.h @@ -8,6 +8,8 @@ #ifndef __MX6QSABRE_COMMON_CONFIG_H #define __MX6QSABRE_COMMON_CONFIG_H +#include <linux/stringify.h> + #include "mx6_common.h" #define CONFIG_IMX_THERMAL diff --git a/include/configs/mx6sllevk.h b/include/configs/mx6sllevk.h index 03c0c88e50..61c637d26c 100644 --- a/include/configs/mx6sllevk.h +++ b/include/configs/mx6sllevk.h @@ -135,4 +135,5 @@ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #endif +#include <linux/stringify.h> #endif /* __CONFIG_H */ diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h index 8633756dd0..3eea9de986 100644 --- a/include/configs/mx6sxsabresd.h +++ b/include/configs/mx6sxsabresd.h @@ -8,6 +8,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#include <linux/stringify.h> + #include "mx6_common.h" #ifdef CONFIG_SPL diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h index 7927779cc8..8466abf3d5 100644 --- a/include/configs/mx6ul_14x14_evk.h +++ b/include/configs/mx6ul_14x14_evk.h @@ -9,6 +9,7 @@ #include <asm/arch/imx-regs.h> #include <linux/sizes.h> +#include <linux/stringify.h> #include "mx6_common.h" #include <asm/mach-imx/gpio.h> diff --git a/include/configs/mx6ullevk.h b/include/configs/mx6ullevk.h index 7e3a5c7cf3..9cedb96a6b 100644 --- a/include/configs/mx6ullevk.h +++ b/include/configs/mx6ullevk.h @@ -10,6 +10,7 @@ #include <asm/arch/imx-regs.h> #include <linux/sizes.h> +#include <linux/stringify.h> #include "mx6_common.h" #include <asm/mach-imx/gpio.h> diff --git a/include/configs/mx7_common.h b/include/configs/mx7_common.h index b6ded774cc..cc07e858d5 100644 --- a/include/configs/mx7_common.h +++ b/include/configs/mx7_common.h @@ -9,6 +9,7 @@ #define __MX7_COMMON_H #include <linux/sizes.h> +#include <linux/stringify.h> #include <asm/arch/imx-regs.h> #include <asm/mach-imx/gpio.h> diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h index a5ca5f9c4b..f3081f4f33 100644 --- a/include/configs/nitrogen6x.h +++ b/include/configs/nitrogen6x.h @@ -113,6 +113,7 @@ DISTRO_BOOT_DEV_DHCP(func) #include <config_distro_bootcmd.h> +#include <linux/stringify.h> #define CONFIG_EXTRA_ENV_SETTINGS \ "console=ttymxc1\0" \ diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index af278ded9a..219e5d216b 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -10,6 +10,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#include <linux/stringify.h> + #if defined(CONFIG_TARGET_P1020MBG) #define CONFIG_BOARDNAME "P1020MBG-PC" #define CONFIG_VSC7385_ENET diff --git a/include/configs/p1_twr.h b/include/configs/p1_twr.h index e99b41cc88..d731f9c8fa 100644 --- a/include/configs/p1_twr.h +++ b/include/configs/p1_twr.h @@ -9,6 +9,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#include <linux/stringify.h> + #if defined(CONFIG_TWR_P1025) #define CONFIG_BOARDNAME "TWR-P1025" #define CONFIG_SYS_LBC_LBCR 0x00080000 /* Conversion of LBC addr */ diff --git a/include/configs/pcl063_ull.h b/include/configs/pcl063_ull.h index 6aa77f1f5e..4ae955d9ca 100644 --- a/include/configs/pcl063_ull.h +++ b/include/configs/pcl063_ull.h @@ -10,6 +10,7 @@ #define __PCL063_ULL_H #include <linux/sizes.h> +#include <linux/stringify.h> #include "mx6_common.h" /* SPL options */ diff --git a/include/configs/pcm052.h b/include/configs/pcm052.h index 0bfaaf784a..ba7aad8b05 100644 --- a/include/configs/pcm052.h +++ b/include/configs/pcm052.h @@ -10,6 +10,7 @@ #include <asm/arch/imx-regs.h> #include <linux/sizes.h> +#include <linux/stringify.h> #define CONFIG_SKIP_LOWLEVEL_INIT diff --git a/include/configs/pico-imx6ul.h b/include/configs/pico-imx6ul.h index b0e2f6ce33..8bfada75f7 100644 --- a/include/configs/pico-imx6ul.h +++ b/include/configs/pico-imx6ul.h @@ -111,6 +111,7 @@ func(DHCP, dhcp, na) #include <config_distro_bootcmd.h> +#include <linux/stringify.h> #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR #define CONFIG_SYS_HZ 1000 diff --git a/include/configs/pico-imx7d.h b/include/configs/pico-imx7d.h index 9a987f4150..3ca3ec6112 100644 --- a/include/configs/pico-imx7d.h +++ b/include/configs/pico-imx7d.h @@ -108,6 +108,7 @@ func(DHCP, dhcp, na) #include <config_distro_bootcmd.h> +#include <linux/stringify.h> #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR #define CONFIG_SYS_HZ 1000 diff --git a/include/configs/s32v234evb.h b/include/configs/s32v234evb.h index 5b1504d2df..ba0e506fa0 100644 --- a/include/configs/s32v234evb.h +++ b/include/configs/s32v234evb.h @@ -144,6 +144,7 @@ "run distro_bootcmd" #include <config_distro_bootcmd.h> +#include <linux/stringify.h> /* Miscellaneous configurable options */ #define CONFIG_SYS_PROMPT "=> " diff --git a/include/configs/sbc8548.h b/include/configs/sbc8548.h index f5462549a5..55c4bff28a 100644 --- a/include/configs/sbc8548.h +++ b/include/configs/sbc8548.h @@ -12,6 +12,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#include <linux/stringify.h> + /* * Top level Makefile configuration choices */ diff --git a/include/configs/socfpga_arria5_secu1.h b/include/configs/socfpga_arria5_secu1.h index b059100ccd..ad4c3c0786 100644 --- a/include/configs/socfpga_arria5_secu1.h +++ b/include/configs/socfpga_arria5_secu1.h @@ -7,6 +7,7 @@ #define __CONFIG_SOCFPGA_SECU1_H__ #include <asm/arch/base_addr_ac5.h> +#include <linux/stringify.h> /* Call misc_init_r */ #define CONFIG_MISC_INIT_R diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index 0579a00d40..07c9745eba 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -5,6 +5,8 @@ #ifndef __CONFIG_SOCFPGA_COMMON_H__ #define __CONFIG_SOCFPGA_COMMON_H__ +#include <linux/stringify.h> + /* * High level configuration */ diff --git a/include/configs/socfpga_soc64_common.h b/include/configs/socfpga_soc64_common.h index 61f7b254b5..7237ec95e3 100644 --- a/include/configs/socfpga_soc64_common.h +++ b/include/configs/socfpga_soc64_common.h @@ -9,6 +9,7 @@ #include <asm/arch/base_addr_s10.h> #include <asm/arch/handoff_s10.h> +#include <linux/stringify.h> /* * U-Boot general configurations diff --git a/include/configs/strider.h b/include/configs/strider.h index d5f710be59..4ad3401c04 100644 --- a/include/configs/strider.h +++ b/include/configs/strider.h @@ -8,6 +8,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#include <linux/stringify.h> + /* * High Level Configuration Options */ diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h index 895cd0324e..13ab1cc4bf 100644 --- a/include/configs/tqma6.h +++ b/include/configs/tqma6.h @@ -9,6 +9,8 @@ #define __CONFIG_H #include <linux/kconfig.h> +#include <linux/stringify.h> + /* SPL */ /* #if defined(CONFIG_SPL_BUILD) */ /* common IMX6 SPL configuration */ diff --git a/include/configs/udoo.h b/include/configs/udoo.h index 163cbbb54e..54f472d595 100644 --- a/include/configs/udoo.h +++ b/include/configs/udoo.h @@ -70,6 +70,7 @@ func(DHCP, dhcp, na) #include <config_distro_bootcmd.h> +#include <linux/stringify.h> /* Physical Memory Map */ #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR diff --git a/include/configs/ve8313.h b/include/configs/ve8313.h index bdacd81885..81b171ea16 100644 --- a/include/configs/ve8313.h +++ b/include/configs/ve8313.h @@ -12,6 +12,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#include <linux/stringify.h> + /* * High Level Configuration Options */ diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h index 739219e8f8..0ef2de33cc 100644 --- a/include/configs/vf610twr.h +++ b/include/configs/vf610twr.h @@ -9,6 +9,7 @@ #define __CONFIG_H #include <asm/arch/imx-regs.h> +#include <linux/stringify.h> #define CONFIG_SYS_FSL_CLK diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h index 9d2bd7b278..2b0576e1e6 100644 --- a/include/configs/wandboard.h +++ b/include/configs/wandboard.h @@ -107,6 +107,7 @@ func(DHCP, dhcp, na) #include <config_distro_bootcmd.h> +#include <linux/stringify.h> /* Physical Memory Map */ #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR diff --git a/include/configs/wb45n.h b/include/configs/wb45n.h index fea07056b0..aecf2737f8 100644 --- a/include/configs/wb45n.h +++ b/include/configs/wb45n.h @@ -7,6 +7,7 @@ #define __CONFIG_H__ #include <asm/hardware.h> +#include <linux/stringify.h> /* ARM asynchronous clock */ #define CONFIG_SYS_AT91_SLOW_CLOCK 32768 diff --git a/include/configs/xpedite517x.h b/include/configs/xpedite517x.h index 6c9991fa03..d3bb92964e 100644 --- a/include/configs/xpedite517x.h +++ b/include/configs/xpedite517x.h @@ -51,6 +51,7 @@ #define CONFIG_SYS_SCRATCH_VA 0xe0000000 #ifndef __ASSEMBLY__ +#include <linux/stringify.h> extern unsigned long get_board_sys_clk(unsigned long dummy); #endif diff --git a/include/configs/xpedite537x.h b/include/configs/xpedite537x.h index 6d847cb793..7262c86908 100644 --- a/include/configs/xpedite537x.h +++ b/include/configs/xpedite537x.h @@ -47,6 +47,7 @@ #define CONFIG_VERY_BIG_RAM #ifndef __ASSEMBLY__ +#include <linux/stringify.h> extern unsigned long get_board_sys_clk(unsigned long dummy); extern unsigned long get_board_ddr_clk(unsigned long dummy); #endif diff --git a/include/configs/xpedite550x.h b/include/configs/xpedite550x.h index 106269bae0..b9c9ac4ba8 100644 --- a/include/configs/xpedite550x.h +++ b/include/configs/xpedite550x.h @@ -46,6 +46,7 @@ #define CONFIG_VERY_BIG_RAM #ifndef __ASSEMBLY__ +#include <linux/stringify.h> extern unsigned long get_board_sys_clk(unsigned long dummy); extern unsigned long get_board_ddr_clk(unsigned long dummy); #endif diff --git a/include/cpu_func.h b/include/cpu_func.h index f701f02bfe..8aa825daa4 100644 --- a/include/cpu_func.h +++ b/include/cpu_func.h @@ -18,7 +18,7 @@ int cpu_status(u32 nr); int cpu_reset(u32 nr); int cpu_disable(u32 nr); -int cpu_release(u32 nr, int argc, char * const argv[]); +int cpu_release(u32 nr, int argc, char *const argv[]); static inline int cpumask_next(int cpu, unsigned int mask) { diff --git a/include/dma.h b/include/dma.h index 5b247b5b06..6ff591977b 100644 --- a/include/dma.h +++ b/include/dma.h @@ -9,6 +9,7 @@ #ifndef _DMA_H_ #define _DMA_H_ +#include <linux/bitops.h> #include <linux/errno.h> #include <linux/types.h> diff --git a/include/dwc3-sti-glue.h b/include/dwc3-sti-glue.h index e2856f1268..3989a9bb53 100644 --- a/include/dwc3-sti-glue.h +++ b/include/dwc3-sti-glue.h @@ -8,6 +8,7 @@ #define __DWC3_STI_UBOOT_H_ /* glue registers */ +#include <linux/bitops.h> #define CLKRST_CTRL 0x00 #define AUX_CLK_EN BIT(0) #define SW_PIPEW_RESET_N BIT(4) diff --git a/include/dwmmc.h b/include/dwmmc.h index f06720dc0d..d8a8355a0a 100644 --- a/include/dwmmc.h +++ b/include/dwmmc.h @@ -7,8 +7,10 @@ #ifndef __DWMMC_HW_H #define __DWMMC_HW_H +#include <asm/cache.h> #include <asm/io.h> #include <mmc.h> +#include <linux/bitops.h> #define DWMCI_CTRL 0x000 #define DWMCI_PWREN 0x004 diff --git a/include/efi_loader.h b/include/efi_loader.h index 75c20e4679..4b48f99773 100644 --- a/include/efi_loader.h +++ b/include/efi_loader.h @@ -9,11 +9,15 @@ #define _EFI_LOADER_H 1 #include <common.h> +#include <blk.h> +#include <log.h> #include <part_efi.h> #include <efi_api.h> #include <image.h> #include <pe.h> +struct blk_desc; + static inline int guidcmp(const void *g1, const void *g2) { return memcmp(g1, g2, sizeof(efi_guid_t)); diff --git a/include/elf.h b/include/elf.h index e7c51986df..b04e746d61 100644 --- a/include/elf.h +++ b/include/elf.h @@ -9,7 +9,7 @@ #ifndef _ELF_H #define _ELF_H -#ifndef __ASSEMBLER__ +#ifndef __ASSEMBLY__ #include "compiler.h" /* This version doesn't work for 64-bit ABIs - Erik */ @@ -690,7 +690,7 @@ unsigned long elf_hash(const unsigned char *name); #define R_RISCV_64 2 #define R_RISCV_RELATIVE 3 -#ifndef __ASSEMBLER__ +#ifndef __ASSEMBLY__ int valid_elf_image(unsigned long addr); unsigned long load_elf64_image_phdr(unsigned long addr); unsigned long load_elf64_image_shdr(unsigned long addr); diff --git a/include/env_default.h b/include/env_default.h index 56a8bae39a..a657927e06 100644 --- a/include/env_default.h +++ b/include/env_default.h @@ -8,6 +8,7 @@ */ #include <env_callback.h> +#include <linux/stringify.h> #ifdef DEFAULT_ENV_INSTANCE_EMBEDDED env_t embedded_environment __UBOOT_ENV_SECTION__(environment) = { diff --git a/include/environment/ti/boot.h b/include/environment/ti/boot.h index 11a57af0a4..a9d8f28d46 100644 --- a/include/environment/ti/boot.h +++ b/include/environment/ti/boot.h @@ -9,6 +9,8 @@ #ifndef __TI_BOOT_H #define __TI_BOOT_H +#include <linux/stringify.h> + #ifndef CONSOLEDEV #define CONSOLEDEV "ttyS2" #endif diff --git a/include/exception.h b/include/exception.h index fc02490223..a7f21e73d7 100644 --- a/include/exception.h +++ b/include/exception.h @@ -5,10 +5,12 @@ * Copyright (c) 2018, Heinrich Schuchardt <xypron.glpk@gmx.de> */ -static int do_exception(cmd_tbl_t *cmdtp, int flag, int argc, - char * const argv[]) +#include <command.h> + +static int do_exception(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) { - cmd_tbl_t *cp; + struct cmd_tbl *cp; if (argc != 2) return CMD_RET_USAGE; @@ -25,12 +27,12 @@ static int do_exception(cmd_tbl_t *cmdtp, int flag, int argc, return CMD_RET_USAGE; } -static int exception_complete(int argc, char * const argv[], char last_char, +static int exception_complete(int argc, char *const argv[], char last_char, int maxv, char *cmdv[]) { int len = 0; int i = 0; - cmd_tbl_t *cmdtp; + struct cmd_tbl *cmdtp; switch (argc) { case 1: diff --git a/include/exports.h b/include/exports.h index cbd16fc518..b300554091 100644 --- a/include/exports.h +++ b/include/exports.h @@ -2,6 +2,7 @@ #define __EXPORTS_H__ #include <irq_func.h> +#include <linux/delay.h> #ifndef __ASSEMBLY__ #ifdef CONFIG_PHY_AQUANTIA @@ -11,6 +12,7 @@ #include <irq_func.h> +struct cmd_tbl; struct spi_slave; /* Set up the jump table for use by the API */ diff --git a/include/ext4fs.h b/include/ext4fs.h index 34585d407d..cb5d9cc0a5 100644 --- a/include/ext4fs.h +++ b/include/ext4fs.h @@ -28,6 +28,8 @@ #define __EXT4__ #include <ext_common.h> +struct disk_partition; + #define EXT4_INDEX_FL 0x00001000 /* Inode uses hash tree index */ #define EXT4_EXTENTS_FL 0x00080000 /* Inode uses extents */ #define EXT4_EXT_MAGIC 0xf30a @@ -152,11 +154,11 @@ int ext4fs_exists(const char *filename); int ext4fs_size(const char *filename, loff_t *size); void ext4fs_free_node(struct ext2fs_node *node, struct ext2fs_node *currroot); int ext4fs_devread(lbaint_t sector, int byte_offset, int byte_len, char *buf); -void ext4fs_set_blk_dev(struct blk_desc *rbdd, disk_partition_t *info); +void ext4fs_set_blk_dev(struct blk_desc *rbdd, struct disk_partition *info); long int read_allocated_block(struct ext2_inode *inode, int fileblock, struct ext_block_cache *cache); int ext4fs_probe(struct blk_desc *fs_dev_desc, - disk_partition_t *fs_partition); + struct disk_partition *fs_partition); int ext4_read_file(const char *filename, void *buf, loff_t offset, loff_t len, loff_t *actread); int ext4_read_superblock(char *buffer); diff --git a/include/ext_common.h b/include/ext_common.h index 1c10c50474..bc3324172a 100644 --- a/include/ext_common.h +++ b/include/ext_common.h @@ -19,7 +19,9 @@ #ifndef __EXT_COMMON__ #define __EXT_COMMON__ -#include <command.h> + +struct cmd_tbl; + #define SECTOR_SIZE 0x200 #define LOG2_SECTOR_SIZE 9 @@ -210,11 +212,11 @@ struct ext2_data { extern lbaint_t part_offset; -int do_ext2ls(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]); -int do_ext2load(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]); -int do_ext4_load(cmd_tbl_t *cmdtp, int flag, int argc, - char *const argv[]); -int do_ext4_ls(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]); -int do_ext4_write(cmd_tbl_t *cmdtp, int flag, int argc, - char *const argv[]); +int do_ext2ls(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); +int do_ext2load(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); +int do_ext4_load(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]); +int do_ext4_ls(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); +int do_ext4_write(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]); #endif diff --git a/include/faraday/ftpci100.h b/include/faraday/ftpci100.h index b4a43f82e5..8801bd1350 100644 --- a/include/faraday/ftpci100.h +++ b/include/faraday/ftpci100.h @@ -11,6 +11,7 @@ #define __FTPCI100_H /* AHB Control Registers */ +#include <linux/bitops.h> struct ftpci100_ahbc { unsigned int iosize; /* 0x00 - I/O Space Size Signal */ unsigned int prot; /* 0x04 - AHB Protection */ diff --git a/include/faraday/ftsdc010.h b/include/faraday/ftsdc010.h index d3a359ab75..30726dab85 100644 --- a/include/faraday/ftsdc010.h +++ b/include/faraday/ftsdc010.h @@ -12,6 +12,7 @@ #ifndef __ASSEMBLY__ /* sd controller register */ +#include <linux/bitops.h> struct ftsdc010_mmc { unsigned int cmd; /* 0x00 - command reg */ unsigned int argu; /* 0x04 - argument reg */ diff --git a/include/faraday/ftsdmc021.h b/include/faraday/ftsdmc021.h index 3c979ced27..e0e5eb339e 100644 --- a/include/faraday/ftsdmc021.h +++ b/include/faraday/ftsdmc021.h @@ -14,6 +14,7 @@ #define __FTSDMC021_H #ifndef __ASSEMBLY__ +#include <linux/bitops.h> struct ftsdmc021 { unsigned int tp1; /* 0x00 - SDRAM Timing Parameter 1 */ unsigned int tp2; /* 0x04 - SDRAM Timing Parameter 2 */ diff --git a/include/fat.h b/include/fat.h index bc139f8c88..02742f92a5 100644 --- a/include/fat.h +++ b/include/fat.h @@ -12,6 +12,8 @@ #include <asm/byteorder.h> #include <fs.h> +struct disk_partition; + /* Maximum Long File Name length supported here is 128 UTF-16 code units */ #define VFAT_MAXLEN_BYTES 256 /* Maximum LFN buffer in bytes */ #define VFAT_MAXSEQ 9 /* Up to 9 of 13 2-byte UTF-16 entries */ @@ -193,7 +195,7 @@ int fat_size(const char *filename, loff_t *size); int file_fat_read_at(const char *filename, loff_t pos, void *buffer, loff_t maxsize, loff_t *actread); int file_fat_read(const char *filename, void *buffer, int maxsize); -int fat_set_blk_dev(struct blk_desc *rbdd, disk_partition_t *info); +int fat_set_blk_dev(struct blk_desc *rbdd, struct disk_partition *info); int fat_register_device(struct blk_desc *dev_desc, int part_no); int file_fat_write(const char *filename, void *buf, loff_t offset, loff_t len, diff --git a/include/fb_mmc.h b/include/fb_mmc.h index 95db001bee..76ed7cd6be 100644 --- a/include/fb_mmc.h +++ b/include/fb_mmc.h @@ -6,17 +6,21 @@ #ifndef _FB_MMC_H_ #define _FB_MMC_H_ +struct blk_desc; +struct disk_partition; + /** * fastboot_mmc_get_part_info() - Lookup eMMC partion by name * * @part_name: Named partition to lookup * @dev_desc: Pointer to returned blk_desc pointer - * @part_info: Pointer to returned disk_partition_t + * @part_info: Pointer to returned struct disk_partition * @response: Pointer to fastboot response buffer */ int fastboot_mmc_get_part_info(const char *part_name, struct blk_desc **dev_desc, - disk_partition_t *part_info, char *response); + struct disk_partition *part_info, + char *response); /** * fastboot_mmc_flash_write() - Write image to eMMC for fastboot diff --git a/include/flash.h b/include/flash.h index 2655c72087..3bf6b22399 100644 --- a/include/flash.h +++ b/include/flash.h @@ -84,20 +84,20 @@ typedef unsigned long flash_sect_t; /* Prototypes */ -extern unsigned long flash_init (void); -extern void flash_print_info (flash_info_t *); -extern int flash_erase (flash_info_t *, int, int); -extern int flash_sect_erase (ulong addr_first, ulong addr_last); -extern int flash_sect_protect (int flag, ulong addr_first, ulong addr_last); -extern int flash_sect_roundb (ulong *addr); -extern unsigned long flash_sector_size(flash_info_t *info, flash_sect_t sect); -extern void flash_set_verbose(uint); +unsigned long flash_init(void); +void flash_print_info(flash_info_t *info); +int flash_erase(flash_info_t *info, int s_first, int s_last); +int flash_sect_erase(ulong addr_first, ulong addr_last); +int flash_sect_protect(int flag, ulong addr_first, ulong addr_last); +int flash_sect_roundb(ulong *addr); +unsigned long flash_sector_size(flash_info_t *info, flash_sect_t sect); +void flash_set_verbose(uint v); /* common/flash.c */ -extern void flash_protect (int flag, ulong from, ulong to, flash_info_t *info); -extern int flash_write (char *, ulong, ulong); -extern flash_info_t *addr2info (ulong); -extern int write_buff (flash_info_t *info, uchar *src, ulong addr, ulong cnt); +void flash_protect(int flag, ulong from, ulong to, flash_info_t *info); +int flash_write(char *src, ulong addr, ulong cnt); +flash_info_t *addr2info(ulong addr); +int write_buff(flash_info_t *info, uchar *src, ulong addr, ulong cnt); /* drivers/mtd/cfi_mtd.c */ #ifdef CONFIG_FLASH_CFI_MTD diff --git a/include/fs.h b/include/fs.h index 37e35c2120..29f737b8c2 100644 --- a/include/fs.h +++ b/include/fs.h @@ -7,6 +7,8 @@ #include <common.h> +struct cmd_tbl; + #define FS_TYPE_ANY 0 #define FS_TYPE_FAT 1 #define FS_TYPE_EXT 2 @@ -14,6 +16,8 @@ #define FS_TYPE_UBIFS 4 #define FS_TYPE_BTRFS 5 +struct blk_desc; + /** * do_fat_fsload - Run the fatload command * @@ -23,7 +27,8 @@ * @argv: List of arguments * @return result (see enum command_ret_t) */ -int do_fat_fsload(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]); +int do_fat_fsload(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]); /** * do_ext2load - Run the ext2load command @@ -34,7 +39,7 @@ int do_fat_fsload(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]); * @argv: List of arguments * @return result (see enum command_ret_t) */ -int do_ext2load(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]); +int do_ext2load(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); /* * Tell the fs layer which block device an partition to use for future @@ -224,34 +229,34 @@ int fs_mkdir(const char *filename); * Common implementation for various filesystem commands, optionally limited * to a specific filesystem type via the fstype parameter. */ -int do_size(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[], - int fstype); -int do_load(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[], - int fstype); -int do_ls(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[], - int fstype); +int do_size(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[], + int fstype); +int do_load(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[], + int fstype); +int do_ls(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[], + int fstype); int file_exists(const char *dev_type, const char *dev_part, const char *file, int fstype); -int do_save(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[], - int fstype); -int do_rm(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[], - int fstype); -int do_mkdir(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[], - int fstype); -int do_ln(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[], +int do_save(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[], + int fstype); +int do_rm(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[], + int fstype); +int do_mkdir(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[], + int fstype); +int do_ln(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[], int fstype); /* * Determine the UUID of the specified filesystem and print it. Optionally it is * possible to store the UUID directly in env. */ -int do_fs_uuid(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[], - int fstype); +int do_fs_uuid(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[], + int fstype); /* * Determine the type of the specified filesystem and print it. Optionally it is * possible to store the type directly in env. */ -int do_fs_type(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]); +int do_fs_type(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); #endif /* _FS_H */ diff --git a/include/fs_internal.h b/include/fs_internal.h index 96d26032ac..3d4d25da96 100644 --- a/include/fs_internal.h +++ b/include/fs_internal.h @@ -10,7 +10,7 @@ #include <part.h> -int fs_devread(struct blk_desc *, disk_partition_t *, lbaint_t, int, int, +int fs_devread(struct blk_desc *, struct disk_partition *, lbaint_t, int, int, char *); #endif /* __U_BOOT_FS_INTERNAL_H__ */ diff --git a/include/fsl-mc/fsl_mc.h b/include/fsl-mc/fsl_mc.h index a4d7d85fce..6cbcd39f12 100644 --- a/include/fsl-mc/fsl_mc.h +++ b/include/fsl-mc/fsl_mc.h @@ -7,6 +7,7 @@ #define __FSL_MC_H__ #include <common.h> +#include <linux/bitops.h> #define MC_CCSR_BASE_ADDR \ ((struct mc_ccsr_registers __iomem *)0x8340000) diff --git a/include/fsl_ddr.h b/include/fsl_ddr.h index 2476f40c56..025d7a1e74 100644 --- a/include/fsl_ddr.h +++ b/include/fsl_ddr.h @@ -12,6 +12,8 @@ #include <common_timing_params.h> +struct cmd_tbl; + #ifndef CONFIG_SYS_FSL_DDR_MAIN_NUM_CTRLS /* All controllers are for main memory */ #define CONFIG_SYS_FSL_DDR_MAIN_NUM_CTRLS CONFIG_SYS_NUM_DDR_CTLRS @@ -120,7 +122,7 @@ unsigned long long fsl_ddr_interactive(fsl_ddr_info_t *pinfo, int var_is_set); void fsl_ddr_get_spd(generic_spd_eeprom_t *ctrl_dimms_spd, unsigned int ctrl_num, unsigned int dimm_slots_per_ctrl); -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[]); unsigned int check_fsl_memctl_config_regs(const fsl_ddr_cfg_regs_t *ddr); void board_add_ram_info(int use_default); diff --git a/include/fsl_ifc.h b/include/fsl_ifc.h index 3edcc39f4e..fd915335b2 100644 --- a/include/fsl_ifc.h +++ b/include/fsl_ifc.h @@ -10,6 +10,7 @@ #ifdef CONFIG_FSL_IFC #include <config.h> #include <common.h> +#include <part.h> #ifdef CONFIG_ARM #include <asm/arch/soc.h> #endif diff --git a/include/fsl_validate.h b/include/fsl_validate.h index 06951fccf4..252d499e7b 100644 --- a/include/fsl_validate.h +++ b/include/fsl_validate.h @@ -8,9 +8,10 @@ #include <fsl_sec.h> #include <fsl_sec_mon.h> -#include <command.h> #include <linux/types.h> +struct cmd_tbl; + #define WORD_SIZE 4 /* Minimum and maximum size of RSA signature length in bits */ @@ -261,15 +262,14 @@ struct fsl_secboot_img_priv { uint32_t img_size; /* ESBC Image Size */ }; -int do_esbc_halt(cmd_tbl_t *cmdtp, int flag, int argc, - char * const argv[]); +int do_esbc_halt(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); int fsl_secboot_validate(uintptr_t haddr, char *arg_hash_str, uintptr_t *img_addr_ptr); -int fsl_secboot_blob_encap(cmd_tbl_t *cmdtp, int flag, int argc, - char * const argv[]); -int fsl_secboot_blob_decap(cmd_tbl_t *cmdtp, int flag, int argc, - char * const argv[]); +int fsl_secboot_blob_encap(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]); +int fsl_secboot_blob_decap(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]); int fsl_check_boot_mode_secure(void); int fsl_setenv_chain_of_trust(void); diff --git a/include/gzip.h b/include/gzip.h index 2e340673c3..783acbb60d 100644 --- a/include/gzip.h +++ b/include/gzip.h @@ -7,6 +7,8 @@ #ifndef __GZIP_H #define __GZIP_H +struct blk_desc; + /** * gzip_parse_header() - Parse a header from a gzip file * diff --git a/include/hash.h b/include/hash.h index f4019a9791..835962e7f6 100644 --- a/include/hash.h +++ b/include/hash.h @@ -6,6 +6,8 @@ #ifndef _HASH_H #define _HASH_H +struct cmd_tbl; + /* * Maximum digest size for all algorithms we support. Having this value * avoids a malloc() or C99 local declaration in common/cmd_hash.c. @@ -85,8 +87,8 @@ struct hash_algo { * @argc: Number of arguments (arg 0 must be the command text) * @argv: Arguments */ -int hash_command(const char *algo_name, int flags, cmd_tbl_t *cmdtp, int flag, - int argc, char * const argv[]); +int hash_command(const char *algo_name, int flags, struct cmd_tbl *cmdtp, + int flag, int argc, char *const argv[]); /** * hash_block() - Hash a block according to the requested algorithm diff --git a/include/i2c.h b/include/i2c.h index 059200115a..1d792db454 100644 --- a/include/i2c.h +++ b/include/i2c.h @@ -16,6 +16,8 @@ #ifndef _I2C_H_ #define _I2C_H_ +#include <linker_lists.h> + /* * For now there are essentially two parts to this file - driver model * here at the top, and the older code below (with CONFIG_SYS_I2C being diff --git a/include/image.h b/include/image.h index de55b2fb57..ad81dad444 100644 --- a/include/image.h +++ b/include/image.h @@ -590,10 +590,10 @@ ulong genimg_get_kernel_addr(char * const img_addr); int genimg_get_format(const void *img_addr); int genimg_has_config(bootm_headers_t *images); -int boot_get_fpga(int argc, char * const argv[], bootm_headers_t *images, - uint8_t arch, const ulong *ld_start, ulong * const ld_len); -int boot_get_ramdisk(int argc, char * const argv[], bootm_headers_t *images, - uint8_t arch, ulong *rd_start, ulong *rd_end); +int boot_get_fpga(int argc, char *const argv[], bootm_headers_t *images, + uint8_t arch, const ulong *ld_start, ulong * const ld_len); +int boot_get_ramdisk(int argc, char *const argv[], bootm_headers_t *images, + uint8_t arch, ulong *rd_start, ulong *rd_end); /** * boot_get_loadable - routine to load a list of binaries to memory @@ -616,8 +616,8 @@ int boot_get_ramdisk(int argc, char * const argv[], bootm_headers_t *images, * 0, if only valid images or no images are found * error code, if an error occurs during fit_image_load */ -int boot_get_loadable(int argc, char * const argv[], bootm_headers_t *images, - uint8_t arch, const ulong *ld_start, ulong * const ld_len); +int boot_get_loadable(int argc, char *const argv[], bootm_headers_t *images, + uint8_t arch, const ulong *ld_start, ulong *const ld_len); #endif /* !USE_HOSTCC */ int boot_get_setup_fit(bootm_headers_t *images, uint8_t arch, @@ -726,7 +726,7 @@ int image_source_script(ulong addr, const char *fit_uname); int fit_get_node_from_config(bootm_headers_t *images, const char *prop_name, ulong addr); -int boot_get_fdt(int flag, int argc, char * const argv[], uint8_t arch, +int boot_get_fdt(int flag, int argc, char *const argv[], uint8_t arch, bootm_headers_t *images, char **of_flat_tree, ulong *of_size); void boot_fdt_add_mem_rsv_regions(struct lmb *lmb, void *fdt_blob); diff --git a/include/initcall.h b/include/initcall.h index b5acdd01bd..41b74dc52d 100644 --- a/include/initcall.h +++ b/include/initcall.h @@ -8,6 +8,11 @@ typedef int (*init_fnc_t)(void); +#include <log.h> +#ifdef CONFIG_EFI_APP +#include <efi.h> +#endif + /* * To enable debugging. add #define DEBUG at the top of the including file. * diff --git a/include/kgdb.h b/include/kgdb.h index b6ba742ad3..616ce4451f 100644 --- a/include/kgdb.h +++ b/include/kgdb.h @@ -55,7 +55,7 @@ extern int kgdb_getregs(struct pt_regs *, char *, int); extern void kgdb_putreg(struct pt_regs *, int, char *, int); extern void kgdb_putregs(struct pt_regs *, char *, int); extern int kgdb_trap(struct pt_regs *); -extern void kgdb_breakpoint(int argc, char * const argv[]); +void kgdb_breakpoint(int argc, char *const argv[]); /* these functions are provided by the platform serial driver */ extern void kgdb_serial_init(void); diff --git a/include/linux/bitops.h b/include/linux/bitops.h index a07c70fd48..6b509dce58 100644 --- a/include/linux/bitops.h +++ b/include/linux/bitops.h @@ -1,6 +1,8 @@ #ifndef _LINUX_BITOPS_H #define _LINUX_BITOPS_H +#ifndef USE_HOSTCC + #include <asm/types.h> #include <asm-generic/bitsperlong.h> #include <linux/compiler.h> @@ -216,4 +218,6 @@ static inline void generic_clear_bit(int nr, volatile unsigned long *addr) *p &= ~mask; } +#endif /* !USE_HOSTCC */ + #endif diff --git a/include/linux/compat.h b/include/linux/compat.h index 171188a76f..712eeaef4e 100644 --- a/include/linux/compat.h +++ b/include/linux/compat.h @@ -1,6 +1,7 @@ #ifndef _LINUX_COMPAT_H_ #define _LINUX_COMPAT_H_ +#include <log.h> #include <malloc.h> #include <linux/types.h> #include <linux/err.h> diff --git a/include/linux/mtd/rawnand.h b/include/linux/mtd/rawnand.h index bd373b9617..66febc6b72 100644 --- a/include/linux/mtd/rawnand.h +++ b/include/linux/mtd/rawnand.h @@ -16,6 +16,7 @@ #include <config.h> #include <dm/device.h> +#include <linux/bitops.h> #include <linux/compat.h> #include <linux/mtd/mtd.h> #include <linux/mtd/flashchip.h> diff --git a/include/linux/soc/ti/cppi5.h b/include/linux/soc/ti/cppi5.h index 34038b31f7..cfdf7ea29f 100644 --- a/include/linux/soc/ti/cppi5.h +++ b/include/linux/soc/ti/cppi5.h @@ -10,6 +10,7 @@ #include <hexdump.h> #include <linux/bitops.h> +#include <linux/bug.h> /** * Descriptor header, present in all types of descriptors diff --git a/include/linux/soc/ti/k3-navss-ringacc.h b/include/linux/soc/ti/k3-navss-ringacc.h index 487dfe9859..7b027f8bd4 100644 --- a/include/linux/soc/ti/k3-navss-ringacc.h +++ b/include/linux/soc/ti/k3-navss-ringacc.h @@ -9,6 +9,7 @@ #define __SOC_TI_K3_NAVSS_RINGACC_API_H_ #include <dm/ofnode.h> +#include <linux/bitops.h> /** * enum k3_nav_ring_mode - &struct k3_nav_ring_cfg mode diff --git a/include/linux/soc/ti/ti_sci_protocol.h b/include/linux/soc/ti/ti_sci_protocol.h index 8c4863efe1..eb916ba101 100644 --- a/include/linux/soc/ti/ti_sci_protocol.h +++ b/include/linux/soc/ti/ti_sci_protocol.h @@ -20,6 +20,7 @@ * @firmware_revision: Firmware revision (not usually used). * @firmware_description: Firmware description (not usually used). */ +#include <linux/bitops.h> struct ti_sci_version_info { u8 abi_major; u8 abi_minor; diff --git a/include/log.h b/include/log.h index cf32351134..df65398c04 100644 --- a/include/log.h +++ b/include/log.h @@ -9,10 +9,13 @@ #ifndef __LOG_H #define __LOG_H -#include <command.h> +#include <stdio.h> +#include <linker_lists.h> #include <dm/uclass-id.h> #include <linux/list.h> +struct cmd_tbl; + /** Log levels supported, ranging from most to least important */ enum log_level_t { LOGL_EMERG = 0, /* U-Boot is unstable */ @@ -413,7 +416,7 @@ enum log_fmt { }; /* Handle the 'log test' command */ -int do_log_test(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]); +int do_log_test(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); /** * log_add_filter() - Add a new filter to a log device diff --git a/include/mipi_dsi.h b/include/mipi_dsi.h index f4a63b47f3..83c5163cf8 100644 --- a/include/mipi_dsi.h +++ b/include/mipi_dsi.h @@ -16,6 +16,7 @@ #define MIPI_DSI_H #include <mipi_display.h> +#include <linux/bitops.h> struct mipi_dsi_host; struct mipi_dsi_device; diff --git a/include/mmc.h b/include/mmc.h index 6a2e9739e0..82562193cc 100644 --- a/include/mmc.h +++ b/include/mmc.h @@ -9,6 +9,7 @@ #ifndef _MMC_H_ #define _MMC_H_ +#include <linux/bitops.h> #include <linux/list.h> #include <linux/sizes.h> #include <linux/compiler.h> diff --git a/include/net.h b/include/net.h index 82500eeb30..00a8ec0c78 100644 --- a/include/net.h +++ b/include/net.h @@ -12,12 +12,19 @@ #ifndef __NET_H__ #define __NET_H__ +#include <linux/types.h> #include <asm/cache.h> #include <asm/byteorder.h> /* for nton* / ntoh* stuff */ #include <env.h> +#include <log.h> +#include <time.h> #include <linux/if_ether.h> #include <rand.h> +struct bd_info; +struct cmd_tbl; +struct udevice; + #define DEBUG_LL_STATE 0 /* Link local state machine changes */ #define DEBUG_DEV_PKT 0 /* Packets or info directed to the device */ #define DEBUG_NET_PKT 0 /* Packets on info on the network at large */ @@ -59,7 +66,7 @@ struct in_addr { * @argv: List of arguments * @return result (see enum command_ret_t) */ -int do_tftpb(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]); +int do_tftpb(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); /** * An incoming packet handler. @@ -184,12 +191,12 @@ struct eth_device { phys_addr_t iobase; int state; - int (*init)(struct eth_device *, bd_t *); + int (*init)(struct eth_device *eth, struct bd_info *bd); int (*send)(struct eth_device *, void *packet, int length); int (*recv)(struct eth_device *); void (*halt)(struct eth_device *); int (*mcast)(struct eth_device *, const u8 *enetaddr, int join); - int (*write_hwaddr)(struct eth_device *); + int (*write_hwaddr)(struct eth_device *eth); struct eth_device *next; int index; void *priv; @@ -242,7 +249,7 @@ static __always_inline void eth_halt_state_only(void) int eth_write_hwaddr(struct eth_device *dev, const char *base_name, int eth_number); -int usb_eth_initialize(bd_t *bi); +int usb_eth_initialize(struct bd_info *bi); #endif int eth_initialize(void); /* Initialize network subsystem */ diff --git a/include/net/pfe_eth/pfe/cbus/class_csr.h b/include/net/pfe_eth/pfe/cbus/class_csr.h index e2fece7aa1..80f1f96b44 100644 --- a/include/net/pfe_eth/pfe/cbus/class_csr.h +++ b/include/net/pfe_eth/pfe/cbus/class_csr.h @@ -12,6 +12,7 @@ * class_csr - block containing all the classifier control and status register. * Mapped on CBUS and accessible from all PE's and ARM. */ +#include <linux/bitops.h> #define CLASS_VERSION (CLASS_CSR_BASE_ADDR + 0x000) #define CLASS_TX_CTRL (CLASS_CSR_BASE_ADDR + 0x004) #define CLASS_INQ_PKTPTR (CLASS_CSR_BASE_ADDR + 0x010) diff --git a/include/net/pfe_eth/pfe/cbus/emac.h b/include/net/pfe_eth/pfe/cbus/emac.h index 53db8cc08f..5dc2113687 100644 --- a/include/net/pfe_eth/pfe/cbus/emac.h +++ b/include/net/pfe_eth/pfe/cbus/emac.h @@ -7,6 +7,7 @@ #ifndef _EMAC_H_ #define _EMAC_H_ +#include <linux/bitops.h> #define EMAC_IEVENT_REG 0x004 #define EMAC_IMASK_REG 0x008 #define EMAC_R_DES_ACTIVE_REG 0x010 diff --git a/include/net/pfe_eth/pfe/cbus/hif.h b/include/net/pfe_eth/pfe/cbus/hif.h index 36722c5e07..aa4951ec0e 100644 --- a/include/net/pfe_eth/pfe/cbus/hif.h +++ b/include/net/pfe_eth/pfe/cbus/hif.h @@ -12,6 +12,7 @@ * hif - PFE hif block control and status register. * Mapped on CBUS and accessible from all PE's and ARM. */ +#include <linux/bitops.h> #define HIF_VERSION (HIF_BASE_ADDR + 0x00) #define HIF_TX_CTRL (HIF_BASE_ADDR + 0x04) #define HIF_TX_CURR_BD_ADDR (HIF_BASE_ADDR + 0x08) diff --git a/include/net/pfe_eth/pfe/cbus/tmu_csr.h b/include/net/pfe_eth/pfe/cbus/tmu_csr.h index 1e1abe26ca..cfe8f8ce8f 100644 --- a/include/net/pfe_eth/pfe/cbus/tmu_csr.h +++ b/include/net/pfe_eth/pfe/cbus/tmu_csr.h @@ -7,6 +7,7 @@ #ifndef _TMU_CSR_H_ #define _TMU_CSR_H_ +#include <linux/bitops.h> #define TMU_VERSION (TMU_CSR_BASE_ADDR + 0x000) #define TMU_INQ_WATERMARK (TMU_CSR_BASE_ADDR + 0x004) #define TMU_PHY_INQ_PKTPTR (TMU_CSR_BASE_ADDR + 0x008) diff --git a/include/net/pfe_eth/pfe/pfe_hw.h b/include/net/pfe_eth/pfe/pfe_hw.h index 5da676bf8b..c69fc69130 100644 --- a/include/net/pfe_eth/pfe/pfe_hw.h +++ b/include/net/pfe_eth/pfe/pfe_hw.h @@ -8,6 +8,7 @@ #define _PFE_H_ #include <elf.h> +#include <linux/bitops.h> #include "cbus.h" #define PFE_RESET_WA diff --git a/include/net/pfe_eth/pfe_eth.h b/include/net/pfe_eth/pfe_eth.h index 68b2e381b9..116a2b2c1d 100644 --- a/include/net/pfe_eth/pfe_eth.h +++ b/include/net/pfe_eth/pfe_eth.h @@ -7,6 +7,7 @@ #ifndef __PFE_ETH_H__ #define __PFE_ETH_H__ +#include <linux/bitops.h> #include <linux/sizes.h> #include <asm/io.h> #include <miiphy.h> diff --git a/include/part.h b/include/part.h index 3693527397..55be724d20 100644 --- a/include/part.h +++ b/include/part.h @@ -54,7 +54,7 @@ struct block_drvr { #define PART_BOOTABLE ((int)BIT(0)) #define PART_EFI_SYSTEM_PARTITION ((int)BIT(1)) -typedef struct disk_partition { +struct disk_partition { lbaint_t start; /* # of first block in partition */ lbaint_t size; /* number of blocks in partition */ ulong blksz; /* block size in bytes */ @@ -76,11 +76,11 @@ typedef struct disk_partition { #ifdef CONFIG_DOS_PARTITION uchar sys_ind; /* partition type */ #endif -} disk_partition_t; +}; struct disk_part { int partnum; - disk_partition_t gpt_part_info; + struct disk_partition gpt_part_info; struct list_head list; }; @@ -105,12 +105,14 @@ struct blk_desc *mg_disk_get_dev(int dev); int host_get_dev_err(int dev, struct blk_desc **blk_devp); /* disk/part.c */ -int part_get_info(struct blk_desc *dev_desc, int part, disk_partition_t *info); +int part_get_info(struct blk_desc *dev_desc, int part, + struct disk_partition *info); /** * part_get_info_whole_disk() - get partition info for the special case of * a partition occupying the entire disk. */ -int part_get_info_whole_disk(struct blk_desc *dev_desc, disk_partition_t *info); +int part_get_info_whole_disk(struct blk_desc *dev_desc, + struct disk_partition *info); void part_print(struct blk_desc *dev_desc); void part_init(struct blk_desc *dev_desc); @@ -179,7 +181,7 @@ int blk_get_device_by_str(const char *ifname, const char *dev_str, */ int blk_get_device_part_str(const char *ifname, const char *dev_part_str, struct blk_desc **dev_desc, - disk_partition_t *info, int allow_whole_dev); + struct disk_partition *info, int allow_whole_dev); /** * part_get_info_by_name_type() - Search for a partition by name @@ -194,7 +196,7 @@ int blk_get_device_part_str(const char *ifname, const char *dev_part_str, * otherwise error */ int part_get_info_by_name_type(struct blk_desc *dev_desc, const char *name, - disk_partition_t *info, int part_type); + struct disk_partition *info, int part_type); /** * part_get_info_by_name() - Search for a partition by name @@ -208,7 +210,7 @@ int part_get_info_by_name_type(struct blk_desc *dev_desc, const char *name, * otherwise error */ int part_get_info_by_name(struct blk_desc *dev_desc, - const char *name, disk_partition_t *info); + const char *name, struct disk_partition *info); /** * Get partition info from dev number + part name, or dev number + part number. @@ -229,7 +231,7 @@ int part_get_info_by_name(struct blk_desc *dev_desc, int part_get_info_by_dev_and_name_or_num(const char *dev_iface, const char *dev_part_str, struct blk_desc **dev_desc, - disk_partition_t *part_info); + struct disk_partition *part_info); /** * part_set_generic_name() - create generic partition like hda1 or sdb2 @@ -252,9 +254,9 @@ static inline struct blk_desc *blk_get_dev(const char *ifname, int dev) static inline struct blk_desc *mg_disk_get_dev(int dev) { return NULL; } static inline int part_get_info(struct blk_desc *dev_desc, int part, - disk_partition_t *info) { return -1; } + struct disk_partition *info) { return -1; } static inline int part_get_info_whole_disk(struct blk_desc *dev_desc, - disk_partition_t *info) + struct disk_partition *info) { return -1; } static inline void part_print(struct blk_desc *dev_desc) {} static inline void part_init(struct blk_desc *dev_desc) {} @@ -263,10 +265,10 @@ static inline int blk_get_device_by_str(const char *ifname, const char *dev_str, struct blk_desc **dev_desc) { return -1; } static inline int blk_get_device_part_str(const char *ifname, - const char *dev_part_str, - struct blk_desc **dev_desc, - disk_partition_t *info, - int allow_whole_dev) + const char *dev_part_str, + struct blk_desc **dev_desc, + struct disk_partition *info, + int allow_whole_dev) { *dev_desc = NULL; return -1; } #endif @@ -301,7 +303,7 @@ struct part_driver { * @info: Returns partition information */ int (*get_info)(struct blk_desc *dev_desc, int part, - disk_partition_t *info); + struct disk_partition *info); /** * print() - Print partition information @@ -353,7 +355,7 @@ int write_gpt_table(struct blk_desc *dev_desc, */ int gpt_fill_pte(struct blk_desc *dev_desc, gpt_header *gpt_h, gpt_entry *gpt_e, - disk_partition_t *partitions, int parts); + struct disk_partition *partitions, int parts); /** * gpt_fill_header(): Fill the GPT header @@ -379,7 +381,7 @@ int gpt_fill_header(struct blk_desc *dev_desc, gpt_header *gpt_h, * @return zero on success */ int gpt_restore(struct blk_desc *dev_desc, char *str_disk_guid, - disk_partition_t *partitions, const int parts_count); + struct disk_partition *partitions, const int parts_count); /** * is_valid_gpt_buf() - Ensure that the Primary GPT information is valid @@ -433,7 +435,7 @@ int gpt_verify_headers(struct blk_desc *dev_desc, gpt_header *gpt_head, * @return - '0' on success, otherwise error */ int gpt_verify_partitions(struct blk_desc *dev_desc, - disk_partition_t *partitions, int parts, + struct disk_partition *partitions, int parts, gpt_header *gpt_head, gpt_entry **gpt_pte); diff --git a/include/pch.h b/include/pch.h index 0b44b66df9..620566819c 100644 --- a/include/pch.h +++ b/include/pch.h @@ -7,6 +7,7 @@ #ifndef __pch_h #define __pch_h +#include <linux/bitops.h> #define PCH_RCBA 0xf0 #define BIOS_CTRL_BIOSWE BIT(0) diff --git a/include/power/stpmic1.h b/include/power/stpmic1.h index 1493a677f0..d3567df326 100644 --- a/include/power/stpmic1.h +++ b/include/power/stpmic1.h @@ -6,6 +6,7 @@ #ifndef __PMIC_STPMIC1_H_ #define __PMIC_STPMIC1_H_ +#include <linux/bitops.h> #define STPMIC1_MAIN_CR 0x10 #define STPMIC1_BUCKS_MRST_CR 0x18 #define STPMIC1_LDOS_MRST_CR 0x1a diff --git a/include/regmap.h b/include/regmap.h index 9ada1af5ef..30183c5e71 100644 --- a/include/regmap.h +++ b/include/regmap.h @@ -7,6 +7,8 @@ #ifndef __REGMAP_H #define __REGMAP_H +#include <linux/delay.h> + /** * DOC: Overview * diff --git a/include/reiserfs.h b/include/reiserfs.h index de4150024c..b61bb60067 100644 --- a/include/reiserfs.h +++ b/include/reiserfs.h @@ -18,6 +18,9 @@ #define SECTOR_SIZE 0x200 #define SECTOR_BITS 9 +struct blk_desc; +struct disk_partition; + /* Error codes */ typedef enum { @@ -62,7 +65,7 @@ typedef enum } reiserfs_error_t; -void reiserfs_set_blk_dev(struct blk_desc *rbdd, disk_partition_t *info); +void reiserfs_set_blk_dev(struct blk_desc *rbdd, struct disk_partition *info); extern int reiserfs_ls (char *dirname); extern int reiserfs_open (char *filename); extern int reiserfs_read (char *buf, unsigned len); diff --git a/include/sandboxfs.h b/include/sandboxfs.h index 6e6e3c62ff..783dd5c88a 100644 --- a/include/sandboxfs.h +++ b/include/sandboxfs.h @@ -18,7 +18,10 @@ #ifndef __SANDBOX_FS__ #define __SANDBOX_FS__ -int sandbox_fs_set_blk_dev(struct blk_desc *rbdd, disk_partition_t *info); +struct blk_desc; +struct disk_partition; + +int sandbox_fs_set_blk_dev(struct blk_desc *rbdd, struct disk_partition *info); int sandbox_fs_read_at(const char *filename, loff_t pos, void *buffer, loff_t maxsize, loff_t *actread); diff --git a/include/scsi.h b/include/scsi.h index 61da958bf6..96cb726676 100644 --- a/include/scsi.h +++ b/include/scsi.h @@ -6,6 +6,7 @@ #ifndef _SCSI_H #define _SCSI_H +#include <asm/cache.h> #include <linux/dma-direction.h> struct scsi_cmd { diff --git a/include/sdhci.h b/include/sdhci.h index 0ef8c2ed62..94fc3ed56a 100644 --- a/include/sdhci.h +++ b/include/sdhci.h @@ -9,6 +9,7 @@ #ifndef __SDHCI_HW_H #define __SDHCI_HW_H +#include <linux/bitops.h> #include <linux/types.h> #include <asm/io.h> #include <mmc.h> diff --git a/include/search.h b/include/search.h index 8f87dc72ce..bca36d3abc 100644 --- a/include/search.h +++ b/include/search.h @@ -84,7 +84,7 @@ int hmatch_r(const char *match, int last_idx, struct env_entry **retval, int hdelete_r(const char *key, struct hsearch_data *htab, int flag); ssize_t hexport_r(struct hsearch_data *htab, const char sep, int flag, - char **resp, size_t size, int argc, char * const argv[]); + char **resp, size_t size, int argc, char *const argv[]); /* * nvars: length of vars array diff --git a/include/spi.h b/include/spi.h index 2b4929fc79..5cc6d6e008 100644 --- a/include/spi.h +++ b/include/spi.h @@ -10,6 +10,7 @@ #define _SPI_H_ #include <common.h> +#include <linux/bitops.h> /* SPI mode flags */ #define SPI_CPHA BIT(0) /* clock phase */ diff --git a/include/spl.h b/include/spl.h index 90395fedb0..b31c9bb4ab 100644 --- a/include/spl.h +++ b/include/spl.h @@ -7,6 +7,7 @@ #define _SPL_H_ #include <binman_sym.h> +#include <linker_lists.h> /* Platform-specific defines */ #include <linux/compiler.h> @@ -26,6 +27,9 @@ struct image_header; #define MMCSD_MODE_FS 2 #define MMCSD_MODE_EMMCBOOT 3 +struct blk_desc; +struct image_header; + /* * u_boot_first_phase() - check if this is the first U-Boot phase * diff --git a/include/tee.h b/include/tee.h index 02bcd9e703..8207d0c02a 100644 --- a/include/tee.h +++ b/include/tee.h @@ -6,6 +6,7 @@ #ifndef __TEE_H #define __TEE_H +#include <linux/bitops.h> #define TEE_UUID_LEN 16 #define TEE_GEN_CAP_GP BIT(0) /* GlobalPlatform compliant TEE */ diff --git a/include/tee/optee.h b/include/tee/optee.h index 121b30a303..affa937da0 100644 --- a/include/tee/optee.h +++ b/include/tee/optee.h @@ -10,6 +10,7 @@ #define _OPTEE_H #include <linux/errno.h> +#include <image.h> #define OPTEE_MAGIC 0x4554504f #define OPTEE_VERSION 1 @@ -28,14 +29,16 @@ struct optee_header { uint32_t paged_size; }; -static inline uint32_t optee_image_get_entry_point(const image_header_t *hdr) +static inline uint32_t +optee_image_get_entry_point(const struct image_header *hdr) { struct optee_header *optee_hdr = (struct optee_header *)(hdr + 1); return optee_hdr->init_load_addr_lo; } -static inline uint32_t optee_image_get_load_addr(const image_header_t *hdr) +static inline uint32_t +optee_image_get_load_addr(const struct image_header *hdr) { return optee_image_get_entry_point(hdr) - sizeof(struct optee_header); } diff --git a/include/test/suites.h b/include/test/suites.h index 213e3cee77..f120b3a82a 100644 --- a/include/test/suites.h +++ b/include/test/suites.h @@ -7,6 +7,7 @@ #ifndef __TEST_SUITES_H__ #define __TEST_SUITES_H__ +struct cmd_tbl; struct unit_test; /** @@ -23,18 +24,22 @@ struct unit_test; */ int cmd_ut_category(const char *name, const char *prefix, struct unit_test *tests, int n_ents, - int argc, char * const argv[]); + int argc, char *const argv[]); -int do_ut_bloblist(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]); -int do_ut_compression(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]); -int do_ut_dm(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]); -int do_ut_env(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]); -int do_ut_lib(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]); -int do_ut_log(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]); -int do_ut_optee(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]); -int do_ut_overlay(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]); -int do_ut_str(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]); -int do_ut_time(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]); -int do_ut_unicode(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]); +int do_ut_bloblist(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]); +int do_ut_compression(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]); +int do_ut_dm(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); +int do_ut_env(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); +int do_ut_lib(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); +int do_ut_log(struct cmd_tbl *cmdtp, int flag, int argc, char * const argv[]); +int do_ut_optee(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); +int do_ut_overlay(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]); +int do_ut_str(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); +int do_ut_time(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); +int do_ut_unicode(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]); #endif /* __TEST_SUITES_H__ */ diff --git a/include/test/ut.h b/include/test/ut.h index b05d719ed0..7ddd6e8872 100644 --- a/include/test/ut.h +++ b/include/test/ut.h @@ -8,6 +8,7 @@ #ifndef __TEST_UT_H #define __TEST_UT_H +#include <command.h> #include <hexdump.h> #include <linux/err.h> diff --git a/include/tpm-common.h b/include/tpm-common.h index 702cd6e93b..e29b10b176 100644 --- a/include/tpm-common.h +++ b/include/tpm-common.h @@ -7,6 +7,8 @@ #ifndef __TPM_COMMON_H #define __TPM_COMMON_H +#include <command.h> + enum tpm_duration { TPM_SHORT = 0, TPM_MEDIUM = 1, @@ -173,8 +175,8 @@ struct tpm_ops { U_BOOT_CMD_MKENT(cmd, 0, 1, do_tpm_ ## cmd, "", "") #define TPM_COMMAND_NO_ARG(cmd) \ -int do_##cmd(cmd_tbl_t *cmdtp, int flag, \ - int argc, char * const argv[]) \ +int do_##cmd(struct cmd_tbl *cmdtp, int flag, \ + int argc, char *const argv[]) \ { \ struct udevice *dev; \ int rc; \ @@ -263,20 +265,20 @@ int tpm_init(struct udevice *dev); /** * Retrieve the array containing all the v1 (resp. v2) commands. * - * @return a cmd_tbl_t array. + * @return a struct cmd_tbl array. */ #if defined(CONFIG_TPM_V1) -cmd_tbl_t *get_tpm1_commands(unsigned int *size); +struct cmd_tbl *get_tpm1_commands(unsigned int *size); #else -static inline cmd_tbl_t *get_tpm1_commands(unsigned int *size) +static inline struct cmd_tbl *get_tpm1_commands(unsigned int *size) { return NULL; } #endif #if defined(CONFIG_TPM_V2) -cmd_tbl_t *get_tpm2_commands(unsigned int *size); +struct cmd_tbl *get_tpm2_commands(unsigned int *size); #else -static inline cmd_tbl_t *get_tpm2_commands(unsigned int *size) +static inline struct cmd_tbl *get_tpm2_commands(unsigned int *size) { return NULL; } diff --git a/include/tpm-v1.h b/include/tpm-v1.h index 45b7a4831d..59ad4aecf4 100644 --- a/include/tpm-v1.h +++ b/include/tpm-v1.h @@ -8,6 +8,7 @@ #define __TPM_V1_H #include <tpm-common.h> +#include <linux/bitops.h> /* Useful constants */ enum { diff --git a/include/ubifs_uboot.h b/include/ubifs_uboot.h index 015ce12226..b025779d59 100644 --- a/include/ubifs_uboot.h +++ b/include/ubifs_uboot.h @@ -14,13 +14,16 @@ #ifndef __UBIFS_UBOOT_H__ #define __UBIFS_UBOOT_H__ +struct blk_desc; +struct disk_partition; + int ubifs_init(void); int uboot_ubifs_mount(char *vol_name); void uboot_ubifs_umount(void); int ubifs_is_mounted(void); int ubifs_load(char *filename, u32 addr, u32 size); -int ubifs_set_blk_dev(struct blk_desc *rbdd, disk_partition_t *info); +int ubifs_set_blk_dev(struct blk_desc *rbdd, struct disk_partition *info); int ubifs_ls(const char *dir_name); int ubifs_exists(const char *filename); int ubifs_size(const char *filename, loff_t *size); diff --git a/include/virtio.h b/include/virtio.h index 561dcc34ba..10a9c073ba 100644 --- a/include/virtio.h +++ b/include/virtio.h @@ -20,6 +20,8 @@ #ifndef __VIRTIO_H__ #define __VIRTIO_H__ +#include <linux/bitops.h> +#include <linux/bug.h> #define VIRTIO_ID_NET 1 /* virtio net */ #define VIRTIO_ID_BLOCK 2 /* virtio block */ #define VIRTIO_ID_RNG 4 /* virtio rng */ diff --git a/include/vsc9953.h b/include/vsc9953.h index fe072da516..5d6fc7716c 100644 --- a/include/vsc9953.h +++ b/include/vsc9953.h @@ -11,6 +11,7 @@ #include <config.h> #include <miiphy.h> #include <asm/types.h> +#include <linux/bitops.h> #define VSC9953_OFFSET (CONFIG_SYS_CCSRBAR_DEFAULT + 0x800000) diff --git a/include/vxworks.h b/include/vxworks.h index d90d862fb7..c2585e61ce 100644 --- a/include/vxworks.h +++ b/include/vxworks.h @@ -9,6 +9,9 @@ #include <efi_api.h> +struct bootm_headers; +struct cmd_tbl; + /* Use Linux compatible standard DTB */ #define VXWORKS_SYSFLG_STD_DTB 0x1 @@ -83,8 +86,8 @@ struct efi_gop_info { u32 fb_size; /* framebuffer size */ }; -int do_bootvx(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]); -void boot_prep_vxworks(bootm_headers_t *images); -void boot_jump_vxworks(bootm_headers_t *images); +int do_bootvx(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); +void boot_prep_vxworks(struct bootm_headers *images); +void boot_jump_vxworks(struct bootm_headers *images); #endif diff --git a/include/wait_bit.h b/include/wait_bit.h index 79da0811fe..dc2ffeb2c2 100644 --- a/include/wait_bit.h +++ b/include/wait_bit.h @@ -8,9 +8,11 @@ #ifndef __WAIT_BIT_H #define __WAIT_BIT_H -#include <common.h> #include <console.h> +#include <log.h> +#include <time.h> #include <watchdog.h> +#include <linux/delay.h> #include <linux/errno.h> #include <asm/io.h> diff --git a/include/wdt.h b/include/wdt.h index aea5abc768..d2ccfbc62e 100644 --- a/include/wdt.h +++ b/include/wdt.h @@ -7,6 +7,7 @@ #define _WDT_H_ #include <dm.h> +#include <log.h> #include <dm/read.h> /* diff --git a/include/xyzModem.h b/include/xyzModem.h index 6fae634961..a8911b6bf5 100644 --- a/include/xyzModem.h +++ b/include/xyzModem.h @@ -25,6 +25,8 @@ #ifndef _XYZMODEM_H_ #define _XYZMODEM_H_ +#include <linux/delay.h> + #define xyzModem_xmodem 1 #define xyzModem_ymodem 2 /* Don't define this until the protocol support is in place */ diff --git a/include/zfs_common.h b/include/zfs_common.h index bca3dff06e..027ba91b28 100644 --- a/include/zfs_common.h +++ b/include/zfs_common.h @@ -98,7 +98,7 @@ int zfs_close(zfs_file_t); int zfs_ls(device_t dev, const char *path, int (*hook) (const char *, const struct zfs_dirhook_info *)); int zfs_devread(int sector, int byte_offset, int byte_len, char *buf); -void zfs_set_blk_dev(struct blk_desc *rbdd, disk_partition_t *info); +void zfs_set_blk_dev(struct blk_desc *rbdd, struct disk_partition *info); void zfs_unmount(struct zfs_data *data); int lzjb_decompress(void *, void *, uint32_t, uint32_t); #endif diff --git a/include/zynqmppl.h b/include/zynqmppl.h index 5214db99fb..a0a52ec4c1 100644 --- a/include/zynqmppl.h +++ b/include/zynqmppl.h @@ -8,6 +8,7 @@ #define _ZYNQMPPL_H_ #include <xilinx.h> +#include <linux/bitops.h> #define ZYNQMP_SIP_SVC_CSU_DMA_CHIPID 0xC2000018 #define ZYNQMP_SIP_SVC_PM_FPGA_LOAD 0xC2000016 |