mirror of
https://github.com/linuxboot/heads.git
synced 2024-12-18 20:47:55 +00:00
b500505312
Most logic throughout Heads doesn't need to know TPM1 versus TPM2 (and shouldn't, the differences should be localized). Some checks were incorrect and are fixed by this change. Most checks are now unchanged relative to master. There are not that many places outside of tpmr that need to differentiate TPM1 and TPM2. Some of those are duplicate code that should be consolidated (seal-hotpkey, unseal-totp, unseal-hotp), and some more are probably good candidates for abstracting in tpmr so the business logic doesn't have to know TPM1 vs. TPM2. Previously, CONFIG_TPM could be variously 'y', 'n', or empty. Now it is always 'y' or 'n', and 'y' means "any TPM". Board configs are unchanged, setting CONFIG_TPM2_TOOLS=y implies CONFIG_TPM=y so this doesn't have to be duplicated and can't be mistakenly mismatched. There were a few checks for CONFIG_TPM = n that only coincidentally worked for TPM2 because CONFIG_TPM was empty (not 'n'). This test is now OK, but the checks were also cleaned up to '!= "y"' for robustness. Signed-off-by: Jonathon Hall <jonathon.hall@puri.sm>
37 lines
1.2 KiB
Makefile
37 lines
1.2 KiB
Makefile
# TPM2 tools program
|
|
modules-$(CONFIG_TPM2_TOOLS) += tpm2-tools
|
|
|
|
# CONFIG_TPM means any TPM version. (CONFIG_TPM2_TOOLS differentiates them when
|
|
# they must be handled differently, which should be localized.) Boards setting
|
|
# CONFIG_TPM2_TOOLS=y imply CONFIG_TPM=y.
|
|
ifeq "$(CONFIG_TPM2_TOOLS)" "y"
|
|
export CONFIG_TPM=y
|
|
endif
|
|
|
|
tpm2-tools_version := 5.2
|
|
#tpm2-tools_version := 78a7681
|
|
#tpm2-tools_repo := https://github.com/tpm2-software/tpm2-tools.git
|
|
|
|
tpm2-tools_dir := tpm2-tools-$(tpm2-tools_version)
|
|
tpm2-tools_tar := tpm2-tools-$(tpm2-tools_version).tar.gz
|
|
tpm2-tools_url := https://github.com/tpm2-software/tpm2-tools/releases/download/$(tpm2-tools_version)/$(tpm2-tools_tar)
|
|
tpm2-tools_hash := c0b402f6a7b3456e8eb2445211e2d41c46c7e769e05fe4d8909ff64119f7a630
|
|
|
|
# we have ESYS 3.0, but it doesn't figure that out on its own
|
|
tpm2-tools_configure := ./bootstrap && ./configure \
|
|
$(CROSS_TOOLS) \
|
|
--host $(MUSL_ARCH)-elf-linux \
|
|
--prefix "/" \
|
|
--disable-fapi \
|
|
TSS2_ESYS_3_0_CFLAGS="-I$(INSTALL)/include" \
|
|
TSS2_ESYS_3_0_LIBS="-ltss2-esys" \
|
|
|
|
tpm2-tools_target := $(MAKE_JOBS) \
|
|
DESTDIR="$(INSTALL)" \
|
|
$(CROSS_TOOLS) \
|
|
install \
|
|
|
|
tpm2-tools_output := tools/tpm2
|
|
|
|
tpm2-tools_depends := openssl tpm2-tss $(musl_dep)
|