Merge "Fix the problem with tap_strap tests"
diff --git a/hw/top_matcha/dv/chip_sim_cfg.hjson b/hw/top_matcha/dv/chip_sim_cfg.hjson
index 55305c3..397f411 100644
--- a/hw/top_matcha/dv/chip_sim_cfg.hjson
+++ b/hw/top_matcha/dv/chip_sim_cfg.hjson
@@ -2077,6 +2077,7 @@
"chip_sw_sysrst_ctrl_inputs",
"chip_sw_uart_smoketest",
"chip_sw_uart_tx_rx",
+ "chip_tap_straps_rma",
]
}
{
diff --git a/sw/device/lib/testing/test_rom/BUILD b/sw/device/lib/testing/test_rom/BUILD
index bce31d3..c5fa7d0 100644
--- a/sw/device/lib/testing/test_rom/BUILD
+++ b/sw/device/lib/testing/test_rom/BUILD
@@ -26,14 +26,9 @@
opentitan_rom_binary(
name = "test_rom",
- srcs = [
- "test_rom.c",
- "test_rom_start.S",
- ],
deps = [
":linker_script",
- ":test_rom_lib",
- "//sw/device/silicon_creator/rom:bootstrap",
+ ":test_rom_otp_lib",
],
)
@@ -48,7 +43,19 @@
":linker_script",
":test_rom_lib",
"//sw/device/silicon_creator/rom:bootstrap_no_otp",
- ]
+ ],
+)
+
+cc_library(
+ name = "test_rom_otp_lib",
+ srcs = [
+ "test_rom.c",
+ "test_rom_start.S",
+ ],
+ deps = [
+ ":test_rom_lib",
+ "//sw/device/silicon_creator/rom:bootstrap",
+ ],
)
cc_library(
@@ -63,8 +70,8 @@
"//hw/top_matcha/ip/flash_ctrl/data/autogen:flash_ctrl_regs",
"//hw/top_matcha/ip/sensor_ctrl/data:sensor_ctrl_regs",
"//hw/top_matcha/sw/autogen:top_matcha",
- "//sw/device/lib/testing:pinmux_testutils",
"//sw/device/lib/dif:pinmux",
+ "//sw/device/lib/testing:pinmux_testutils",
"@lowrisc_opentitan//hw/ip/csrng/data:csrng_regs",
"@lowrisc_opentitan//hw/ip/edn/data:edn_regs",
"@lowrisc_opentitan//hw/ip/entropy_src/data:entropy_src_regs",
diff --git a/sw/device/tests/BUILD b/sw/device/tests/BUILD
index 9e9f935..9f6e2af 100644
--- a/sw/device/tests/BUILD
+++ b/sw/device/tests/BUILD
@@ -670,7 +670,7 @@
deps = [
":test_lib_base",
"//sw/device/lib/testing/test_rom:linker_script",
- "//sw/device/lib/testing/test_rom:test_rom_lib",
+ "//sw/device/lib/testing/test_rom:test_rom_otp_lib",
],
)
