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/tpm-common.h | |
| 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/tpm-common.h')
| -rw-r--r-- | include/tpm-common.h | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/include/tpm-common.h b/include/tpm-common.h index 702cd6e93b8..e29b10b1766 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; } |