@@ -449,40 +449,6 @@ index 5324b4978..a1a858232 100644
449449 } reg2hw_wrap_t;
450450
451451 endpackage : alert_pkg
452- diff --git a/hw/ip/flash_ctrl/rtl/flash_ctrl.sv b/hw/ip/flash_ctrl/rtl/flash_ctrl.sv
453- index 6b573e1b7..6a4f5b30e 100644
454- --- a/hw/ip/flash_ctrl/rtl/flash_ctrl.sv
455- +++ b/hw/ip/flash_ctrl/rtl/flash_ctrl.sv
456- @@ -309,20 +309,20 @@ module flash_ctrl import flash_ctrl_pkg::*; (
457- end
458-
459- // extra region is the default region
460- - flash_ctrl_reg2hw_mp_region_cfg_mreg_t [MpRegions:0] region_cfgs;
461- + logic [MpRegions*24:0] region_cfgs;
462-
463- - assign region_cfgs[MpRegions-1:0] = reg2hw.mp_region_cfg[MpRegions-1:0];
464- + assign region_cfgs[(MpRegions - 1)*24-1:0] = reg2hw.mp_region_cfg[MpRegions*24-1:0];
465-
466- //default region
467- - assign region_cfgs[MpRegions].base.q = '0;
468- - assign region_cfgs[MpRegions].size.q = NumBanks * PagesPerBank;
469- - assign region_cfgs[MpRegions].en.q = 1'b1;
470- - assign region_cfgs[MpRegions].rd_en.q = reg2hw.default_region.rd_en.q;
471- - assign region_cfgs[MpRegions].prog_en.q = reg2hw.default_region.prog_en.q;
472- - assign region_cfgs[MpRegions].erase_en.q = reg2hw.default_region.erase_en.q;
473- + assign region_cfgs[(MpRegions - 1)*24+19:(MpRegions - 1)*24+11] = '0;
474- + assign region_cfgs[(MpRegions - 1)*24+10:(MpRegions - 1)*24+1] = NumBanks * PagesPerBank;
475- + assign region_cfgs[(MpRegions - 1)*24+23] = 1'b1;
476- + assign region_cfgs[(MpRegions - 1)*24+22] = reg2hw.default_region.rd_en.q;
477- + assign region_cfgs[(MpRegions - 1)*24+21] = reg2hw.default_region.prog_en.q;
478- + assign region_cfgs[(MpRegions - 1)*24+20] = reg2hw.default_region.erase_en.q;
479- // we are allowed to set default accessibility of data partitions
480- // however info partitions default to inaccessible
481- - assign region_cfgs[MpRegions].partition.q = FlashPartData;
482- + assign region_cfgs[(MpRegions - 1)*24+0] = FlashPartData;
483-
484- flash_part_e flash_part_sel;
485- assign flash_part_sel = flash_part_e'(reg2hw.control.partition_sel.q);
486452diff --git a/hw/ip/padctrl/rtl/padring.sv b/hw/ip/padctrl/rtl/padring.sv
487453index fc8b3d183..2b94b0d67 100644
488454--- a/hw/ip/padctrl/rtl/padring.sv
0 commit comments