Hi Simon,
Thanks for reviewing all of this.
On Wed, 2 May 2018 20:31:50 -0600, Simon Glass sjg@chromium.org wrote:
Hi Miquel,
On 2 May 2018 at 02:59, Miquel Raynal miquel.raynal@bootlin.com wrote:
Choice between v1 and v2 compliant functions is done with the configuration.
Create the various files that will receive TPMv2-only code on the same scheme as for the TPMv1 code.
Signed-off-by: Miquel Raynal miquel.raynal@bootlin.com
cmd/Makefile | 1 + cmd/tpm-v2.c | 33 ++++++++++++ drivers/tpm/tpm-uclass.c | 2 + include/tpm-v2.h | 128 +++++++++++++++++++++++++++++++++++++++++++++++ lib/Makefile | 1 + lib/tpm-v2.c | 11 ++++ 6 files changed, 176 insertions(+) create mode 100644 cmd/tpm-v2.c create mode 100644 include/tpm-v2.h create mode 100644 lib/tpm-v2.c
diff --git a/cmd/Makefile b/cmd/Makefile index 66732085e8..bdb5475e07 100644 --- a/cmd/Makefile +++ b/cmd/Makefile @@ -120,6 +120,7 @@ obj-$(CONFIG_HUSH_PARSER) += test.o obj-$(CONFIG_CMD_TPM) += tpm-common.o obj-$(CONFIG_CMD_TPM_V1) += tpm-v1.o obj-$(CONFIG_CMD_TPM_TEST) += tpm_test.o +obj-$(CONFIG_CMD_TPM_V2) += tpm-v2.o obj-$(CONFIG_CMD_CROS_EC) += cros_ec.o obj-$(CONFIG_CMD_TSI148) += tsi148.o obj-$(CONFIG_CMD_UBI) += ubi.o diff --git a/cmd/tpm-v2.c b/cmd/tpm-v2.c new file mode 100644 index 0000000000..606aa92409 --- /dev/null +++ b/cmd/tpm-v2.c @@ -0,0 +1,33 @@ +// SPDX-License-Identifier: GPL-2.0+ +/*
- Copyright (c) 2018 Bootlin
- Authoredr: Miquel Raynal miquel.raynal@bootlin.com
- */
+#include <common.h> +#include <dm.h> +#include <log.h> +#include <tpm-common.h> +#include <tpm-v2.h> +#include "tpm-user-utils.h"
+static cmd_tbl_t tpm2_commands[] = {
U_BOOT_CMD_MKENT(info, 0, 1, do_tpm_info, "", ""),U_BOOT_CMD_MKENT(init, 0, 1, do_tpm_init, "", ""),+};
+cmd_tbl_t *get_tpm_commands(unsigned int *size)
Why is this exported? Is it used somewhere else?
Indeed, this function is exported in both tpm-v1.c and tpm-v2.c (only one is compiled at a time) and shared code (tpm-common.c) call this function to retrieve the commands array.
+{
*size = ARRAY_SIZE(tpm2_commands);return tpm2_commands;+}
Reviewed-by: Simon Glass sjg@chromium.org
Thanks, Miquèl