Skip to content

Commit 59d67a5

Browse files
committed
Fixes
1 parent 117a9f8 commit 59d67a5

File tree

5 files changed

+20
-14
lines changed

5 files changed

+20
-14
lines changed

Makefile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
###############
88

99
BENDER ?= bender
10+
PEAKRDL ?= peakrdl
1011

1112
#########################
1213
# Files and directories #
@@ -80,10 +81,7 @@ $(GENERATED_DOCS_DIR):
8081
mkdir -p $@
8182

8283
$(GENERATED_DOCS_DIR)/peripherals.md: hw/snitch_cluster/src/snitch_cluster_peripheral/snitch_cluster_peripheral_reg.rdl | $(GENERATED_DOCS_DIR)
83-
peakrdl markdown $< -o $@
84-
85-
# Command to generate rdl regblock:
86-
# peakrdl regblock hw/snitch_cluster/src/snitch_cluster_peripheral/snitch_cluster_peripheral_reg.rdl -o hw/snitch_cluster/src/snitch_cluster_peripheral --cpuif apb4-flat --default-reset arst_n
84+
$(PEAKRDL) markdown $< -o $@
8785

8886
$(DOXYGEN_DOCS_DIR): $(DOXYFILE) $(DOXYGEN_INPUTS)
8987
doxygen $<

