| Message ID | 20211115171310.192040-1-heinrich.schuchardt@canonical.com |
|---|---|
| State | Accepted, archived |
| Commit | 617270b97ba9d930cf830f41472053ac195a80d4 |
| Delegated to: | Heinrich Schuchardt |
| Headers | show |
| Series | [1/1] configs: enable CMD_TPM on QEMU ARM | expand |
Hi Heinrich, On Mon, 15 Nov 2021 at 19:13, Heinrich Schuchardt <heinrich.schuchardt@canonical.com> wrote: > > With TPM emulation enabled in u-boot-test-hooks we should also provide the > tpm2 command used for the test/py/tests/test_tpm2.py test. > > One of the Python TPMv2 tests expects sandbox specific values. So disable > it on other platforms. > > Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com> > --- > configs/qemu_arm64_defconfig | 1 + > configs/qemu_arm_defconfig | 1 + > test/py/tests/test_tpm2.py | 1 + > 3 files changed, 3 insertions(+) > > diff --git a/configs/qemu_arm64_defconfig b/configs/qemu_arm64_defconfig > index 83d7ae54de..e8a6f752cd 100644 > --- a/configs/qemu_arm64_defconfig > +++ b/configs/qemu_arm64_defconfig > @@ -23,6 +23,7 @@ CONFIG_CMD_DFU=y > CONFIG_CMD_MTD=y > CONFIG_CMD_PCI=y > CONFIG_CMD_USB=y > +CONFIG_CMD_TPM=y > CONFIG_CMD_MTDPARTS=y > CONFIG_OF_BOARD=y > CONFIG_ENV_IS_IN_FLASH=y > diff --git a/configs/qemu_arm_defconfig b/configs/qemu_arm_defconfig > index ab5574847e..b459305144 100644 > --- a/configs/qemu_arm_defconfig > +++ b/configs/qemu_arm_defconfig > @@ -25,6 +25,7 @@ CONFIG_CMD_DFU=y > CONFIG_CMD_MTD=y > CONFIG_CMD_PCI=y > CONFIG_CMD_USB=y > +CONFIG_CMD_TPM=y > CONFIG_CMD_MTDPARTS=y > CONFIG_OF_BOARD=y > CONFIG_ENV_IS_IN_FLASH=y > diff --git a/test/py/tests/test_tpm2.py b/test/py/tests/test_tpm2.py > index 7c89f5f293..d2ad6f9e73 100644 > --- a/test/py/tests/test_tpm2.py > +++ b/test/py/tests/test_tpm2.py > @@ -186,6 +186,7 @@ def test_tpm2_change_auth(u_boot_console): > u_boot_console.run_command('tpm2 clear TPM2_RH_PLATFORM') > assert output.endswith('0') > > +@pytest.mark.buildconfigspec('sandbox') > @pytest.mark.buildconfigspec('cmd_tpm_v2') > def test_tpm2_get_capability(u_boot_console): > """Execute a TPM_GetCapability command. > -- > 2.32.0 > Do we still need this after [1] [1] https://lore.kernel.org/u-boot/20211118081343.107963-1-ilias.apalodimas@linaro.org/ Cheers /Ilias /Ilias
diff --git a/configs/qemu_arm64_defconfig b/configs/qemu_arm64_defconfig index 83d7ae54de..e8a6f752cd 100644 --- a/configs/qemu_arm64_defconfig +++ b/configs/qemu_arm64_defconfig @@ -23,6 +23,7 @@ CONFIG_CMD_DFU=y CONFIG_CMD_MTD=y CONFIG_CMD_PCI=y CONFIG_CMD_USB=y +CONFIG_CMD_TPM=y CONFIG_CMD_MTDPARTS=y CONFIG_OF_BOARD=y CONFIG_ENV_IS_IN_FLASH=y diff --git a/configs/qemu_arm_defconfig b/configs/qemu_arm_defconfig index ab5574847e..b459305144 100644 --- a/configs/qemu_arm_defconfig +++ b/configs/qemu_arm_defconfig @@ -25,6 +25,7 @@ CONFIG_CMD_DFU=y CONFIG_CMD_MTD=y CONFIG_CMD_PCI=y CONFIG_CMD_USB=y +CONFIG_CMD_TPM=y CONFIG_CMD_MTDPARTS=y CONFIG_OF_BOARD=y CONFIG_ENV_IS_IN_FLASH=y diff --git a/test/py/tests/test_tpm2.py b/test/py/tests/test_tpm2.py index 7c89f5f293..d2ad6f9e73 100644 --- a/test/py/tests/test_tpm2.py +++ b/test/py/tests/test_tpm2.py @@ -186,6 +186,7 @@ def test_tpm2_change_auth(u_boot_console): u_boot_console.run_command('tpm2 clear TPM2_RH_PLATFORM') assert output.endswith('0') +@pytest.mark.buildconfigspec('sandbox') @pytest.mark.buildconfigspec('cmd_tpm_v2') def test_tpm2_get_capability(u_boot_console): """Execute a TPM_GetCapability command.
With TPM emulation enabled in u-boot-test-hooks we should also provide the tpm2 command used for the test/py/tests/test_tpm2.py test. One of the Python TPMv2 tests expects sandbox specific values. So disable it on other platforms. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com> --- configs/qemu_arm64_defconfig | 1 + configs/qemu_arm_defconfig | 1 + test/py/tests/test_tpm2.py | 1 + 3 files changed, 3 insertions(+)