The Kria boards start the TPM with a 'tpm autostart' call in the board environment. Enable CONFIG_TPM_AUTOSTART instead and drop tpm_setup from the environment, so the TPM is started even when the preboot script is changed or skipped.
The TPM is now started before preboot, so the TPM reset hints for some carrier card revisions are printed after the startup. Boards which still have the old environment saved run 'tpm autostart' a second time, which is harmless. Signed-off-by: Michael Haener <[email protected]> --- Changes in v3: - New patch board/xilinx/zynqmp/zynqmp_kria.env | 4 +--- configs/xilinx_zynqmp_kria_defconfig | 1 + 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/board/xilinx/zynqmp/zynqmp_kria.env b/board/xilinx/zynqmp/zynqmp_kria.env index 89f48c03586..ed6c1d7ad6f 100644 --- a/board/xilinx/zynqmp/zynqmp_kria.env +++ b/board/xilinx/zynqmp/zynqmp_kria.env @@ -66,7 +66,6 @@ bootmenu_delay=5 # Enabling PM nodes for uart0 and can0 kd240_setup=zynqmp pmufw node 33; zynqmp pmufw node 47 -tpm_setup=tpm autostart; tpm_reset=echo "!!! For TPM reset a full power cycle or pressing the POR_B button is required !!!"; tpm_kv260=if test ${card1_rev} = A -o ${card1_rev} = B -o ${card1_rev} = Y -o ${card1_rev} = Z -o ${card1_rev} = 1; then run tpm_reset; fi tpm_kd240=if test ${card1_rev} = A; then run tpm_reset; fi @@ -76,5 +75,4 @@ rtc dev 0; \ zynqmp mmio_write 0xFFCA0010 0xfff 0; \ if test ${card1_name} = SCK-KV-G; then run tpm_kv260; fi;\ if test ${card1_name} = SCK-KR-G; then run tpm_reset; fi;\ -if test ${card1_name} = SCK-KD-G; then run kd240_setup; run tpm_kd240; fi;\ -run tpm_setup +if test ${card1_name} = SCK-KD-G; then run kd240_setup; run tpm_kd240; fi diff --git a/configs/xilinx_zynqmp_kria_defconfig b/configs/xilinx_zynqmp_kria_defconfig index 2eb4fe4e8bf..2f9d6ccf98f 100644 --- a/configs/xilinx_zynqmp_kria_defconfig +++ b/configs/xilinx_zynqmp_kria_defconfig @@ -222,5 +222,6 @@ CONFIG_BINMAN_DTB="./arch/arm/dts/zynqmp-binman-som.dtb" CONFIG_PANIC_HANG=y CONFIG_MBEDTLS_LIB=y CONFIG_TPM=y +CONFIG_TPM_AUTOSTART=y CONFIG_SPL_GZIP=y CONFIG_TOOLS_MKFWUMDATA=y -- 2.55.0
