[top_darjeeling] Overwrite default PMP config from package definition

Signed-off-by: Robert Schilling <[email protected]>
lowRISC · Jan 10, 2025 · 257ba6f · 257ba6f
1 parent dc134b4
commit 257ba6f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/hw/top_darjeeling/data/autogen/top_darjeeling.gen.hjson b/hw/top_darjeeling/data/autogen/top_darjeeling.gen.hjson
@@ -8871,6 +8871,9 @@
         PMPNumRegions: "16"
         MHPMCounterNum: "10"
         MHPMCounterWidth: "32"
+        PMPRstCfg: ibex_pmp_reset_pkg::PmpCfgRst
+        PMPRstAddr: ibex_pmp_reset_pkg::PmpAddrRst
+        PMPRstMsecCfg: ibex_pmp_reset_pkg::PmpMseccfgRst
         RV32E: "0"
         RV32M: ibex_pkg::RV32MSingleCycle
         RV32B: ibex_pkg::RV32BOTEarlGrey
@@ -9053,7 +9056,7 @@
           desc: Reset value of PMP config CSRs
           type: ibex_pkg::pmp_cfg_t
           unpacked_dimensions: "[16]"
-          default: ibex_pkg::PmpCfgRst
+          default: ibex_pmp_reset_pkg::PmpCfgRst
           local: "false"
           expose: "true"
           name_top: RvCoreIbexPMPRstCfg
@@ -9063,7 +9066,7 @@
           desc: Reset value of PMP address CSRs
           type: logic [33:0]
           unpacked_dimensions: "[16]"
-          default: ibex_pkg::PmpAddrRst
+          default: ibex_pmp_reset_pkg::PmpAddrRst
           local: "false"
           expose: "true"
           name_top: RvCoreIbexPMPRstAddr
@@ -9072,7 +9075,7 @@
           name: PMPRstMsecCfg
           desc: Reset value of MSECCFG CSR
           type: ibex_pkg::pmp_mseccfg_t
-          default: ibex_pkg::PmpMseccfgRst
+          default: ibex_pmp_reset_pkg::PmpMseccfgRst
           local: "false"
           expose: "true"
           name_top: RvCoreIbexPMPRstMsecCfg

diff --git a/hw/top_darjeeling/data/top_darjeeling.hjson b/hw/top_darjeeling/data/top_darjeeling.hjson
@@ -988,6 +988,9 @@
                    PMPNumRegions: "16",
                    MHPMCounterNum: "10",
                    MHPMCounterWidth: "32",
+                   PMPRstCfg: "ibex_pmp_reset_pkg::PmpCfgRst",
+                   PMPRstAddr: "ibex_pmp_reset_pkg::PmpAddrRst",
+                   PMPRstMsecCfg: "ibex_pmp_reset_pkg::PmpMseccfgRst",
                    RV32E: "0",
                    RV32M: "ibex_pkg::RV32MSingleCycle",
                    RV32B: "ibex_pkg::RV32BOTEarlGrey",

diff --git a/hw/top_darjeeling/rtl/autogen/top_darjeeling.sv b/hw/top_darjeeling/rtl/autogen/top_darjeeling.sv
@@ -124,9 +124,9 @@ module top_darjeeling #(
   parameter int unsigned RvCoreIbexPMPNumRegions = 16,
   parameter int unsigned RvCoreIbexMHPMCounterNum = 10,
   parameter int unsigned RvCoreIbexMHPMCounterWidth = 32,
-  parameter ibex_pkg::pmp_cfg_t RvCoreIbexPMPRstCfg[16] = ibex_pkg::PmpCfgRst,
-  parameter logic [33:0] RvCoreIbexPMPRstAddr[16] = ibex_pkg::PmpAddrRst,
-  parameter ibex_pkg::pmp_mseccfg_t RvCoreIbexPMPRstMsecCfg = ibex_pkg::PmpMseccfgRst,
+  parameter ibex_pkg::pmp_cfg_t RvCoreIbexPMPRstCfg[16] = ibex_pmp_reset_pkg::PmpCfgRst,
+  parameter logic [33:0] RvCoreIbexPMPRstAddr[16] = ibex_pmp_reset_pkg::PmpAddrRst,
+  parameter ibex_pkg::pmp_mseccfg_t RvCoreIbexPMPRstMsecCfg = ibex_pmp_reset_pkg::PmpMseccfgRst,
   parameter bit RvCoreIbexRV32E = 0,
   parameter ibex_pkg::rv32m_e RvCoreIbexRV32M = ibex_pkg::RV32MSingleCycle,
   parameter ibex_pkg::rv32b_e RvCoreIbexRV32B = ibex_pkg::RV32BOTEarlGrey,