hw/snitch_cluster/src/snitch_cluster_peripheral/snitch_cluster_peripheral.sv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ module snitch_cluster_peripheral
7575
.s_apb_penable ( sn_periph_regs_apb_req.penable ),
7676
.s_apb_pwrite ( sn_periph_regs_apb_req.pwrite ),
7777
.s_apb_pprot ( sn_periph_regs_apb_req.pprot ),
78-
.s_apb_paddr ( sn_periph_regs_apb_req.paddr ),
78+
.s_apb_paddr ( sn_periph_regs_apb_req.paddr[SNITCH_CLUSTER_PERIPHERAL_REG_MIN_ADDR_WIDTH-1:0] ),
7979
.s_apb_pwdata ( sn_periph_regs_apb_req.pwdata ),
8080
.s_apb_pstrb ( sn_periph_regs_apb_req.pstrb ),
8181
.s_apb_pready ( sn_periph_regs_apb_rsp.pready ),

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ dependencies = [
3535
"pandas",
3636
"peakrdl",
3737
"peakrdl-markdown",
38-
"peakrdl-regblock@git+https://github.com/micprog/PeakRDL-regblock.git#egg=offset_params",
38+
"peakrdl-rawheader@git+https://github.com/micprog/PeakRDL-rawheader.git",
3939
"prettytable",
4040
"progressbar2",
4141
"psutil",

target/common/common.mk

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ SN_BIN_DIR = $(SN_TARGET_DIR)/bin
2020

2121
# External executables
2222
BENDER ?= bender
23-
REGGEN ?= $(shell $(BENDER) path register_interface)/vendor/lowrisc_opentitan/util/regtool.py
23+
# REGGEN ?= $(shell $(BENDER) path register_interface)/vendor/lowrisc_opentitan/util/regtool.py
24+
PEAKRDL ?= peakrdl
2425
VERIBLE_FMT ?= verible-verilog-format
2526
CLANG_FORMAT ?= clang-format
2627
RISCV_MC ?= $(LLVM_BINROOT)/llvm-mc
@@ -83,7 +84,7 @@ $(SN_GEN_DIR) $(SN_BIN_DIR):
8384
# $1: target name, $2: prerequisite (hjson description file)
8485
define peakrdl_generate_header
8586
@echo "[peakRDL] Generating $1"
86-
peakrdl c-header -b htol $2 -o $1
87+
$(PEAKRDL) c-header -b htol $2 -o $1
8788
@$(CLANG_FORMAT) -i $1
8889
endef
8990

target/common/rtl.mk

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,26 +8,33 @@ SN_BOOTROM_DIR ?= $(SN_TARGET_DIR)/test
88
# Templates
99
SN_CLUSTER_WRAPPER_TPL = $(SN_HW_DIR)/snitch_cluster/src/snitch_cluster_wrapper.sv.tpl
1010
SN_CLUSTER_PKG_TPL = $(SN_HW_DIR)/snitch_cluster/src/snitch_cluster_pkg.sv.tpl
11+
SN_CLUSTER_RDL_TPL = $(SN_HW_DIR)/snitch_cluster/src/snitch_cluster_wrapper.rdl.tpl
1112

1213
# Generated RTL sources
1314
SN_CLUSTER_WRAPPER = $(SN_GEN_DIR)/snitch_cluster_wrapper.sv
1415
SN_CLUSTER_PKG = $(SN_GEN_DIR)/snitch_cluster_pkg.sv
15-
SN_CLUSTER_PERIPH_TOP = $(SN_PERIPH_DIR)/snitch_cluster_peripheral_reg_top.sv
16+
SN_CLUSTER_PERIPH_TOP = $(SN_PERIPH_DIR)/snitch_cluster_peripheral_reg.sv
1617
SN_CLUSTER_PERIPH_PKG = $(SN_PERIPH_DIR)/snitch_cluster_peripheral_reg_pkg.sv
1718
SN_BOOTROM = $(SN_BOOTROM_DIR)/snitch_bootrom.sv
19+
SN_CLUSTER_RDL = $(SN_GEN_DIR)/snitch_cluster_wrapper.rdl
20+
SN_CLUSTER_ADDR_SVH = $(SN_GEN_DIR)/snitch_cluster_addrmap.svh
1821

1922
# All generated RTL sources
20-
SN_GEN_RTL_SRCS = $(SN_CLUSTER_WRAPPER) $(SN_CLUSTER_PKG) $(SN_CLUSTER_PERIPH_TOP) $(SN_CLUSTER_PERIPH_PKG) $(SN_BOOTROM)
23+
SN_GEN_RTL_SRCS = $(SN_CLUSTER_WRAPPER) $(SN_CLUSTER_PKG) $(SN_CLUSTER_PERIPH_TOP) $(SN_CLUSTER_PERIPH_PKG) $(SN_BOOTROM) $(SN_CLUSTER_ADDR_PKG)
2124

2225
# CLUSTERGEN rules
2326
$(eval $(call sn_cluster_gen_rule,$(SN_CLUSTER_WRAPPER),$(SN_CLUSTER_WRAPPER_TPL)))
2427
$(eval $(call sn_cluster_gen_rule,$(SN_CLUSTER_PKG),$(SN_CLUSTER_PKG_TPL)))
28+
$(eval $(call sn_cluster_gen_rule,$(SN_CLUSTER_RDL),$(SN_CLUSTER_RDL_TPL)))
2529

26-
# REGGEN rules
30+
# peakRDL rules
2731
$(SN_CLUSTER_PERIPH_PKG): $(SN_CLUSTER_PERIPH_TOP)
28-
$(SN_CLUSTER_PERIPH_TOP): $(SN_PERIPH_DIR)/snitch_cluster_peripheral_reg.hjson
29-
@echo "[REGGEN] Generating peripheral regfile"
30-
$(REGGEN) -r -t $(SN_PERIPH_DIR) $<
32+
$(SN_CLUSTER_PERIPH_TOP): $(SN_PERIPH_DIR)/snitch_cluster_peripheral_reg.rdl
33+
@echo "[peakrdl] Generating peripheral regfile"
34+
$(PEAKRDL) regblock $< -o $(PERIPH_DIR) --cpuif apb4-flat --default-reset arst_n
35+
$(SN_CLUSTER_ADDR_PKG): $(SN_CLUSTER_RDL)
36+
@echo "[peakrdl] Generating addr pkg"
37+
$(PEAKRDL) raw-header $< -o $(SN_GEN_DIR) --format svh -I $(SN_PERIPH_DIR)
3138

3239
# Bootrom rules
3340
$(SN_BOOTROM_DIR)/bootrom.elf $(SN_BOOTROM_DIR)/bootrom.dump $(SN_BOOTROM_DIR)/bootrom.bin $(SN_BOOTROM): $(SN_BOOTROM_DIR)/bootrom.S $(SN_BOOTROM_DIR)/bootrom.ld $(SN_BOOTROM_GEN) | $(SN_BOOTROM_DIR)

0 commit comments

Comments
 (0)