diff --git a/hw/chimera_pkg.sv b/hw/chimera_pkg.sv index ed9cca1..c90336e 100644 --- a/hw/chimera_pkg.sv +++ b/hw/chimera_pkg.sv @@ -50,8 +50,8 @@ package chimera_pkg; localparam int HyperRegIdx = 2; localparam int HyperAXIIdx = 5; - localparam doub_bt HyperRegionStart = 64'h3000_1000; - localparam doub_bt HyperRegionEnd = 64'h3000_2000; + localparam doub_bt HyperRegionStart = 64'h3000_2000; + localparam doub_bt HyperRegionEnd = 64'h3000_3000; localparam aw_bt ClusterNarrowAxiMstIdWidth = 1; @@ -102,9 +102,9 @@ package chimera_pkg; // REG CFG cfg.RegExtNumSlv = ExtRegNum; cfg.RegExtNumRules = ExtRegNum; - cfg.RegExtRegionIdx = {8'h1, 8'h0}; // SnitchBootROM - cfg.RegExtRegionStart = {TopLevelRegionStart, SnitchBootROMRegionStart}; - cfg.RegExtRegionEnd = {TopLevelRegionEnd, SnitchBootROMRegionEnd}; + cfg.RegExtRegionIdx = {8'h2, 8'h1, 8'h0}; // SnitchBootROM + cfg.RegExtRegionStart = {HyperRegionStart, TopLevelRegionStart, SnitchBootROMRegionStart}; + cfg.RegExtRegionEnd = {HyperRegionEnd, TopLevelRegionEnd, SnitchBootROMRegionEnd}; // ACCEL HART/IRQ CFG cfg.NumExtIrqHarts = ExtCores; diff --git a/hw/chimera_top_wrapper.sv b/hw/chimera_top_wrapper.sv index bfb1725..66ed3d3 100644 --- a/hw/chimera_top_wrapper.sv +++ b/hw/chimera_top_wrapper.sv @@ -339,7 +339,7 @@ module chimera_top_wrapper .IsClockODelayed(0), // SCHEREMO: REVIEWME .AxiAddrWidth(Cfg.AddrWidth), .AxiDataWidth(Cfg.AxiDataWidth), - .AxiIdWidth(Cfg.AxiMstIdWidth + 4), + .AxiIdWidth($bits(axi_slv_req[0].aw.id)), .AxiUserWidth(Cfg.AxiUserWidth), .axi_req_t(axi_slv_req_t),