Skip to content

Commit 8cb5805

Browse files
committed
[hardware] Generate new registers and waive linter checks
1 parent 5e2950a commit 8cb5805

File tree

6 files changed

+24
-18
lines changed

6 files changed

+24
-18
lines changed

.github/workflows/lint.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,10 @@ jobs:
6767
fi
6868
- name: Check for trailing whitespaces and tabs
6969
run: |
70-
git diff --check $base HEAD -- \
71-
':(exclude)**.def' \
72-
':(exclude)**.patch' \
73-
':(exclude)toolchain/**' \
74-
':(exclude)software/riscv-tests/**'
70+
git diff --check $base HEAD -- \
71+
':(exclude)**.def' \
72+
':(exclude)**.patch' \
73+
':(exclude)toolchain/**' \
74+
':(exclude)software/riscv-tests/**' \
75+
':(exclude)software/runtime/control_registers.h' \
76+
':(exclude)hardware/src/control_registers/*.sv'

hardware/src/control_registers/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@
77
SHELL = /usr/bin/env bash
88
ROOT_DIR := $(patsubst %/,%, $(dir $(abspath $(lastword $(MAKEFILE_LIST)))))
99
RUNTIME_DIR := $(abspath $(ROOT_DIR)/../../../software/runtime)
10+
BENDER := $(ROOT_DIR)/../../../install/bender/bender
1011

11-
regtool ?= $(abspath $(ROOT_DIR)/../../deps/register_interface/vendor/lowrisc_opentitan/util/regtool.py)
12+
regtool ?= $(shell $(BENDER) path register_interface)/vendor/lowrisc_opentitan/util/regtool.py
1213

1314
RTL := $(patsubst $(ROOT_DIR)/%.hjson,%,$(shell find $(ROOT_DIR) -name "*.hjson"))
1415

hardware/src/control_registers/control_registers_reg_pkg.sv

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
// Copyright 2024 ETH Zurich and University of Bologna.
2-
// Solderpad Hardware License, Version 0.51, see LICENSE for details.
3-
// SPDX-License-Identifier: SHL-0.51
1+
// Copyright lowRISC contributors.
2+
// Licensed under the Apache License, Version 2.0, see LICENSE for details.
3+
// SPDX-License-Identifier: Apache-2.0
44
//
55
// Register Package auto-generated by `reggen` containing data structure
66

@@ -209,3 +209,4 @@ package control_registers_reg_pkg;
209209
};
210210

211211
endpackage
212+

hardware/src/control_registers/control_registers_reg_top.sv

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
// Copyright 2024 ETH Zurich and University of Bologna.
2-
// Solderpad Hardware License, Version 0.51, see LICENSE for details.
3-
// SPDX-License-Identifier: SHL-0.51
1+
// Copyright lowRISC contributors.
2+
// Licensed under the Apache License, Version 2.0, see LICENSE for details.
3+
// SPDX-License-Identifier: Apache-2.0
44
//
55
// Register Top module auto-generated by `reggen`
66

@@ -993,7 +993,6 @@ module control_registers_reg_top #(
993993

994994
endmodule
995995

996-
/* verilator lint_off DECLFILENAME */
997996
module control_registers_reg_top_intf
998997
#(
999998
parameter int AW = 7,
@@ -1021,12 +1020,12 @@ module control_registers_reg_top_intf
10211020

10221021
reg_bus_req_t s_reg_req;
10231022
reg_bus_rsp_t s_reg_rsp;
1024-
1023+
10251024
// Assign SV interface to structs
10261025
`REG_BUS_ASSIGN_TO_REQ(s_reg_req, regbus_slave)
10271026
`REG_BUS_ASSIGN_FROM_RSP(regbus_slave, s_reg_rsp)
10281027

1029-
1028+
10301029

10311030
control_registers_reg_top #(
10321031
.reg_req_t(reg_bus_req_t),
@@ -1041,6 +1040,7 @@ module control_registers_reg_top_intf
10411040
.hw2reg, // Read
10421041
.devmode_i
10431042
);
1044-
1043+
10451044
endmodule
1046-
/* verilator lint_on DECLFILENAME */
1045+
1046+

scripts/license-checker.hjson

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
'software/riscv-tests/*'
2222
'hardware/deps/*'
2323
'hardware/tb/dpi/elfloader.cpp'
24+
'hardware/src/control_registers/control_registers_reg_pkg.sv'
25+
'hardware/src/control_registers/control_registers_reg_top.sv'
2426
'scripts/run_clang_format.py'
2527
'toolchain/*'
2628
]

software/runtime/control_registers.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// Copyright 2024 ETH Zurich and University of Bologna.
55

66
// Licensing information found in source file:
7-
// Solderpad Hardware License, Version 0.51, see LICENSE for details.
7+
//
88
// SPDX-License-Identifier: SHL-0.51
99

1010
#ifndef _CONTROL_REGISTERS_REG_DEFS_

0 commit comments

Comments
 (0)