Merge branch 'master' into fix-3170

Author: oChunCai

core/include/cv64a60ax_config_pkg_cvfpu-uvm.sv

@@ -64,6 +64,7 @@ package cva6_config_pkg;
       CoproType: config_pkg::COPRO_EXAMPLE,
       RVZiCond: bit'(1),
       RVZicntr: bit'(1),
+      RVZiCbom: bit'(1),
       RVZihpm: bit'(1),
       NrScoreboardEntries: unsigned'(8),
       PerfCounterEn: bit'(1),
@@ -104,6 +105,11 @@ package cva6_config_pkg;
       CachedRegionLength: 1024'({64'h2_0000_0000, 64'h1_0000}),
       MaxOutstandingStores: unsigned'(7),
       DebugEn: bit'(1),
+      SDTRIG: bit'(0),
+      Mcontrol6: bit'(0),
+      Icount: bit'(0),
+      Etrigger: bit'(0),
+      Itrigger: bit'(0),
       AxiBurstWriteEn: bit'(1),
       IcacheByteSize: unsigned'(32768),
       IcacheSetAssoc: unsigned'(8),
@@ -113,6 +119,7 @@ package cva6_config_pkg;
       DcacheSetAssoc: unsigned'(8),
       DcacheLineWidth: unsigned'(512),
       DcacheFlushOnFence: bit'(0),
+      DcacheFlushOnFenceI: bit'(0),
       DcacheInvalidateOnFlush: bit'(0),
       DataUserEn: unsigned'(0),
       WtDcacheWbufDepth: int'(8),
@@ -121,6 +128,7 @@ package cva6_config_pkg;
       InstrTlbEntries: int'(16),
       DataTlbEntries: int'(16),
       UseSharedTlb: bit'(0),
+      SvnapotEn: bit'(0),
       SharedTlbDepth: int'(64),
       NrLoadPipeRegs: int'(0),
       NrStorePipeRegs: int'(0),