Skip to content

Commit b2e21dd

Browse files
Apply patches to lowrisc_ip
Apply patches to code from upstream repository https://github.com/lowRISC/opentitan at revision 5ad6963fa71a63b4cc7817fb3bae5052c796bfc1 The space added to aon_timer was added in a previous PR and is already in a patch file: https://github.com/lowRISC/sunburst-chip/blob/main/hw/vendor/patches/lowrisc_ip/aon_timer/0004-Fix-DV.patch Signed-off-by: Marno van der Maas <mvdmaas+git@lowrisc.org>
1 parent 39b908b commit b2e21dd

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

hw/vendor/lowrisc_ip/dv/tools/dvsim/testplans/tl_device_access_types_testplan.hjson

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Licensed under the Apache License, Version 2.0, see LICENSE for details.
33
// SPDX-License-Identifier: Apache-2.0
44
{
5-
import_testplans: ["hw/dv/tools/dvsim/testplans/tl_device_access_types_wo_intg_testplan.hjson"]
5+
import_testplans: ["hw/vendor/lowrisc_ip/dv/tools/dvsim/testplans/tl_device_access_types_wo_intg_testplan.hjson"]
66
testpoints: [
77
{
88
name: tl_intg_err

hw/vendor/lowrisc_ip/ip/aon_timer/dv/tb.sv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ module tb;
5050

5151
`DV_ALERT_IF_CONNECT()
5252

53-
assign alert_tx = '0;
53+
assign alert_tx = '0;
5454

5555
aon_timer dut (
5656
.clk_i (clk),

hw/vendor/lowrisc_ip/ip/i2c/data/i2c_testplan.hjson

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
// SPDX-License-Identifier: Apache-2.0
44
{
55
name: "i2c"
6-
import_testplans: ["hw/dv/tools/dvsim/testplans/csr_testplan.hjson",
7-
"hw/dv/tools/dvsim/testplans/alert_test_testplan.hjson",
8-
"hw/dv/tools/dvsim/testplans/intr_test_testplan.hjson",
9-
"hw/dv/tools/dvsim/testplans/tl_device_access_types_testplan.hjson",
6+
import_testplans: ["hw/vendor/lowrisc_ip/dv/tools/dvsim/testplans/csr_testplan.hjson",
7+
//"hw/vendor/lowrisc_ip/dv/tools/dvsim/testplans/alert_test_testplan.hjson",
8+
"hw/vendor/lowrisc_ip/dv/tools/dvsim/testplans/intr_test_testplan.hjson",
9+
"hw/vendor/lowrisc_ip/dv/tools/dvsim/testplans/tl_device_access_types_testplan.hjson",
1010
"i2c_sec_cm_testplan.hjson"]
1111
testpoints: [
1212
//-----------------------------------------------

hw/vendor/lowrisc_ip/ip/i2c/dv/i2c_sim_cfg.hjson

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,17 @@
1818
fusesoc_core: lowrisc:dv:i2c_sim:0.1
1919

2020
// Testplan hjson file.
21-
testplan: "{proj_root}/hw/ip/i2c/data/i2c_testplan.hjson"
21+
testplan: "{proj_root}/hw/vendor/lowrisc_ip/ip/i2c/data/i2c_testplan.hjson"
2222

2323
// RAL spec - used to generate the RAL model.
24-
ral_spec: "{proj_root}/hw/ip/i2c/data/i2c.hjson"
24+
ral_spec: "{proj_root}/hw/vendor/lowrisc_ip/ip/i2c/data/i2c.hjson"
2525

2626
// Import additional common sim cfg files.
2727
import_cfgs: [// Project wide common sim cfg file
2828
"{proj_root}/hw/vendor/lowrisc_ip/dv/tools/dvsim/common_sim_cfg.hjson",
2929
// Common CIP test lists
3030
"{proj_root}/hw/vendor/lowrisc_ip/dv/tools/dvsim/tests/csr_tests.hjson",
31-
"{proj_root}/hw/vendor/lowrisc_ip/dv/tools/dvsim/tests/alert_test.hjson",
31+
//"{proj_root}/hw/vendor/lowrisc_ip/dv/tools/dvsim/tests/alert_test.hjson",
3232
"{proj_root}/hw/vendor/lowrisc_ip/dv/tools/dvsim/tests/intr_test.hjson",
3333
"{proj_root}/hw/vendor/lowrisc_ip/dv/tools/dvsim/tests/sec_cm_tests.hjson",
3434
"{proj_root}/hw/vendor/lowrisc_ip/dv/tools/dvsim/tests/tl_access_tests.hjson"]
@@ -37,7 +37,7 @@
3737
sim_tops: ["i2c_bind", "sec_cm_prim_onehot_check_bind"]
3838

3939
// Add coverage exclusion file
40-
vcs_cov_excl_files: ["{proj_root}/hw/ip/i2c/dv/cov/i2c_cov_excl.el"]
40+
vcs_cov_excl_files: ["{proj_root}/hw/vendor/lowrisc_ip/ip/i2c/dv/cov/i2c_cov_excl.el"]
4141

4242
// Default iterations for all tests - each test entry can override this.
4343
reseed: 50
@@ -53,7 +53,7 @@
5353
overrides: [
5454
{
5555
name: default_vcs_cov_cfg_file
56-
value: "-cm_hier {proj_root}/hw/dv/tools/vcs/cover.cfg+{proj_root}/hw/dv/tools/vcs/common_cov_excl.cfg+{proj_root}/hw/ip/i2c/dv/cov/cov_excl.cfg"
56+
value: "-cm_hier {proj_root}/hw/vendor/lowrisc_ip/dv/tools/vcs/cover.cfg+{proj_root}/hw/vendor/lowrisc_ip/dv/tools/vcs/common_cov_excl.cfg+{proj_root}/hw/vendor/lowrisc_ip/ip/i2c/dv/cov/cov_excl.cfg"
5757
}
5858
]
5959

0 commit comments

Comments
 (0)