Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[top] Enable Darjeeling in the hw Makefile #25485

Merged
merged 2 commits into from
Dec 4, 2024
+8 −6
Merged

[top] Enable Darjeeling in the hw Makefile #25485

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0a76097
[top] Enable Darjeeling in the hw Makefile
Razer6 Dec 3, 2024
41e06f0
[darjeeling] Re-generate and properly set alert handler deps
Razer6 Dec 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion hw/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ IPS ?= aes \
uart \
usbdev

TOPS ?= top_earlgrey
TOPS ?= top_darjeeling top_earlgrey

USE_BUFFER ?= 0

Expand Down
6 changes: 4 additions & 2 deletions hw/top_darjeeling/data/autogen/top_darjeeling.gen.hjson
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8387,6 +8387,8 @@
DmHaltAddr: tl_main_pkg::ADDR_SPACE_RV_DM__MEM + dm::HaltAddress[31:0]
DmExceptionAddr: tl_main_pkg::ADDR_SPACE_RV_DM__MEM + dm::ExceptionAddress[31:0]
PipeLine: "0"
NEscalationSeverities: alert_handler_reg_pkg::N_ESC_SEV
WidthPingCounter: alert_handler_reg_pkg::PING_CNT_DW
}
clock_srcs:
{
Expand Down Expand Up @@ -8485,7 +8487,7 @@
name: NEscalationSeverities
desc: Number of escalation severities
type: int unsigned
default: "4"
default: alert_handler_reg_pkg::N_ESC_SEV
local: "true"
expose: "true"
name_top: RvCoreIbexNEscalationSeverities
Expand All @@ -8494,7 +8496,7 @@
name: WidthPingCounter
desc: Width of the ping counter
type: int unsigned
default: "16"
default: alert_handler_reg_pkg::PING_CNT_DW
local: "true"
expose: "true"
name_top: RvCoreIbexWidthPingCounter
Expand Down
2 changes: 1 addition & 1 deletion hw/top_darjeeling/data/top_darjeeling.hjson
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -985,7 +985,7 @@
SecureIbex: "1",
DmHaltAddr: "tl_main_pkg::ADDR_SPACE_RV_DM__MEM + dm::HaltAddress[31:0]",
DmExceptionAddr: "tl_main_pkg::ADDR_SPACE_RV_DM__MEM + dm::ExceptionAddress[31:0]",
PipeLine: "0"
PipeLine: "0",
NEscalationSeverities: "alert_handler_reg_pkg::N_ESC_SEV",
WidthPingCounter: "alert_handler_reg_pkg::PING_CNT_DW"
},
Expand Down
4 changes: 2 additions & 2 deletions hw/top_darjeeling/rtl/autogen/top_darjeeling.sv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,8 +277,8 @@ module top_darjeeling #(
// local parameters for lc_ctrl
localparam int LcCtrlNumRmaAckSigs = 1;
// local parameters for rv_core_ibex
localparam int unsigned RvCoreIbexNEscalationSeverities = 4;
localparam int unsigned RvCoreIbexWidthPingCounter = 16;
localparam int unsigned RvCoreIbexNEscalationSeverities = alert_handler_reg_pkg::N_ESC_SEV;
localparam int unsigned RvCoreIbexWidthPingCounter = alert_handler_reg_pkg::PING_CNT_DW;

// Signals
logic [3:0] mio_p2d;
Expand Down
Loading