diff options
| author | Miquel Raynal <miquel.raynal@bootlin.com> | 2018-05-15 11:57:06 +0200 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-05-25 20:12:55 -0400 |
| commit | d677bfe2f7914367d1caa6146b34e86d0df1c75d (patch) | |
| tree | a9fd34e6cceac25b6d232ab2d07460648cb53022 /cmd/Makefile | |
| parent | 9f9ce3c369b7fbcc47496331ff28fad80302a42c (diff) | |
| download | u-boot-d677bfe2f7914367d1caa6146b34e86d0df1c75d.tar.gz | |
tpm: disociate TPMv1.x specific and generic code
There are no changes in this commit but a new organization of the code
as follow.
* cmd/ directory:
> move existing code from cmd/tpm.c in cmd/tpm-common.c
> move specific code in cmd/tpm-v1.c
> create a specific header file with generic definitions for
commands only called cmd/tpm-user-utils.h
* lib/ directory:
> move existing code from lib/tpm.c in lib/tpm-common.c
> move specific code in lib/tpm-v1.c
> create a specific header file with generic definitions for
the library itself called lib/tpm-utils.h
* include/ directory:
> move existing code from include/tpm.h in include/tpm-common.h
> move specific code in include/tpm-v1.h
Code designated as 'common' is compiled if TPM are used. Code designated
as 'specific' is compiled only if the right specification has been
selected.
All files include tpm-common.h.
Files in cmd/ include tpm-user-utils.h.
Files in lib/ include tpm-utils.h.
Depending on the specification, files may include either (not both)
tpm-v1.h or tpm-v2.h.
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
[trini: Fix a few more cases of tpm.h -> tpm-v1.h, some Kconfig logic]
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'cmd/Makefile')
| -rw-r--r-- | cmd/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cmd/Makefile b/cmd/Makefile index ca6ead8e8e..6164f6e611 100644 --- a/cmd/Makefile +++ b/cmd/Makefile @@ -120,7 +120,8 @@ obj-$(CONFIG_CMD_TERMINAL) += terminal.o obj-$(CONFIG_CMD_TIME) += time.o obj-$(CONFIG_CMD_TRACE) += trace.o obj-$(CONFIG_HUSH_PARSER) += test.o -obj-$(CONFIG_CMD_TPM_V1) += tpm.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_CROS_EC) += cros_ec.o obj-$(CONFIG_CMD_TSI148) += tsi148.o |