From 1d01293914399fc1e1ef1559efdb5e053586fc95 Mon Sep 17 00:00:00 2001 From: Tim Trippel Date: Mon, 22 Apr 2024 17:14:16 -0700 Subject: [PATCH] [test] adjust exec_env of `otbn_boot_functest` The `otbn_boot_services_functest` must run in the ROM_EXT slot since it manipulates the keygmr state, which normally is done by the ROM_EXT. This partially addresses #21706. Signed-off-by: Tim Trippel --- sw/device/silicon_creator/lib/BUILD | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/sw/device/silicon_creator/lib/BUILD b/sw/device/silicon_creator/lib/BUILD index 29fa3921453059..0757027c8d58a2 100644 --- a/sw/device/silicon_creator/lib/BUILD +++ b/sw/device/silicon_creator/lib/BUILD @@ -66,14 +66,12 @@ cc_test( opentitan_test( name = "boot_data_functest", srcs = ["boot_data_functest.c"], - broken = cw310_params(tags = ["broken"]), - exec_env = dicts.add( - EARLGREY_TEST_ENVS, - { - # FIXME broken in sival ROM_EXT, remove this line when fixed. See #21706. - "//hw/top_earlgrey:fpga_cw310_sival_rom_ext": "broken", - }, - ), + exec_env = { + "//hw/top_earlgrey:fpga_cw310_rom_with_fake_keys": None, + "//hw/top_earlgrey:fpga_cw310_sival": None, + "//hw/top_earlgrey:sim_dv": None, + "//hw/top_earlgrey:sim_verilator": None, + }, verilator = verilator_params( timeout = "eternal", tags = ["flaky"], @@ -491,12 +489,10 @@ cc_library( opentitan_test( name = "otbn_boot_services_functest", srcs = ["otbn_boot_services_functest.c"], - broken = cw310_params(tags = ["broken"]), exec_env = dicts.add( EARLGREY_TEST_ENVS, { - # FIXME broken in sival ROM_EXT, remove this line when fixed. See #21706. - "//hw/top_earlgrey:fpga_cw310_sival_rom_ext": "broken", + "//hw/top_earlgrey:fpga_cw310_sival": None, }, ), # This target uses OTBN pointers internally, so it cannot work host-side.